[freeside-commits] branch master updated. 01717353564b79dd143220ec67207a2d245f24e9

[Carl J. Adams-Collier]

The branch, master has been updated
       via  01717353564b79dd143220ec67207a2d245f24e9 (commit)
      from  0d93c344df3eb3caf2ba14807475a5a8e2d01267 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 01717353564b79dd143220ec67207a2d245f24e9
Author: C.J. Adams-Collier <cjac at colliertech.org>
Date:   Mon Sep 15 14:25:28 2014 -0700

    FS RT #30961 - displaying Upload / Download in gigs rather than megs
     - added a nowrap around the MAC vendor string to improve readability

diff --git a/httemplate/search/sqlradius.cgi b/httemplate/search/sqlradius.cgi
index 604f44e..5d6aeea 100644
--- a/httemplate/search/sqlradius.cgi
+++ b/httemplate/search/sqlradius.cgi
@@ -302,10 +302,10 @@ my $duration_format = sub {
 
 my $octets_format = sub {
   my $octets = shift;
-  my $megs = $octets / 1048576;
-  sprintf('<B>%.3f</B> megs', $megs);
-  #my $gigs = $octets / 1073741824
-  #sprintf('<B>%.3f</B> gigabytes', $gigs);
+  #my $megs = $octets / 1048576;
+  #sprintf('<B>%.3f</B> megs', $megs);
+  my $gigs = $octets / 1073741824;
+  sprintf('<B>%.3f</B> gigs', $gigs);
 };
 
 ###
@@ -380,9 +380,9 @@ tie %fields, 'Tie::IxHash',
                              my $src = shift;
                              if ( $src =~
                                     /^\s*(([\dA-F]{2}[\-:]){5}[\dA-F]{2})/i ) {
-                               return $src. ' ('.
+                               return $src. ' <span style="white-space: nowrap">('.
                                         (Net::MAC::Vendor::lookup($1))->[0].
-                                      ')';
+                                      ')</span>';
 
                              }
                              length($src) ? $src : '&nbsp';
@@ -396,9 +396,9 @@ tie %fields, 'Tie::IxHash',
                              my $dst = shift;
                              if ( $dst =~
                                     /^\s*(([\dA-F]{2}[\-:]){5}[\dA-F]{2})/i ) {
-                               return $dst. ' ('.
+                               return $dst. ' <span style="white-space: nowrap">('.
                                         (Net::MAC::Vendor::lookup($1))->[0].
-                                      ')';
+                                      ')</span>';
                              }
                              length($dst) ? $dst : '&nbsp';
                            },

-----------------------------------------------------------------------

Summary of changes:
 httemplate/search/sqlradius.cgi |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)