X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=templates%2Fdefault%2Fread_menubar_nav.tpl;h=26bb9e98b2c97d75b913291d9e502aec95cc9f06;hp=777b1b3014302c28f4f0ddcc0e76164b31740ed9;hb=c4faef335b2362c81b8ebf026d4066c12d70536c;hpb=9faee7711fcff21623533c0590d161b0507d1e89

diff --git a/templates/default/read_menubar_nav.tpl b/templates/default/read_menubar_nav.tpl
index 777b1b30..26bb9e98 100644
--- a/templates/default/read_menubar_nav.tpl
+++ b/templates/default/read_menubar_nav.tpl
@@ -37,7 +37,7 @@
  *    $move_form_extra - additional input elements needed by the MOVE form.
  *    $last_move_target - the last folder that a message was moved/copied to. 
  *     *
- * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @copyright 1999-2020 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
@@ -49,16 +49,7 @@
 /** extract template variables **/
 extract($t);
 
-/*FIXME: This is a place where Marc's idea for putting all the buttons and
-         links and other widgets into an array is sorely needed instead of
-         hard-coding everything.  Whomever implements that, PLEASE, PLEASE
-         look at how the preview pane plugin code is used in this same template 
-         file for the *default_advanced* set to change some links and buttons 
-         and make sure your implementation can support it (tip: it may or may 
-         not be OK to let a plugin do the modification of the widgets, since 
-         a template set can turn on the needed plugin, but that might not be 
-         the most clear way to solve said issue).*/
-
+/*FIXME: This is a place where Marc's idea for putting all the buttons and links and other widgets into an array is sorely needed instead of hard-coding everything.  Whomever implements that, PLEASE, PLEASE look at how the preview pane plugin code is used in this same template file for the *default_advanced* set to change some links and buttons and make sure your implementation can support it (tip: it may or may not be OK to let a plugin do the modification of the widgets, since a template set can turn on the needed plugin, but that might not be the most clear way to solve said issue).*/
 
 /** Begin template **/
 
@@ -75,13 +66,11 @@ if ($nav_on_top) {
  <tr class="nav">
   <td class="nav">
    <small>
-   [
-   <?php
+   [&nbsp;<?php
     if (empty($prev_href)) {
         echo _("Previous");
     } else {
-        ?>
-   <a href="<?php echo $prev_href; ?>"><?php echo _("Previous"); ?></a>
+        ?><a href="<?php echo $prev_href; ?>"><?php echo _("Previous"); ?></a>
         <?php
     }
    ?> | 
@@ -98,56 +87,47 @@ if ($nav_on_top) {
         echo _("Next");
     } else {
         ?>
-   <a href="<?php echo $next_href; ?>"><?php echo _("Next"); ?></a>
-        <?php
+   <a href="<?php echo $next_href; ?>"><?php echo _("Next"); ?></a><?php
     }
-   ?>
-   ]
+   ?>&nbsp;]
    &nbsp;&nbsp;&nbsp;&nbsp;
    <?php
     if (!empty($del_prev_href) || !empty($del_next_href)) {
         ?>
-        [
-        <?php        
+        [&nbsp;<?php        
         if (empty($del_prev_href)) {
-            echo _("Delete &amp; Previous");
+            echo '<span style="white-space: nowrap;">' . _("Delete &amp; Previous") . '</span>';
         } else {
-            ?>
-   <a href="<?php echo $del_prev_href; ?>"><?php echo _("Delete &amp; Previous"); ?></a>
+            ?><a href="<?php echo $del_prev_href; ?>" style="white-space: nowrap"><?php echo _("Delete &amp; Previous"); ?></a>
             <?php
         }
         ?>
         | 
         <?php
         if (empty($del_next_href)) {
-            echo _("Delete &amp; Next");
+            echo '<span style="white-space: nowrap;">' . _("Delete &amp; Next") . '</span>';
         } else {
             ?>
-   <a href="<?php echo $del_next_href; ?>"><?php echo _("Delete &amp; Next"); ?></a>
-            <?php
+   <a href="<?php echo $del_next_href; ?>" style="white-space: nowrap"><?php echo _("Delete &amp; Next"); ?></a><?php
         }
-        ?>
-        ]
+        ?>&nbsp;]
    &nbsp;&nbsp;&nbsp;&nbsp;
         <?php
     }
    
     if (!empty($view_msg_href)) {
         ?>
-   [ <a href="<?php echo $view_msg_href; ?>"><?php echo _("View Message"); ?></a> ]
+   [&nbsp;<a href="<?php echo $view_msg_href; ?>" style="white-space: nowrap"><?php echo _("View Message"); ?></a>&nbsp;]
    &nbsp;&nbsp;&nbsp;&nbsp;
         <?php
     }
    ?>
-   [ <a href="<?php echo $message_list_href; ?>"><?php echo _("Message List"); ?></a>
-   <?php
+   [&nbsp;<a href="<?php echo $message_list_href; ?>" style="white-space: nowrap"><?php echo _("Message List"); ?></a><?php
     if (!empty($search_href)) {
         ?>
-   | <a href="<?php echo $search_href; ?>"><?php echo _("Search Results"); ?></a>
-        <?php
+   | <a href="<?php echo $search_href; ?>" style="white-space: nowrap"><?php echo _("Search Results"); ?></a><?php
     }
-   ?>
-   ]
+   ?>&nbsp;]
    </small>
    <?php if(!empty($plugin_output[$plugin_hook])) echo $plugin_output[$plugin_hook]; ?>
   </td>