From 17c81f3f97fa84701b406fdf204b7cb0b14ba20d Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sun, 22 Jul 2007 16:22:54 +0000
Subject: [PATCH] bug #1758159 Wrong place for styling

---
 Documentation.html                     |  4 ++++
 phpmyadmin.css.php                     | 13 -------------
 themes/darkblue_orange/layout.inc.php  |  3 +++
 themes/original/css/theme_left.css.php |  4 ++++
 themes/original/layout.inc.php         |  2 ++
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Documentation.html b/Documentation.html
index ca609bbb5..829ccc985 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -1540,6 +1540,10 @@ $cfg['TrustedProxies'] =
     <dd>The style used for the pointer in the navi frame.
         See <tt>themes/themename/layout.inc.php</tt>.</dd>
 
+    <dt id="cfg_NaviDatabaseNameColor">$cfg['NaviDatabaseNameColor'] string [valid css code]<br />
+    <dd>The color used for the database name in the navi frame.
+    See <tt>themes/themename/layout.inc.php</tt>.</dd>
+
     <dt id="cfg_LeftPointerEnable">$cfg['LeftPointerEnable'] boolean</dt>
     <dd>A value of <tt>TRUE</tt> activates the navi pointer (when LeftFrameLight
         is <tt>FALSE</tt>).</dd>
diff --git a/phpmyadmin.css.php b/phpmyadmin.css.php
index c6b240d08..543ad5664 100644
--- a/phpmyadmin.css.php
+++ b/phpmyadmin.css.php
@@ -790,18 +790,5 @@ body.loginform div.container {
     <?php
 } // end styles 2.9
 
-if ($_SESSION['PMA_Theme']->checkVersion('2.11')) {
-    ?>
-/********************/
-/* NEW in PMA 2.11  */
-/********************/
-
-.navi_dbName {
-    font-weight:    bold;
-    color:          #0000FF;
-}
-    <?php
-} // end styles 2.11
-
 $_SESSION['PMA_Theme_Manager']->printCss($_REQUEST['js_frame']);
 ?>
diff --git a/themes/darkblue_orange/layout.inc.php b/themes/darkblue_orange/layout.inc.php
index 69667c3e4..c0b7a3af3 100644
--- a/themes/darkblue_orange/layout.inc.php
+++ b/themes/darkblue_orange/layout.inc.php
@@ -27,6 +27,9 @@ $GLOBALS['cfg']['NaviPointerColor']         = '#000000';
 // background of the pointer in navi frame
 $GLOBALS['cfg']['NaviPointerBackground']    = '#9999cc';
 
+// text color of the selected database name (when showing the table list)
+$GLOBALS['cfg']['NaviDatabaseNameColor']    = '#ff9900';
+
 /**
  * main frame
  */
diff --git a/themes/original/css/theme_left.css.php b/themes/original/css/theme_left.css.php
index 46c424242..0d9bcae9b 100644
--- a/themes/original/css/theme_left.css.php
+++ b/themes/original/css/theme_left.css.php
@@ -62,6 +62,10 @@ button {
     margin-left:        0.3em;
 }
 
+.navi_dbName {
+    font-weight:    bold;
+    color:          <?php echo $GLOBALS['cfg']['NaviDatabaseNameColor']; ?>;
+}
 
 /******************************************************************************/
 /* specific elements */
diff --git a/themes/original/layout.inc.php b/themes/original/layout.inc.php
index 93a6f6a09..909320a36 100644
--- a/themes/original/layout.inc.php
+++ b/themes/original/layout.inc.php
@@ -25,6 +25,8 @@ $GLOBALS['cfg']['NaviBackground']           = '#D0DCE0';
 $GLOBALS['cfg']['NaviPointerColor']         = '#000000';
 // background of the pointer in navi frame
 $GLOBALS['cfg']['NaviPointerBackground']    = '#9999CC';
+// text color of the selected database name (when showing the table list)
+$GLOBALS['cfg']['NaviDatabaseNameColor']    = '#0000FF';
 
 /**
  * main frame