webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-05-01 07:50:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Update accelerator changes from Jörn-Ingo Weigert."

Browse Source 
This reverts commit 5cf2c33968.

Conflicts:
	html/html/themes/ipfire/include/functions.pl
	html/html/themes/maniac/include/functions.pl
	langs/de/cgi-bin/de.pl
	langs/en/cgi-bin/en.pl
This commit is contained in:
Michael Tremer
2013-05-11 11:39:36 +02:00
parent 83eb743523
commit 2ad1a8bc0c
36 changed files with 1519 additions and 2169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
html/html/themes/ipfire/images/updxl-icons.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.3 KiB

111
html/html/themes/ipfire/include/functions.pl
View File

@@ -161,7 +161,6 @@ END
print <<END
<link rel="shortcut icon" href="/favicon.ico" />
<link rel="stylesheet" type="text/css" href="/themes/ipfire/include/style.css" />
$extrahead
<script language="javascript" type="text/javascript">
function swapVisibility(id) {
@@ -224,36 +223,38 @@ END
;
}
else {
print "</head><body>";}
print "</head><body>";}
print <<END
<!-- IPFIRE HEADER -->
<div id="header">
<div id="header_inner" class="fixed">
<div id="logo">
<div id="header_inner" class="fixed">
<div id="logo">
END
;
if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
print "<h1><span>$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}</span></h1><br />";
}
else {
print "<h1><span>IPFire</span></h1><br />";
}
print <<END
<h2>$h2</h2>
</div>
if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
print "<h1><span>$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}</span></h1><br />";
} else {
print "<h1><span>IPFire</span></h1><br />";
}
print <<END
<h2>$h2</h2>
</div>
END
;
&showmenu();
&showmenu();
print <<END
</div>
</div>
</div>
<div id="main">
<div id="main_inner" class="fixed">
<div id="primaryContent_2columns">
<div id="columnA_2columns">
<div id="main_inner" class="fixed">
<div id="primaryContent_2columns">
<div id="columnA_2columns">
END
;
}
@@ -279,7 +280,8 @@ sub openpagewithoutmenu {
<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>$title</title>
<title>$title</title>
$extrahead
END
;
if ($settings{'FX'} ne 'off') {
@@ -292,7 +294,6 @@ END
print <<END
<link rel="shortcut icon" href="/favicon.ico" />
<link rel="stylesheet" type="text/css" href="/include/style.css" />
$extrahead
<script language="javascript" type="text/javascript">
function swapVisibility(id) {
@@ -305,21 +306,26 @@ END
}
}
</script>
</head>
<body>
<!-- IPFIRE HEADER -->
<div id="header">
<div id="header_inner" class="fixed">
<div id="logo">
<h1><span>IPFire</span></h1>
<h2>$h2</h2>
</div>
</div>
</div>
<div id="main">
<div id="main_inner" class="fixed">
<div id="primaryContent_2columns">
<div id="columnA_2columns">
<div id="header">
<div id="header_inner" class="fixed">
<div id="logo">
<h1><span>IPFire</span></h1>
<h2>$h2</h2>
</div>
</div>
</div>
<div id="main">
<div id="main_inner" class="fixed">
<div id="primaryContent_2columns">
<div id="columnA_2columns">
END
;
}
@@ -334,10 +340,12 @@ sub closepage () {
$uptime =~ s/load average/$Lang::tr{'uptime load average'}/;
print <<END
</div>
</div>
<div id="secondaryContent_2columns">
<div id="columnC_2columns">
</div>
</div>
<div id="secondaryContent_2columns">
<div id="columnC_2columns">
END
;
&showsubsection($menu);
@@ -353,16 +361,17 @@ END
;
if ($settings{'SPEED'} ne 'off') {
print <<END
<br />
<b>$Lang::tr{'bandwidth usage'}:</b>
<br />
<b>$Lang::tr{'bandwidth usage'}:</b>
$Lang::tr{'incoming'}: <span id="rx_kbs"></span>&nbsp;$Lang::tr{'outgoing'}: <span id="tx_kbs"></span>
END
;
}
print <<END
</div>
</div>
</div>
</div>
</div>
</div>
</body>
</html>
END
@@ -379,25 +388,25 @@ sub closebigbox
sub openbox
{
$width = $_[0];
$align = $_[1];
$caption = $_[2];
$width = $_[0];
$align = $_[1];
$caption = $_[2];
print <<END
print <<END
<!-- openbox -->
<div class="post" style="text-align:$align">
<div class="post" align="$align">
END
;
if ($caption) { print "<h3>$caption</h3>\n"; } else { print "&nbsp;"; }
if ($caption) { print "<h3>$caption</h3>\n"; } else { print "&nbsp;"; }
}
sub closebox
{
print <<END
</div>
<br class="clear" />
<!-- closebox -->
print <<END
</div>
<br class="clear" />
<!-- closebox -->
END
;
}

384
html/html/themes/ipfire/include/upxlr.css
View File

@@ -1,384 +0,0 @@
span[id^=ledgr],li#liledgr,label#lbledgr
{
background-position:0 0;
}
span[id^=ledbl],li#liledbl,label#lbledbl
{
background-position:0 -20px;
}
span[id^=ledye],li#liledye,label#lbledye
{
background-position:0 -40px;
}
span[id^=ledrd],li#liledrd,label#lbledrd
{
background-position:0 -60px;
}
span[id^=ledgy],li#liledgy,label#lbledgy
{
background-position:0 -80px;
}
span#rel,li#lirel
{
background-position:0 -100px;
}
span#glo,li#liglo
{
background-position:0 -120px;
}
span#del,li#lidel,label#lbdel,button[id^=del]
{
background-position:0 -140px;
}
span#blo,li#liblo
{
background-position:0 -160px;
}
#stat
{
background-position:0 -180px;
}
#wrench
{
background-position:0 -200px;
}
#set
{
background-position:0 -220px;
}
#oview
{
background-position:0 -240px;
}
.symbols
{
background:transparent url(/themes/ipfire/images/updxl-icons.gif) no-repeat;
height:20px;
width:20px;
}
.vendimg
{
background-repeat:no-repeat;
height:18px;
width:18px;
}
.noborder
{
border:none;
}
fieldset
{
padding: 0 0 .5em;
margin-bottom: .5em;
border: 1px dotted #E1E1E1;
border-top: none;
border-left: none;
border-right: none;
}
legend
{
margin-left:0;
padding-left:0;
padding-right:.5em;
font-weight: bolder;
}
label
{
cursor:pointer;
padding-right:1em;
}
label[for^=text],label[for^=select]
{
padding-right:.2em;
}
label.symbols
{
display:inline-block;
min-height:20px;
padding-left:25px;
width:auto;
}
button[id^=del]
{
border-style:none;
}
input:invalid
{
border:2px solid red;
}
input#text01
{
height:1em;
max-width:120px;
}
input#text02
{
width:7em;
}
input[type=submit] {
margin-right: 3em;
margin-left: 3em;
}
output#duval
{
display:inline-block;
min-width:2em;
text-align:right;
}
.frmshow
{
position:absolute;
right:0;
top:0;
}
.frmshow fieldset
{
display:inline-block;
position:relative;
}
.frmshow legend
{
display:inline-block;
}
.frmshow legend span
{
left:-100px;
position:absolute;
top:.2em;
}
.frmshow button
{
border:1px solid;
display:inline;
height:22px;
padding-left:25px;
padding-right:5px;
width:auto;
cursor: pointer;
}
.frmshow button:disabled
{
border:1px solid #D90000;
color:#D90000;
cursor: default;
}
span.symbols,span.vendimg
{
display:inline-block;
}
caption
{
margin-top:.5em;
font-weight:bolder;
}
table
{
width:100%;
}
#diskusage td
{
text-align:center;
}
#summary
{
background-color:none!important;
}
[id^=list] thead tr th
{
border-bottom:1px dotted #E1E1E1;
}
th
{
text-align:center;
}
td,th
{
padding:3px;
}
tbody tr:nth-child(even)
{
background:#D6D6D6;
}
tbody tr:nth-child(odd)
{
background:#F0F0F0;
}
th span.symbols,th span.vendimg
{
vertical-align:middle!important;
}
th span[id^=vd].vendimg
{
display:block;
padding-left:27px;
text-align:left!important;
width:auto;
}
tbody tr td
{
text-align:right;
}
tfoot tr td
{
border-top:1px dotted #E1E1E1;
}
tfoot ul
{
list-style-type:none;
margin-left:1em;
padding-left:0;
}
li.symbols
{
padding-left:23px;
}
li.vendimg
{
padding-left:25px;
}
tfoot ul li
{
background-repeat:no-repeat;
display:inline;
margin-bottom:.3em;
padding-right:1em;
}
li.symbols,li.vendimg
{
display:inline-block;
width:auto;
}
td[id^=legend] h5
{
font-size:.9em;
}
div#pbar
{
background-color:#90EE90;
border:1px solid #a0a0a0;
height:15px;
min-width:100px;
padding-right:2px;
position:relative;
text-align:left;
width:auto;
}
div[id^=bar]
{
background-color:red;
border:1px solid #e2e2e2;
border-left:none;
border-right:none;
float:left;
height:13px;
}
div#bar1
{
background-color:orange;
}
div#bar2
{
background-color:blue;
}
div#bar3
{
background-color:#FF0;
}
span#duused
{
color: red;
font-weight: bolder;
}
span#free
{
color: green;
font-weight: bolder;
}
span#percent
{
font-weight:bolder;
position:relative;
}
span#max
{
position:absolute;
right:2px;
}
span#used
{
color: orange;
font-weight: bolder;
}
hr
{
margin-bottom:1em;
}
#errors
{
color:#CA2F2F;
font-weight:bolder;
}

BIN
html/html/themes/maniac/images/Thumbs.db Normal file
View File

Binary file not shown.

BIN
html/html/themes/maniac/images/updxl-icons.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.3 KiB

206
html/html/themes/maniac/include/functions.pl
View File

@@ -147,7 +147,8 @@ sub openpage {
<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>$title</title>
<title>$title</title>
$extrahead
END
;
if ($settings{'FX'} ne 'off') {
@@ -160,84 +161,87 @@ END
print <<END
<link rel="shortcut icon" href="/favicon.ico" />
<link rel="stylesheet" type="text/css" href="/themes/maniac/include/style.css" />
$extrahead
<script language="javascript" type="text/javascript">
function swapVisibility(id) {
el = document.getElementById(id);
if(el.style.display != 'block') {
el.style.display = 'block'
}
else {
el.style.display = 'none'
}
function swapVisibility(id) {
el = document.getElementById(id);
if(el.style.display != 'block') {
el.style.display = 'block'
}
else {
el.style.display = 'none'
}
}
</script>
</script>
END
;
if ($settings{'SPEED'} ne 'off') {
print <<END
<script type="text/javascript" src="/include/jquery-1.9.1.min.js"></script>
<script type="text/javascript">
var t_current;
var t_last;
var rxb_current;
var rxb_last;
var txb_current;
var txb_last;
function refreshInetInfo() {
\$.ajax({
url: '/cgi-bin/speed.cgi',
success: function(xml){
t_current = new Date();
var t_diff = t_current - t_last;
t_last = t_current;
rxb_current = \$("rxb",xml).text();
var rxb_diff = rxb_current - rxb_last;
rxb_last = rxb_current;
var rx_kbs = rxb_diff/t_diff;
rx_kbs = Math.round(rx_kbs*10)/10;
txb_current = \$("txb",xml).text();
var txb_diff = txb_current - txb_last;
txb_last = txb_current;
var tx_kbs = txb_diff/t_diff;
tx_kbs = Math.round(tx_kbs*10)/10;
\$("#rx_kbs").text(rx_kbs + ' kb/s');
\$("#tx_kbs").text(tx_kbs + ' kb/s');
}
<script type="text/javascript" src="/include/jquery-1.9.1.min.js"></script>
<script type="text/javascript">
var t_current;
var t_last;
var rxb_current;
var rxb_last;
var txb_current;
var txb_last;
function refreshInetInfo() {
\$.ajax({
url: '/cgi-bin/speed.cgi',
success: function(xml){
t_current = new Date();
var t_diff = t_current - t_last;
t_last = t_current;
rxb_current = \$("rxb",xml).text();
var rxb_diff = rxb_current - rxb_last;
rxb_last = rxb_current;
var rx_kbs = rxb_diff/t_diff;
rx_kbs = Math.round(rx_kbs*10)/10;
txb_current = \$("txb",xml).text();
var txb_diff = txb_current - txb_last;
txb_last = txb_current;
var tx_kbs = txb_diff/t_diff;
tx_kbs = Math.round(tx_kbs*10)/10;
\$("#rx_kbs").text(rx_kbs + ' kb/s');
\$("#tx_kbs").text(tx_kbs + ' kb/s');
}
});
window.setTimeout("refreshInetInfo()", 3000);
}
\$(document).ready(function(){
refreshInetInfo();
});
window.setTimeout("refreshInetInfo()", 3000);
}
\$(document).ready(function(){
refreshInetInfo();
});
</script>
</head>
<body>
</script>
</head>
<body>
END
;
}
else {
print "</head>\n<body>";}
print "</head>\n<body>";}
print <<END
<!-- IPFIRE HEADER -->
<div id="header">
<div id="header_inner" class="fixed">
<div id="logo">
<div id="header">
<div id="header_inner" class="fixed">
<div id="logo">
END
;
if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
print "<h1><span>$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}</span></h1><br />";
} else {
print "<h1><span>-= IPFire =-</span></h1><br />";
}
print <<END
<h2>+ $h2 +</h2>
</div>
if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
print "<h1><span>$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}</span></h1><br />";
} else {
print "<h1><span>-= IPFire =-</span></h1><br />";
}
print <<END
<h2>+ $h2 +</h2>
</div>
END
;
@@ -277,6 +281,7 @@ sub openpagewithoutmenu {
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>$title</title>
$extrahead
END
;
if ($settings{'FX'} ne 'off') {
@@ -289,34 +294,38 @@ END
print <<END
<link rel="shortcut icon" href="/favicon.ico" />
<link rel="stylesheet" type="text/css" href="/include/style.css" />
$extrahead
<script language="javascript" type="text/javascript">
function swapVisibility(id) {
el = document.getElementById(id);
if(el.style.display != 'block') {
el.style.display = 'block'
}
else {
el.style.display = 'none'
}
}
function swapVisibility(id) {
el = document.getElementById(id);
if(el.style.display != 'block') {
el.style.display = 'block'
}
else {
el.style.display = 'none'
}
}
</script>
</head>
<body>
</head>
<body>
<!-- IPFIRE HEADER -->
<div id="header">
<div id="header_inner" class="fixed">
<div id="logo">
<h1><span>-= IPFire =-</span></h1>
<h2>+ $h2 +</h2>
</div>
</div>
<div id="header">
<div id="header_inner" class="fixed">
<div id="logo">
<h1><span>-= IPFire =-</span></h1>
<h2>+ $h2 +</h2>
</div>
</div>
<div id="main">
<div id="main_inner" class="fixed">
<div id="primaryContent_2columns">
<div id="columnA_2columns">
</div>
<div id="main">
<div id="main_inner" class="fixed">
<div id="primaryContent_2columns">
<div id="columnA_2columns">
END
;
}
@@ -331,17 +340,18 @@ sub closepage () {
$uptime =~ s/load average/$Lang::tr{'uptime load average'}/;
print <<END
</div>
</div>
<div id="secondaryContent_2columns">
<div id="columnC_2columns">
</div>
<div id="secondaryContent_2columns">
<div id="columnC_2columns">
END
;
&showsubsection($menu);
&showsubsubsection($menu);
print <<END
</div>
</div>
<br class="clear" />
<div id="footer" class="fixed">
@@ -350,16 +360,17 @@ END
;
if ($settings{'SPEED'} ne 'off') {
print <<END
<br />
<b>$Lang::tr{'bandwidth usage'}:</b>
<br />
<b>$Lang::tr{'bandwidth usage'}:</b>
$Lang::tr{'incoming'}: <span id="rx_kbs"></span>&nbsp;$Lang::tr{'outgoing'}: <span id="tx_kbs"></span>
END
;
}
print <<END
</div>
</div>
</div>
</div>
</div>
</div>
</body>
</html>
END
@@ -382,9 +393,10 @@ sub openbox
print <<END
<!-- openbox -->
<div class="post" style="text-align:$align">
<div class="post" align="$align">
END
;
if ($caption) { print "<h3>$caption</h3>\n"; } else { print "&nbsp;"; }
}

390
html/html/themes/maniac/include/upxlr.css
View File

@@ -1,390 +0,0 @@
span[id^=ledgr],li#liledgr,label#lbledgr
{
background-position:0 0;
}
span[id^=ledbl],li#liledbl,label#lbledbl
{
background-position:0 -20px;
}
span[id^=ledye],li#liledye,label#lbledye
{
background-position:0 -40px;
}
span[id^=ledrd],li#liledrd,label#lbledrd
{
background-position:0 -60px;
}
span[id^=ledgy],li#liledgy,label#lbledgy
{
background-position:0 -80px;
}
span#rel,li#lirel
{
background-position:0 -100px;
}
span#glo,li#liglo
{
background-position:0 -120px;
}
span#del,li#lidel,label#lbdel,button[id^=del]
{
background-position:0 -140px;
}
span#blo,li#liblo
{
background-position:0 -160px;
}
#stat
{
background-position:0 -180px;
}
#wrench
{
background-position:0 -200px;
}
#set
{
background-position:0 -220px;
}
#oview
{
background-position:0 -240px;
}
.symbols
{
background:transparent url(/themes/maniac/images/updxl-icons.gif) no-repeat;
height:20px;
width:20px;
}
.vendimg
{
background-repeat:no-repeat;
height:18px;
width:18px;
}
.noborder
{
border:none;
}
fieldset
{
padding: 0 0 .5em;
margin-bottom: .5em;
border: 1px dotted #E1E1E1;
border-top: none;
border-left: none;
border-right: none;
}
legend
{
margin-left:0;
padding-left:0;
padding-right:.5em;
font-weight: bolder;
}
label
{
cursor:pointer;
padding-right:1em;
}
label[for^=text],label[for^=select]
{
padding-right:.2em;
}
label.symbols
{
display:inline-block;
min-height:20px;
padding-left:25px;
width:auto;
}
button[id^=del]
{
border-style:none;
}
input:invalid
{
border:2px solid red;
}
input#text01
{
height:1em;
max-width:120px;
}
input#text02
{
width:7em;
}
input[type=submit]
{
border:1px solid #2941BC;
margin-right: 3em;
margin-left: 3em;
}
output#duval
{
display:inline-block;
min-width:2em;
text-align:right;
}
.frmshow
{
position:absolute;
right:0;
top:0;
}
.frmshow fieldset
{
display:inline-block;
position:relative;
}
.frmshow legend
{
display:inline-block;
}
.frmshow legend span
{
left:-100px;
position:absolute;
top:.2em;
}
.frmshow button
{
background-color:#CA2F2F;
border:1px solid #2941BC;
color:#000;
display:inline;
height:22px;
padding-left:25px;
padding-right:5px;
width:auto;
cursor: pointer;
}
.frmshow button:disabled
{
border:1px solid #fff;
color:#F1F1F1;
cursor: default;
}
span.symbols,span.vendimg
{
display:inline-block;
}
caption
{
margin-top:.5em;
font-weight:bolder;
}
table
{
width:100%;
}
#diskusage td
{
text-align:center;
}
#summary
{
background-color:none!important;
}
[id^=list] thead tr th
{
border-bottom:1px dotted #fff;
}
th
{
text-align:center;
}
td,th
{
padding:3px;
}
tbody tr:nth-child(even)
{
background:#1C1C1C;
}
tbody tr:nth-child(odd)
{
background:#4F4F4F;
}
th span.symbols,th span.vendimg
{
vertical-align:middle!important;
}
th span[id^=vd].vendimg
{
display:block;
padding-left:27px;
text-align:left!important;
width:auto;
}
tbody tr td
{
text-align:right;
}
tfoot tr td
{
border-top:1px dotted #E1E1E1;
}
tfoot ul
{
list-style-type:none;
margin-left:1em;
padding-left:0;
}
li.symbols
{
padding-left:23px;
}
li.vendimg
{
padding-left:25px;
}
tfoot ul li
{
background-repeat:no-repeat;
display:inline;
margin-bottom:.3em;
padding-right:1em;
}
li.symbols,li.vendimg
{
display:inline-block;
width:auto;
}
td[id^=legend] h5
{
font-size:.9em;
}
div#pbar
{
background-color:#90EE90;
border:1px solid #a0a0a0;
color:#000;
font-weight:bolder;
height:15px;
min-width:100px;
padding-right:2px;
position:relative;
text-align:left;
width:auto;
}
div[id^=bar]
{
background-color:red;
border:1px solid #e2e2e2;
border-left:none;
border-right:none;
float:left;
height:13px;
}
div#bar1
{
background-color:orange;
}
div#bar2
{
background-color:blue;
}
div#bar3
{
background-color:#FF0;
}
span#duused
{
color: red;
font-weight: bolder;
}
span#free
{
color: green;
font-weight: bolder;
}
span#percent
{
font-weight:bolder;
position:relative;
}
span#max
{
position:absolute;
right:2px;
}
span#used
{
color: orange;
font-weight: bolder;
}
hr
{
margin-bottom:1em;
}
#errors
{
color:#CA2F2F;
font-weight:bolder;
}