[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1035-gfc37859

[Marc Delisle]

The branch, master has been updated
       via  fc37859b4206bb5721aae6f609b451df8e32b328 (commit)
      from  8b609dfe353cffd476f4f033ac895e7f42ec9882 (commit)


- Log -----------------------------------------------------------------
commit fc37859b4206bb5721aae6f609b451df8e32b328
Author: Marc Delisle <marc at infomarc.info>
Date:   Thu Dec 23 13:02:53 2010 -0500

    RFE 3141334: Reload icon
    New icon by Michael Keck
    and move it with other navi frame icons

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

Summary of changes:
 libraries/navigation_header.inc.php     |   23 ++++++++++++++++++-----
 navigation.php                          |   12 ------------
 themes/darkblue_orange/img/s_reload.png |  Bin 245 -> 385 bytes
 themes/original/css/theme_left.css.php  |    7 -------
 themes/original/img/s_reload.png        |  Bin 245 -> 385 bytes
 5 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/libraries/navigation_header.inc.php b/libraries/navigation_header.inc.php
index 6c5b266..e34adc5 100644
--- a/libraries/navigation_header.inc.php
+++ b/libraries/navigation_header.inc.php
@@ -91,13 +91,26 @@ if ($GLOBALS['cfg']['LeftDisplayLogo']) {
         echo '>' . $query_frame_link_text . '</a>' . "\n";
     } // end if ($server != 0)
 
-if ($GLOBALS['cfg']['MainPageIconic']) {
     echo '    <a href="Documentation.html" target="documentation"'
-        .' title="' . __('phpMyAdmin documentation') . '" >'
-        .'<img class="icon" src="' . $pmaThemeImage . 'b_docs.png" width="16" height="16"'
-        .' alt="' . __('phpMyAdmin documentation') . '" /></a>' . "\n";
+        .' title="' . __('phpMyAdmin documentation') . '" >';
+
+    if ($GLOBALS['cfg']['MainPageIconic']) {
+        echo '<img class="icon" src="' . $pmaThemeImage . 'b_docs.png" width="16" height="16"'
+            .' alt="' . __('phpMyAdmin documentation') . '" />';
+    }
+    echo '</a>';
     echo '    ' . PMA_showMySQLDocu('', '', TRUE) . "\n";
-}
+
+    echo '<a href="navigation.php' . PMA_generate_common_url($params) . '" target="frame_navigation">';
+    if ($GLOBALS['cfg']['MainPageIconic']) {
+        echo '<img class="icon" src="'. $GLOBALS['pmaThemeImage'] . 's_reload.png"'
+            . ' title="' . __('Reload navigation frame') . '"'
+            . ' alt="' . __('Reload navigation frame') . '" />';
+    } else {
+        echo '<br />' . __('Reload navigation frame');
+    }
+    echo '</a>';
+
 echo '</div>' . "\n";
 
 /**
diff --git a/navigation.php b/navigation.php
index fdb6502..aa16e66 100644
--- a/navigation.php
+++ b/navigation.php
@@ -53,18 +53,6 @@ function PMA_exitNavigationFrame()
     if (!empty($GLOBALS['db'])) {
         $params['db'] = $GLOBALS['db'];
     }
-    echo '<div id="reloadlink">' . "\n";
-    echo '<a href="navigation.php' . PMA_generate_common_url($params) . '" target="frame_navigation">';
-    if ($GLOBALS['cfg']['NavigationBarIconic']) {
-        echo '<img class="icon" src="'. $GLOBALS['pmaThemeImage'] . 's_reload.png"'
-            . ' title="' . __('Reload navigation frame') . '"'
-            . ' alt="' . __('Reload navigation frame') . '" />';
-    }
-    if ($GLOBALS['cfg']['NavigationBarIconic'] !== true) {
-        echo __('Reload navigation frame');
-    }
-    echo '</a>';
-    echo '</div>' . "\n";
     echo '</body></html>';
     exit;
 }
diff --git a/themes/darkblue_orange/img/s_reload.png b/themes/darkblue_orange/img/s_reload.png
index 754361e..0113cbd 100644
Binary files a/themes/darkblue_orange/img/s_reload.png and b/themes/darkblue_orange/img/s_reload.png differ
diff --git a/themes/original/css/theme_left.css.php b/themes/original/css/theme_left.css.php
index 9bb3c39..ef0f53c 100644
--- a/themes/original/css/theme_left.css.php
+++ b/themes/original/css/theme_left.css.php
@@ -134,7 +134,6 @@ div#leftframelinks .icon {
     margin:             0;
 }
 
-div#reloadlink a img,
 div#leftframelinks a img.icon {
     margin:             0;
     padding:            0.2em;
@@ -231,12 +230,6 @@ div#left_tableList ul ul {
     background:         <?php echo $GLOBALS['cfg']['NaviPointerBackground']; ?>;
     color:              <?php echo $GLOBALS['cfg']['NaviPointerColor']; ?>;
 }
-#reloadlink {
-    clear: both;
-    float: <?php echo $right; ?>;
-    display: block;
-    padding: 1em;
-}
 
 #NavFilter {
     display: none;
diff --git a/themes/original/img/s_reload.png b/themes/original/img/s_reload.png
index 754361e..0113cbd 100644
Binary files a/themes/original/img/s_reload.png and b/themes/original/img/s_reload.png differ


hooks/post-receive
-- 
phpMyAdmin