[Rt-commit] rt branch, 4.2/report-os-details, updated. rt-4.0.6-448-g9c705bd

[Ruslan Zakirov]

The branch, 4.2/report-os-details has been updated
       via  9c705bd3fb93f9543920294d3c95284cc45d10c4 (commit)
       via  a4f63f8020e357712e56cc5d15add7efdeecd096 (commit)
      from  7534d84af3b2962a45cd3ad8041ea8e98ad34014 (commit)

Summary of changes:
 share/html/Admin/Tools/Configuration.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

- Log -----------------------------------------------------------------
commit a4f63f8020e357712e56cc5d15add7efdeecd096
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Sat Oct 6 02:50:34 2012 +0400

    don't show empty OS information
    
    either command is not there or command itself has no sense
    to the system, so just hide them.

diff --git a/share/html/Admin/Tools/Configuration.html b/share/html/Admin/Tools/Configuration.html
index bf0b3a7..f115fc5 100644
--- a/share/html/Admin/Tools/Configuration.html
+++ b/share/html/Admin/Tools/Configuration.html
@@ -267,9 +267,10 @@ my %os = (
 my $row = 0;
 </%perl>
 % while (my ($name, $cmd) = each %os) {
+% my $res = `$cmd </dev/null 2>/dev/null` or next;
 <tr class="collection-as-table <% $row++ % 2 ? "oddline" : "evenline" %>">
 <td class="collection-as-table"><% $name %></td>
-<td class="collection-as-table" style="white-space: pre; font-family: monospace"><% `$cmd </dev/null 2>/dev/null` || '' %></td>
+<td class="collection-as-table" style="white-space: pre; font-family: monospace"><% $res %></td>
 </tr>
 % }
 </table>

commit 9c705bd3fb93f9543920294d3c95284cc45d10c4
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Sat Oct 6 02:51:58 2012 +0400

    don't use pre formatting for OS's info
    
    For example uname -a output is just to wide so left column
    becomes multiline.

diff --git a/share/html/Admin/Tools/Configuration.html b/share/html/Admin/Tools/Configuration.html
index f115fc5..c5df4bb 100644
--- a/share/html/Admin/Tools/Configuration.html
+++ b/share/html/Admin/Tools/Configuration.html
@@ -270,7 +270,7 @@ my $row = 0;
 % my $res = `$cmd </dev/null 2>/dev/null` or next;
 <tr class="collection-as-table <% $row++ % 2 ? "oddline" : "evenline" %>">
 <td class="collection-as-table"><% $name %></td>
-<td class="collection-as-table" style="white-space: pre; font-family: monospace"><% $res %></td>
+<td class="collection-as-table" style="font-family: monospace"><% $res %></td>
 </tr>
 % }
 </table>

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