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

List:       ipcop-svn
Subject:    [Ipcop-svn] SF.net SVN: ipcop:[2652] ipcop/trunk
From:       owes () users ! sourceforge ! net
Date:       2009-03-28 22:39:03
Message-ID: E1LnhB9-0005gp-34 () c3vjzd1 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 2652
          http://ipcop.svn.sourceforge.net/ipcop/?rev=2652&view=rev
Author:   owes
Date:     2009-03-28 22:39:02 +0000 (Sat, 28 Mar 2009)

Log Message:
-----------
Move percentbar to header.pl so other CGIs can use it.
Also show inodes usage for tmpfs & co.

Modified Paths:
--------------
    ipcop/trunk/html/cgi-bin/status.cgi
    ipcop/trunk/src/libs/header.pl

Modified: ipcop/trunk/html/cgi-bin/status.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/status.cgi	2009-03-28 22:36:44 UTC (rev 2651)
+++ ipcop/trunk/html/cgi-bin/status.cgi	2009-03-28 22:39:02 UTC (rev 2652)
@@ -96,12 +96,8 @@
 my $key = '';
 foreach $key (sort keys %servicenames)
 {
-    if ($lines % 2) {
-        print "<tr class='table1colour'>\n"; 
-    }
-    else {
-        print "<tr class='table2colour'>\n"; 
-    }
+    my $tid = ($lines % 2) + 1;
+    print "<tr class='table${tid}colour'>\n"; 
     print "<td align='left'>$key</td>\n";
     my $shortname = $servicenames{$key};
     my $status = &General::isrunning($shortname);
@@ -178,7 +174,7 @@
 <td>
 END
 ;
-                    &percentbar($percent);
+                    &Header::percentbar($percent);
                     print <<END
 </td>
 <td align='right'>$percent</td>
@@ -249,7 +245,7 @@
 <td>
 END
 ;
-    &percentbar($percent);
+    &Header::percentbar($percent);
     print <<END
 </td>
 <td align='right'>$percent</td>
@@ -277,7 +273,7 @@
 END
 ;
 
-open(DF,'/bin/df -i -x rootfs -x tmpfs|');
+open(DF,'/bin/df -i -x rootfs|');
 @df = <DF>;
 close DF;
 
@@ -299,6 +295,7 @@
     my $free=shift(@all_entries);
     my $percent=shift(@all_entries);
     my $mount=shift(@all_entries);
+    next if ($mount eq "/dev");
     print <<END
 <tr>
 <td>$device</td>
@@ -309,7 +306,7 @@
 <td>
 END
 ;
-    &percentbar($percent);
+    &Header::percentbar($percent);
     print <<END
 </td>
 <td align='right'>$percent</td>
@@ -381,31 +378,3 @@
 
 &Header::closepage();
 
-sub percentbar
-{
-    my $percent = $_[0];
-    my $fg = '#A0A0A0';
-    my $bg = '#F2F2F2';
-
-    if ($percent =~ m/^(\d+)%$/ )
-    {
-        print <<END
-<table width='100' border='1' cellspacing='0' cellpadding='0' \
style='border-width:1px;border-style:solid;border-color:$fg;width:100px;height:10px;'>
                
-<tr>
-END
-;
-        if ($percent eq "100%") {
-            print "<td width='100%' bgcolor='$fg' \
                style='background-color:$fg;border-style:solid;border-width:1px;border-color:$bg'>"
                
-        }
-        elsif ($percent eq "0%") {
-            print "<td width='100%' bgcolor='$bg' \
                style='background-color:$bg;border-style:solid;border-width:1px;border-color:$bg'>"
                
-        }
-        else {
-            print "<td width='$percent' bgcolor='$fg' \
style='background-color:$fg;border-style:solid;border-width:1px;border-color:$bg'></td><td \
width='" . (100-$1) . "%' bgcolor='$bg' \
                style='background-color:$bg;border-style:solid;border-width:1px;border-color:$bg'>"
                
-        }
-        print <<END
-<img src='/images/null.gif' width='1' height='1' alt='' /></td></tr></table>
-END
-;
-    }
-}

Modified: ipcop/trunk/src/libs/header.pl
===================================================================
--- ipcop/trunk/src/libs/header.pl	2009-03-28 22:36:44 UTC (rev 2651)
+++ ipcop/trunk/src/libs/header.pl	2009-03-28 22:39:02 UTC (rev 2652)
@@ -705,6 +705,33 @@
     return $name;
 }
 
+sub percentbar
+{
+    my $percent = $_[0];
+
+    if ($percent =~ m/^(\d+)%$/ )
+    {
+        print <<END
+<table class='percentbar'>
+<tr>
+END
+;
+        if ($percent eq "100%") {
+            print "<td width='100%' class='percent1'>"
+        }
+        elsif ($percent eq "0%") {
+            print "<td width='100%' class='percent0'>"
+        }
+        else {
+            print "<td width='$percent' class='percent1'></td><td width='" . \
(100-$1) . "%' class='percent0'>"; +        }
+        print <<END
+<img src='/images/null.gif' width='1' height='1' alt='' /></td></tr></table>
+END
+;
+    }
+}
+
 sub connectionstatus
 {
     my %pppsettings = ();


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

------------------------------------------------------------------------------
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn


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