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

diff --cc html/cgi-bin/logs.cgi/firewalllogip.dat
index 8f07661a77bd5e2c0a98d1ab0f0923b1c474c2eb,d24dd983fdb22518c974988fcda5a0fbe9254071..f671ab855f5237b7711e66d926ec0f4f45628216
--- 1/html/cgi-bin/logs.cgi/firewalllogip.dat
--- 2/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 b27f6ede790566708dd6632592f658896ac652c3,a13414654a72d78337e8b38ce5a738e5d6b0aedc..ba106016fd3b788889bc1863a8cc54a870e4e400
--- 1/html/cgi-bin/logs.cgi/firewalllogport.dat
--- 2/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 6dc2b9c85d9a5fdc98af4e3df2c5f9f01befd733,700b563e07e9850e0719d4b76f188d4a742420df..7e8e32eeae848a96e0def3f7b00159287c8fda69
--- 1/html/cgi-bin/media.cgi
--- 2/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>";
                }
        }
  

diff --cc html/cgi-bin/ovpnmain.cgi
Simple merge