[prev in list] [next in list] [prev in thread] [next in thread] 

List:       squirrelmail-cvs
Subject:    [SM-CVS] SF.net SVN: squirrelmail:[14696] branches/SM-1_4-STABLE/squirrelmail/ functions/mailbox_dis
From:       Paul Lesniewski via squirrelmail-cvs <squirrelmail-cvs () lists ! sourceforge ! net>
Date:       2017-06-28 21:29:22
Message-ID: 1498685362.507709.23153 () sfp-scm-6 ! v30 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 14696
          http://sourceforge.net/p/squirrelmail/code/14696
Author:   pdontthink
Date:     2017-06-28 21:29:22 +0000 (Wed, 28 Jun 2017)
Log Message:
-----------
More sensible whitespace wrapping

Modified Paths:
--------------
    branches/SM-1_4-STABLE/squirrelmail/functions/mailbox_display.php

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/mailbox_display.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/mailbox_display.php	2017-06-27 \
                04:43:21 UTC (rev 14695)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/mailbox_display.php	2017-06-28 \
21:29:22 UTC (rev 14696) @@ -984,11 +984,12 @@
     global $checkall, $what, $where, $mailbox, $javascript_on;
     global $PHP_SELF, $PG_SHOWNUM;
 
+    $whitespace_style = ' style="white-space:nowrap" ';
     $result = '';
     if ($javascript_on) {
         $safe_name = preg_replace("/[^0-9A-Za-z_]/", '_', $mailbox);
         $func_name = "CheckAll" . $safe_name;
-        $result = '<a href="javascript:void(0)" onClick="' . $func_name . '();">' . \
_("Toggle All") +        $result = '<a href="javascript:void(0)" onClick="' . \
$func_name . '();"' . $whitespace_style . '>' . _("Toggle All")  /*                . \
                '</script><a href="javascript:' . $func_name . '()">' . _("Toggle \
                All")*/
                 . "</a>\n";
     } else {
@@ -1009,7 +1010,7 @@
             $result .= '&amp;where=' . urlencode($where)
                     .  '&amp;what=' . urlencode($what);
         }
-        $result .= "\">";
+        $result .= "\"$whitespace_style>";
 
         if (isset($checkall) && ($checkall == '1')) {
             $result .= _("Unselect All");
@@ -1240,7 +1241,7 @@
     if (($prv_str != '') || ($nxt_str != '')) {
         $all_str = "<a href=\"right_main.php?PG_SHOWALL=1"
                  . "&amp;use_mailbox_cache=$use&amp;startMessage=1&amp;mailbox=$box\" \
                "
-                 . ">" . _("Show All") . '</a>';
+                 . "style=\"white-space:nowrap\">" . _("Show All") . '</a>';
     }
 
     /* Last but not least, get the value for the toggle all link. */
@@ -1252,11 +1253,11 @@
      * a different approach would be any easier to read. ;)
      */
     $result = '';
-    $result .= ($prv_str != '' ? $prv_str . $spc . $sep . $spc : '');
-    $result .= ($nxt_str != '' ? $nxt_str . $spc . $sep . $spc : '');
+    $result .= ($prv_str != '' ? $prv_str . $spc . $sep . ' ' : '');
+    $result .= ($nxt_str != '' ? $nxt_str . $spc . $sep . ' ' : '');
     $result .= ($pg_str  != '' ? $pg_str : '');
-    $result .= ($all_str != '' ? $sep . $spc . $all_str . $spc : '');
-    $result .= ($result  != '' ? $sep . $spc . $tgl_str: $tgl_str);
+    $result .= ($all_str != '' ? $sep . ' ' . $all_str . $spc : '');
+    $result .= ($result  != '' ? $sep . ' ' . $tgl_str: $tgl_str);
 
     /* If the resulting string is blank, return a non-breaking space. */
     if ($result == '') {

This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
-----
squirrelmail-cvs mailing list
List address: squirrelmail-cvs@lists.sourceforge.net
List info (subscribe/unsubscribe/change options): \
                https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs
Repository: http://squirrelmail.org/svn


[prev in list] [next in list] [prev in thread] [next in thread]