[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13349-g38d99b4

[Michal Čihař]

The branch, master has been updated
       via  38d99b4e17a5c0cee966ddb4de13a9987c5ae6fa (commit)
      from  51dc70d35a1167431b031e88180a4bf3691af729 (commit)


- Log -----------------------------------------------------------------
commit 38d99b4e17a5c0cee966ddb4de13a9987c5ae6fa
Author: Michal Čihař <mcihar at suse.cz>
Date:   Mon Aug 8 10:00:21 2011 +0200

    Use PMA_getIcon instead of duplicating logic

-----------------------------------------------------------------------

Summary of changes:
 sql.php           |    3 +--
 tbl_structure.php |   33 +++++++--------------------------
 2 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/sql.php b/sql.php
index 07d54de..2ce10ea 100644
--- a/sql.php
+++ b/sql.php
@@ -1013,8 +1013,7 @@ $(document).ready(makeProfilingChart);
 <input type="hidden" name="fields[query]" value="<?php echo urlencode(isset($complete_query) ? $complete_query : $sql_query); ?>" />
 <fieldset>
     <legend><?php
-     echo ($cfg['PropertiesIconic'] ? '<img class="icon ic_b_bookmark" src="themes/dot.gif" alt="' . __('Bookmark this SQL query') . '" />' : '')
-        . __('Bookmark this SQL query');
+    echo PMA_getIcon('b_bookmark.png', __('Bookmark this SQL query'));
 ?>
     </legend>
 
diff --git a/tbl_structure.php b/tbl_structure.php
index 9aaeb12..25787e3 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -600,19 +600,13 @@ if ($tbl_is_view) {
                 'show_query' => '1',
             )
         ),
-        sprintf(
-            '<img class="icon ic_b_edit" src="themes/dot.gif" alt="%1$s"/> %1$s',
-            __('Edit view')
-            )
+        PMA_getIcon('b_edit.png', __('Edit view'))
         );
 }
 ?>
 
 <a href="tbl_printview.php?<?php echo $url_query; ?>"><?php
-if ($cfg['PropertiesIconic']) {
-    echo '<img class="icon ic_b_print" src="themes/dot.gif" alt="' . __('Print view') . '"/>';
-}
-echo __('Print view');
+echo PMA_getIcon('b_print.png', __('Print view'));
 ?></a>
 
 <?php
@@ -623,19 +617,13 @@ if (! $tbl_is_view && ! $db_is_information_schema) {
     if ($cfgRelation['relwork'] || PMA_foreignkey_supported($tbl_type)) {
         ?>
 <a href="tbl_relation.php?<?php echo $url_query; ?>"><?php
-        if ($cfg['PropertiesIconic']) {
-            echo '<img class="icon ic_b_relations" src="themes/dot.gif" alt="' . __('Relation view') . '"/>';
-        }
-        echo __('Relation view');
+        echo PMA_getIcon('b_relations.png', __('Relation view'));
         ?></a>
         <?php
     }
     ?>
 <a href="sql.php?<?php echo $url_query; ?>&session_max_rows=all&sql_query=<?php echo urlencode('SELECT * FROM ' . PMA_backquote($table) . ' PROCEDURE ANALYSE()'); ?>"><?php
-    if ($cfg['PropertiesIconic']) {
-        echo '<img class="icon ic_b_tblanalyse" src="themes/dot.gif" alt="' . __('Propose table structure') . '" />';
-    }
-    echo __('Propose table structure');
+    echo PMA_getIcon('b_tblanalyse.png', __('Propose table structure'));
     ?></a><?php
     echo PMA_showMySQLDocu('Extending_MySQL', 'procedure_analyse') . "\n";
 
@@ -643,12 +631,8 @@ if (! $tbl_is_view && ! $db_is_information_schema) {
     if (PMA_Tracker::isActive())
     {
         echo '<a href="tbl_tracking.php?' . $url_query . '">';
-
-        if ($cfg['PropertiesIconic'])
-        {
-            echo '<img class="icon ic_eye" src="themes/dot.gif" alt="' . __('Track table') . '" /> ';
-        }
-        echo __('Track table') . '</a>';
+        echo PMA_getIcon('eye.png', __('Track table'));
+        echo '</a>';
     }
     ?>
 
@@ -823,10 +807,7 @@ if ($cfg['ShowStats']) {
     <tr class="tblFooters">
         <td colspan="3" align="center">
             <a href="sql.php?<?php echo $url_query; ?>&pos=0&sql_query=<?php echo urlencode('OPTIMIZE TABLE ' . PMA_backquote($table)); ?>"><?php
-            if ($cfg['PropertiesIconic']) {
-               echo '<img class="icon ic_b_tbloptimize" src="themes/dot.gif" alt="' . __('Optimize table'). '" />';
-            }
-            echo __('Optimize table');
+            echo PMA_getIcon('b_tbloptimize.png', __('Optimize table'));
             ?></a>
         </td>
     </tr>


hooks/post-receive
-- 
phpMyAdmin