Merge remote-tracking branch 'origin/master'

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

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:

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')
  *

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.');

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',

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');

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 */

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 */