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

List:       squirrelmail-cvs
Subject:    [SM-CVS] SF.net SVN: squirrelmail:[14672] branches/SM-1_4-STABLE/squirrelmail
From:       Paul Lesniewski via squirrelmail-cvs <squirrelmail-cvs () lists ! sourceforge ! net>
Date:       2017-06-11 22:15:07
Message-ID: 1497219307.285637.18958 () sfp-scm-5 ! v30 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 14672
          http://sourceforge.net/p/squirrelmail/code/14672
Author:   pdontthink
Date:     2017-06-11 22:15:06 +0000 (Sun, 11 Jun 2017)
Log Message:
-----------
Subtle but better

Modified Paths:
--------------
    branches/SM-1_4-STABLE/squirrelmail/functions/mime.php
    branches/SM-1_4-STABLE/squirrelmail/src/read_body.php

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/mime.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/mime.php	2017-06-11 21:54:51 UTC \
                (rev 14671)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/mime.php	2017-06-11 22:15:06 UTC \
(rev 14672) @@ -400,7 +400,7 @@
 
         // Always add the link for downloading the mail as a file to the global
         // variable.
-        $download_and_unsafe_link .= ' | <a \
href="download.php?absolute_dl=true&amp;' . +        $download_and_unsafe_link .= \
                '&nbsp;| <a href="download.php?absolute_dl=true&amp;' .
             $link . '" style="white-space: nowrap;">' . _("Download this as a file") \
.  '</a>';  
         // Find out the right text to use in the link depending on the
@@ -421,7 +421,7 @@
         // Only create a link for unsafe images if there's need for one. If so:
         // add it to the global variable.
         if($text != '') {
-            $download_and_unsafe_link .= ' | <a href="read_body.php?' . $link . '" \
style="white-space: nowrap;">' . $text . '</a>'; +            \
$download_and_unsafe_link .= '&nbsp;| <a href="read_body.php?' . $link . '" \
style="white-space: nowrap;">' . $text . '</a>';  }
     }
     return $body;

Modified: branches/SM-1_4-STABLE/squirrelmail/src/read_body.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/src/read_body.php	2017-06-11 21:54:51 UTC \
                (rev 14671)
+++ branches/SM-1_4-STABLE/squirrelmail/src/read_body.php	2017-06-11 22:15:06 UTC \
(rev 14672) @@ -526,7 +526,7 @@
            $enable_forward_as_attachment;
 
     // wrapping is ok:  $topbar_delimiter = '&nbsp;|&nbsp;';
-    $topbar_delimiter = ' | ';
+    $topbar_delimiter = '&nbsp;| ';
     $urlMailbox = urlencode($mailbox);
     $s = '<table width="100%" cellpadding="3" cellspacing="0" align="center"'.
          ' border="0" bgcolor="'.$color[9].'"><tr>' .
@@ -583,7 +583,8 @@
         $s .= makeComposeLink($comp_alt_uri, '<span style="white-space: nowrap;">' . \
$comp_alt_string . '</span>');  }
 
-    $s .= '</small></td><td align="center" width="2%" style="white-space: \
nowrap"><small>' . $topbar_delimiter; +    $s .= '</small></td><td align="center" \
width="2%" style="white-space: nowrap"><small>' +       . (strpos($topbar_delimiter, \
'&nbsp;') === 0 ? substr($topbar_delimiter, 6) : ltrim($topbar_delimiter));  
     if (!(isset($where) && isset($what)) && !$passed_ent_id) {
         $prev = findPreviousMessage($mbx_response['EXISTS'], $passed_id);
@@ -647,7 +648,8 @@
         $s .= $topbar_delimiter . $next_link;
     }
 
-    $s .= $topbar_delimiter . '</small></td>' . "\n" .
+    $s .= (strrpos($topbar_delimiter, '&nbsp;') === strlen($topbar_delimiter) - 6 ? \
substr($topbar_delimiter, 0, -6) : rtrim($topbar_delimiter)) +        . \
'</small></td>' . "\n" .  html_tag( 'td', '', 'right', '', 'width="49%" ' ) . \
'<small>';  $comp_action_uri = $comp_uri . '&amp;smaction=forward';
     $s .= makeComposeLink($comp_action_uri, _("Forward"));
@@ -699,7 +701,7 @@
           '<a href="'.$url.'" style="white-space: nowrap;">'._("View Full \
Header").'</a>';  
     /* Output the printer friendly link if we are in subtle mode. */
-    $s .= ' | ' .
+    $s .= '&nbsp;| ' .
           printer_friendly_link($mailbox, $passed_id, $passed_ent_id, $color);
     echo $s;
 

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]