From 049a22264854bbf70b875a344168e06c15399308 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sun, 15 Apr 2012 19:57:06 -0400
Subject: [PATCH] Remove LightTabs configuration directive

---
 Documentation.html                          |  4 ----
 config.sample.inc.php                       |  6 ------
 libraries/config.default.php                |  7 -------
 libraries/config/messages.inc.php           |  2 --
 libraries/config/setup.forms.php            |  1 -
 libraries/config/user_preferences.forms.php |  1 -
 themes/original/css/theme_right.css.php     | 11 -----------
 themes/pmahomme/css/theme_right.css.php     | 13 -------------
 8 files changed, 45 deletions(-)

diff --git a/Documentation.html b/Documentation.html
index bdcc80fbb2..38aa5ce806 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -1755,10 +1755,6 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
         memory limit. Produced files contain more GZip/BZip2 headers, but all
         normal programs handle this correctly.</dd>
 
-    <dt id="cfg_LightTabs">$cfg['LightTabs'] boolean</dt>
-    <dd>If set to <code>TRUE</code>, use less graphically intense tabs on the top of the
-        mainframe.</dd>
-
     <dt id="cfg_PropertiesIconic">$cfg['PropertiesIconic'] string</dt>
     <dd>If set to <code>TRUE</code>, will display icons instead of text for db and table
         properties links (like 'Browse', 'Select', 'Insert', ...).<br /> Can be
diff --git a/config.sample.inc.php b/config.sample.inc.php
index a98d548022..9c12ef6b3d 100644
--- a/config.sample.inc.php
+++ b/config.sample.inc.php
@@ -86,12 +86,6 @@ $cfg['SaveDir'] = '';
  */
 //$cfg['MaxRows'] = 50;
 
-/**
- * Use graphically less intense menu tabs
- * default = false
- */
-//$cfg['LightTabs'] = true;
-
 /**
  * disallow editing of binary fields
  * valid values are:
diff --git a/libraries/config.default.php b/libraries/config.default.php
index 217d1cb9d8..e9935dc045 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -1134,13 +1134,6 @@ $cfg['CompressOnFly'] = true;
  * Tabs display settings
  */
 
-/**
- * Use graphically less intense menu tabs
- *
- * @global boolean $cfg['LightTabs']
- */
-$cfg['LightTabs'] = false;
-
 /**
  * Use icons instead of text for the table display of a database (true|false|'both')
  *
diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index bd7d10a5d3..47df00ade0 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -291,8 +291,6 @@ $strConfigLeftPointerEnable_desc = __('Highlight server under the mouse cursor')
 $strConfigLeftPointerEnable_name = __('Enable highlighting');
 $strConfigLeftRecentTable_desc = __('Maximum number of recently used tables; set 0 to disable');
 $strConfigLeftRecentTable_name = __('Recently used tables');
-$strConfigLightTabs_desc = __('Use less graphically intense tabs');
-$strConfigLightTabs_name = __('Light tabs');
 $strConfigLimitChars_desc = __('Maximum number of characters shown in any non-numeric column on browse view');
 $strConfigLimitChars_name = __('Limit column characters');
 $strConfigLoginCookieDeleteAll_desc = __('If TRUE, logout deletes cookies for all servers; when set to FALSE, logout only occurs for the current server. Setting this to FALSE makes it easy to forget to log out from other servers when connected to multiple servers.');
diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
index 5ca2f03e08..a6518b1a33 100644
--- a/libraries/config/setup.forms.php
+++ b/libraries/config/setup.forms.php
@@ -227,7 +227,6 @@ $forms['Main_frame']['Edit'] = array(
     'ForeignKeyDropdownOrder',
     'ForeignKeyMaxLimit');
 $forms['Main_frame']['Tabs'] = array(
-    'LightTabs',
     'PropertiesIconic',
     'DefaultTabServer',
     'DefaultTabDatabase',
diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php
index 788ea9999b..d52abcb823 100644
--- a/libraries/config/user_preferences.forms.php
+++ b/libraries/config/user_preferences.forms.php
@@ -130,7 +130,6 @@ $forms['Main_frame']['Edit'] = array(
     'ForeignKeyDropdownOrder',
     'ForeignKeyMaxLimit');
 $forms['Main_frame']['Tabs'] = array(
-    'LightTabs',
     'DefaultTabServer',
     'DefaultTabDatabase',
     'DefaultTabTable');
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index 683e382359..65bc3c88f6 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -752,16 +752,6 @@ fieldset.caution a:hover {
     background-color:   #FF0000;
 }
 
-<?php if ($GLOBALS['cfg']['LightTabs']) { ?>
-/* active tab */
-ul#topmenu a.tabactive, ul#topmenu2 a.tabactive {
-    color:              black;
-}
-
-ul#topmenu ul {
-    background:         <?php echo $GLOBALS['cfg']['MainBackground']; ?>;
-}
-<?php } else { ?>
 #topmenu {
     margin-top:         0.5em;
     padding:            0.1em 0.3em 0.1em 0.3em;
@@ -832,7 +822,6 @@ ul#topmenu span.tab,
 a.error {
     cursor:             url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>error.ico), default;
 }
-<?php } ?>
 /* end topmenu */
 
 /* zoom search */
diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php
index 99199a41c2..c97dc8dff3 100644
--- a/themes/pmahomme/css/theme_right.css.php
+++ b/themes/pmahomme/css/theme_right.css.php
@@ -1018,18 +1018,6 @@ fieldset.caution a:hover {
     background-color: #FF0000;
 }
 
-<?php if ($GLOBALS['cfg']['LightTabs']) { ?>
-/* active tab */
-ul#topmenu a.tabactive,
-ul#topmenu2 a.tabactive {
-    color: #000;
-}
-
-ul#topmenu ul {
-    background: <?php echo $GLOBALS['cfg']['MainBackground']; ?>;
-}
-<?php } else { ?>
-
 #topmenu {
     margin-top: .5em;
     padding: .1em .3em;
@@ -1100,7 +1088,6 @@ a.error {
     cursor: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>error.ico), default;
     color: #ccc;
 }
-<?php } ?>
 /* end topmenu */
 
 /* zoom search */