From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 17 Feb 2014 15:33:38 +0000 (+0100)
Subject: Merge remote-tracking branch 'alfh/feature_htmlcleanup' into next
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=5ee7500e597d88199b82195f1301712f9179466b

Merge remote-tracking branch 'alfh/feature_htmlcleanup' into next

Conflicts:
	html/cgi-bin/logs.cgi/firewalllogip.dat
	html/cgi-bin/logs.cgi/firewalllogport.dat
	html/cgi-bin/media.cgi
---

5ee7500e597d88199b82195f1301712f9179466b
diff --cc html/cgi-bin/logs.cgi/firewalllogip.dat
index 8f07661a7,d24dd983f..f671ab855
--- a/html/cgi-bin/logs.cgi/firewalllogip.dat
+++ b/html/cgi-bin/logs.cgi/firewalllogip.dat
@@@ -403,14 -403,14 +403,14 @@@ if ($showpie != 2 && $pienumber <= 50 &
  }
  
  print <<END
- <TABLE WIDTH='100%' class='tbl'>
- <TR>
- <TH WIDTH='10%' ALIGN='CENTER' CLASS='boldbase'></TH>
- <TH WIDTH='30%' ALIGN='CENTER' CLASS='boldbase'><B>$Lang::tr{'ip address'}</B></TH>
- <TH WIDTH='10%' ALIGN='CENTER' CLASS='boldbase'><B>$Lang::tr{'country'}</B></TH>
- <TH WIDTH='10%' ALIGN='CENTER' CLASS='boldbase'><B>Count</B></TH>
- <TH WIDTH='30%' ALIGN='CENTER' CLASS='boldbase'><B>$Lang::tr{'percentage'}</B></TH>
- </TR>
+ <table width='100%' class='tbl'>
+ <tr>
+ <th width='10%' align='center' class='boldbase'></th>
 -<th width='30%' align='center' class='boldbase'><b>IP</b></th>
 -<th width='10%' align='center' class='boldbase'><b>Flag</b></th>
++<th width='30%' align='center' class='boldbase'><b>$Lang::tr{'ip address'}</b></th>
++<th width='10%' align='center' class='boldbase'><b>$Lang::tr{'country'}</b></th>
+ <th width='10%' align='center' class='boldbase'><b>Count</b></th>
 -<th width='30%' align='center' class='boldbase'><b>Percent</b></th>
++<th width='30%' align='center' class='boldbase'><b>$Lang::tr{'percentage'}</b></th>
+ </tr>
  END
  ;
  
diff --cc html/cgi-bin/logs.cgi/firewalllogport.dat
index b27f6ede7,a13414654..ba106016f
--- a/html/cgi-bin/logs.cgi/firewalllogport.dat
+++ b/html/cgi-bin/logs.cgi/firewalllogport.dat
@@@ -406,13 -406,13 +406,13 @@@ if ($showpie != 2 && $pienumber <= 50 &
  }
  
  print <<END
- <TABLE WIDTH='100%' CLASS='tbl'>
- <TR>
- <TH WIDTH='10%' ALIGN='CENTER' CLASS='boldbase'></TH>
- <TH WIDTH='33%' ALIGN='CENTER' CLASS='boldbase'><B>$Lang::tr{'port'}</B></TH>
- <TH WIDTH='33%' ALIGN='CENTER' CLASS='boldbase'><B>Count</B></TH>
- <TH WIDTH='33%' ALIGN='CENTER' CLASS='boldbase'><B>$Lang::tr{'percentage'}</B></TH>
- </TR>
+ <table width='100%' CLASS='tbl'>
+ <tr>
+ <th width='10%' align='center' class='boldbase'></th>
 -<th width='33%' align='center' class='boldbase'><b>Port</b></th>
 -<th width='33%' align='center' class='boldbase'><b>Count</b></th>
 -<th width='33%' align='center' class='boldbase'><b>Percent</b></th>
++<th width='33%' align='center' class='boldbase'><b>$Lang::tr{'port'}</b></th>
++<th width='33%' align='center' class='boldbase'><b>count</b></th>
++<th width='33%' align='center' class='boldbase'><b>$Lang::tr{'percentage'}</b></th>
+ </tr>
  END
  ;
  
diff --cc html/cgi-bin/media.cgi
index 6dc2b9c85,700b563e0..7e8e32eea
--- a/html/cgi-bin/media.cgi
+++ b/html/cgi-bin/media.cgi
@@@ -206,9 -206,9 +206,9 @@@ sub diskbox 
  
  		if ( $status[1]=~/standby/){
  			my $ftime = localtime((stat("/var/run/hddshutdown-$disk"))[9]);
- 			print"<B>Disk $disk status:<font color=#FF0000>".$status[1]."</font></B> ($Lang::tr{'since'} $ftime)";
 -			print"<b>Disk $disk status:<font color='#FF0000'>".$status[1]."</font></b> (since $ftime)";
++			print"<b>Disk $disk status:<font color='#FF0000'>".$status[1]."</font></b> ($Lang::tr{'since'} $ftime)";
  		}else{
- 			print"<B>Disk $disk status:<font color=#00FF00>".$status[1]."</font></B>";
+ 			print"<b>Disk $disk status:<font color='#00FF00'>".$status[1]."</font></b>";
  		}
  	}