From 9dcfce8bb865ffd6c71d3910f93fb6b947944d32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Thu, 3 Jun 2004 10:53:08 +0000
Subject: [PATCH] Can disable main page icons (bug #965550).

---
 ChangeLog                       | 2 ++
 config.inc.php                  | 5 ++++-
 css/phpmyadmin.css.php          | 7 ++++++-
 libraries/config_import.lib.php | 4 ++++
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 229c8102c..a338c8a82 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,8 @@ $Source$
       strDatabase (needed for above fix).
     * libraries/config_import.lib.php: Do not override
       $cfg['ShowHttpHostTitle'].
+    * config.inc.php, css/phpmyadmin.css.php, libraries/config_import.lib.php:
+      Can disable main page icons (bug #965550).
 
 2004-06-02 Alexander M. Turek  <happybirthdaytome@derrabus.de>
     * db_details_db_info.php, tbl_properties_tbl_info.php: Table type is called
diff --git a/config.inc.php b/config.inc.php
index a870c6a7c..536bea614 100644
--- a/config.inc.php
+++ b/config.inc.php
@@ -518,14 +518,17 @@ $cfg['NaturalOrder']        = TRUE;         // Sort table and database in natura
 //-----------------------------------------------------------------------------
 // custom-setup by mkkeck: 2004-05-04
 //    some specials for new icons and scrollings
+// FIXME:
 // 2004-05-08 rabus: We need to rearrange these variables.
+// 2004-06-03 nijel: We also need to add these to Documentation.html
 
 $cfg['ShowHttpHostTitle']    = FALSE;   // show HTTP host in browsers window title (true|false)?
 $cfg['SetHttpHostTitle']     = '';      // if ShowHttpHostTitle=true, please set your host (server)
                                         // or an other string, wich should be shown in browsers window title.
                                         // If not set (or empty), the PMA will get your real host address.
 
-$cfg['ErrorIconic']          = TRUE;    // show some icons for warnings, errors and informations? (true|false)?
+$cfg['ErrorIconic']          = TRUE;    // show some icons for warnings, errors and informations (true|false)?
+$cfg['MainPageIconic']       = TRUE;    // show icons in list on main page (true|false)?
 $cfg['ReplaceHelpImg']       = TRUE;    // show help button instead of strDocumentation (true|false)?
 
 //-----------------------------------------------------------------------------
diff --git a/css/phpmyadmin.css.php b/css/phpmyadmin.css.php
index 6a85c0874..345e6f0ab 100644
--- a/css/phpmyadmin.css.php
+++ b/css/phpmyadmin.css.php
@@ -307,6 +307,9 @@ ul.mainLeft li {
     padding-top: 0.1em;
     padding-bottom: 0.1em;
 }
+
+
+<?php if ($cfg['MainPageIconic']) { ?>
 .lstPhpInfo {
   list-style: url(../images/php_sym.png);
 }
@@ -339,7 +342,8 @@ ul.mainLeft li {
 }
 .lstCollations {
   list-style: url(../images/s_asci.png);
-}.lstReload {
+}
+.lstReload {
   list-style: url(../images/s_reload.png);
 }
 .lstDatabases {
@@ -354,6 +358,7 @@ ul.mainLeft li {
 .lstPasswd {
   list-style: url(../images/s_passwd.png);
 }
+<?php } ?>
 
 hr{ color: #666699; background-color: #6666cc; border: 0; height: 1px; }
 
diff --git a/libraries/config_import.lib.php b/libraries/config_import.lib.php
index 679f6480c..e834a6e5f 100644
--- a/libraries/config_import.lib.php
+++ b/libraries/config_import.lib.php
@@ -819,6 +819,10 @@ if (!isset($cfg['ErrorIconic'])) {
     $cfg['ErrorIconic'] = TRUE;
 }
 
+if (!isset($cfg['MainPageIconic'])) {
+    $cfg['MainPageIconic'] = TRUE;
+}
+
 if (!isset($cfg['ReplaceHelpImg'])) {
     $cfg['ReplaceHelpImg'] = TRUE;
 }