From 63b929c1e3f66d87df41176696b1c19256d91451 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Lucas?= <sebastien@slucas.fr>
Date: Sat, 31 May 2014 15:03:46 +0200
Subject: [PATCH] Add a fullTitle property to show the current database

---
 JSON_renderer.php               | 7 +++++++
 templates/bootstrap/header.html | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/JSON_renderer.php b/JSON_renderer.php
index d92a466..4cec790 100644
--- a/JSON_renderer.php
+++ b/JSON_renderer.php
@@ -190,6 +190,13 @@ class JSONRenderer
         }
         $out ["databaseId"] = GetUrlParam (DB, "");
         $out ["databaseName"] = Base::getDbName ();
+        if ($out ["databaseId"] == "") {
+            $out ["databaseName"] = "";
+        }
+        $out ["fullTitle"] = $out ["title"];
+        if ($out ["databaseId"] != "" && $out ["databaseName"] != $out ["fullTitle"]) {
+            $out ["fullTitle"] = $out ["databaseName"] . " > " . $out ["fullTitle"];
+        }
         $out ["page"] = $page;
         $out ["multipleDatabase"] = Base::isMultipleDatabaseEnabled () ? 1 : 0;
         $out ["entries"] = $entries;
diff --git a/templates/bootstrap/header.html b/templates/bootstrap/header.html
index ea9e7ec..8cad012 100644
--- a/templates/bootstrap/header.html
+++ b/templates/bootstrap/header.html
@@ -10,7 +10,7 @@
       <ul class="nav navbar-nav">
         <li><a href="{{=it.homeurl}}"><span class="glyphicon glyphicon-home"></span></a></li>
       </ul>
-      <a class="navbar-brand" href="#">{{=it.title}}</a>
+      <a class="navbar-brand" href="#">{{=it.fullTitle}}</a>
     </div>
     <div class="collapse navbar-collapse">
       <ul class="nav navbar-nav navbar-right">