RFE 3141334: Reload icon

New icon by Michael Keck
and move it with other navi frame icons

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') . '" >'
+        .' title="' . __('phpMyAdmin documentation') . '" >';
-        .'<img class="icon" src="' . $pmaThemeImage . 'b_docs.png" width="16" height="16"'
+
-        .' alt="' . __('phpMyAdmin documentation') . '" /></a>' . "\n";
+    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";
 
 /**

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;
 }

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;