Happy New Year

[squirrelmail.git] / templates / default_advanced / read_menubar_nav.tpl

diff --git a/templates/default_advanced/read_menubar_nav.tpl b/templates/default_advanced/read_menubar_nav.tpl
index d14e07f5c5bd00a659dca58ed3934023c0f2f1f8..9f8ddfae1634fa238c5ad169d5ab9f8bbb8da86e 100644 (file)
--- a/templates/default_advanced/read_menubar_nav.tpl
+++ b/templates/default_advanced/read_menubar_nav.tpl
@@ -37,9 +37,9 @@
  *    $move_form_extra - additional input elements needed by the MOVE form.
  *    $last_move_target - the last folder that a message was moved/copied to. 
  *     *
  *    $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
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License

- * @version $Id: read_menubar_nav.tpl 11850 2006-10-06 21:57:26Z stevetruckstuff $
+ * @version $Id$

  * @package squirrelmail
  * @subpackage templates
  */
  * @package squirrelmail
  * @subpackage templates
  */


@@ -50,15 +50,7 @@
 extract($t);
 
 
 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 here 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 here 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).*/

 
 /** preview pane prep */
 global $data_dir, $username, $base_uri;
 
 /** preview pane prep */
 global $data_dir, $username, $base_uri;


@@ -66,17 +58,6 @@ $pp_refresh_message_list = getPref($data_dir, $username, 'pp_refresh_message_lis
 $use_previewPane = getPref($data_dir, $username, 'use_previewPane', 0);
 $show_preview_pane = checkForJavascript() && $use_previewPane;
 $empty_frame_uri = $base_uri . 'plugins/preview_pane/empty_frame.php';
 $use_previewPane = getPref($data_dir, $username, 'use_previewPane', 0);
 $show_preview_pane = checkForJavascript() && $use_previewPane;
 $empty_frame_uri = $base_uri . 'plugins/preview_pane/empty_frame.php';

-if ($show_preview_pane) { ?>
-   <script>
-   <!--
-      function refresh_message_list()
-      { 
-          if (typeof(parent.right.delayed_page_load) != 'undefined')
-              parent.right.delayed_page_load("<?php echo $message_list_href; ?>"); 
-      }
-   // -->
-   </script>
-<?php }

 
 
 /** Begin template **/
 
 
 /** Begin template **/


@@ -94,13 +75,11 @@ if ($nav_on_top) {
  <tr class="nav">
   <td class="nav">
    <small>
  <tr class="nav">
   <td class="nav">
    <small>

-   [
-   <?php
+   [&nbsp;<?php

     if (empty($prev_href)) {
         echo _("Previous");
     } else {
     if (empty($prev_href)) {
         echo _("Previous");
     } else {

-        ?>
-   <a href="<?php echo $prev_href; ?><?php
+        ?><a href="<?php echo $prev_href; ?><?php

 
 /** if preview pane turned on with "always refresh message list", 
     refresh message list frame too, but only if we are in the bottom frame! 
 
 /** if preview pane turned on with "always refresh message list", 
     refresh message list frame too, but only if we are in the bottom frame! 


@@ -141,22 +120,18 @@ if ($show_preview_pane && $pp_refresh_message_list)
    echo '&amp;pp_rr=1';
 
 
    echo '&amp;pp_rr=1';
 
 

-echo '">' . _("Next"); ?></a>
-        <?php
+echo '">' . _("Next"); ?></a><?php

     }
     }

-   ?>
-   ]
+   ?>&nbsp;]

    &nbsp;&nbsp;&nbsp;&nbsp;
    <?php
     if (!empty($del_prev_href) || !empty($del_next_href)) {
         ?>
    &nbsp;&nbsp;&nbsp;&nbsp;
    <?php
     if (!empty($del_prev_href) || !empty($del_next_href)) {
         ?>

-        [
-        <?php        
+        [&nbsp;<?php        

         if (empty($del_prev_href)) {
         if (empty($del_prev_href)) {

-            echo _("Delete &amp; Previous");
+            echo '<span style="white-space: nowrap;">' . _("Delete &amp; Previous") . '</span>';

         } else {
         } else {

-            ?>
-   <a href="<?php echo $del_prev_href; ?>"<?php
+            ?><a href="<?php echo $del_prev_href; ?>"<?php

 
 /** if preview pane turned on with "always refresh message list", 
     refresh message list frame too, but only if we are in the bottom frame! */
 
 /** if preview pane turned on with "always refresh message list", 
     refresh message list frame too, but only if we are in the bottom frame! */


@@ -164,14 +139,14 @@ if ($show_preview_pane && $pp_refresh_message_list)
    echo ' onclick="if (self.name == \'bottom\') { refresh_message_list(); } "';
 
 
    echo ' onclick="if (self.name == \'bottom\') { refresh_message_list(); } "';
 
 

-echo '>' . _("Delete &amp; Previous"); ?></a>
+echo ' style="white-space: nowrap;">' . _("Delete &amp; Previous"); ?></a>

             <?php
         }
         ?>
         | 
         <?php
         if (empty($del_next_href)) {
             <?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
         } else {
             ?>
    <a href="<?php echo $del_next_href; ?>"<?php


@@ -182,23 +157,21 @@ if ($show_preview_pane && $pp_refresh_message_list)
    echo ' onclick="if (self.name == \'bottom\') { refresh_message_list(); } "';
 
 
    echo ' onclick="if (self.name == \'bottom\') { refresh_message_list(); } "';
 
 

-echo '>' . _("Delete &amp; Next"); ?></a>
-            <?php
+echo ' style="white-space: nowrap;">' . _("Delete &amp; Next"); ?></a><?php

         }
         }

-        ?>
-        ]
+        ?>&nbsp;]

    &nbsp;&nbsp;&nbsp;&nbsp;
         <?php
     }
    
     if (!empty($view_msg_href)) {
         ?>
    &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
     }
    ?>
    &nbsp;&nbsp;&nbsp;&nbsp;
         <?php
     }
    ?>

-   [ <a href="<?php echo $message_list_href; ?>"<?php
+   [&nbsp;<a href="<?php echo $message_list_href; ?>"<?php

 
 /** if preview pane turned on, retarget to message list frame & clear 
     bottom frame, but only if we are in the bottom frame! */
 
 /** if preview pane turned on, retarget to message list frame & clear 
     bottom frame, but only if we are in the bottom frame! */


@@ -206,15 +179,12 @@ if ($show_preview_pane)
    echo ' onclick="if (self.name == \'bottom\') { parent.right.document.location=\'' . $message_list_href . '\'; document.location=\'' . $empty_frame_uri . '\'; return false; } "';
 
 
    echo ' onclick="if (self.name == \'bottom\') { parent.right.document.location=\'' . $message_list_href . '\'; document.location=\'' . $empty_frame_uri . '\'; return false; } "';
 
 

-echo '>' . _("Message List"); ?></a>
-   <?php
+echo ' style="white-space: nowrap;">' . _("Message List"); ?></a><?php

     if (!empty($search_href)) {
         ?>
     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>
    </small>
    <?php if(!empty($plugin_output[$plugin_hook])) echo $plugin_output[$plugin_hook]; ?>
   </td>