From b7c84e4247df5e4d1b2ba398045dd961c5f1e85a Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Mon, 7 Jun 2004 08:07:53 +0000
Subject: [PATCH] Enabled new icons for privileges administration.

---
 ChangeLog              |  5 +++++
 css/phpmyadmin.css.php | 40 ++++++++++++++++++++++++----------------
 server_databases.php   |  4 ++--
 server_privileges.php  |  8 ++++----
 4 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ba380db83..25e25c2b0 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2004-06-07 Alexander M. Turek  <me@derrabus.de>
+    * css/phpmyadmin.css.php: beautifications.
+    * server_databases.php, server_privileges.php, css/phpmyadmin.css.php:
+      Enabled new icons for privileges administration (patch #947190).
+
 2004-06-06 Garvin Hicking <me@supergarv.de>
     * libraries/display_tbl.lib.php, libraries/functions.js,
       css/phpmyadmin.css.php: Further fixing of broken vertical
diff --git a/css/phpmyadmin.css.php b/css/phpmyadmin.css.php
index c0921d139..64a4e18c3 100644
--- a/css/phpmyadmin.css.php
+++ b/css/phpmyadmin.css.php
@@ -312,55 +312,63 @@ ul.mainLeft li {
 
 
 <?php if ($cfg['MainPageIconic']) { ?>
-.lstPhpInfo {
+li.lstPhpInfo {
   list-style: url(../images/php_sym.png);
 }
-.lstPmaDocs {
+li.lstPmaDocs {
   list-style: url(../images/b_docs.png);
 }
-.lstPmaPage {
+li.lstPmaPage {
   list-style: url(../images/b_home.png);
 }
-.lstPmaLang {
+li.lstPmaLang {
   list-style: url(../images/s_lang.png);
 }
-.lstPmaChar {
+li.lstPmaChar {
   list-style: url(../images/s_rights.png);
 }
-.lstNewdb {
+li.lstNewdb {
   list-style: url(../images/b_newdb.png);
 }
-.lstStatus {
+li.lstStatus {
   list-style: url(../images/s_status.png);
 }
-.lstVars {
+li.lstVars {
   list-style: url(../images/s_vars.png);
 }
-.lstProcess {
+li.lstProcess {
   list-style: url(../images/s_process.png);
 }
-.lstPrivileges {
+li.lstPrivileges {
   list-style: url(../images/s_rights.png);
 }
-.lstCollations {
+li.lstCollations {
   list-style: url(../images/s_asci.png);
 }
-.lstReload {
+li.lstReload {
   list-style: url(../images/s_reload.png);
 }
-.lstDatabases {
+li.lstDatabases {
   list-style: url(../images/s_db.png);
 }
-.lstExport {
+li.lstExport {
   list-style: url(../images/b_export.png);
 }
-.lstLogoff {
+li.lstLogoff {
   list-style: url(../images/s_loggoff.png);
 }
-.lstPasswd {
+li.lstPasswd {
   list-style: url(../images/s_passwd.png);
 }
 <?php } ?>
+<?php if ($cfg['MainPageIconic']) { ?>
+li.lstUsradd {
+  list-style: url(../images/b_usradd.png);
+}
+li.lstUsrdrop {
+  list-style: url(../images/b_usrdrop.png);
+}
+<?php } ?>
 
 hr{ color: #666699; background-color: #6666cc; border: 0; height: 1px; }
 
diff --git a/server_databases.php b/server_databases.php
index 04858d461..e19c28290 100644
--- a/server_databases.php
+++ b/server_databases.php
@@ -210,7 +210,7 @@ if (count($statistics) > 0) {
     }
     if ($is_superuser) {
         echo '            <th>' . "\n"
-           . '                &nbsp;' . $strAction . '&nbsp;' . "\n"
+           . '                &nbsp;' . ($cfg['PropertiesIconic'] ? '' : $strAction . '&nbsp;') . "\n"
            . '            </th>' . "\n";
     }
     echo '        </tr>' . "\n";
@@ -272,7 +272,7 @@ if (count($statistics) > 0) {
         if ($is_superuser) {
             echo '            <td bgcolor="' . ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']) . '">' . "\n"
                . '                <a onclick="reload_window(\'' . urlencode($current['db_name']) . '\'); return true;" href="./server_privileges.php?' . $url_query . '&amp;checkprivs=' . urlencode($current['db_name']) . '" title="' . sprintf($strCheckPrivsLong, htmlspecialchars($current['db_name'])) . '">'. "\n"
-               . '                    ' . $strCheckPrivs . "\n"
+               . '                    ' . ($cfg['PropertiesIconic'] ? '<img src="./images/b_usrcheck.png" alt="' . $strCheckPrivs . '" border="0" width="16" height="16" />' : $strCheckPrivs) . "\n"
                . '                </a>' . "\n"
                . '            </td>' . "\n";
         }
diff --git a/server_privileges.php b/server_privileges.php
index 61adaa184..f65f9c593 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -949,7 +949,7 @@ if (empty($adduser) && empty($checkprivs)) {
                . '            <th>&nbsp;' . $strPassword . '&nbsp;</th>' . "\n"
                . '            <th>&nbsp;' . $strGlobalPrivileges . '&nbsp;</th>' . "\n"
                . '            <th>&nbsp;' . $strGrantOption . '&nbsp;</th>' . "\n"
-               . '            <th>&nbsp;' . $strAction . '&nbsp;</th>' . "\n";
+               . '            <th>&nbsp;' . ($cfg['PropertiesIconic'] ? '' : $strAction . '&nbsp;') . '</th>' . "\n";
             echo '        </tr>' . "\n";
             $useBgcolorOne = TRUE;
             for ($i = 0; $row = PMA_DBI_fetch_assoc($res); $i++) {
@@ -963,7 +963,7 @@ if (empty($adduser) && empty($checkprivs)) {
                    . '                ' . join(',' . "\n" . '            ', $privs) . "\n"
                    . '            </tt></td>' . "\n"
                    . '            <td bgcolor="' . ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']) . '">' . ($row['Grant_priv'] == 'Y' ? $strYes : $strNo) . '</td>' . "\n"
-                   . '            <td bgcolor="' . ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']) . '"><a href="server_privileges.php?' . $url_query . '&amp;username=' . urlencode($row['User']) . '&amp;hostname=' . urlencode($row['Host']) . '">' . $strEdit . '</a></td>' . "\n"
+                   . '            <td bgcolor="' . ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']) . '"><a href="server_privileges.php?' . $url_query . '&amp;username=' . urlencode($row['User']) . '&amp;hostname=' . urlencode($row['Host']) . '" title="' . $strEdit . '">' . ($cfg['PropertiesIconic'] ? '<img src="./images/b_usredit.png" alt="' . $strEdit . '" border="0" width="16" height="16" />' : $strEdit) . '</a></td>' . "\n"
                    . '        </tr>' . "\n";
                 $useBgcolorOne = !$useBgcolorOne;
             }
@@ -986,11 +986,11 @@ if (empty($adduser) && empty($checkprivs)) {
                . '        </tr>' . "\n"
                . '    </table>' . "\n"
                . '    <ul>' . "\n"
-               . '        <li>' . "\n"
+               . '        <li class="lstUsradd">' . "\n"
                . '            <b><a href="server_privileges.php?' . $url_query . '&amp;adduser=1">' . $strAddUser . '</a></b><br />' . "\n"
                . '            <br /><br />' . "\n"
                . '        </li>' . "\n"
-               . '        <li>' . "\n"
+               . '        <li class="lstUsrdrop">' . "\n"
                . '            <b>' . $strRemoveSelectedUsers . '</b><br />' . "\n"
                . '            <input type="radio" title="' . $strJustDelete . ' ' . $strJustDeleteDescr . '" name="mode" id="radio_mode_1" value="1" checked="checked" />' . "\n"
                . '            <label for="radio_mode_1" title="' . $strJustDelete . ' ' . $strJustDeleteDescr . '">' . "\n"