From fc37859b4206bb5721aae6f609b451df8e32b328 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Thu, 23 Dec 2010 13:02:53 -0500
Subject: [PATCH] RFE 3141334: Reload icon New icon by Michael Keck and move it
 with other navi frame icons

---
 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 6c5b26652..e34adc58c 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 fdb65028a..aa16e66e0 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 754361eb8fc41650f5f06b4a5161c636bcbb51b5..0113cbd48cd44103343aab41c4b6f95cabb30184 100644
GIT binary patch
delta 334
zcmey$*vLFVl7o$bfkFQB|HO%g>h+Auo-U3d6}OW9{QqyytlH4o=yae-FCZjDg?mX;
z;|<x4-i3$K8!OZW*1vuIx|%2Cv%H6KlZwQ|y%T25%Hmvds_}+=d#iL}(dP8?X)cA1
zDJe^ICOu<z*dvpr&3wgl;tifQ=?_0YKTl9Os~Wv6$Fh4#-n9Py^FDhL8B7vnCp@ZW
zf3%yOU(V&)nS}iOe(O~Zi48ryJv~1z9-Z(c;^I*Qk;0;)O^=KiG};p_Y{YKdxM48o
z=j-eGZYg#FzC06x*dG0K*y*m3c;M*K)<r)LxASYvVr60JY0R3`=)<n?kK>4N01tx|
zf8<|APtTJkPcm3exjUIQUpf@k6Y=2LGdF)7Yd#C1pyzX~%jJ?yA3QqR-Sg|$uT2-W
qG?;2KU$t>Fn^<_DSlOY0kzsS#nigZV9gYkP3=E#GelF{r5}E*e-jd+}

delta 193
zcmZo<{>nH(Qi7R*fk8u;KbV1mfhFD1*O7r?{Rwl{u9p)P)$1A90(?ST8D=stFfddW
z{#nPsz`#@z<QM#(;puh*F9rsNbWaz@kcwML2`<bGj7JWfIC0<r!x00<28Jf?11=0q
z9EuF0j2sFoj2#>f42s+ht_(~Zt_&(n0uC#f9ON7r5?3&ADDW6FFmW6fYhXB3!0y11
uxI;vt!Qc;*fCJA9xqYl03OtMr49pDvy$o}%v#n|bxx~}e&t;ucLK6T2Lox*b

diff --git a/themes/original/css/theme_left.css.php b/themes/original/css/theme_left.css.php
index 9bb3c39c3..ef0f53c79 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 754361eb8fc41650f5f06b4a5161c636bcbb51b5..0113cbd48cd44103343aab41c4b6f95cabb30184 100644
GIT binary patch
delta 334
zcmey$*vLFVl7o$bfkFQB|HO%g>h+Auo-U3d6}OW9{QqyytlH4o=yae-FCZjDg?mX;
z;|<x4-i3$K8!OZW*1vuIx|%2Cv%H6KlZwQ|y%T25%Hmvds_}+=d#iL}(dP8?X)cA1
zDJe^ICOu<z*dvpr&3wgl;tifQ=?_0YKTl9Os~Wv6$Fh4#-n9Py^FDhL8B7vnCp@ZW
zf3%yOU(V&)nS}iOe(O~Zi48ryJv~1z9-Z(c;^I*Qk;0;)O^=KiG};p_Y{YKdxM48o
z=j-eGZYg#FzC06x*dG0K*y*m3c;M*K)<r)LxASYvVr60JY0R3`=)<n?kK>4N01tx|
zf8<|APtTJkPcm3exjUIQUpf@k6Y=2LGdF)7Yd#C1pyzX~%jJ?yA3QqR-Sg|$uT2-W
qG?;2KU$t>Fn^<_DSlOY0kzsS#nigZV9gYkP3=E#GelF{r5}E*e-jd+}

delta 193
zcmZo<{>nH(Qi7R*fk8u;KbV1mfhFD1*O7r?{Rwl{u9p)P)$1A90(?ST8D=stFfddW
z{#nPsz`#@z<QM#(;puh*F9rsNbWaz@kcwML2`<bGj7JWfIC0<r!x00<28Jf?11=0q
z9EuF0j2sFoj2#>f42s+ht_(~Zt_&(n0uC#f9ON7r5?3&ADDW6FFmW6fYhXB3!0y11
uxI;vt!Qc;*fCJA9xqYl03OtMr49pDvy$o}%v#n|bxx~}e&t;ucLK6T2Lox*b