This disables the theme support and makes it impossible to use any other themes than the ipfire default theme.
The only intention of this patch is to hardcode the theme to ipfire. To change any cgi we have is an ugly way, but the only way to do this fast. The colour handling needs certainly to be improved as well, but this will and should be done in other patches.
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org --- config/cfgroot/graphs.pl | 4 +- config/cfgroot/header.pl | 3 +- html/cgi-bin/atm-status.cgi | 2 +- html/cgi-bin/backup.cgi | 2 +- html/cgi-bin/captive.cgi | 2 +- html/cgi-bin/connscheduler.cgi | 2 +- html/cgi-bin/ddns.cgi | 2 +- html/cgi-bin/dhcp.cgi | 2 +- html/cgi-bin/dns.cgi | 2 +- html/cgi-bin/dnsforward.cgi | 2 +- html/cgi-bin/firewall.cgi | 2 +- html/cgi-bin/fwhosts.cgi | 2 +- html/cgi-bin/guardian.cgi | 2 +- html/cgi-bin/gui.cgi | 45 -------------------- html/cgi-bin/hardwaregraphs.cgi | 2 +- html/cgi-bin/hosts.cgi | 2 +- html/cgi-bin/ids.cgi | 2 +- html/cgi-bin/index.cgi | 2 +- html/cgi-bin/ipinfo.cgi | 2 +- html/cgi-bin/location-block.cgi | 2 +- html/cgi-bin/logs.cgi/firewalllog.dat | 2 +- html/cgi-bin/logs.cgi/firewalllogcountry.dat | 2 +- html/cgi-bin/logs.cgi/firewalllogip.dat | 2 +- html/cgi-bin/logs.cgi/firewalllogport.dat | 2 +- html/cgi-bin/logs.cgi/ids.dat | 2 +- html/cgi-bin/logs.cgi/log.dat | 2 +- html/cgi-bin/logs.cgi/ovpnclients.dat | 2 +- html/cgi-bin/logs.cgi/proxylog.dat | 2 +- html/cgi-bin/logs.cgi/urlfilter.dat | 2 +- html/cgi-bin/mail.cgi | 2 +- html/cgi-bin/mdstat.cgi | 2 +- html/cgi-bin/media.cgi | 2 +- html/cgi-bin/memory.cgi | 2 +- html/cgi-bin/mpfire.cgi | 2 +- html/cgi-bin/netexternal.cgi | 2 +- html/cgi-bin/netinternal.cgi | 2 +- html/cgi-bin/netother.cgi | 2 +- html/cgi-bin/netovpnrw.cgi | 2 +- html/cgi-bin/netovpnsrv.cgi | 2 +- html/cgi-bin/ovpnmain.cgi | 2 +- html/cgi-bin/p2p-block.cgi | 2 +- html/cgi-bin/pakfire.cgi | 2 +- html/cgi-bin/pppsetup.cgi | 2 +- html/cgi-bin/proxy.cgi | 2 +- html/cgi-bin/qos.cgi | 2 +- html/cgi-bin/remote.cgi | 2 +- html/cgi-bin/routing.cgi | 2 +- html/cgi-bin/samba.cgi | 2 +- html/cgi-bin/services.cgi | 2 +- html/cgi-bin/system.cgi | 2 +- html/cgi-bin/tor.cgi | 2 +- html/cgi-bin/traffic.cgi | 2 +- html/cgi-bin/updatexlrator.cgi | 2 +- html/cgi-bin/vpnmain.cgi | 2 +- html/cgi-bin/vulnerabilities.cgi | 2 +- html/cgi-bin/wakeonlan.cgi | 2 +- html/cgi-bin/wirelessclient.cgi | 2 +- html/cgi-bin/wlanap.cgi | 2 +- html/html/themes/ipfire/include/functions.pl | 10 ++--- src/scripts/makegraphs | 2 +- src/squid-accounting/accounting.cgi | 2 +- src/wio/wio-graphs.pl | 2 +- src/wio/wio.cgi | 2 +- 63 files changed, 64 insertions(+), 116 deletions(-)
diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl index cf4a30de3..441d4c483 100644 --- a/config/cfgroot/graphs.pl +++ b/config/cfgroot/graphs.pl @@ -62,14 +62,12 @@ my @GRAPH_ARGS = ( "--alt-y-grid", );
-# Read the global settings files to get the current theme and after this load -# colors for this theme
my %color = (); my %mainsettings = (); my %sensorsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
if ( $mainsettings{'RRDLOG'} eq "" ){ $mainsettings{'RRDLOG'}="/var/log/rrd"; diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl index 8dea804d0..83ef01951 100644 --- a/config/cfgroot/header.pl +++ b/config/cfgroot/header.pl @@ -91,11 +91,10 @@ if ( -d "/var/ipfire/langs/${language}/" ) { }; };
-our $THEME_NAME = $settings{'THEME'};
require "${swroot}/langs/en.pl"; require "${swroot}/langs/${language}.pl"; -eval `/bin/cat /srv/web/ipfire/html/themes/$THEME_NAME/include/functions.pl`; +eval `/bin/cat /srv/web/ipfire/html/themes/ipfire/include/functions.pl`;
sub green_used() { if ($ethsettings{'GREEN_DEV'} && $ethsettings{'GREEN_DEV'} ne "") { diff --git a/html/cgi-bin/atm-status.cgi b/html/cgi-bin/atm-status.cgi index c2a9914f7..49f19209d 100644 --- a/html/cgi-bin/atm-status.cgi +++ b/html/cgi-bin/atm-status.cgi @@ -33,7 +33,7 @@ my %color = (); my %mainsettings = ();
&General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
&Header::showhttpheaders(); &Header::openpage($Lang::tr{'status information'}, 1, ''); diff --git a/html/cgi-bin/backup.cgi b/html/cgi-bin/backup.cgi index cac4146ab..683f8add4 100644 --- a/html/cgi-bin/backup.cgi +++ b/html/cgi-bin/backup.cgi @@ -42,7 +42,7 @@ my @backupisos = ""; $a = new CGI;
&General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
$cgiparams{'ACTION'} = ''; $cgiparams{'FILE'} = ''; diff --git a/html/cgi-bin/captive.cgi b/html/cgi-bin/captive.cgi index 8204eb7b3..51c5d45f2 100755 --- a/html/cgi-bin/captive.cgi +++ b/html/cgi-bin/captive.cgi @@ -69,7 +69,7 @@ unless (-e $settingsfile) { system("touch $settingsfile"); } &Header::getcgihash(%cgiparams);
&General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color); &General::readhash("$settingsfile", %settings) if(-f $settingsfile); &General::readhash("${General::swroot}/ethernet/settings", %netsettings);
diff --git a/html/cgi-bin/connscheduler.cgi b/html/cgi-bin/connscheduler.cgi index 90aae52fb..1393df65f 100644 --- a/html/cgi-bin/connscheduler.cgi +++ b/html/cgi-bin/connscheduler.cgi @@ -34,7 +34,7 @@ require '/var/ipfire/connscheduler/lib.pl'; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
my $buttontext = $Lang::tr{'add'}; my $hiddenvalue = 'add'; diff --git a/html/cgi-bin/ddns.cgi b/html/cgi-bin/ddns.cgi index 9b58db895..7e4ddb5b7 100644 --- a/html/cgi-bin/ddns.cgi +++ b/html/cgi-bin/ddns.cgi @@ -37,7 +37,7 @@ undef (@dummy); my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
# Config file for basic configuration. my $settingsfile = "${General::swroot}/ddns/settings"; diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi index 867614f2a..dd379dc47 100644 --- a/html/cgi-bin/dhcp.cgi +++ b/html/cgi-bin/dhcp.cgi @@ -111,7 +111,7 @@ foreach my $itf (@ITFs) { &General::readhash("${General::swroot}/ethernet/settings", %netsettings); &General::readhash("${General::swroot}/main/settings", %mainsettings); &General::readhash("${General::swroot}/time/settings", %timesettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
#Get GUI values &Header::getcgihash(%dhcpsettings); diff --git a/html/cgi-bin/dns.cgi b/html/cgi-bin/dns.cgi index 337166ccf..7dc113582 100755 --- a/html/cgi-bin/dns.cgi +++ b/html/cgi-bin/dns.cgi @@ -65,7 +65,7 @@ my $check_servers; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
&Header::showhttpheaders(); &Header::getcgihash(%cgiparams); diff --git a/html/cgi-bin/dnsforward.cgi b/html/cgi-bin/dnsforward.cgi index ed373c09a..749d1216a 100644 --- a/html/cgi-bin/dnsforward.cgi +++ b/html/cgi-bin/dnsforward.cgi @@ -43,7 +43,7 @@ my $changed = 'no'; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
&Header::showhttpheaders();
diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi index 532f99f91..4f4d63cc8 100644 --- a/html/cgi-bin/firewall.cgi +++ b/html/cgi-bin/firewall.cgi @@ -99,7 +99,7 @@ my $checkorange=''; my @protocols; &General::readhash("${General::swroot}/firewall/settings", %fwdfwsettings); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color); &General::readhash($fwoptions, %optionsfw); &General::readhash($ifacesettings, %ifaces); &General::readhash("$configovpn", %ovpnsettings); diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi index fe5117ae5..84b018459 100644 --- a/html/cgi-bin/fwhosts.cgi +++ b/html/cgi-bin/fwhosts.cgi @@ -83,7 +83,7 @@ unless (-e $configsrvgrp) { system("touch $configsrvgrp"); } unless (-e $configlocationgrp) { system("touch $configlocationgrp"); }
&General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color); &General::readhash("${General::swroot}/ethernet/settings", %ownnet); &General::readhash("$configovpn", %ovpnsettings); &General::readhasharray("$configipsec", %ipsecconf); diff --git a/html/cgi-bin/guardian.cgi b/html/cgi-bin/guardian.cgi index 7dc6b0149..fb16be00e 100644 --- a/html/cgi-bin/guardian.cgi +++ b/html/cgi-bin/guardian.cgi @@ -60,7 +60,7 @@ our %netsettings = (); our %color = (); our %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
# File declarations. my $settingsfile = "${General::swroot}/guardian/settings"; diff --git a/html/cgi-bin/gui.cgi b/html/cgi-bin/gui.cgi index f06b0f923..1b316a2a2 100644 --- a/html/cgi-bin/gui.cgi +++ b/html/cgi-bin/gui.cgi @@ -88,7 +88,6 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}") $mainsettings{'WINDOWWITHHOSTNAME'} = $cgiparams{'WINDOWWITHHOSTNAME'}; $mainsettings{'PPPUPDOWNBEEP'} = $cgiparams{'PPPUPDOWNBEEP'}; $mainsettings{'SPEED'} = $cgiparams{'SPEED'}; - $mainsettings{'THEME'} = $cgiparams{'theme'}; $mainsettings{'REFRESHINDEX'} = $cgiparams{'REFRESHINDEX'}; &General::writehash("${General::swroot}/main/settings", %mainsettings); &Lang::reload($cgiparams{'lang'}); @@ -106,12 +105,6 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}") $cgiparams{'PPPUPDOWNBEEP'} = 'on'; }
- if ($mainsettings{'THEME'}) { - $cgiparams{'THEME'} = $mainsettings{'THEME'}; - } else { - $cgiparams{'THEME'} = 'ipfire'; - } - if($mainsettings{'REFRESHINDEX'}) { $cgiparams{'REFRESHINDEX'} = $mainsettings{'REFRESHINDEX'}; } else { @@ -134,7 +127,6 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'restore defaults'}") $cgiparams{'PPPUPDOWNBEEP'} = 'on'; $cgiparams{'REFRESHINDEX'} = 'off'; $cgiparams{'SPEED'} = 'on'; - $cgiparams{'THEME'} = 'ipfire'; }
$checked{'WINDOWWITHHOSTNAME'}{'off'} = ''; @@ -210,43 +202,6 @@ END ; }
-print <<END -</select></td></tr> -</table> -END -; -&Header::closebox(); -&Header::openbox('100%','left',$Lang::tr{'theme'}); -print<<END; -<table> -<tr> - <td> </td> - <td><select name='theme'> -END -; - -my $dir = "/srv/web/ipfire/html/themes"; -local *DH; -my ($item, $file); -my @files; - -# Foreach directory create am theme entry to be selected by user - -opendir (DH, $dir); -while ($file = readdir (DH)) { - next if ( $file =~ /^./ ); - push (@files, $file); -} -closedir (DH); - -foreach $item (sort (@files)) { - if ( "$mainsettings{'THEME'}" eq "$item" ) { - print "<option value='$item' selected='selected'>$item</option>\n"; - } else { - print "<option value='$item'>$item</option>\n"; - } -} - print <<END </select></td></tr> </table> diff --git a/html/cgi-bin/hardwaregraphs.cgi b/html/cgi-bin/hardwaregraphs.cgi index 5c677d815..813d32f7b 100644 --- a/html/cgi-bin/hardwaregraphs.cgi +++ b/html/cgi-bin/hardwaregraphs.cgi @@ -33,7 +33,7 @@ require "${General::swroot}/graphs.pl"; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
my %sensorsettings = ();
diff --git a/html/cgi-bin/hosts.cgi b/html/cgi-bin/hosts.cgi index 1c9df5a62..d9e9cb0af 100644 --- a/html/cgi-bin/hosts.cgi +++ b/html/cgi-bin/hosts.cgi @@ -40,7 +40,7 @@ our $datafile = "${General::swroot}/main/hosts"; #(our: used in subroutine) my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
our %settings = (); #Settings1 diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index 83d5f52ba..85c5ddd86 100644 --- a/html/cgi-bin/ids.cgi +++ b/html/cgi-bin/ids.cgi @@ -44,7 +44,7 @@ my %ignored=();
# Read-in main settings, for language, theme and colors. &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
# Get the available network zones, based on the config type of the system and store # the list of zones in an array. diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index fdf62361d..4ac237d0f 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -70,7 +70,7 @@ $pppsettings{'PROFILENAME'} = 'None'; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
my $connstate = &Header::connectionstatus();
diff --git a/html/cgi-bin/ipinfo.cgi b/html/cgi-bin/ipinfo.cgi index 31b4a16d4..fd490b08e 100644 --- a/html/cgi-bin/ipinfo.cgi +++ b/html/cgi-bin/ipinfo.cgi @@ -36,7 +36,7 @@ require "${General::swroot}/location-functions.pl"; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
my %cgiparams=();
diff --git a/html/cgi-bin/location-block.cgi b/html/cgi-bin/location-block.cgi index 5bd70dfb5..df3f397a6 100644 --- a/html/cgi-bin/location-block.cgi +++ b/html/cgi-bin/location-block.cgi @@ -42,7 +42,7 @@ my %cgiparams = (); &General::readhash("$settingsfile", %settings);
&General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
&Header::showhttpheaders();
diff --git a/html/cgi-bin/logs.cgi/firewalllog.dat b/html/cgi-bin/logs.cgi/firewalllog.dat index 361bf0432..e326d65c0 100644 --- a/html/cgi-bin/logs.cgi/firewalllog.dat +++ b/html/cgi-bin/logs.cgi/firewalllog.dat @@ -27,7 +27,7 @@ require "${General::swroot}/header.pl"; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
use POSIX();
diff --git a/html/cgi-bin/logs.cgi/firewalllogcountry.dat b/html/cgi-bin/logs.cgi/firewalllogcountry.dat index e3901b945..a55b80511 100644 --- a/html/cgi-bin/logs.cgi/firewalllogcountry.dat +++ b/html/cgi-bin/logs.cgi/firewalllogcountry.dat @@ -405,7 +405,7 @@ my $color=0; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
if ($showpie != 2 && $pienumber <= 50 && $pienumber != 0) { my $mygraph = GD::Graph::pie->new(500, 350); diff --git a/html/cgi-bin/logs.cgi/firewalllogip.dat b/html/cgi-bin/logs.cgi/firewalllogip.dat index 6de4081af..4474a8c59 100644 --- a/html/cgi-bin/logs.cgi/firewalllogip.dat +++ b/html/cgi-bin/logs.cgi/firewalllogip.dat @@ -378,7 +378,7 @@ my $color=0; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
if ($showpie != 2 && $pienumber <= 50 && $pienumber != 0) { my $mygraph = GD::Graph::pie->new(500, 350); diff --git a/html/cgi-bin/logs.cgi/firewalllogport.dat b/html/cgi-bin/logs.cgi/firewalllogport.dat index 67fe6aa6e..bcaffad70 100644 --- a/html/cgi-bin/logs.cgi/firewalllogport.dat +++ b/html/cgi-bin/logs.cgi/firewalllogport.dat @@ -378,7 +378,7 @@ use GD::Graph::colour qw( :files ); my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
if ($showpie != 2 && $pienumber <= 50 && $pienumber != 0) { my $mygraph = GD::Graph::pie->new(500, 350); diff --git a/html/cgi-bin/logs.cgi/ids.dat b/html/cgi-bin/logs.cgi/ids.dat index 74cad6267..b9c19aa17 100644 --- a/html/cgi-bin/logs.cgi/ids.dat +++ b/html/cgi-bin/logs.cgi/ids.dat @@ -25,7 +25,7 @@ require "${General::swroot}/header.pl"; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
use POSIX();
diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat index 1fec05c35..e467e1d2e 100644 --- a/html/cgi-bin/logs.cgi/log.dat +++ b/html/cgi-bin/logs.cgi/log.dat @@ -22,7 +22,7 @@ require "${General::swroot}/header.pl"; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
use POSIX();
diff --git a/html/cgi-bin/logs.cgi/ovpnclients.dat b/html/cgi-bin/logs.cgi/ovpnclients.dat index a064893a1..5e2c1ff49 100755 --- a/html/cgi-bin/logs.cgi/ovpnclients.dat +++ b/html/cgi-bin/logs.cgi/ovpnclients.dat @@ -34,7 +34,7 @@ require "${General::swroot}/header.pl"; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
# Path and file of the OVPN connections database. my $database = "/var/ipfire/ovpn/clients.db"; diff --git a/html/cgi-bin/logs.cgi/proxylog.dat b/html/cgi-bin/logs.cgi/proxylog.dat index 1d1844e7c..8724768ea 100644 --- a/html/cgi-bin/logs.cgi/proxylog.dat +++ b/html/cgi-bin/logs.cgi/proxylog.dat @@ -35,7 +35,7 @@ my $errormessage = ''; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
my @shortmonths = ( 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec' ); diff --git a/html/cgi-bin/logs.cgi/urlfilter.dat b/html/cgi-bin/logs.cgi/urlfilter.dat index 221ed74ac..554169ab0 100644 --- a/html/cgi-bin/logs.cgi/urlfilter.dat +++ b/html/cgi-bin/logs.cgi/urlfilter.dat @@ -24,7 +24,7 @@ require "${General::swroot}/header.pl"; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
my $dbdir = "${General::swroot}/urlfilter/blacklists"; my $logdir = "/var/log/squidGuard"; diff --git a/html/cgi-bin/mail.cgi b/html/cgi-bin/mail.cgi index 7865a1da6..68c516660 100755 --- a/html/cgi-bin/mail.cgi +++ b/html/cgi-bin/mail.cgi @@ -43,7 +43,7 @@ my $errormessage=''; #Read all parameters for site &Header::getcgihash(%cgiparams); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
#Show Headers &Header::showhttpheaders(); diff --git a/html/cgi-bin/mdstat.cgi b/html/cgi-bin/mdstat.cgi index e22856f1f..d476e074d 100644 --- a/html/cgi-bin/mdstat.cgi +++ b/html/cgi-bin/mdstat.cgi @@ -33,7 +33,7 @@ my %color = (); my %mainsettings = ();
&General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
&Header::showhttpheaders(); &Header::openpage($Lang::tr{'status information'}, 1, ''); diff --git a/html/cgi-bin/media.cgi b/html/cgi-bin/media.cgi index 5753bc301..f574729ed 100644 --- a/html/cgi-bin/media.cgi +++ b/html/cgi-bin/media.cgi @@ -33,7 +33,7 @@ require "${General::swroot}/graphs.pl"; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
#workaround to suppress a warning when a variable is used only once my @dummy = ( ${Header::colourred} ); diff --git a/html/cgi-bin/memory.cgi b/html/cgi-bin/memory.cgi index 1708b0f32..204365294 100644 --- a/html/cgi-bin/memory.cgi +++ b/html/cgi-bin/memory.cgi @@ -33,7 +33,7 @@ require "${General::swroot}/graphs.pl"; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
my @querry = split(/?/,$ENV{'QUERY_STRING'}); $querry[0] = '' unless defined $querry[0]; diff --git a/html/cgi-bin/mpfire.cgi b/html/cgi-bin/mpfire.cgi index 6cec8ff33..c8cfc4b11 100644 --- a/html/cgi-bin/mpfire.cgi +++ b/html/cgi-bin/mpfire.cgi @@ -47,7 +47,7 @@ my $errormessage = ""; my @songs;
&General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
&Header::showhttpheaders();
diff --git a/html/cgi-bin/netexternal.cgi b/html/cgi-bin/netexternal.cgi index 781633c1d..a31502dd0 100644 --- a/html/cgi-bin/netexternal.cgi +++ b/html/cgi-bin/netexternal.cgi @@ -38,7 +38,7 @@ my %mainsettings = (); my %netsettings=(); &General::readhash("${General::swroot}/ethernet/settings", %netsettings); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
my @graphs=(); my %dhcpinfo=(); diff --git a/html/cgi-bin/netinternal.cgi b/html/cgi-bin/netinternal.cgi index 3f2fb56cc..3c2828fbf 100644 --- a/html/cgi-bin/netinternal.cgi +++ b/html/cgi-bin/netinternal.cgi @@ -35,7 +35,7 @@ my %mainsettings = (); my %netsettings=(); &General::readhash("${General::swroot}/ethernet/settings", %netsettings); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
my @graphs=(); my @wireless=(); diff --git a/html/cgi-bin/netother.cgi b/html/cgi-bin/netother.cgi index 6524ad575..cbd2bc228 100755 --- a/html/cgi-bin/netother.cgi +++ b/html/cgi-bin/netother.cgi @@ -33,7 +33,7 @@ require "${General::swroot}/graphs.pl"; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
my @pings=();
diff --git a/html/cgi-bin/netovpnrw.cgi b/html/cgi-bin/netovpnrw.cgi index cae7770bb..00ef35337 100755 --- a/html/cgi-bin/netovpnrw.cgi +++ b/html/cgi-bin/netovpnrw.cgi @@ -33,7 +33,7 @@ require "${General::swroot}/graphs.pl"; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
my @vpns=();
diff --git a/html/cgi-bin/netovpnsrv.cgi b/html/cgi-bin/netovpnsrv.cgi index ab3548713..a53090f0f 100755 --- a/html/cgi-bin/netovpnsrv.cgi +++ b/html/cgi-bin/netovpnsrv.cgi @@ -33,7 +33,7 @@ require "${General::swroot}/graphs.pl"; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
my %vpnsettings = (); &General::readhasharray("${General::swroot}/vpn/config", %vpnsettings); diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 68a70d147..b98d88529 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -47,7 +47,7 @@ undef (@dummy); my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
### ### Initialize variables diff --git a/html/cgi-bin/p2p-block.cgi b/html/cgi-bin/p2p-block.cgi index 04f133142..d14725504 100644 --- a/html/cgi-bin/p2p-block.cgi +++ b/html/cgi-bin/p2p-block.cgi @@ -41,7 +41,7 @@ my %color = (); my %mainsettings = ();
&General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
&Header::showhttpheaders(); &Header::getcgihash(%fwdfwsettings); diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi index dd96a92e9..a9e12d23c 100644 --- a/html/cgi-bin/pakfire.cgi +++ b/html/cgi-bin/pakfire.cgi @@ -49,7 +49,7 @@ sub refreshpage{&Header::openbox( 'Waiting', 1, "<meta http-equiv='refresh' cont &Header::getcgihash(%cgiparams);
&General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
&Header::openpage($Lang::tr{'pakfire configuration'}, 1); &Header::openbigbox('100%', 'left', '', $errormessage); diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi index 4b9b7271b..7597bfbc7 100644 --- a/html/cgi-bin/pppsetup.cgi +++ b/html/cgi-bin/pppsetup.cgi @@ -44,7 +44,7 @@ my $kernel=`/bin/uname -r | /usr/bin/tr -d '\012'`; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
&Header::showhttpheaders();
diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index a63e1c2df..b6d71db84 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -39,7 +39,7 @@ my $https_port='444'; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
my %proxysettings=(); my %netsettings=(); diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi index 8211a3ca0..1825aca11 100644 --- a/html/cgi-bin/qos.cgi +++ b/html/cgi-bin/qos.cgi @@ -109,7 +109,7 @@ $qossettings{'RED_DEV'} = `cat /var/ipfire/red/iface`; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
my @querry = split(/?/,$ENV{'QUERY_STRING'}); $querry[0] = '' unless defined $querry[0]; diff --git a/html/cgi-bin/remote.cgi b/html/cgi-bin/remote.cgi index 9e566201d..c76f5129e 100644 --- a/html/cgi-bin/remote.cgi +++ b/html/cgi-bin/remote.cgi @@ -40,7 +40,7 @@ my $errormessage=''; my $counter = 0;
&General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
&Header::showhttpheaders();
diff --git a/html/cgi-bin/routing.cgi b/html/cgi-bin/routing.cgi index be21007fa..d2d3bdd26 100644 --- a/html/cgi-bin/routing.cgi +++ b/html/cgi-bin/routing.cgi @@ -40,7 +40,7 @@ our $datafile = "${General::swroot}/main/routing"; #(our: used in subroutine) my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
our %settings = ();
diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 4e0f14a01..72e8ac63e 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -48,7 +48,7 @@ my %shares = &config("${General::swroot}/samba/shares");
&General::readhash("${General::swroot}/ethernet/settings", %netsettings); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
############################################################################################################################ #################################### Initialisierung von Samba Variablen fr global Settings ############################### diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi index 36954ba70..38b89ef1e 100644 --- a/html/cgi-bin/services.cgi +++ b/html/cgi-bin/services.cgi @@ -34,7 +34,7 @@ my %color = (); my %mainsettings = (); my %netsettings=(); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color); &General::readhash("${General::swroot}/ethernet/settings", %netsettings);
#workaround to suppress a warning when a variable is used only once diff --git a/html/cgi-bin/system.cgi b/html/cgi-bin/system.cgi index 0548dddda..67c479736 100644 --- a/html/cgi-bin/system.cgi +++ b/html/cgi-bin/system.cgi @@ -33,7 +33,7 @@ require "${General::swroot}/graphs.pl"; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
my @querry = split(/?/,$ENV{'QUERY_STRING'}); $querry[0] = '' unless defined $querry[0]; diff --git a/html/cgi-bin/tor.cgi b/html/cgi-bin/tor.cgi index ea340b612..f39c0d8da 100644 --- a/html/cgi-bin/tor.cgi +++ b/html/cgi-bin/tor.cgi @@ -88,7 +88,7 @@ our %netsettings = (); our %color = (); our %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
our %settings = ();
diff --git a/html/cgi-bin/traffic.cgi b/html/cgi-bin/traffic.cgi index e19bea20a..cafccf73f 100644 --- a/html/cgi-bin/traffic.cgi +++ b/html/cgi-bin/traffic.cgi @@ -32,7 +32,7 @@ require "${General::swroot}/header.pl"; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
my %cgiparams; my %pppsettings; diff --git a/html/cgi-bin/updatexlrator.cgi b/html/cgi-bin/updatexlrator.cgi index c94c34ec1..ec7b75228 100644 --- a/html/cgi-bin/updatexlrator.cgi +++ b/html/cgi-bin/updatexlrator.cgi @@ -103,7 +103,7 @@ my @metadata=(); &General::readhash("${General::swroot}/ethernet/settings", %netsettings); &General::readhash("${General::swroot}/main/settings", %mainsettings); &General::readhash("${General::swroot}/proxy/settings", %proxysettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
$xlratorsettings{'ACTION'} = ''; $xlratorsettings{'ENABLE_LOG'} = 'off'; diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index db442e111..f200f1002 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -54,7 +54,7 @@ my $errormessage = ''; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
&General::readhash("${General::swroot}/ethernet/settings", %netsettings);
diff --git a/html/cgi-bin/vulnerabilities.cgi b/html/cgi-bin/vulnerabilities.cgi index d5f81cdc1..926f043b8 100644 --- a/html/cgi-bin/vulnerabilities.cgi +++ b/html/cgi-bin/vulnerabilities.cgi @@ -47,7 +47,7 @@ my $notice = ""; my %mainsettings = (); my %color = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
my %settings = ( "ENABLE_SMT" => "auto", diff --git a/html/cgi-bin/wakeonlan.cgi b/html/cgi-bin/wakeonlan.cgi index 1f7fde54a..289dc224a 100644 --- a/html/cgi-bin/wakeonlan.cgi +++ b/html/cgi-bin/wakeonlan.cgi @@ -51,7 +51,7 @@ our $datafile = "/var/ipfire/wakeonlan/clients.conf"; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
my %netsettings = (); &General::readhash("${General::swroot}/ethernet/settings", %netsettings); diff --git a/html/cgi-bin/wirelessclient.cgi b/html/cgi-bin/wirelessclient.cgi index 63218a021..a7a9881b8 100644 --- a/html/cgi-bin/wirelessclient.cgi +++ b/html/cgi-bin/wirelessclient.cgi @@ -43,7 +43,7 @@ our $datafile = "${General::swroot}/ethernet/wireless"; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
our %settings = (); our %netsettings = (); diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi index 575b696d7..01dcaeea2 100644 --- a/html/cgi-bin/wlanap.cgi +++ b/html/cgi-bin/wlanap.cgi @@ -54,7 +54,7 @@ my $country = ''; my $txpower = '';
&General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color); &General::readhash("/var/ipfire/ethernet/settings", %netsettings);
$wlanapsettings{'APMODE'} = 'on'; diff --git a/html/html/themes/ipfire/include/functions.pl b/html/html/themes/ipfire/include/functions.pl index c76af336d..9f12bbe59 100644 --- a/html/html/themes/ipfire/include/functions.pl +++ b/html/html/themes/ipfire/include/functions.pl @@ -114,10 +114,6 @@ sub openpage { $headline = "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}"; }
- my @stylesheets = ("style.css"); - if ($THEME_NAME eq "ipfire-rounded") { - push(@stylesheets, "style-rounded.css"); - }
print <<END; <!DOCTYPE html> @@ -137,9 +133,9 @@ print <<END; </script> END
- foreach my $stylesheet (@stylesheets) { - print "<link href="/themes/ipfire/include/css/$stylesheet" rel="stylesheet" type="text/css" />\n"; - } + +print "<link href="/themes/ipfire/include/css/style.css" rel="stylesheet" type="text/css" />\n"; +
if ($settings{'SPEED'} ne 'off') { print <<END diff --git a/src/scripts/makegraphs b/src/scripts/makegraphs index 1dc14b8a3..f8f6f70a9 100644 --- a/src/scripts/makegraphs +++ b/src/scripts/makegraphs @@ -36,7 +36,7 @@ my $path_smartctl = "/usr/sbin/smartctl"; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
if ( $mainsettings{'RRDLOG'} eq "" ){ $mainsettings{'RRDLOG'}="/var/log/rrd"; diff --git a/src/squid-accounting/accounting.cgi b/src/squid-accounting/accounting.cgi index 0fe5ff6b3..751b6e8a5 100755 --- a/src/squid-accounting/accounting.cgi +++ b/src/squid-accounting/accounting.cgi @@ -60,7 +60,7 @@ my $mailfile="${General::swroot}/dma/mail.conf";
&Header::getcgihash(%cgiparams); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color); &General::readhash("$settingsfile", %settings) if(-f $settingsfile);
if ( -f $mailfile){ diff --git a/src/wio/wio-graphs.pl b/src/wio/wio-graphs.pl index 0cfac20d6..78b6f99dc 100644 --- a/src/wio/wio-graphs.pl +++ b/src/wio/wio-graphs.pl @@ -45,7 +45,7 @@ require '/var/ipfire/lang.pl'; my ( %mainsettings, %color ) = ();
&General::readhash('/var/ipfire/main/settings', %mainsettings); -&General::readhash('/srv/web/ipfire/html/themes/'.$mainsettings{'THEME'}.'/include/colors.txt', %color); +&General::readhash('/srv/web/ipfire/html/themes/ipfire/include/colors.txt', %color);
sub wiograph { my $hostid = $_[0]; diff --git a/src/wio/wio.cgi b/src/wio/wio.cgi index ac8fc1220..1dcec52fe 100644 --- a/src/wio/wio.cgi +++ b/src/wio/wio.cgi @@ -62,7 +62,7 @@ my ( %mainsettings, %mailsettings, %wiosettings, %cgiparams, %netsettings, %ipsh &General::readhash('/var/ipfire/ethernet/settings', %netsettings); &General::readhash('/var/ipfire/dma/mail.conf', %mailsettings); &General::readhash('/var/ipfire/wio/wio.conf', %wiosettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color); &General::readhasharray('/var/ipfire/ovpn/ovpnconfig', %ovpnconfighash); &General::readhash('/var/ipfire/ovpn/settings', %ovpnsettings); &General::readhasharray('/var/ipfire/ovpn/ccd.conf', %ovpnccdconfhash);
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org --- config/rootfiles/common/web-user-interface | 43 -- html/html/themes/darkdos/images/IPFire.png | Bin 11934 -> 0 bytes html/html/themes/darkdos/images/b1.gif | Bin 2446 -> 0 bytes html/html/themes/darkdos/images/b2.gif | Bin 1124 -> 0 bytes html/html/themes/darkdos/images/b3.gif | Bin 839 -> 0 bytes html/html/themes/darkdos/images/b4.gif | Bin 839 -> 0 bytes html/html/themes/darkdos/images/b5.gif | Bin 72 -> 0 bytes html/html/themes/darkdos/images/b6.gif | Bin 70 -> 0 bytes html/html/themes/darkdos/images/spacer.gif | Bin 43 -> 0 bytes html/html/themes/darkdos/include/colors.txt | 25 - html/html/themes/darkdos/include/functions.pl | 404 --------------- html/html/themes/darkdos/include/style.css | 473 ----------------- html/html/themes/ipfire-legacy/images/n1.gif | Bin 1014 -> 0 bytes html/html/themes/ipfire-legacy/images/n2.gif | Bin 449 -> 0 bytes html/html/themes/ipfire-legacy/images/n3.gif | Bin 155 -> 0 bytes html/html/themes/ipfire-legacy/images/n4.gif | Bin 155 -> 0 bytes html/html/themes/ipfire-legacy/images/n5.gif | Bin 72 -> 0 bytes html/html/themes/ipfire-legacy/images/n6.gif | Bin 70 -> 0 bytes .../themes/ipfire-legacy/images/spacer.gif | Bin 43 -> 0 bytes .../themes/ipfire-legacy/include/colors.txt | 25 - .../themes/ipfire-legacy/include/functions.pl | 404 --------------- .../themes/ipfire-legacy/include/style.css | 450 ---------------- .../ipfire/include/css/style-rounded.css | 82 --- html/html/themes/maniac/images/IPFire.png | Bin 11934 -> 0 bytes html/html/themes/maniac/images/b1.gif | Bin 1323 -> 0 bytes html/html/themes/maniac/images/b2.gif | Bin 1167 -> 0 bytes html/html/themes/maniac/images/b3.gif | Bin 847 -> 0 bytes html/html/themes/maniac/images/b4.gif | Bin 847 -> 0 bytes html/html/themes/maniac/images/b5.gif | Bin 72 -> 0 bytes html/html/themes/maniac/images/b6.gif | Bin 70 -> 0 bytes html/html/themes/maniac/images/spacer.gif | Bin 43 -> 0 bytes html/html/themes/maniac/include/colors.txt | 25 - html/html/themes/maniac/include/functions.pl | 404 --------------- html/html/themes/maniac/include/style.css | 479 ------------------ lfs/web-user-interface | 1 - 35 files changed, 2815 deletions(-) delete mode 100644 html/html/themes/darkdos/images/IPFire.png delete mode 100644 html/html/themes/darkdos/images/b1.gif delete mode 100644 html/html/themes/darkdos/images/b2.gif delete mode 100644 html/html/themes/darkdos/images/b3.gif delete mode 100644 html/html/themes/darkdos/images/b4.gif delete mode 100644 html/html/themes/darkdos/images/b5.gif delete mode 100644 html/html/themes/darkdos/images/b6.gif delete mode 100644 html/html/themes/darkdos/images/spacer.gif delete mode 100644 html/html/themes/darkdos/include/colors.txt delete mode 100644 html/html/themes/darkdos/include/functions.pl delete mode 100644 html/html/themes/darkdos/include/style.css delete mode 100644 html/html/themes/ipfire-legacy/images/n1.gif delete mode 100644 html/html/themes/ipfire-legacy/images/n2.gif delete mode 100644 html/html/themes/ipfire-legacy/images/n3.gif delete mode 100644 html/html/themes/ipfire-legacy/images/n4.gif delete mode 100644 html/html/themes/ipfire-legacy/images/n5.gif delete mode 100644 html/html/themes/ipfire-legacy/images/n6.gif delete mode 100644 html/html/themes/ipfire-legacy/images/spacer.gif delete mode 100644 html/html/themes/ipfire-legacy/include/colors.txt delete mode 100644 html/html/themes/ipfire-legacy/include/functions.pl delete mode 100644 html/html/themes/ipfire-legacy/include/style.css delete mode 100644 html/html/themes/ipfire/include/css/style-rounded.css delete mode 100644 html/html/themes/maniac/images/IPFire.png delete mode 100644 html/html/themes/maniac/images/b1.gif delete mode 100644 html/html/themes/maniac/images/b2.gif delete mode 100644 html/html/themes/maniac/images/b3.gif delete mode 100644 html/html/themes/maniac/images/b4.gif delete mode 100644 html/html/themes/maniac/images/b5.gif delete mode 100644 html/html/themes/maniac/images/b6.gif delete mode 100644 html/html/themes/maniac/images/spacer.gif delete mode 100644 html/html/themes/maniac/include/colors.txt delete mode 100644 html/html/themes/maniac/include/functions.pl delete mode 100644 html/html/themes/maniac/include/style.css
diff --git a/config/rootfiles/common/web-user-interface b/config/rootfiles/common/web-user-interface index 23e9f3e5e..4d9f7b52f 100644 --- a/config/rootfiles/common/web-user-interface +++ b/config/rootfiles/common/web-user-interface @@ -309,35 +309,7 @@ srv/web/ipfire/html/redirect-templates/legacy srv/web/ipfire/html/redirect-templates/legacy/template.html srv/web/ipfire/html/redirect.cgi srv/web/ipfire/html/themes -srv/web/ipfire/html/themes/darkdos -srv/web/ipfire/html/themes/darkdos/images -srv/web/ipfire/html/themes/darkdos/images/IPFire.png -srv/web/ipfire/html/themes/darkdos/images/b1.gif -srv/web/ipfire/html/themes/darkdos/images/b2.gif -srv/web/ipfire/html/themes/darkdos/images/b3.gif -srv/web/ipfire/html/themes/darkdos/images/b4.gif -srv/web/ipfire/html/themes/darkdos/images/b5.gif -srv/web/ipfire/html/themes/darkdos/images/b6.gif -srv/web/ipfire/html/themes/darkdos/images/spacer.gif -srv/web/ipfire/html/themes/darkdos/include -srv/web/ipfire/html/themes/darkdos/include/colors.txt -srv/web/ipfire/html/themes/darkdos/include/functions.pl -srv/web/ipfire/html/themes/darkdos/include/style.css srv/web/ipfire/html/themes/ipfire -srv/web/ipfire/html/themes/ipfire-legacy -srv/web/ipfire/html/themes/ipfire-legacy/images -srv/web/ipfire/html/themes/ipfire-legacy/images/n1.gif -srv/web/ipfire/html/themes/ipfire-legacy/images/n2.gif -srv/web/ipfire/html/themes/ipfire-legacy/images/n3.gif -srv/web/ipfire/html/themes/ipfire-legacy/images/n4.gif -srv/web/ipfire/html/themes/ipfire-legacy/images/n5.gif -srv/web/ipfire/html/themes/ipfire-legacy/images/n6.gif -srv/web/ipfire/html/themes/ipfire-legacy/images/spacer.gif -srv/web/ipfire/html/themes/ipfire-legacy/include -srv/web/ipfire/html/themes/ipfire-legacy/include/colors.txt -srv/web/ipfire/html/themes/ipfire-legacy/include/functions.pl -srv/web/ipfire/html/themes/ipfire-legacy/include/style.css -srv/web/ipfire/html/themes/ipfire-rounded srv/web/ipfire/html/themes/ipfire/images srv/web/ipfire/html/themes/ipfire/images/n2.gif srv/web/ipfire/html/themes/ipfire/images/n3.gif @@ -347,25 +319,10 @@ srv/web/ipfire/html/themes/ipfire/images/tux2.png srv/web/ipfire/html/themes/ipfire/include srv/web/ipfire/html/themes/ipfire/include/colors.txt srv/web/ipfire/html/themes/ipfire/include/css -srv/web/ipfire/html/themes/ipfire/include/css/style-rounded.css srv/web/ipfire/html/themes/ipfire/include/css/style.css srv/web/ipfire/html/themes/ipfire/include/functions.pl srv/web/ipfire/html/themes/ipfire/include/js srv/web/ipfire/html/themes/ipfire/include/js/refreshInetInfo.js -srv/web/ipfire/html/themes/maniac -srv/web/ipfire/html/themes/maniac/images -srv/web/ipfire/html/themes/maniac/images/IPFire.png -srv/web/ipfire/html/themes/maniac/images/b1.gif -srv/web/ipfire/html/themes/maniac/images/b2.gif -srv/web/ipfire/html/themes/maniac/images/b3.gif -srv/web/ipfire/html/themes/maniac/images/b4.gif -srv/web/ipfire/html/themes/maniac/images/b5.gif -srv/web/ipfire/html/themes/maniac/images/b6.gif -srv/web/ipfire/html/themes/maniac/images/spacer.gif -srv/web/ipfire/html/themes/maniac/include -srv/web/ipfire/html/themes/maniac/include/colors.txt -srv/web/ipfire/html/themes/maniac/include/functions.pl -srv/web/ipfire/html/themes/maniac/include/style.css var/updatecache var/updatecache/download var/updatecache/metadata diff --git a/html/html/themes/darkdos/images/IPFire.png b/html/html/themes/darkdos/images/IPFire.png deleted file mode 100644 index ec56b7af56e9d1c7ae5dccedd63078aea66f2542..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001
literal 11934 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
diff --git a/html/html/themes/darkdos/images/b1.gif b/html/html/themes/darkdos/images/b1.gif deleted file mode 100644 index 123ff917e9373e33767dcd6529eb5442c2c0060e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001
literal 2446 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 M_rCxpZ9o73J8-mNDgXcg
diff --git a/html/html/themes/darkdos/images/b2.gif b/html/html/themes/darkdos/images/b2.gif deleted file mode 100644 index 0172874506cc27922c3f71b77e38cbd6b98abe34..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001
literal 1124 zcmZ?wbhEHbv|&(U_|Cw<!obAMz`)PQAk4@h#>gPW$RNkapuotW%E+L>$e_o>V8X;; z$;4pC#Nf=t;Kj@kz|0WJ%n-}Wkj~673PwX<sE2?K$OE9fz`*gJft^FfW5a@j%^bp7 zIvxua9&Q&<_L}3dQOSi_!Z_>BiH(bo_bZsoNqBBra&odp@T!<hqsG(I4U$jI@!Y)Z z><q4=S9eZsUVeVQL-VH?hb=2EF7}wL6?^K7M)UH3#a?s0wywImI!HR>?y0S-udh!y z-1YX=f;BfcXIx$tdwQGhE%t)Pr{;QZUw3zR#dD_{r?;=azrTT*Tkef{)5F6Z!rF0X zc5HlnL`cbdp3lxrPfyP<&c1hM=jP{}3!J;<e0Obmd3l9<b==uqTVG$FCx3dL?`^|} zw|5ltpF6#Kd;XrhW^Va=Wote@K5;ZD_S~MISC?H_?47Q)W!Kl&j`>;l&)rpPdjH^X zx2L@SzCAxbKZ;xxf4(lY@%x9zr|0|c-}m?TC-GPJ&&Mxp_|L$m@t}c4EaO2V6Wf9Z hO+02V9yANMX(To?gk(Hyl}KChuuZ0{Bhi7u8URXJyCMJp
diff --git a/html/html/themes/darkdos/images/b3.gif b/html/html/themes/darkdos/images/b3.gif deleted file mode 100644 index 8c8fba3bd3a0e0c8840afcc8485ee1f20e38c816..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001
literal 839 zcmZ?wbhEHbWMt4{_|CwvnOA5xuh3y$q0_uVmwAQm@`^m+6@JSr@}HOgKOgT`Ug7_| zg8zAi{s0+*y#IxG|BLbdm*8a>1*0J_EJ8pB<O@(<VBpYUVCPT?IB=kmnM=wbVgrLC i6Fa}0LkEN6BW89^0fUqa4hJ2XSvfdF1Q;9~7_0$9uOHU{
diff --git a/html/html/themes/darkdos/images/b4.gif b/html/html/themes/darkdos/images/b4.gif deleted file mode 100644 index 5964fa7726b4a9cefc6141f4938512c485509e18..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001
literal 839 zcmZ?wbhEHbWMt4{_|CxaKidAko9ll!kN@sI|GixP`#Ar13;pjN_1`t_zkB?DkHG(d z&i_Lk|3^6dcT4>5ne^Wah>{sb!Dt8!ixAKO`2v&|7&vqoggHtY9yBmAbFp!72sAh} ivhqlnFkDbjYG!5SFc2|tICzkmLx!V9fYHf;!5RQUuPMj?
diff --git a/html/html/themes/darkdos/images/b5.gif b/html/html/themes/darkdos/images/b5.gif deleted file mode 100644 index a03224278920646cba16f1047d653cc34851d45a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001
literal 72 zcmZ?wbhEHb<YnMxXkcLY|NsB8B?}dQvM@3LfewfO$v7~{xAaS9R<E1kBCsYa^=NM! XztQy{fnpUiGk(pvu&vF3k--`O2p$*w
diff --git a/html/html/themes/darkdos/images/b6.gif b/html/html/themes/darkdos/images/b6.gif deleted file mode 100644 index ed1781c5ffd981df8bc1bdb63fdae6c2fc77ac62..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001
literal 70 zcmZ?wbhEHb<YnMxXkcLY|NsB8B?}dQvM@3LfewfO$v7~{w)Bgi-1uOTasS2atCI!I VR}>1(2n;owx?soLv%w4u)&T5W7e@d9
diff --git a/html/html/themes/darkdos/images/spacer.gif b/html/html/themes/darkdos/images/spacer.gif deleted file mode 100644 index 5bfd67a2d6f72ac3a55cbfcea5866e841d22f5d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001
literal 43 mcmZ?wbhEHbWMp7uXkdT>#h)yUAf^t80Ld^gF}W}@SOWlZ0R#L1
diff --git a/html/html/themes/darkdos/include/colors.txt b/html/html/themes/darkdos/include/colors.txt deleted file mode 100644 index 6efefc53f..000000000 --- a/html/html/themes/darkdos/include/colors.txt +++ /dev/null @@ -1,25 +0,0 @@ -color1=#CD0000 -color2=#FF0000 -color3=#CD0000 -color4=#FA1818 -color5=#CD0000 -color6=#FF0000 -color7=#FF2424 -color8=#FF5050 -color9=#EE0F0F -color10=#EE0000 -color11=#0000FF -color12=#00FF00 -color13=#FF0000 -color14=#F32020 -color15=#CCCCCC -color16=#40E0D0 -color17=#90EE90 -color18=#F4A460 -color19=#EAE9EE -color20=#1C1C1C -color21=#CD6600 -color22=#4F4F4F -color23=#FF00FF -color24=#6464FF -color25=#FF6464 diff --git a/html/html/themes/darkdos/include/functions.pl b/html/html/themes/darkdos/include/functions.pl deleted file mode 100644 index ed3f546b0..000000000 --- a/html/html/themes/darkdos/include/functions.pl +++ /dev/null @@ -1,404 +0,0 @@ -#!/usr/bin/perl -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see http://www.gnu.org/licenses/. # -# # -############################################################################### - -sub showmenu() { - print <<EOF - <div id="menu"> - <ul> -EOF -; - foreach my $k1 ( sort keys %$menu ) { - if (! $menu->{$k1}{'enabled'}) { - next; - } - my $link = getlink($menu->{$k1}); - if ($link eq '') { - next; - } - if (! is_menu_visible($link)) { - next; - } - if ($menu->{$k1}->{'selected'}) { - print "<li><a href="$link" class="active">$menu->{$k1}{'caption'}</a></li>"; - } else { - print "<li><a href="$link">$menu->{$k1}{'caption'}</a></li>"; - } - } - print <<EOF - </ul> - </div> -EOF -; -} - -sub getselected($) { - my $root = shift; - if (!$root) { - return 0; - } - - foreach my $item (%$root) { - if ($root->{$item}{'selected'}) { - return $root->{$item}; - } - } -} - -sub showsubsection($$) { - my $root = shift; - - if (! $root) { - return; - } - my $selected = getselected($root); - if (! $selected) { - return; - } - my $submenus = $selected->{'subMenu'}; - if (! $submenus) { - return; - } - - print <<EOF - <h4><span>Side</span>menu</h4> - <ul class="links"> -EOF -; - foreach my $item (sort keys %$submenus) { - my $hash = $submenus->{$item}; - if (! $hash->{'enabled'}) { - next; - } - my $link = getlink($hash); - if ($link eq '') { - next; - } - if (! is_menu_visible($link)) { - next; - } - if ($hash->{'selected'}) { - print '<li class="selected">'; - } else { - print '<li>'; - } - - print "<a href="$link">$hash->{'caption'}</a></li>"; - } - - print <<EOF - </ul> -EOF -; -} - - -sub showsubsubsection($) { - my $root = shift; - if (!$root) { - return; - } - my $selected = getselected($root); - if (! $selected) { - return - } - if (! $selected->{'subMenu'}) { - return - } - - showsubsection($selected->{'subMenu'}, 'menu-subtop'); -} - -sub openpage { - my $title = shift; - my $boh = shift; - my $extrahead = shift; - - @URI=split ('?', $ENV{'REQUEST_URI'} ); - &General::readhash("${swroot}/main/settings", %settings); - &genmenu(); - - my $h2 = gettitle($menu); - - $title = "-= IPFire - $title =-"; - if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') { - $title = "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'} - $title"; - } - - print <<END -<?xml version='1.0' encoding='UTF-8'?> -<!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> - $extrahead - <link rel="shortcut icon" href="/favicon.ico" /> - <link rel="stylesheet" type="text/css" href="/themes/darkdos/include/style.css" /> - <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' - } - } - </script> -END -; -if ($settings{'SPEED'} ne 'off') { -print <<END - <script type="text/javascript" src="/include/jquery.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(); - }); - </script> - </head> - <body> -END -; -} -else { -print "</head>\n<body>";} -print <<END -<!-- IPFIRE HEADER --> - -<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><a href='https://www.ipfire.org' style='text-decoration: none;'>-= IPFire =-</a></span></h1><br />"; - } - print <<END - <h2>+ $h2 +</h2> - </div> - -END -; - &showmenu(); - -print <<END - </div> -</div> - -<div id="main"> - <div id="main_inner" class="fixed"> - <div id="primaryContent_2columns"> - <div id="columnA_2columns"> -END -; -} - -sub openpagewithoutmenu { - my $title = shift; - my $boh = shift; - my $extrahead = shift; - - @URI=split ('?', $ENV{'REQUEST_URI'} ); - &General::readhash("${swroot}/main/settings", %settings); - &genmenu(); - - my $h2 = gettitle($menu); - - $title = "-= IPFire - $title =-"; - if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') { - $title = "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'} - $title"; - } - - print <<END -<?xml version='1.0' encoding='UTF-8'?> -<!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> - $extrahead -END -; - if ($settings{'FX'} ne 'off') { - print <<END - <meta http-equiv="Page-Enter" content="blendTrans(Duration=0.5,Transition=12)" /> - <meta http-equiv="Page-Exit" content="blendTrans(Duration=0.5,Transition=12)" /> -END -; - } - print <<END - <link rel="shortcut icon" href="/favicon.ico" /> - <link rel="stylesheet" type="text/css" href="/include/style.css" /> - <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' - } - } - </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"> -END -; -} - -sub closepage () { - my $status = &connectionstatus(); - my $uptime = `/usr/bin/uptime|cut -d " " -f 4-`; - $uptime =~ s/year(s|)/$Lang::tr{'year'}/; - $uptime =~ s/month(s|)/$Lang::tr{'month'}/; - $uptime =~ s/day(s|)/$Lang::tr{'day'}/; - $uptime =~ s/user(s|)/$Lang::tr{'user'}/; - $uptime =~ s/load average/$Lang::tr{'uptime load average'}/; - - print <<END - </div> - </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"> - <b>Status:</b> $status <b>Uptime:</b> $uptime -END -; -if ($settings{'SPEED'} ne 'off') { -print <<END - <br /> - <b>$Lang::tr{'bandwidth usage'}:</b> - $Lang::tr{'incoming'}: <span id="rx_kbs"></span> $Lang::tr{'outgoing'}: <span id="tx_kbs"></span> - -END -; -} -print <<END - </div> - </div> -</div> -</body> -</html> -END -; -} - -sub openbigbox -{ -} - -sub closebigbox -{ -} - -sub openbox -{ - $width = $_[0]; - $align = $_[1]; - $caption = $_[2]; - - print <<END -<!-- openbox --> - <div class="post" align="$align"> -END -; - - if ($caption) { print "<h3>$caption</h3>\n"; } else { print " "; } -} - -sub closebox -{ - print <<END - </div> - <br class="clear" /> - <!-- closebox --> -END -; -} - -1; diff --git a/html/html/themes/darkdos/include/style.css b/html/html/themes/darkdos/include/style.css deleted file mode 100644 index b8850677c..000000000 --- a/html/html/themes/darkdos/include/style.css +++ /dev/null @@ -1,473 +0,0 @@ -/*darkdos theme by d4rkd0s*/ - -/* This controls the width of the fluid width layouts */ - -div.fluid -{ -width: 90% !important; -} - -/* This controls the width of the fixed width layouts */ - -div.fixed -{ -width: 950px !important; -} - -/* Basic Stuff */ - -* -{ -margin: 0em; -padding: 0em; -} - -body -{ -background-color: #000000; -color: rgb(255,128,0); -font-size: 10pt; -font-family: "trebuchet ms", helvetica, sans-serif; -} - -h1,h2,h3,h4,h5,h6 -{ -background-color: #000000; -font-weight: normal; -letter-spacing: -1px; -text-transform: lowercase; -text-align: left; -} - -h3,h4,h5,h6 -{ -background-color: #000000; -color: silver; -} - -h1 span -{ -font-weight: bold; -color: rgb(255,58,58); -} - -h3 span -{ -background-color: #000000; -font-weight: bold; -} - -h4 span -{ -background-color: #000000; -font-weight: bold; -} - -br.clear -{ -background-color: #000000; -clear: both; -} - -img -{ -} - -img.floatTL -{ -float: left; -margin-right: 1.5em; -margin-bottom: 1.5em; -margin-top: 0.5em; -} - -a -{ -text-decoration: underline; -color: white; -} - -a:hover -{ -text-decoration: none; -} - -ul.links -{ -list-style: none; -} - -ul.links li -{ -line-height: 2em; -} - -ul.links li.first -{ -} - -p -{ -line-height: 1.8em; -} - -/* Header */ - -#header -{ -width:100%; -height:100px; -background: #000000 url('/themes/darkdos/images/b1.gif') repeat-x; -} - -#header_inner -{ -position: relative; -width: 700px; -height:110px; -margin: 0 auto; -} - -/* Logo */ - -#logo -{ -position: absolute; -bottom: 0.6em; -} - -#logo h1 -{ -display: inline; -color: #fff; -font-size: 2.6em; -} - -#logo h2 -{ -display: inline; -padding-left: 0.5em; -color: white; -font-size: 1.0em; -} - -/* Menu */ - -#menu -{ -position: absolute; -right: 0em; -bottom: 0em; -} - -#menu ul -{ -list-style: none; -} - -#menu li -{ -float: left; -} - -#menu li a -{ -margin-left: 0.5em; -display: block; -padding: 1.1em 1.4em 1.0em 1.4em; -background: url('/themes/darkdos/images/b4.gif') repeat-x; -border: solid 1px #fff; -color: #616161; -font-weight: bold; -font-size: 1.0em; -text-transform: lowercase; -text-decoration: none; -} - -#menu li a.active -{ -background: url('/themes/darkdos/images/b3.gif') repeat-x; -color: #fff; -border: solid 1px silver; -} - -/* Main */ - -#main -{ -background: #000000 url('/themes/darkdos/images/b2.gif') 0px 1px repeat-x; -} - -#main_inner p -{ -text-align: justify; -margin-bottom: 2.0em; -} - -#main_inner ul -{ -margin-bottom: 2.0em; -} - -#main_inner -{ -position: relative; -width: 950px; -margin: 0 auto; -padding-top: 3.5em; -} - -#main_inner h3,h4 -{ -border-bottom: dotted 1px #E1E1E1; -position: relative; -padding-bottom: 0.4em; -} - -#main_inner h3 -{ -font-size: 2.1em; -padding-bottom: 0.1em; -} - -#main_inner h4 -{ -font-size: 1.2em; -padding-bottom: 0.175em; -margin-bottom: 1.4em; -margin-top: 0.95em; -} - -#main_inner .post -{ -position: relative; -} - -#main_inner .post h3 -{ -position: relative; -font-size: 1.7em; -padding-bottom: 0.4em; -} - -#main_inner .post ul.post_info -{ -list-style: none; -position: absolute; -top: 3em; -font-size: 0.8em; -} - -#main_inner .post ul.post_info li -{ -background-position: 0em 0.2em; -background-repeat: no-repeat; -display: inline; -padding-left: 18px; -} - -#main_inner .post ul.post_info li.date -{ -background-image: url('/themes/darkdos/images/b5.gif'); -} - -#main_inner .post ul.post_info li.comments -{ -background-image: url('/themes/darkdos/images/b6.gif'); -margin-left: 1.1em; -} - -/* Footer */ - -#footer -{ -width: 950px; -margin: 0 auto; -text-align: center; -clear: both; -border-top: dotted 1px #E1E1E1; -margin-top: 1.0em; -margin-bottom: 1.0em; -padding-top: 1.0em; -text-transform: lowercase; -} - -/* Search */ - -select -{ -margin: 0.2em; -background-color: rgb(255,58,58); color:black; border:1px solid silver; -} - -textarea -{ -margin: 0.2em; -background-color: rgb(255,58,58); color:black; border:1px solid silver; -} - -checkbox -{ -margin: 0.2em; -background-color: rgb(255,58,58); color:black; border:1px solid silver; -} - -radio -{ -margin: 0.2em; -background-color: rgb(255,58,58); color:black; border:1px solid silver; -} - -input -{ -margin: 0.2em; -background-color: rgb(255,58,58); color:black; border:1px solid silver; -} - -input.button -{ -background: #CA2F2F url('/themes/darkdos/images/b3.gif') repeat-x; -color: #fff; -border: solid 1px #2941BC; -font-weight: bold; -text-transform: lowercase; -font-size: 0.8em; -height: 2.0em; -} - -input.text -{ -border: solid 1px #F1F1F1; -font-size: 1.0em; -padding: 0.25em 0.25em 0.25em 0.25em; -} - -#search -{ -position: relative; -width: 100%; -margin-bottom: 2.0em; -} - -#search input.text -{ -position: absolute; -top: 0em; -left: 0em; -width: 9.5em; -} - -#search input.button -{ -position: absolute; -top: 0em; -right: 0em; -min-width: 2.0em; -max-width: 2.5em; -} - -table.fw-nat tbody tr td { - height: 2.25em; -} - -/* LAYOUT - 3 COLUMNS */ - - /* Primary content */ - - #primaryContent_3columns - { - position: relative; - margin-right: 34em; - } - - #columnA_3columns - { - position: relative; - float: left; - width: 100%; - margin-right: -34em; - padding-right: 2em; - } - - /* Secondary Content */ - - #secondaryContent_3columns - { - float: right; - } - - #columnB_3columns - { - width: 13.0em; - float: left; - padding: 0em 2em 0.5em 2em; - border-left: dotted 1px #E1E1E1; - } - - #columnC_3columns - { - width: 13.0em; - float: left; - padding: 0em 0em 0.5em 2em; - border-left: dotted 1px #E1E1E1; - } - -/* LAYOUT - 2 COLUMNS */ - - /* Primary content */ - - #primaryContent_2columns - { - position: relative; - margin-right: 17em; - } - - #columnA_2columns - { - position: relative; - float: left; - width: 100%; - margin-right: -17em; - padding-right: 2em; - } - - /* Secondary Content */ - - #secondaryContent_2columns - { - float: right; - } - - #columnC_2columns - { - width: 13.0em; - float: left; - padding: 0em 0em 0.5em 2em; - border-left: dotted 1px #E1E1E1; - } - -/* LAYOUT - COLUMNLESS */ - - /* Primary content */ - - #primaryContent_columnless - { - position: relative; - } - - #columnA_columnless - { - position: relative; - width: 100%; - } - -/* FOOTER COLORIZE BANDWIDTH */ - -#rx_kbs { color: green; } - -#tx_kbs { color: red; } - -iframe.graph { - width: 100%; - min-height: 300px; -} diff --git a/html/html/themes/ipfire-legacy/images/n1.gif b/html/html/themes/ipfire-legacy/images/n1.gif deleted file mode 100644 index 6eb5161798f610218190dd64d46a2cdf842f2e68..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001
literal 1014 zcmV<S0}1>`Nk%w1VIBZ_0M!5hhX53O01|=#6M+B|djJx101<fr5_kX-ga8zV02For z5_bR+YXA^r01tHl5pMtxXaEm!01;*Y4{ZPtVE_(p01#gQ4t@X=eE<`G025mP4p#sT zY5)*f01aIL4uAj?asUxy01s3E41)j@g#Z+K01|Wn5l{dOWdILV01aXQ4_*KcYyc2& z01;LI4QT)nP5=x{01H?E4O0LNTmTMQ01ZR{3P%77NdOCH01r(73sL|KU;qvP00000 z00000A^8LV00000EC2ui03HB(06+%+K!6}XEE<UefO5%f9s|jylsP<3uhpk9D$Qz< zSHO20o_e|ErPr8NuC-|DxEPnt>*aG>K2E=%aRP!E3x$S<g#m(#jEoPDkdF=ol$Dm3 z1PYN1Af29{pdc(Lq@|{$5~-@HJTk7Yu&yhssv9RaxVgHxFdM$Vz`=KWYGlMhbAEGR zX3J1}UwC19$A4B>&eGP#&_~kP*L&M^03_z;BpC+l?Ct9p=<x;f^!4)w8TtDA{23(- z02#DEL=aJgfCw2(Sjey;LkSilN}L!G1w)E5PH5c7QR4=RAhR7q24|$TZ_P?pb0$ut zvSldUxXd%N&9Id!iJdf=OlM91a5rhfY%`8onx8KL@yywhDN&YBhbl=xwQAJ?m@s{? zS`~p;uNMx89ZOa$hOcPRVs*f_ty{Jw2FRUDw{C>Hc=Im6z_+j8zZeeObvU7byTk5G z5QYGu!rRAhA26Ow8A7DXm|v*a%(?Ss%N#<B9?hWvjnk-8pH@LSgzMKKXr!1;yY_4i zuybqJog#+s-@tv(*iF26@uJU;N%c7<W|MKw`9xbf9cOjseXKXfzP)MCq}`)_7dn0# zQlR0%U+<P)yi@hwsJ|ya-+X)c;k@5Rzn*@7`{nUhUl-@46rh3oA^2Yz%ju_-b`NqF zp@Z>3SfPYZ$hV+^13p*(U>8|kQU_O8m0;qDD4Li7iBzS9fI5h^bAgL!jbP&lVU?vL z1~>NTqaXn&Amorl3Q0gCNG?Kv2~0NWB$Fk4Amx-)R{4QFSRQb}mRxq}<pl;5(88Ex zlBs|*Ml3*P1#Grife9go=zyCQuwbX15$LGrSOwha=L>*7P~@ORwgBj%h)Tc$mW<Lf z0WFZ`CF!IGHDKwbm|DsKot(A_0R^CjDk`Wsu$j=Q44|;Ws;suUY6A#WR+$Pl)N1Rk zwNfB!rkAeZ!mq#v`>O}MS~@BP8qA>Vvdk*m!Lg!xAgu>3z+mmQ*jk&ywA^;vK?ghF kAnv&2ihIJh=%%X^t`0V|>+ZYl#vsDH^ww*y2tfb<JCZ!4PXGV_
diff --git a/html/html/themes/ipfire-legacy/images/n2.gif b/html/html/themes/ipfire-legacy/images/n2.gif deleted file mode 100644 index b92a19de7af7153d9c02a92866fcdcaab1d5d914..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001
literal 449 zcmV;y0Y3gmNk%w1VFdt90M!5h{{H^_{QUp_|NHy<`T6<x_xJt%{rLF!`uh6y_4V`f z^Yrxe^78WR?CkOJ@%Hxi?d|RB>+9<3>hSRJ?(XjC>FMw9@9600*4Nqa@$v5O@7USd z=I7_$-QVTr=HcMt+}_^W+1u~#?(pyL>FVn3?(W~=;n~~U>g(&|<K^Sx<l^My=;`U{ z=;+YV)7974;o{=d*4EeA+2`o!?Ca~@-`~;H)a>o;=H=($-{IQa+}qvV)z;Y4)YjYD z+~efrA^8LV00000EC2ui00jU|06+%bK-a5MxiliDPQzodP*x07gTYu>9gKojOXzk7 zV6b647MRTvUMLcQKpLG7=Q61)6eW!!@#rTGfPe^tg8_zy0EvlbXc84Y8#-(fGCMhL z4G<qc6ciI99y1dTq%9;6R16Ih8CDAkcL{ubeOp{!1cZZOV26feV~WCxi~<-Ejy8@l z8xj~NlMP29AQ3(_(k7T76c8pV6fh~B5KST}I3sg)B%}@(q%0^7G&iYtczPlhcMh%@ rvKZ{KB5T$IS+)`u2*fZDu7|mF@tQcmm&J>~G8!1hQCP8JK>z?dJcIpz
diff --git a/html/html/themes/ipfire-legacy/images/n3.gif b/html/html/themes/ipfire-legacy/images/n3.gif deleted file mode 100644 index 6627c91a15b21f67fd2d4b52a78f9c7d3513b6ab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001
literal 155 zcmZ?wbhEHbWMoiaIKseiN?(7OvhqG{?PGd+v*hIVXlZTN)I6l4vqDAXfR4^Q1%=hB zsz-En7b+@Fk(J%0rFB$K@1(x|I#ty<^77MVWtS)^ZBSF&s-ba0Uw^Z@Is*n!{K*0q n(*cnnI~`ah7Bq`YoMgxl=;>y}z+h^6Fe$dbz(InioxvIa)8Zxw
diff --git a/html/html/themes/ipfire-legacy/images/n4.gif b/html/html/themes/ipfire-legacy/images/n4.gif deleted file mode 100644 index 86985252b47f996923aa4b464e32faa9a5d66876..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001
literal 155 zcmZ?wbhEHbWMoiaIKsg2|NsAg|Ni~?^XK{V=N~_Q{Qdj)j~_q2eEIV7<;&NvU*Erf z|HFq5Po6w^`0(M~yLX>Gd-n6^&v)<MegFRb&6_uO?%a9w=+W1&Uq65T%zy(Z{$v5m n=zvI&oer!L3at^2TSXc^`Ak=2Xt-?PEF{>@!pX?f&R`7yId@MO
diff --git a/html/html/themes/ipfire-legacy/images/n5.gif b/html/html/themes/ipfire-legacy/images/n5.gif deleted file mode 100644 index a03224278920646cba16f1047d653cc34851d45a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001
literal 72 zcmZ?wbhEHb<YnMxXkcLY|NsB8B?}dQvM@3LfewfO$v7~{xAaS9R<E1kBCsYa^=NM! XztQy{fnpUiGk(pvu&vF3k--`O2p$*w
diff --git a/html/html/themes/ipfire-legacy/images/n6.gif b/html/html/themes/ipfire-legacy/images/n6.gif deleted file mode 100644 index ed1781c5ffd981df8bc1bdb63fdae6c2fc77ac62..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001
literal 70 zcmZ?wbhEHb<YnMxXkcLY|NsB8B?}dQvM@3LfewfO$v7~{w)Bgi-1uOTasS2atCI!I VR}>1(2n;owx?soLv%w4u)&T5W7e@d9
diff --git a/html/html/themes/ipfire-legacy/images/spacer.gif b/html/html/themes/ipfire-legacy/images/spacer.gif deleted file mode 100644 index 5bfd67a2d6f72ac3a55cbfcea5866e841d22f5d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001
literal 43 mcmZ?wbhEHbWMp7uXkdT>#h)yUAf^t80Ld^gF}W}@SOWlZ0R#L1
diff --git a/html/html/themes/ipfire-legacy/include/colors.txt b/html/html/themes/ipfire-legacy/include/colors.txt deleted file mode 100644 index 6d7dd1cba..000000000 --- a/html/html/themes/ipfire-legacy/include/colors.txt +++ /dev/null @@ -1,25 +0,0 @@ -color1=#CD5B45 -color2=#EE6A50 -color3=#FF7256 -color4=#EE9572 -color5=#FFA07A -color6=#CDAF95 -color7=#EECBAD -color8=#FFDAB9 -color9=#FFE4C4 -color10=#FFCCCC -color11=#0000FF -color12=#00FF00 -color13=#FF0000 -color14=#FFD700 -color15=#CCCCCC -color16=#40E0D0 -color17=#90EE90 -color18=#F4A460 -color19=#EAE9EE -color20=#D6D6D6 -color21=#FFFFFF -color22=#F0F0F0 -color23=#FF00FF -color24=#6464FF -color25=#FF6464 diff --git a/html/html/themes/ipfire-legacy/include/functions.pl b/html/html/themes/ipfire-legacy/include/functions.pl deleted file mode 100644 index 26a8763c1..000000000 --- a/html/html/themes/ipfire-legacy/include/functions.pl +++ /dev/null @@ -1,404 +0,0 @@ -#!/usr/bin/perl -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see http://www.gnu.org/licenses/. # -# # -############################################################################### - -sub showmenu() { - print <<EOF - <div id="menu"> - <ul> -EOF -; - foreach my $k1 ( sort keys %$menu ) { - if (! $menu->{$k1}{'enabled'}) { - next; - } - my $link = getlink($menu->{$k1}); - if ($link eq '') { - next; - } - if (! is_menu_visible($link)) { - next; - } - if ($menu->{$k1}->{'selected'}) { - print "<li><a href="$link" class="active">$menu->{$k1}{'caption'}</a></li>"; - } else { - print "<li><a href="$link">$menu->{$k1}{'caption'}</a></li>"; - } - } - print <<EOF - </ul> - </div> -EOF -; -} - -sub getselected($) { - my $root = shift; - if (!$root) { - return 0; - } - - foreach my $item (%$root) { - if ($root->{$item}{'selected'}) { - return $root->{$item}; - } - } -} - -sub showsubsection($$) { - my $root = shift; - - if (! $root) { - return; - } - my $selected = getselected($root); - if (! $selected) { - return; - } - my $submenus = $selected->{'subMenu'}; - if (! $submenus) { - return; - } - - print <<EOF - <h4><span>Side</span>menu</h4> - <ul class="links"> -EOF -; - foreach my $item (sort keys %$submenus) { - my $hash = $submenus->{$item}; - if (! $hash->{'enabled'}) { - next; - } - my $link = getlink($hash); - if ($link eq '') { - next; - } - if (! is_menu_visible($link)) { - next; - } - if ($hash->{'selected'}) { - print '<li class="selected">'; - } else { - print '<li>'; - } - - print "<a href="$link">$hash->{'caption'}</a></li>"; - } - - print <<EOF - </ul> -EOF -; -} - - -sub showsubsubsection($) { - my $root = shift; - if (!$root) { - return; - } - my $selected = getselected($root); - if (! $selected) { - return - } - if (! $selected->{'subMenu'}) { - return - } - - showsubsection($selected->{'subMenu'}, 'menu-subtop'); -} - -sub openpage { - my $title = shift; - my $boh = shift; - my $extrahead = shift; - - @URI=split ('?', $ENV{'REQUEST_URI'} ); - &General::readhash("${swroot}/main/settings", %settings); - &genmenu(); - - my $h2 = gettitle($menu); - - $title = "IPFire - $title"; - if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') { - $title = "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'} - $title"; - } - - print <<END -<?xml version='1.0' encoding='UTF-8'?> -<!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> - $extrahead - <link rel="shortcut icon" href="/favicon.ico" /> - <link rel="stylesheet" type="text/css" href="/themes/ipfire-legacy/include/style.css" /> - <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' - } - } - </script> -END -; -if ($settings{'SPEED'} ne 'off') { -print <<END - <script type="text/javascript" src="/include/jquery.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(); - }); - </script> - </head> - <body> -END -; -} -else { -print "</head><body>";} -print <<END -<!-- IPFIRE HEADER --> - -<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><a href='https://www.ipfire.org' style='text-decoration: none;'>IPFire</a></span></h1><br />"; - } - print <<END - <h2>$h2</h2> - </div> - -END -; - &showmenu(); - -print <<END - </div> -</div> - -<div id="main"> - <div id="main_inner" class="fixed"> - <div id="primaryContent_2columns"> - <div id="columnA_2columns"> -END -; -} - -sub openpagewithoutmenu { - my $title = shift; - my $boh = shift; - my $extrahead = shift; - - @URI=split ('?', $ENV{'REQUEST_URI'} ); - &General::readhash("${swroot}/main/settings", %settings); - &genmenu(); - - my $h2 = gettitle($menu); - - $title = "IPFire - $title"; - if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') { - $title = "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'} - $title"; - } - - print <<END -<?xml version='1.0' encoding='UTF-8'?> -<!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> - $extrahead -END -; - if ($settings{'FX'} ne 'off') { - print <<END - <meta http-equiv="Page-Enter" content="blendTrans(Duration=0.5,Transition=12)" /> - <meta http-equiv="Page-Exit" content="blendTrans(Duration=0.5,Transition=12)" /> -END -; - } - print <<END - <link rel="shortcut icon" href="/favicon.ico" /> - <link rel="stylesheet" type="text/css" href="/include/style.css" /> - <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' - } - } - </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"> -END -; -} - -sub closepage () { - my $status = &connectionstatus(); - my $uptime = `/usr/bin/uptime|cut -d " " -f 4-`; - $uptime =~ s/year(s|)/$Lang::tr{'year'}/; - $uptime =~ s/month(s|)/$Lang::tr{'month'}/; - $uptime =~ s/day(s|)/$Lang::tr{'day'}/; - $uptime =~ s/user(s|)/$Lang::tr{'user'}/; - $uptime =~ s/load average/$Lang::tr{'uptime load average'}/; - - print <<END - </div> - </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"> - <b>Status:</b> $status <b>Uptime:</b> $uptime -END -; -if ($settings{'SPEED'} ne 'off') { -print <<END - <br /> - <b>$Lang::tr{'bandwidth usage'}:</b> - $Lang::tr{'incoming'}: <span id="rx_kbs"></span> $Lang::tr{'outgoing'}: <span id="tx_kbs"></span> - -END -; -} -print <<END - </div> - </div> -</div> -</body> -</html> -END -; -} - -sub openbigbox -{ -} - -sub closebigbox -{ -} - -sub openbox -{ - $width = $_[0]; - $align = $_[1]; - $caption = $_[2]; - - print <<END -<!-- openbox --> - <div class="post" align="$align"> -END -; - - if ($caption) { print "<h3>$caption</h3>\n"; } else { print " "; } -} - -sub closebox -{ - print <<END - </div> - <br class="clear" /> - <!-- closebox --> -END -; -} - -1; diff --git a/html/html/themes/ipfire-legacy/include/style.css b/html/html/themes/ipfire-legacy/include/style.css deleted file mode 100644 index 2e9ea9266..000000000 --- a/html/html/themes/ipfire-legacy/include/style.css +++ /dev/null @@ -1,450 +0,0 @@ -/* - - Nonzero1.0 by nodethirtythree design - http://www.nodethirtythree.com - missing in a maze - -*/ - -/* This controls the width of the fluid width layouts */ - -div.fluid -{ -width: 90% !important; -} - -/* This controls the width of the fixed width layouts */ - -div.fixed -{ -width: 950px !important; -} - -/* Basic Stuff */ - -* -{ -margin: 0em; -padding: 0em; -} - -body -{ -background-color: #fff; -color: #585858; -font-size: 9pt; -font-family: "trebuchet ms", helvetica, sans-serif; -} - -h1,h2,h3,h4,h5,h6 -{ -font-weight: normal; -letter-spacing: -1px; -text-transform: lowercase; -text-align: left; -} - -h3,h4,h5,h6 -{ -color: #66000F; -} - -h1 span -{ -font-weight: bold; -} - -h3 span -{ -font-weight: bold; -} - -h4 span -{ -font-weight: bold; -} - -br.clear -{ -clear: both; -} - -img -{ -padding: 3px; -#border: solid 1px #e1e1e1; -} - -img.floatTL -{ -float: left; -margin-right: 1.5em; -margin-bottom: 1.5em; -margin-top: 0.5em; -} - -a -{ -text-decoration: underline; -color: #D90000; -} - -a:hover -{ -text-decoration: none; -} - -ul.links -{ -list-style: none; -} - -ul.links li -{ -line-height: 2em; -} - -ul.links li.first -{ -} - -p -{ -line-height: 1.8em; -} - -/* Header */ - -#header -{ -width:100%; -height:122px; -background: #440000 url('../images/n1.gif') repeat-x; -} - -#header_inner -{ -position: relative; -width: 950px; -height:122px; -margin: 0 auto; -} - -/* Logo */ - -#logo -{ -position: absolute; -bottom: 0.6em; -} - -#logo h1 -{ -display: inline; -color: #fff; -font-size: 2.6em; -} - -#logo h2 -{ -display: inline; -padding-left: 0.5em; -color: #E5CCD0; -font-size: 1.0em; -} - -/* Menu */ - -#menu -{ -position: absolute; -right: 0em; -bottom: 0em; -} - -#menu ul -{ -list-style: none; -} - -#menu li -{ -float: left; -} - -#menu li a -{ -margin-left: 0.5em; -display: block; -padding: 1.1em 1.4em 1.0em 1.4em; -background: #fff url('../images/n4.gif') repeat-x; -border: solid 1px #fff; -color: #616161; -font-weight: bold; -font-size: 1.0em; -text-transform: lowercase; -text-decoration: none; -} - -#menu li a.active -{ -background: #CA2F2F url('../images/n3.gif') repeat-x; -color: #fff; -border: solid 1px #A94B4B; -} - -/* Main */ - -#main -{ -background: #fff url('../images/n2.gif') 0px 1px repeat-x; -} - -#main_inner p -{ -text-align: justify; -margin-bottom: 2.0em; -} - -#main_inner ul -{ -margin-bottom: 2.0em; -} - -#main_inner -{ -position: relative; -width: 950px; -margin: 0 auto; -padding-top: 3.5em; -} - -#main_inner h3,h4 -{ -border-bottom: dotted 1px #E1E1E1; -position: relative; -} - -#main_inner h3 -{ -font-size: 2.1em; -padding-bottom: 0.1em; -margin-bottom: 0.8em; -} - -#main_inner h4 -{ -font-size: 1.2em; -padding-bottom: 0.175em; -margin-bottom: 1.4em; -margin-top: 0.95em; -} - -#main_inner .post -{ -position: relative; -} - -#main_inner .post h3 -{ -position: relative; -font-size: 1.7em; -padding-bottom: 0.4em; -} - -#main_inner .post ul.post_info -{ -list-style: none; -position: absolute; -top: 3em; -font-size: 0.8em; -} - -#main_inner .post ul.post_info li -{ -background-position: 0em 0.2em; -background-repeat: no-repeat; -display: inline; -padding-left: 18px; -} - -#main_inner .post ul.post_info li.date -{ -background-image: url('../images/n5.gif'); -} - -#main_inner .post ul.post_info li.comments -{ -background-image: url('../images/n6.gif'); -margin-left: 1.1em; -} - -/* Footer */ - -#footer -{ -width: 950px; -margin: 0 auto; -text-align: center; -clear: both; -border-top: dotted 1px #E1E1E1; -margin-top: 1.0em; -margin-bottom: 1.0em; -padding-top: 1.0em; -text-transform: lowercase; -} - -/* Search */ - -input -{ -margin: 0.2em; -} - -input.button -{ -background: #CA2F2F url('../images/n3.gif') repeat-x; -color: #fff; -border: solid 1px #A94B4B; -font-weight: bold; -text-transform: lowercase; -font-size: 0.8em; -height: 2.0em; -} - -input.text -{ -border: solid 1px #F1F1F1; -font-size: 1.0em; -padding: 0.25em 0.25em 0.25em 0.25em; -} - -#search -{ -position: relative; -width: 100%; -margin-bottom: 2.0em; -} - -#search input.text -{ -position: absolute; -top: 0em; -left: 0em; -width: 9.5em; -} - -#search input.button -{ -position: absolute; -top: 0em; -right: 0em; -min-width: 2.0em; -max-width: 2.5em; -} - -table.fw-nat tbody tr td { - height: 2.25em; -} - -/* LAYOUT - 3 COLUMNS */ - - /* Primary content */ - - #primaryContent_3columns - { - position: relative; - margin-right: 34em; - } - - #columnA_3columns - { - position: relative; - float: left; - width: 100%; - margin-right: -34em; - padding-right: 2em; - } - - /* Secondary Content */ - - #secondaryContent_3columns - { - float: right; - } - - #columnB_3columns - { - width: 13.0em; - float: left; - padding: 0em 2em 0.5em 2em; - border-left: dotted 1px #E1E1E1; - } - - #columnC_3columns - { - width: 13.0em; - float: left; - padding: 0em 0em 0.5em 2em; - border-left: dotted 1px #E1E1E1; - } - -/* LAYOUT - 2 COLUMNS */ - - /* Primary content */ - - #primaryContent_2columns - { - position: relative; - margin-right: 17em; - } - - #columnA_2columns - { - position: relative; - float: left; - width: 100%; - margin-right: -17em; - padding-right: 2em; - } - - /* Secondary Content */ - - #secondaryContent_2columns - { - float: right; - } - - #columnC_2columns - { - width: 13.0em; - float: left; - padding: 0em 0em 0.5em 2em; - border-left: dotted 1px #E1E1E1; - } - -/* LAYOUT - COLUMNLESS */ - - /* Primary content */ - - #primaryContent_columnless - { - position: relative; - } - - #columnA_columnless - { - position: relative; - width: 100%; - } - -/* FOOTER COLORIZE BANDWIDTH */ - -#rx_kbs { color: green; } - -#tx_kbs { color: red; } - -iframe.graph { - min-height: 285px; - width: 750px; -} diff --git a/html/html/themes/ipfire/include/css/style-rounded.css b/html/html/themes/ipfire/include/css/style-rounded.css deleted file mode 100644 index 886d61f0f..000000000 --- a/html/html/themes/ipfire/include/css/style-rounded.css +++ /dev/null @@ -1,82 +0,0 @@ - -.bigbox { - margin-top: 1em; - border-radius: 8px 8px 8px 8px; - -webkit-border-radius: 8px 8px 8px 8px; -} - -#main_inner .post { - border-radius: 8px 8px 8px 8px; - -webkit-border-radius: 8px 8px 8px 8px; -} - -#cssmenu a { - border-radius: 8px 8px 8px 8px; - -webkit-border-radius: 8px 8px 8px 8px; -} - -#cssmenu .has-sub ul li a { - border-radius: 7px 7px 7px 7px; -} - -#cssmenu .has-sub ul li:hover a { - box-shadow: inset 0 5px 1px rgba(0, 0, 0, 0.15); - -webkit-box-shadow: inset 0 5px 1px rgba(0, 0, 0, 0.15); -} - -/* Table */ -/* when using class='bordered' after tabletag */ - -.tbl th:first-child { - -moz-border-radius: 6px 0 0 0; - -webkit-border-radius: 6px 0 0 0; - border-radius: 6px 0 0 0; -} - -.tbl th:last-child { - -moz-border-radius: 0 6px 0 0; - -webkit-border-radius: 0 6px 0 0; - border-radius: 0 6px 0 0; -} - -.tbl th:only-child { - -moz-border-radius: 6px 6px 0 0; - -webkit-border-radius: 6px 6px 0 0; - border-radius: 6px 6px 0 0; -} - -.tbl tr:first-child td:first-child { - -moz-border-radius: 6px 0 0 0; - -webkit-border-radius: 6px 0 0 0; - border-radius: 6px 0 0 0; -} - -.tbl tr:first-child td:last-child { - -moz-border-radius: 0 6px 0 0; - -webkit-border-radius: 0 6px 0 0; - border-radius: 0 6px 0 0; -} - -.tbl tr:first-child td:only-child { - -moz-border-radius: 6px 6px 0 0; - -webkit-border-radius: 6px 6px 0 0; - border-radius: 6px 6px 0 0; -} - -.tbl tr:last-child td:first-child { - -moz-border-radius: 0 0 0 6px; - -webkit-border-radius: 0 0 0 6px; - border-radius: 0 0 0 6px; -} - -.tbl tr:last-child td:last-child { - -moz-border-radius: 0 0 6px 0; - -webkit-border-radius: 0 0 6px 0; - border-radius: 0 0 6px 0; -} - -.tbl tr:last-child td:only-child { - -moz-border-radius: 0 0 6px 6px; - -webkit-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; -} diff --git a/html/html/themes/maniac/images/IPFire.png b/html/html/themes/maniac/images/IPFire.png deleted file mode 100644 index ec56b7af56e9d1c7ae5dccedd63078aea66f2542..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001
literal 11934 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
diff --git a/html/html/themes/maniac/images/b1.gif b/html/html/themes/maniac/images/b1.gif deleted file mode 100644 index 27e005164fd8cad4cfaa92a12e8c0589b35edf7c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001
literal 1323 zcmZ?wbhEHbv|*@X_|5<VoD2;7Yz*RT46-~7$~+9(f((X&43^>ycH#`~vJBp`457*l z5y}jynhZty3?=#u4W<lz)(mqT7*@G4?DSzc9>j1pg5hx-!^aec|5;!YM~Tr87$PB{ z_>+Z^f#E-c4#>TrJi);6pMjY}#$&^RgUuYmS~?aB79MUFQ1+VRu~F#=lZ0{Bof8`u zAMaN%my__^wB+Pujo?)=nMRGLryC@nn&Y{7+1VM~MX&Ch+`Rn!e23;wISyM^TwLri zSu6I`mle&+0~UMD_1e1X>gpiHjJv0{uD-rL;c(YmsfBB9ZqB&8D)#g?-6+n2$EW6c zZ(nzJcg1tR8>hFgzrVkMnOpA7^rnZ0JA}34&g|Iu_=u>I_dK7So1UJYVH~{ez|PIj z&o6N9mh=7fx%Kjj;MH+wcWr%reU;&fdA_^1y}iAo`1QKE3%9?&f1sIL-fxdZ0q=>) z+VSW1?EL)v!gT5RetWAv-o3Fo`#SIL-QVA@_wN2L?>}$Lv(GOsr`Mg?x3~Iu%j47Y z?Jd^-{r%(PuDj>=*WYGmVAFWez#^9Mppk>G<7yL+S%oOGfSbm{7Ll-whpiHRD-N{D zl)ZS^uF$6Os6$RE;Zdi?vK5cIbhf=n>S8;h@wmt2TE^pEi)S9nj5gn1Jnna3(|j_) z<)6lZi5_YzpG@*Gd--It7n8!%DIsB*Pp3wtt$aEyrtIa@=?QI`&t{}d%X~I7W7*1Q zvvRh*d^Wq_nCA02CD$^a&#id2^7*`)Z!e$EZ(!4Uv7kjP>&3zjwN)<`^_abSv3P=; z*2^VR!m?g2osqWc<+3?tuU;-+(5Cfj#gb`RuU4*Dw(8ZYHQQdjTD{>Iht}&gTdvJY Ibzrat0Bf>0`~Uy|
diff --git a/html/html/themes/maniac/images/b2.gif b/html/html/themes/maniac/images/b2.gif deleted file mode 100644 index 2ae47ed34415fa26401df887af45c3cb2cae8683..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001
literal 1167 zcmZ?wbhEHbv|&(U_|Cw<$-p4a#-Pl@pe@K?D9B(b&R{3b;4aJHEz1z9%n+f>kgCa0 zq|Z>I&(L7X&}Yps$AMv$8^cZ?hT}mDS0fl6$1!|NVfdfLFbYOPU?_%w;!hSv28RC( zIv~e`@&p6Ne+G6A8IKJM4mNWLYw1KRSa`TyK-p`K$3~?i%o4^~cTQ|ve7s-5Tus7r z(~^^uHG)^gWEM4^o^FtQYL4gTWoKvb6ur80a`W=@^BtN$l{jo!adEN7WUbg!UtTmX z4_NFq*K6yltE+<)Gwz<+y88P1gu`8Lr53KaxjEzVs@T)pbfY*69-o@)y?x!?-4)OM zZk*n}{{H?3W^TDR)0-Y1?hw|FJF{cs<0GO<-t&BRZhCrphH>z=13NcAKfl1aTh8~_ z=hn+Bf>+0#-L>`g^;O=d=lRaw^6d7G;`F*RySL{bZ)xV1x3gIP@$rd|yJFAnsl2`M z!eVdn?ybANz7C(Ab^qMl%;xtG4tM9s`|sQH^Yf$pRq^NVEo=Jz;qmGD{`>d+{rySs z#r^a9_y7OTz^0K<&nA-bppipu#e*guvknDD0XL0@Eh1qV4_hVtG!C@Ml)ZS^uF$6O ns6&n|;Zdi?vK5cIbhf=n>S8#e@wmt2TE^pEi)S9m4h+@+Wpmui
diff --git a/html/html/themes/maniac/images/b3.gif b/html/html/themes/maniac/images/b3.gif deleted file mode 100644 index fd3c7d018c27fcf7f6345426465ded2e94d2b443..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001
literal 847 zcmZ?wbhEHbWMt4{_|Cx4WyvtnhGB+1!+a-(Wv&cs-5IucG3@qbI2gciBADTP7{j#) zhP%-WPvRI}Co+6WVfdNO@IQ-T6pV(z@CX6LpDc_F4F4H)K;8l62?h=w26hgWfCC2_ rnK^_sA~rNQGPCo`Idm{6K4NC)l`sgIz;Mu!nU#Y>M1aA;fx#L8VBsRw
diff --git a/html/html/themes/maniac/images/b4.gif b/html/html/themes/maniac/images/b4.gif deleted file mode 100644 index 70337c1a1dbebb776fb2a21d5ec9cbeb5b6f5207..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001
literal 847 zcmZ?wbhEHbWMt4{_|Cxacv9r6sgWONME;l^`F~#I{{@l%7f1eI7Wsc=<o`91|JO(U z-x&FSOXUCUk^gr^{@)w<|3Kvb!;uW5U^E1VMF=SVWMO1r_|KpN@(n0YFmUKFuyd#c u95~R(%ps%^v7y0{nVnzGp@Tv35i>ilgh9vzhJ%jGtQ;I70t^lg4AuYxcQYvf
diff --git a/html/html/themes/maniac/images/b5.gif b/html/html/themes/maniac/images/b5.gif deleted file mode 100644 index a03224278920646cba16f1047d653cc34851d45a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001
literal 72 zcmZ?wbhEHb<YnMxXkcLY|NsB8B?}dQvM@3LfewfO$v7~{xAaS9R<E1kBCsYa^=NM! XztQy{fnpUiGk(pvu&vF3k--`O2p$*w
diff --git a/html/html/themes/maniac/images/b6.gif b/html/html/themes/maniac/images/b6.gif deleted file mode 100644 index ed1781c5ffd981df8bc1bdb63fdae6c2fc77ac62..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001
literal 70 zcmZ?wbhEHb<YnMxXkcLY|NsB8B?}dQvM@3LfewfO$v7~{w)Bgi-1uOTasS2atCI!I VR}>1(2n;owx?soLv%w4u)&T5W7e@d9
diff --git a/html/html/themes/maniac/images/spacer.gif b/html/html/themes/maniac/images/spacer.gif deleted file mode 100644 index 5bfd67a2d6f72ac3a55cbfcea5866e841d22f5d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001
literal 43 mcmZ?wbhEHbWMp7uXkdT>#h)yUAf^t80Ld^gF}W}@SOWlZ0R#L1
diff --git a/html/html/themes/maniac/include/colors.txt b/html/html/themes/maniac/include/colors.txt deleted file mode 100644 index 39961e3be..000000000 --- a/html/html/themes/maniac/include/colors.txt +++ /dev/null @@ -1,25 +0,0 @@ -color1=#CD3700 -color2=#FF4500 -color3=#CD6600 -color4=#FF7F00 -color5=#CD8500 -color6=#FFA500 -color7=#FF7F24 -color8=#FFA54F -color9=#EEAD0E -color10=#EEC900 -color11=#0000FF -color12=#00FF00 -color13=#FF0000 -color14=#FFD700 -color15=#CCCCCC -color16=#40E0D0 -color17=#90EE90 -color18=#F4A460 -color19=#EAE9EE -color20=#1C1C1C -color21=#CD6600 -color22=#4F4F4F -color23=#FF00FF -color24=#6464FF -color25=#FF6464 diff --git a/html/html/themes/maniac/include/functions.pl b/html/html/themes/maniac/include/functions.pl deleted file mode 100644 index 1c0aea1c4..000000000 --- a/html/html/themes/maniac/include/functions.pl +++ /dev/null @@ -1,404 +0,0 @@ -#!/usr/bin/perl -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see http://www.gnu.org/licenses/. # -# # -############################################################################### - -sub showmenu() { - print <<EOF - <div id="menu"> - <ul> -EOF -; - foreach my $k1 ( sort keys %$menu ) { - if (! $menu->{$k1}{'enabled'}) { - next; - } - my $link = getlink($menu->{$k1}); - if ($link eq '') { - next; - } - if (! is_menu_visible($link)) { - next; - } - if ($menu->{$k1}->{'selected'}) { - print "<li><a href="$link" class="active">$menu->{$k1}{'caption'}</a></li>"; - } else { - print "<li><a href="$link">$menu->{$k1}{'caption'}</a></li>"; - } - } - print <<EOF - </ul> - </div> -EOF -; -} - -sub getselected($) { - my $root = shift; - if (!$root) { - return 0; - } - - foreach my $item (%$root) { - if ($root->{$item}{'selected'}) { - return $root->{$item}; - } - } -} - -sub showsubsection($$) { - my $root = shift; - - if (! $root) { - return; - } - my $selected = getselected($root); - if (! $selected) { - return; - } - my $submenus = $selected->{'subMenu'}; - if (! $submenus) { - return; - } - - print <<EOF - <h4><span>Side</span>menu</h4> - <ul class="links"> -EOF -; - foreach my $item (sort keys %$submenus) { - my $hash = $submenus->{$item}; - if (! $hash->{'enabled'}) { - next; - } - my $link = getlink($hash); - if ($link eq '') { - next; - } - if (! is_menu_visible($link)) { - next; - } - if ($hash->{'selected'}) { - print '<li class="selected">'; - } else { - print '<li>'; - } - - print "<a href="$link">$hash->{'caption'}</a></li>"; - } - - print <<EOF - </ul> -EOF -; -} - - -sub showsubsubsection($) { - my $root = shift; - if (!$root) { - return; - } - my $selected = getselected($root); - if (! $selected) { - return - } - if (! $selected->{'subMenu'}) { - return - } - - showsubsection($selected->{'subMenu'}, 'menu-subtop'); -} - -sub openpage { - my $title = shift; - my $boh = shift; - my $extrahead = shift; - - @URI=split ('?', $ENV{'REQUEST_URI'} ); - &General::readhash("${swroot}/main/settings", %settings); - &genmenu(); - - my $h2 = gettitle($menu); - - $title = "-= IPFire - $title =-"; - if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') { - $title = "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'} - $title"; - } - - print <<END -<?xml version='1.0' encoding='UTF-8'?> -<!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> - $extrahead - <link rel="shortcut icon" href="/favicon.ico" /> - <link rel="stylesheet" type="text/css" href="/themes/maniac/include/style.css" /> - <script type="text/javascript"> - - function swapVisibility(id) { - el = document.getElementById(id); - if(el.style.display != 'block') { - el.style.display = 'block' - } - else { - el.style.display = 'none' - } - } - </script> -END -; -if ($settings{'SPEED'} ne 'off') { -print <<END - <script type="text/javascript" src="/include/jquery.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(); - }); - </script> - </head> - <body> -END -; -} -else { -print "</head>\n<body>";} -print <<END -<!-- IPFIRE HEADER --> - -<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><a href='https://www.ipfire.org' style='text-decoration: none;'>-= IPFire =-</a></span></h1><br />"; - } - print <<END - <h2>+ $h2 +</h2> - </div> - -END -; - &showmenu(); - -print <<END - </div> -</div> - -<div id="main"> - <div id="main_inner" class="fixed"> - <div id="primaryContent_2columns"> - <div id="columnA_2columns"> -END -; -} - -sub openpagewithoutmenu { - my $title = shift; - my $boh = shift; - my $extrahead = shift; - - @URI=split ('?', $ENV{'REQUEST_URI'} ); - &General::readhash("${swroot}/main/settings", %settings); - &genmenu(); - - my $h2 = gettitle($menu); - - $title = "-= IPFire - $title =-"; - if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') { - $title = "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'} - $title"; - } - - print <<END -<?xml version='1.0' encoding='UTF-8'?> -<!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> - $extrahead -END -; - if ($settings{'FX'} ne 'off') { - print <<END - <meta http-equiv="Page-Enter" content="blendTrans(Duration=0.5,Transition=12)" /> - <meta http-equiv="Page-Exit" content="blendTrans(Duration=0.5,Transition=12)" /> -END -; - } - print <<END - <link rel="shortcut icon" href="/favicon.ico" /> - <link rel="stylesheet" type="text/css" href="/include/style.css" /> - <script type="text/javascript"> - - function swapVisibility(id) { - el = document.getElementById(id); - if(el.style.display != 'block') { - el.style.display = 'block' - } - else { - el.style.display = 'none' - } - } - </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"> -END -; -} - -sub closepage () { - my $status = &connectionstatus(); - my $uptime = `/usr/bin/uptime|cut -d " " -f 4-`; - $uptime =~ s/year(s|)/$Lang::tr{'year'}/; - $uptime =~ s/month(s|)/$Lang::tr{'month'}/; - $uptime =~ s/day(s|)/$Lang::tr{'day'}/; - $uptime =~ s/user(s|)/$Lang::tr{'user'}/; - $uptime =~ s/load average/$Lang::tr{'uptime load average'}/; - - print <<END - </div> - </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"> - <b>Status:</b> $status <b>Uptime:</b> $uptime -END -; -if ($settings{'SPEED'} ne 'off') { -print <<END - <br /> - <b>$Lang::tr{'bandwidth usage'}:</b> - $Lang::tr{'incoming'}: <span id="rx_kbs"></span> $Lang::tr{'outgoing'}: <span id="tx_kbs"></span> - -END -; -} -print <<END - </div> - </div> -</div> -</body> -</html> -END -; -} - -sub openbigbox -{ -} - -sub closebigbox -{ -} - -sub openbox -{ - $width = $_[0]; - $align = $_[1]; - $caption = $_[2]; - - print <<END -<!-- openbox --> - <div class="post" align="$align"> -END -; - - if ($caption) { print "<h3>$caption</h3>\n"; } else { print " "; } -} - -sub closebox -{ - print <<END - </div> - <br class="clear" /> - <!-- closebox --> -END -; -} - -1; diff --git a/html/html/themes/maniac/include/style.css b/html/html/themes/maniac/include/style.css deleted file mode 100644 index 27d3982a6..000000000 --- a/html/html/themes/maniac/include/style.css +++ /dev/null @@ -1,479 +0,0 @@ -/* - - Nonzero1.0 by nodethirtythree design - http://www.nodethirtythree.com - missing in a maze - -*/ - -/* This controls the width of the fluid width layouts */ - -div.fluid -{ -width: 90% !important; -} - -/* This controls the width of the fixed width layouts */ - -div.fixed -{ -width: 950px !important; -} - -/* Basic Stuff */ - -* -{ -margin: 0em; -padding: 0em; -} - -body -{ -background-color: #000000; -color: rgb(255,128,0); -font-size: 9pt; -font-family: "trebuchet ms", helvetica, sans-serif; -} - -h1,h2,h3,h4,h5,h6 -{ -background-color: #000000; -font-weight: normal; -letter-spacing: -1px; -text-transform: lowercase; -text-align: left; -} - -h3,h4,h5,h6 -{ -background-color: #000000; -color: silver; -} - -h1 span -{ -font-weight: bold; -color: rgb(255,128,0); -} - -h3 span -{ -background-color: #000000; -font-weight: bold; -} - -h4 span -{ -background-color: #000000; -font-weight: bold; -} - -br.clear -{ -background-color: #000000; -clear: both; -} - -img -{ -} - -img.floatTL -{ -float: left; -margin-right: 1.5em; -margin-bottom: 1.5em; -margin-top: 0.5em; -} - -a -{ -text-decoration: underline; -color: white; -} - -a:hover -{ -text-decoration: none; -} - -ul.links -{ -list-style: none; -} - -ul.links li -{ -line-height: 2em; -} - -ul.links li.first -{ -} - -p -{ -line-height: 1.8em; -} - -/* Header */ - -#header -{ -width:100%; -height:100px; -background: #000000 url('/themes/maniac/images/b1.gif') repeat-x; -} - -#header_inner -{ -position: relative; -width: 700px; -height:110px; -margin: 0 auto; -} - -/* Logo */ - -#logo -{ -position: absolute; -bottom: 0.6em; -} - -#logo h1 -{ -display: inline; -color: #fff; -font-size: 2.6em; -} - -#logo h2 -{ -display: inline; -padding-left: 0.5em; -color: white; -font-size: 1.0em; -} - -/* Menu */ - -#menu -{ -position: absolute; -right: 0em; -bottom: 0em; -} - -#menu ul -{ -list-style: none; -} - -#menu li -{ -float: left; -} - -#menu li a -{ -margin-left: 0.5em; -display: block; -padding: 1.1em 1.4em 1.0em 1.4em; -background: url('/themes/maniac/images/b4.gif') repeat-x; -border: solid 1px #fff; -color: #616161; -font-weight: bold; -font-size: 1.0em; -text-transform: lowercase; -text-decoration: none; -} - -#menu li a.active -{ -background: url('/themes/maniac/images/b3.gif') repeat-x; -color: #fff; -border: solid 1px silver; -} - -/* Main */ - -#main -{ -background: #000000 url('/themes/maniac/images/b2.gif') 0px 1px repeat-x; -} - -#main_inner p -{ -text-align: justify; -margin-bottom: 2.0em; -} - -#main_inner ul -{ -margin-bottom: 2.0em; -} - -#main_inner -{ -position: relative; -width: 950px; -margin: 0 auto; -padding-top: 3.5em; -} - -#main_inner h3,h4 -{ -border-bottom: dotted 1px #E1E1E1; -position: relative; -padding-bottom: 0.4em; -} - -#main_inner h3 -{ -font-size: 2.1em; -padding-bottom: 0.1em; -} - -#main_inner h4 -{ -font-size: 1.2em; -padding-bottom: 0.175em; -margin-bottom: 1.4em; -margin-top: 0.95em; -} - -#main_inner .post -{ -position: relative; -} - -#main_inner .post h3 -{ -position: relative; -font-size: 1.7em; -padding-bottom: 0.4em; -} - -#main_inner .post ul.post_info -{ -list-style: none; -position: absolute; -top: 3em; -font-size: 0.8em; -} - -#main_inner .post ul.post_info li -{ -background-position: 0em 0.2em; -background-repeat: no-repeat; -display: inline; -padding-left: 18px; -} - -#main_inner .post ul.post_info li.date -{ -background-image: url('/themes/maniac/images/b5.gif'); -} - -#main_inner .post ul.post_info li.comments -{ -background-image: url('/themes/maniac/images/b6.gif'); -margin-left: 1.1em; -} - -/* Footer */ - -#footer -{ -width: 950px; -margin: 0 auto; -text-align: center; -clear: both; -border-top: dotted 1px #E1E1E1; -margin-top: 1.0em; -margin-bottom: 1.0em; -padding-top: 1.0em; -text-transform: lowercase; -} - -/* Search */ - -select -{ -margin: 0.2em; -background-color: rgb(255,128,0); color:black; border:1px solid silver; -} - -textarea -{ -margin: 0.2em; -background-color: rgb(255,128,0); color:black; border:1px solid silver; -} - -checkbox -{ -margin: 0.2em; -background-color: rgb(255,128,0); color:black; border:1px solid silver; -} - -radio -{ -margin: 0.2em; -background-color: rgb(255,128,0); color:black; border:1px solid silver; -} - -input -{ -margin: 0.2em; -background-color: rgb(255,128,0); color:black; border:1px solid silver; -} - -input.button -{ -background: #CA2F2F url('/themes/maniac/images/b3.gif') repeat-x; -color: #fff; -border: solid 1px #2941BC; -font-weight: bold; -text-transform: lowercase; -font-size: 0.8em; -height: 2.0em; -} - -input.text -{ -border: solid 1px #F1F1F1; -font-size: 1.0em; -padding: 0.25em 0.25em 0.25em 0.25em; -} - -#search -{ -position: relative; -width: 100%; -margin-bottom: 2.0em; -} - -#search input.text -{ -position: absolute; -top: 0em; -left: 0em; -width: 9.5em; -} - -#search input.button -{ -position: absolute; -top: 0em; -right: 0em; -min-width: 2.0em; -max-width: 2.5em; -} - -table.fw-nat tbody tr td { - height: 2.25em; -} - -/* LAYOUT - 3 COLUMNS */ - - /* Primary content */ - - #primaryContent_3columns - { - position: relative; - margin-right: 34em; - } - - #columnA_3columns - { - position: relative; - float: left; - width: 100%; - margin-right: -34em; - padding-right: 2em; - } - - /* Secondary Content */ - - #secondaryContent_3columns - { - float: right; - } - - #columnB_3columns - { - width: 13.0em; - float: left; - padding: 0em 2em 0.5em 2em; - border-left: dotted 1px #E1E1E1; - } - - #columnC_3columns - { - width: 13.0em; - float: left; - padding: 0em 0em 0.5em 2em; - border-left: dotted 1px #E1E1E1; - } - -/* LAYOUT - 2 COLUMNS */ - - /* Primary content */ - - #primaryContent_2columns - { - position: relative; - margin-right: 17em; - } - - #columnA_2columns - { - position: relative; - float: left; - width: 100%; - margin-right: -17em; - padding-right: 2em; - } - - /* Secondary Content */ - - #secondaryContent_2columns - { - float: right; - } - - #columnC_2columns - { - width: 13.0em; - float: left; - padding: 0em 0em 0.5em 2em; - border-left: dotted 1px #E1E1E1; - } - -/* LAYOUT - COLUMNLESS */ - - /* Primary content */ - - #primaryContent_columnless - { - position: relative; - } - - #columnA_columnless - { - position: relative; - width: 100%; - } - -/* FOOTER COLORIZE BANDWIDTH */ - -#rx_kbs { color: green; } - -#tx_kbs { color: red; } - -iframe.graph { - width: 100%; - min-height: 300px; -} diff --git a/lfs/web-user-interface b/lfs/web-user-interface index 7b04ef803..bce6d8eb8 100644 --- a/lfs/web-user-interface +++ b/lfs/web-user-interface @@ -70,7 +70,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) chmod -R 755 /srv/web/ipfire/cgi-bin chmod -R 644 /srv/web/ipfire/html chmod 755 /srv/web/ipfire/html /srv/web/ipfire/html/{index.cgi,redirect.cgi,images,include,themes,themes/*,themes/*/*} - ln -svf ipfire /srv/web/ipfire/html/themes/ipfire-rounded
# Reset permissions of redirect templates and theme directories find /srv/web/ipfire/html/{captive,redirect-templates,themes} -type d | xargs chmod -v 755
Thank you.
On 8 Apr 2021, at 09:36, Jonatan Schlag jonatan.schlag@ipfire.org wrote:
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org
config/rootfiles/common/web-user-interface | 43 -- html/html/themes/darkdos/images/IPFire.png | Bin 11934 -> 0 bytes html/html/themes/darkdos/images/b1.gif | Bin 2446 -> 0 bytes html/html/themes/darkdos/images/b2.gif | Bin 1124 -> 0 bytes html/html/themes/darkdos/images/b3.gif | Bin 839 -> 0 bytes html/html/themes/darkdos/images/b4.gif | Bin 839 -> 0 bytes html/html/themes/darkdos/images/b5.gif | Bin 72 -> 0 bytes html/html/themes/darkdos/images/b6.gif | Bin 70 -> 0 bytes html/html/themes/darkdos/images/spacer.gif | Bin 43 -> 0 bytes html/html/themes/darkdos/include/colors.txt | 25 - html/html/themes/darkdos/include/functions.pl | 404 --------------- html/html/themes/darkdos/include/style.css | 473 ----------------- html/html/themes/ipfire-legacy/images/n1.gif | Bin 1014 -> 0 bytes html/html/themes/ipfire-legacy/images/n2.gif | Bin 449 -> 0 bytes html/html/themes/ipfire-legacy/images/n3.gif | Bin 155 -> 0 bytes html/html/themes/ipfire-legacy/images/n4.gif | Bin 155 -> 0 bytes html/html/themes/ipfire-legacy/images/n5.gif | Bin 72 -> 0 bytes html/html/themes/ipfire-legacy/images/n6.gif | Bin 70 -> 0 bytes .../themes/ipfire-legacy/images/spacer.gif | Bin 43 -> 0 bytes .../themes/ipfire-legacy/include/colors.txt | 25 - .../themes/ipfire-legacy/include/functions.pl | 404 --------------- .../themes/ipfire-legacy/include/style.css | 450 ---------------- .../ipfire/include/css/style-rounded.css | 82 --- html/html/themes/maniac/images/IPFire.png | Bin 11934 -> 0 bytes html/html/themes/maniac/images/b1.gif | Bin 1323 -> 0 bytes html/html/themes/maniac/images/b2.gif | Bin 1167 -> 0 bytes html/html/themes/maniac/images/b3.gif | Bin 847 -> 0 bytes html/html/themes/maniac/images/b4.gif | Bin 847 -> 0 bytes html/html/themes/maniac/images/b5.gif | Bin 72 -> 0 bytes html/html/themes/maniac/images/b6.gif | Bin 70 -> 0 bytes html/html/themes/maniac/images/spacer.gif | Bin 43 -> 0 bytes html/html/themes/maniac/include/colors.txt | 25 - html/html/themes/maniac/include/functions.pl | 404 --------------- html/html/themes/maniac/include/style.css | 479 ------------------ lfs/web-user-interface | 1 - 35 files changed, 2815 deletions(-) delete mode 100644 html/html/themes/darkdos/images/IPFire.png delete mode 100644 html/html/themes/darkdos/images/b1.gif delete mode 100644 html/html/themes/darkdos/images/b2.gif delete mode 100644 html/html/themes/darkdos/images/b3.gif delete mode 100644 html/html/themes/darkdos/images/b4.gif delete mode 100644 html/html/themes/darkdos/images/b5.gif delete mode 100644 html/html/themes/darkdos/images/b6.gif delete mode 100644 html/html/themes/darkdos/images/spacer.gif delete mode 100644 html/html/themes/darkdos/include/colors.txt delete mode 100644 html/html/themes/darkdos/include/functions.pl delete mode 100644 html/html/themes/darkdos/include/style.css delete mode 100644 html/html/themes/ipfire-legacy/images/n1.gif delete mode 100644 html/html/themes/ipfire-legacy/images/n2.gif delete mode 100644 html/html/themes/ipfire-legacy/images/n3.gif delete mode 100644 html/html/themes/ipfire-legacy/images/n4.gif delete mode 100644 html/html/themes/ipfire-legacy/images/n5.gif delete mode 100644 html/html/themes/ipfire-legacy/images/n6.gif delete mode 100644 html/html/themes/ipfire-legacy/images/spacer.gif delete mode 100644 html/html/themes/ipfire-legacy/include/colors.txt delete mode 100644 html/html/themes/ipfire-legacy/include/functions.pl delete mode 100644 html/html/themes/ipfire-legacy/include/style.css delete mode 100644 html/html/themes/ipfire/include/css/style-rounded.css delete mode 100644 html/html/themes/maniac/images/IPFire.png delete mode 100644 html/html/themes/maniac/images/b1.gif delete mode 100644 html/html/themes/maniac/images/b2.gif delete mode 100644 html/html/themes/maniac/images/b3.gif delete mode 100644 html/html/themes/maniac/images/b4.gif delete mode 100644 html/html/themes/maniac/images/b5.gif delete mode 100644 html/html/themes/maniac/images/b6.gif delete mode 100644 html/html/themes/maniac/images/spacer.gif delete mode 100644 html/html/themes/maniac/include/colors.txt delete mode 100644 html/html/themes/maniac/include/functions.pl delete mode 100644 html/html/themes/maniac/include/style.css
diff --git a/config/rootfiles/common/web-user-interface b/config/rootfiles/common/web-user-interface index 23e9f3e5e..4d9f7b52f 100644 --- a/config/rootfiles/common/web-user-interface +++ b/config/rootfiles/common/web-user-interface @@ -309,35 +309,7 @@ srv/web/ipfire/html/redirect-templates/legacy srv/web/ipfire/html/redirect-templates/legacy/template.html srv/web/ipfire/html/redirect.cgi srv/web/ipfire/html/themes -srv/web/ipfire/html/themes/darkdos -srv/web/ipfire/html/themes/darkdos/images -srv/web/ipfire/html/themes/darkdos/images/IPFire.png -srv/web/ipfire/html/themes/darkdos/images/b1.gif -srv/web/ipfire/html/themes/darkdos/images/b2.gif -srv/web/ipfire/html/themes/darkdos/images/b3.gif -srv/web/ipfire/html/themes/darkdos/images/b4.gif -srv/web/ipfire/html/themes/darkdos/images/b5.gif -srv/web/ipfire/html/themes/darkdos/images/b6.gif -srv/web/ipfire/html/themes/darkdos/images/spacer.gif -srv/web/ipfire/html/themes/darkdos/include -srv/web/ipfire/html/themes/darkdos/include/colors.txt -srv/web/ipfire/html/themes/darkdos/include/functions.pl -srv/web/ipfire/html/themes/darkdos/include/style.css srv/web/ipfire/html/themes/ipfire -srv/web/ipfire/html/themes/ipfire-legacy -srv/web/ipfire/html/themes/ipfire-legacy/images -srv/web/ipfire/html/themes/ipfire-legacy/images/n1.gif -srv/web/ipfire/html/themes/ipfire-legacy/images/n2.gif -srv/web/ipfire/html/themes/ipfire-legacy/images/n3.gif -srv/web/ipfire/html/themes/ipfire-legacy/images/n4.gif -srv/web/ipfire/html/themes/ipfire-legacy/images/n5.gif -srv/web/ipfire/html/themes/ipfire-legacy/images/n6.gif -srv/web/ipfire/html/themes/ipfire-legacy/images/spacer.gif -srv/web/ipfire/html/themes/ipfire-legacy/include -srv/web/ipfire/html/themes/ipfire-legacy/include/colors.txt -srv/web/ipfire/html/themes/ipfire-legacy/include/functions.pl -srv/web/ipfire/html/themes/ipfire-legacy/include/style.css -srv/web/ipfire/html/themes/ipfire-rounded srv/web/ipfire/html/themes/ipfire/images srv/web/ipfire/html/themes/ipfire/images/n2.gif srv/web/ipfire/html/themes/ipfire/images/n3.gif @@ -347,25 +319,10 @@ srv/web/ipfire/html/themes/ipfire/images/tux2.png srv/web/ipfire/html/themes/ipfire/include srv/web/ipfire/html/themes/ipfire/include/colors.txt srv/web/ipfire/html/themes/ipfire/include/css -srv/web/ipfire/html/themes/ipfire/include/css/style-rounded.css srv/web/ipfire/html/themes/ipfire/include/css/style.css srv/web/ipfire/html/themes/ipfire/include/functions.pl srv/web/ipfire/html/themes/ipfire/include/js srv/web/ipfire/html/themes/ipfire/include/js/refreshInetInfo.js -srv/web/ipfire/html/themes/maniac -srv/web/ipfire/html/themes/maniac/images -srv/web/ipfire/html/themes/maniac/images/IPFire.png -srv/web/ipfire/html/themes/maniac/images/b1.gif -srv/web/ipfire/html/themes/maniac/images/b2.gif -srv/web/ipfire/html/themes/maniac/images/b3.gif -srv/web/ipfire/html/themes/maniac/images/b4.gif -srv/web/ipfire/html/themes/maniac/images/b5.gif -srv/web/ipfire/html/themes/maniac/images/b6.gif -srv/web/ipfire/html/themes/maniac/images/spacer.gif -srv/web/ipfire/html/themes/maniac/include -srv/web/ipfire/html/themes/maniac/include/colors.txt -srv/web/ipfire/html/themes/maniac/include/functions.pl -srv/web/ipfire/html/themes/maniac/include/style.css var/updatecache var/updatecache/download var/updatecache/metadata diff --git a/html/html/themes/darkdos/images/IPFire.png b/html/html/themes/darkdos/images/IPFire.png deleted file mode 100644 index ec56b7af56e9d1c7ae5dccedd63078aea66f2542..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001
literal 11934 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
diff --git a/html/html/themes/darkdos/images/b1.gif b/html/html/themes/darkdos/images/b1.gif deleted file mode 100644 index 123ff917e9373e33767dcd6529eb5442c2c0060e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001
literal 2446 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 M_rCxpZ9o73J8-mNDgXcg
diff --git a/html/html/themes/darkdos/images/b2.gif b/html/html/themes/darkdos/images/b2.gif deleted file mode 100644 index 0172874506cc27922c3f71b77e38cbd6b98abe34..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001
literal 1124 zcmZ?wbhEHbv|&(U_|Cw<!obAMz`)PQAk4@h#>gPW$RNkapuotW%E+L>$e_o>V8X;; z$;4pC#Nf=t;Kj@kz|0WJ%n-}Wkj~673PwX<sE2?K$OE9fz`*gJft^FfW5a@j%^bp7 zIvxua9&Q&<_L}3dQOSi_!Z_>BiH(bo_bZsoNqBBra&odp@T!<hqsG(I4U$jI@!Y)Z z><q4=S9eZsUVeVQL-VH?hb=2EF7}wL6?^K7M)UH3#a?s0wywImI!HR>?y0S-udh!y z-1YX=f;BfcXIx$tdwQGhE%t)Pr{;QZUw3zR#dD_{r?;=azrTT*Tkef{)5F6Z!rF0X zc5HlnL`cbdp3lxrPfyP<&c1hM=jP{}3!J;<e0Obmd3l9<b==uqTVG$FCx3dL?`^|} zw|5ltpF6#Kd;XrhW^Va=Wote@K5;ZD_S~MISC?H_?47Q)W!Kl&j`>;l&)rpPdjH^X zx2L@SzCAxbKZ;xxf4(lY@%x9zr|0|c-}m?TC-GPJ&&Mxp_|L$m@t}c4EaO2V6Wf9Z hO+02V9yANMX(To?gk(Hyl}KChuuZ0{Bhi7u8URXJyCMJp
diff --git a/html/html/themes/darkdos/images/b3.gif b/html/html/themes/darkdos/images/b3.gif deleted file mode 100644 index 8c8fba3bd3a0e0c8840afcc8485ee1f20e38c816..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001
literal 839 zcmZ?wbhEHbWMt4{_|CwvnOA5xuh3y$q0_uVmwAQm@`^m+6@JSr@}HOgKOgT`Ug7_| zg8zAi{s0+*y#IxG|BLbdm*8a>1*0J_EJ8pB<O@(<VBpYUVCPT?IB=kmnM=wbVgrLC i6Fa}0LkEN6BW89^0fUqa4hJ2XSvfdF1Q;9~7_0$9uOHU{
diff --git a/html/html/themes/darkdos/images/b4.gif b/html/html/themes/darkdos/images/b4.gif deleted file mode 100644 index 5964fa7726b4a9cefc6141f4938512c485509e18..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001
literal 839 zcmZ?wbhEHbWMt4{_|CxaKidAko9ll!kN@sI|GixP`#Ar13;pjN_1`t_zkB?DkHG(d z&i_Lk|3^6dcT4>5ne^Wah>{sb!Dt8!ixAKO`2v&|7&vqoggHtY9yBmAbFp!72sAh} ivhqlnFkDbjYG!5SFc2|tICzkmLx!V9fYHf;!5RQUuPMj?
diff --git a/html/html/themes/darkdos/images/b5.gif b/html/html/themes/darkdos/images/b5.gif deleted file mode 100644 index a03224278920646cba16f1047d653cc34851d45a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001
literal 72 zcmZ?wbhEHb<YnMxXkcLY|NsB8B?}dQvM@3LfewfO$v7~{xAaS9R<E1kBCsYa^=NM! XztQy{fnpUiGk(pvu&vF3k--`O2p$*w
diff --git a/html/html/themes/darkdos/images/b6.gif b/html/html/themes/darkdos/images/b6.gif deleted file mode 100644 index ed1781c5ffd981df8bc1bdb63fdae6c2fc77ac62..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001
literal 70 zcmZ?wbhEHb<YnMxXkcLY|NsB8B?}dQvM@3LfewfO$v7~{w)Bgi-1uOTasS2atCI!I VR}>1(2n;owx?soLv%w4u)&T5W7e@d9
diff --git a/html/html/themes/darkdos/images/spacer.gif b/html/html/themes/darkdos/images/spacer.gif deleted file mode 100644 index 5bfd67a2d6f72ac3a55cbfcea5866e841d22f5d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001
literal 43 mcmZ?wbhEHbWMp7uXkdT>#h)yUAf^t80Ld^gF}W}@SOWlZ0R#L1
diff --git a/html/html/themes/darkdos/include/colors.txt b/html/html/themes/darkdos/include/colors.txt deleted file mode 100644 index 6efefc53f..000000000 --- a/html/html/themes/darkdos/include/colors.txt +++ /dev/null @@ -1,25 +0,0 @@ -color1=#CD0000 -color2=#FF0000 -color3=#CD0000 -color4=#FA1818 -color5=#CD0000 -color6=#FF0000 -color7=#FF2424 -color8=#FF5050 -color9=#EE0F0F -color10=#EE0000 -color11=#0000FF -color12=#00FF00 -color13=#FF0000 -color14=#F32020 -color15=#CCCCCC -color16=#40E0D0 -color17=#90EE90 -color18=#F4A460 -color19=#EAE9EE -color20=#1C1C1C -color21=#CD6600 -color22=#4F4F4F -color23=#FF00FF -color24=#6464FF -color25=#FF6464 diff --git a/html/html/themes/darkdos/include/functions.pl b/html/html/themes/darkdos/include/functions.pl deleted file mode 100644 index ed3f546b0..000000000 --- a/html/html/themes/darkdos/include/functions.pl +++ /dev/null @@ -1,404 +0,0 @@ -#!/usr/bin/perl -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see http://www.gnu.org/licenses/. # -# # -###############################################################################
-sub showmenu() {
- print <<EOF
<div id="menu"><ul>-EOF -;
- foreach my $k1 ( sort keys %$menu ) {
- if (! $menu->{$k1}{'enabled'}) {
next;- }
- my $link = getlink($menu->{$k1});
- if ($link eq '') {
next;- }
- if (! is_menu_visible($link)) {
next;- }
- if ($menu->{$k1}->{'selected'}) {
print "<li><a href=\"$link\" class=\"active\">$menu->{$k1}{'caption'}</a></li>";- } else {
print "<li><a href=\"$link\">$menu->{$k1}{'caption'}</a></li>";- }
- }
- print <<EOF
</ul></div>-EOF -; -}
-sub getselected($) {
- my $root = shift;
- if (!$root) {
- return 0;
- }
- foreach my $item (%$root) {
- if ($root->{$item}{'selected'}) {
return $root->{$item};- }
- }
-}
-sub showsubsection($$) {
- my $root = shift;
- if (! $root) {
- return;
- }
- my $selected = getselected($root);
- if (! $selected) {
- return;
- }
- my $submenus = $selected->{'subMenu'};
- if (! $submenus) {
- return;
- }
- print <<EOF
<h4><span>Side</span>menu</h4>
<ul class="links">
-EOF -;
- foreach my $item (sort keys %$submenus) {
- my $hash = $submenus->{$item};
- if (! $hash->{'enabled'}) {
next;- }
- my $link = getlink($hash);
- if ($link eq '') {
next;- }
- if (! is_menu_visible($link)) {
next;- }
- if ($hash->{'selected'}) {
print '<li class="selected">';- } else {
print '<li>';- }
- print "<a href="$link">$hash->{'caption'}</a></li>";
- }
- print <<EOF
</ul>
-EOF -; -}
-sub showsubsubsection($) {
- my $root = shift;
- if (!$root) {
- return;
- }
- my $selected = getselected($root);
- if (! $selected) {
- return
- }
- if (! $selected->{'subMenu'}) {
- return
- }
- showsubsection($selected->{'subMenu'}, 'menu-subtop');
-}
-sub openpage {
- my $title = shift;
- my $boh = shift;
- my $extrahead = shift;
- @URI=split ('?', $ENV{'REQUEST_URI'} );
- &General::readhash("${swroot}/main/settings", %settings);
- &genmenu();
- my $h2 = gettitle($menu);
- $title = "-= IPFire - $title =-";
- if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
$title = "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'} - $title";- }
- print <<END
-<?xml version='1.0' encoding='UTF-8'?> -<!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>- $extrahead
<link rel="shortcut icon" href="/favicon.ico" />
<link rel="stylesheet" type="text/css" href="/themes/darkdos/include/style.css" />
<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'}}- </script>
-END -; -if ($settings{'SPEED'} ne 'off') { -print <<END
<script type="text/javascript" src="/include/jquery.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();});- </script>
</head>
<body>
-END -; -} -else { -print "</head>\n<body>";} -print <<END -<!-- IPFIRE HEADER -->
-<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><a href='https://www.ipfire.org' style='text-decoration: none;'>-= IPFire =-</a></span></h1><br />";}print <<END<h2>+ $h2 +</h2></div>-END -;
- &showmenu();
-print <<END
</div>
-</div>
-<div id="main">
<div id="main_inner" class="fixed">
<div id="primaryContent_2columns"><div id="columnA_2columns">-END -; -}
-sub openpagewithoutmenu {
- my $title = shift;
- my $boh = shift;
- my $extrahead = shift;
- @URI=split ('?', $ENV{'REQUEST_URI'} );
- &General::readhash("${swroot}/main/settings", %settings);
- &genmenu();
- my $h2 = gettitle($menu);
- $title = "-= IPFire - $title =-";
- if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
$title = "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'} - $title";- }
- print <<END
-<?xml version='1.0' encoding='UTF-8'?> -<!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>$extrahead-END -;
- if ($settings{'FX'} ne 'off') {
- print <<END
<meta http-equiv="Page-Enter" content="blendTrans(Duration=0.5,Transition=12)" />
<meta http-equiv="Page-Exit" content="blendTrans(Duration=0.5,Transition=12)" />
-END -;
- }
- print <<END
<link rel="shortcut icon" href="/favicon.ico" />
<link rel="stylesheet" type="text/css" href="/include/style.css" />
<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'}}- </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">-END -; -}
-sub closepage () {
- my $status = &connectionstatus();
- my $uptime = `/usr/bin/uptime|cut -d " " -f 4-`;
- $uptime =~ s/year(s|)/$Lang::tr{'year'}/;
- $uptime =~ s/month(s|)/$Lang::tr{'month'}/;
- $uptime =~ s/day(s|)/$Lang::tr{'day'}/;
- $uptime =~ s/user(s|)/$Lang::tr{'user'}/;
- $uptime =~ s/load average/$Lang::tr{'uptime load average'}/;
- print <<END
</div></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"><b>Status:</b> $status <b>Uptime:</b> $uptime-END -; -if ($settings{'SPEED'} ne 'off') { -print <<END
<br /><b>$Lang::tr{'bandwidth usage'}:</b>$Lang::tr{'incoming'}: <span id="rx_kbs"></span> $Lang::tr{'outgoing'}: <span id="tx_kbs"></span>-END -; -} -print <<END
</div></div>-</div> -</body> -</html> -END -; -}
-sub openbigbox -{ -}
-sub closebigbox -{ -}
-sub openbox -{
- $width = $_[0];
- $align = $_[1];
- $caption = $_[2];
- print <<END
-<!-- openbox -->
<div class="post" align="$align">
-END -;
- if ($caption) { print "<h3>$caption</h3>\n"; } else { print " "; }
-}
-sub closebox -{
- print <<END
</div>
<br class="clear" />
<!-- closebox -->
-END -; -}
-1; diff --git a/html/html/themes/darkdos/include/style.css b/html/html/themes/darkdos/include/style.css deleted file mode 100644 index b8850677c..000000000 --- a/html/html/themes/darkdos/include/style.css +++ /dev/null @@ -1,473 +0,0 @@ -/*darkdos theme by d4rkd0s*/
-/* This controls the width of the fluid width layouts */
-div.fluid -{ -width: 90% !important; -}
-/* This controls the width of the fixed width layouts */
-div.fixed -{ -width: 950px !important; -}
-/* Basic Stuff */
-* -{ -margin: 0em; -padding: 0em; -}
-body -{ -background-color: #000000; -color: rgb(255,128,0); -font-size: 10pt; -font-family: "trebuchet ms", helvetica, sans-serif; -}
-h1,h2,h3,h4,h5,h6 -{ -background-color: #000000; -font-weight: normal; -letter-spacing: -1px; -text-transform: lowercase; -text-align: left; -}
-h3,h4,h5,h6 -{ -background-color: #000000; -color: silver; -}
-h1 span -{ -font-weight: bold; -color: rgb(255,58,58); -}
-h3 span -{ -background-color: #000000; -font-weight: bold; -}
-h4 span -{ -background-color: #000000; -font-weight: bold; -}
-br.clear -{ -background-color: #000000; -clear: both; -}
-img -{ -}
-img.floatTL -{ -float: left; -margin-right: 1.5em; -margin-bottom: 1.5em; -margin-top: 0.5em; -}
-a -{ -text-decoration: underline; -color: white; -}
-a:hover -{ -text-decoration: none; -}
-ul.links -{ -list-style: none; -}
-ul.links li -{ -line-height: 2em; -}
-ul.links li.first -{ -}
-p -{ -line-height: 1.8em; -}
-/* Header */
-#header -{ -width:100%; -height:100px; -background: #000000 url('/themes/darkdos/images/b1.gif') repeat-x; -}
-#header_inner -{ -position: relative; -width: 700px; -height:110px; -margin: 0 auto; -}
-/* Logo */
-#logo -{ -position: absolute; -bottom: 0.6em; -}
-#logo h1 -{ -display: inline; -color: #fff; -font-size: 2.6em; -}
-#logo h2 -{ -display: inline; -padding-left: 0.5em; -color: white; -font-size: 1.0em; -}
-/* Menu */
-#menu -{ -position: absolute; -right: 0em; -bottom: 0em; -}
-#menu ul -{ -list-style: none; -}
-#menu li -{ -float: left; -}
-#menu li a -{ -margin-left: 0.5em; -display: block; -padding: 1.1em 1.4em 1.0em 1.4em; -background: url('/themes/darkdos/images/b4.gif') repeat-x; -border: solid 1px #fff; -color: #616161; -font-weight: bold; -font-size: 1.0em; -text-transform: lowercase; -text-decoration: none; -}
-#menu li a.active -{ -background: url('/themes/darkdos/images/b3.gif') repeat-x; -color: #fff; -border: solid 1px silver; -}
-/* Main */
-#main -{ -background: #000000 url('/themes/darkdos/images/b2.gif') 0px 1px repeat-x; -}
-#main_inner p -{ -text-align: justify; -margin-bottom: 2.0em; -}
-#main_inner ul -{ -margin-bottom: 2.0em; -}
-#main_inner -{ -position: relative; -width: 950px; -margin: 0 auto; -padding-top: 3.5em; -}
-#main_inner h3,h4 -{ -border-bottom: dotted 1px #E1E1E1; -position: relative; -padding-bottom: 0.4em; -}
-#main_inner h3 -{ -font-size: 2.1em; -padding-bottom: 0.1em; -}
-#main_inner h4 -{ -font-size: 1.2em; -padding-bottom: 0.175em; -margin-bottom: 1.4em; -margin-top: 0.95em; -}
-#main_inner .post -{ -position: relative; -}
-#main_inner .post h3 -{ -position: relative; -font-size: 1.7em; -padding-bottom: 0.4em; -}
-#main_inner .post ul.post_info -{ -list-style: none; -position: absolute; -top: 3em; -font-size: 0.8em; -}
-#main_inner .post ul.post_info li -{ -background-position: 0em 0.2em; -background-repeat: no-repeat; -display: inline; -padding-left: 18px; -}
-#main_inner .post ul.post_info li.date -{ -background-image: url('/themes/darkdos/images/b5.gif'); -}
-#main_inner .post ul.post_info li.comments -{ -background-image: url('/themes/darkdos/images/b6.gif'); -margin-left: 1.1em; -}
-/* Footer */
-#footer -{ -width: 950px; -margin: 0 auto; -text-align: center; -clear: both; -border-top: dotted 1px #E1E1E1; -margin-top: 1.0em; -margin-bottom: 1.0em; -padding-top: 1.0em; -text-transform: lowercase; -}
-/* Search */
-select -{ -margin: 0.2em; -background-color: rgb(255,58,58); color:black; border:1px solid silver; -}
-textarea -{ -margin: 0.2em; -background-color: rgb(255,58,58); color:black; border:1px solid silver; -}
-checkbox -{ -margin: 0.2em; -background-color: rgb(255,58,58); color:black; border:1px solid silver; -}
-radio -{ -margin: 0.2em; -background-color: rgb(255,58,58); color:black; border:1px solid silver; -}
-input -{ -margin: 0.2em; -background-color: rgb(255,58,58); color:black; border:1px solid silver; -}
-input.button -{ -background: #CA2F2F url('/themes/darkdos/images/b3.gif') repeat-x; -color: #fff; -border: solid 1px #2941BC; -font-weight: bold; -text-transform: lowercase; -font-size: 0.8em; -height: 2.0em; -}
-input.text -{ -border: solid 1px #F1F1F1; -font-size: 1.0em; -padding: 0.25em 0.25em 0.25em 0.25em; -}
-#search -{ -position: relative; -width: 100%; -margin-bottom: 2.0em; -}
-#search input.text -{ -position: absolute; -top: 0em; -left: 0em; -width: 9.5em; -}
-#search input.button -{ -position: absolute; -top: 0em; -right: 0em; -min-width: 2.0em; -max-width: 2.5em; -}
-table.fw-nat tbody tr td {
- height: 2.25em;
-}
-/* LAYOUT - 3 COLUMNS */
- /* Primary content */
- #primaryContent_3columns
- {
- position: relative;
- margin-right: 34em;
- }
- #columnA_3columns
- {
- position: relative;
- float: left;
- width: 100%;
- margin-right: -34em;
- padding-right: 2em;
- }
- /* Secondary Content */
- #secondaryContent_3columns
- {
- float: right;
- }
- #columnB_3columns
- {
- width: 13.0em;
- float: left;
- padding: 0em 2em 0.5em 2em;
- border-left: dotted 1px #E1E1E1;
- }
- #columnC_3columns
- {
- width: 13.0em;
- float: left;
- padding: 0em 0em 0.5em 2em;
- border-left: dotted 1px #E1E1E1;
- }
-/* LAYOUT - 2 COLUMNS */
- /* Primary content */
- #primaryContent_2columns
- {
- position: relative;
- margin-right: 17em;
- }
- #columnA_2columns
- {
- position: relative;
- float: left;
- width: 100%;
- margin-right: -17em;
- padding-right: 2em;
- }
- /* Secondary Content */
- #secondaryContent_2columns
- {
- float: right;
- }
- #columnC_2columns
- {
- width: 13.0em;
- float: left;
- padding: 0em 0em 0.5em 2em;
- border-left: dotted 1px #E1E1E1;
- }
-/* LAYOUT - COLUMNLESS */
- /* Primary content */
- #primaryContent_columnless
- {
- position: relative;
- }
- #columnA_columnless
- {
- position: relative;
- width: 100%;
- }
-/* FOOTER COLORIZE BANDWIDTH */
-#rx_kbs { color: green; }
-#tx_kbs { color: red; }
-iframe.graph {
- width: 100%;
- min-height: 300px;
-} diff --git a/html/html/themes/ipfire-legacy/images/n1.gif b/html/html/themes/ipfire-legacy/images/n1.gif deleted file mode 100644 index 6eb5161798f610218190dd64d46a2cdf842f2e68..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001
literal 1014 zcmV<S0}1>`Nk%w1VIBZ_0M!5hhX53O01|=#6M+B|djJx101<fr5_kX-ga8zV02For z5_bR+YXA^r01tHl5pMtxXaEm!01;*Y4{ZPtVE_(p01#gQ4t@X=eE<`G025mP4p#sT zY5)*f01aIL4uAj?asUxy01s3E41)j@g#Z+K01|Wn5l{dOWdILV01aXQ4_*KcYyc2& z01;LI4QT)nP5=x{01H?E4O0LNTmTMQ01ZR{3P%77NdOCH01r(73sL|KU;qvP00000 z00000A^8LV00000EC2ui03HB(06+%+K!6}XEE<UefO5%f9s|jylsP<3uhpk9D$Qz< zSHO20o_e|ErPr8NuC-|DxEPnt>*aG>K2E=%aRP!E3x$S<g#m(#jEoPDkdF=ol$Dm3 z1PYN1Af29{pdc(Lq@|{$5~-@HJTk7Yu&yhssv9RaxVgHxFdM$Vz`=KWYGlMhbAEGR zX3J1}UwC19$A4B>&eGP#&_~kP*L&M^03_z;BpC+l?Ct9p=<x;f^!4)w8TtDA{23(- z02#DEL=aJgfCw2(Sjey;LkSilN}L!G1w)E5PH5c7QR4=RAhR7q24|$TZ_P?pb0$ut zvSldUxXd%N&9Id!iJdf=OlM91a5rhfY%`8onx8KL@yywhDN&YBhbl=xwQAJ?m@s{? zS`~p;uNMx89ZOa$hOcPRVs*f_ty{Jw2FRUDw{C>Hc=Im6z_+j8zZeeObvU7byTk5G z5QYGu!rRAhA26Ow8A7DXm|v*a%(?Ss%N#<B9?hWvjnk-8pH@LSgzMKKXr!1;yY_4i zuybqJog#+s-@tv(*iF26@uJU;N%c7<W|MKw`9xbf9cOjseXKXfzP)MCq}`)_7dn0# zQlR0%U+<P)yi@hwsJ|ya-+X)c;k@5Rzn*@7`{nUhUl-@46rh3oA^2Yz%ju_-b`NqF zp@Z>3SfPYZ$hV+^13p*(U>8|kQU_O8m0;qDD4Li7iBzS9fI5h^bAgL!jbP&lVU?vL z1~>NTqaXn&Amorl3Q0gCNG?Kv2~0NWB$Fk4Amx-)R{4QFSRQb}mRxq}<pl;5(88Ex zlBs|*Ml3*P1#Grife9go=zyCQuwbX15$LGrSOwha=L>*7P~@ORwgBj%h)Tc$mW<Lf z0WFZ`CF!IGHDKwbm|DsKot(A_0R^CjDk`Wsu$j=Q44|;Ws;suUY6A#WR+$Pl)N1Rk zwNfB!rkAeZ!mq#v`>O}MS~@BP8qA>Vvdk*m!Lg!xAgu>3z+mmQ*jk&ywA^;vK?ghF kAnv&2ihIJh=%%X^t`0V|>+ZYl#vsDH^ww*y2tfb<JCZ!4PXGV_
diff --git a/html/html/themes/ipfire-legacy/images/n2.gif b/html/html/themes/ipfire-legacy/images/n2.gif deleted file mode 100644 index b92a19de7af7153d9c02a92866fcdcaab1d5d914..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001
literal 449 zcmV;y0Y3gmNk%w1VFdt90M!5h{{H^_{QUp_|NHy<`T6<x_xJt%{rLF!`uh6y_4V`f z^Yrxe^78WR?CkOJ@%Hxi?d|RB>+9<3>hSRJ?(XjC>FMw9@9600*4Nqa@$v5O@7USd z=I7_$-QVTr=HcMt+}_^W+1u~#?(pyL>FVn3?(W~=;n~~U>g(&|<K^Sx<l^My=;`U{ z=;+YV)7974;o{=d*4EeA+2`o!?Ca~@-`~;H)a>o;=H=($-{IQa+}qvV)z;Y4)YjYD z+~efrA^8LV00000EC2ui00jU|06+%bK-a5MxiliDPQzodP*x07gTYu>9gKojOXzk7 zV6b647MRTvUMLcQKpLG7=Q61)6eW!!@#rTGfPe^tg8_zy0EvlbXc84Y8#-(fGCMhL z4G<qc6ciI99y1dTq%9;6R16Ih8CDAkcL{ubeOp{!1cZZOV26feV~WCxi~<-Ejy8@l z8xj~NlMP29AQ3(_(k7T76c8pV6fh~B5KST}I3sg)B%}@(q%0^7G&iYtczPlhcMh%@ rvKZ{KB5T$IS+)`u2*fZDu7|mF@tQcmm&J>~G8!1hQCP8JK>z?dJcIpz
diff --git a/html/html/themes/ipfire-legacy/images/n3.gif b/html/html/themes/ipfire-legacy/images/n3.gif deleted file mode 100644 index 6627c91a15b21f67fd2d4b52a78f9c7d3513b6ab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001
literal 155 zcmZ?wbhEHbWMoiaIKseiN?(7OvhqG{?PGd+v*hIVXlZTN)I6l4vqDAXfR4^Q1%=hB zsz-En7b+@Fk(J%0rFB$K@1(x|I#ty<^77MVWtS)^ZBSF&s-ba0Uw^Z@Is*n!{K*0q n(*cnnI~`ah7Bq`YoMgxl=;>y}z+h^6Fe$dbz(InioxvIa)8Zxw
diff --git a/html/html/themes/ipfire-legacy/images/n4.gif b/html/html/themes/ipfire-legacy/images/n4.gif deleted file mode 100644 index 86985252b47f996923aa4b464e32faa9a5d66876..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001
literal 155 zcmZ?wbhEHbWMoiaIKsg2|NsAg|Ni~?^XK{V=N~_Q{Qdj)j~_q2eEIV7<;&NvU*Erf z|HFq5Po6w^`0(M~yLX>Gd-n6^&v)<MegFRb&6_uO?%a9w=+W1&Uq65T%zy(Z{$v5m n=zvI&oer!L3at^2TSXc^`Ak=2Xt-?PEF{>@!pX?f&R`7yId@MO
diff --git a/html/html/themes/ipfire-legacy/images/n5.gif b/html/html/themes/ipfire-legacy/images/n5.gif deleted file mode 100644 index a03224278920646cba16f1047d653cc34851d45a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001
literal 72 zcmZ?wbhEHb<YnMxXkcLY|NsB8B?}dQvM@3LfewfO$v7~{xAaS9R<E1kBCsYa^=NM! XztQy{fnpUiGk(pvu&vF3k--`O2p$*w
diff --git a/html/html/themes/ipfire-legacy/images/n6.gif b/html/html/themes/ipfire-legacy/images/n6.gif deleted file mode 100644 index ed1781c5ffd981df8bc1bdb63fdae6c2fc77ac62..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001
literal 70 zcmZ?wbhEHb<YnMxXkcLY|NsB8B?}dQvM@3LfewfO$v7~{w)Bgi-1uOTasS2atCI!I VR}>1(2n;owx?soLv%w4u)&T5W7e@d9
diff --git a/html/html/themes/ipfire-legacy/images/spacer.gif b/html/html/themes/ipfire-legacy/images/spacer.gif deleted file mode 100644 index 5bfd67a2d6f72ac3a55cbfcea5866e841d22f5d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001
literal 43 mcmZ?wbhEHbWMp7uXkdT>#h)yUAf^t80Ld^gF}W}@SOWlZ0R#L1
diff --git a/html/html/themes/ipfire-legacy/include/colors.txt b/html/html/themes/ipfire-legacy/include/colors.txt deleted file mode 100644 index 6d7dd1cba..000000000 --- a/html/html/themes/ipfire-legacy/include/colors.txt +++ /dev/null @@ -1,25 +0,0 @@ -color1=#CD5B45 -color2=#EE6A50 -color3=#FF7256 -color4=#EE9572 -color5=#FFA07A -color6=#CDAF95 -color7=#EECBAD -color8=#FFDAB9 -color9=#FFE4C4 -color10=#FFCCCC -color11=#0000FF -color12=#00FF00 -color13=#FF0000 -color14=#FFD700 -color15=#CCCCCC -color16=#40E0D0 -color17=#90EE90 -color18=#F4A460 -color19=#EAE9EE -color20=#D6D6D6 -color21=#FFFFFF -color22=#F0F0F0 -color23=#FF00FF -color24=#6464FF -color25=#FF6464 diff --git a/html/html/themes/ipfire-legacy/include/functions.pl b/html/html/themes/ipfire-legacy/include/functions.pl deleted file mode 100644 index 26a8763c1..000000000 --- a/html/html/themes/ipfire-legacy/include/functions.pl +++ /dev/null @@ -1,404 +0,0 @@ -#!/usr/bin/perl -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see http://www.gnu.org/licenses/. # -# # -###############################################################################
-sub showmenu() {
- print <<EOF
<div id="menu"><ul>-EOF -;
- foreach my $k1 ( sort keys %$menu ) {
if (! $menu->{$k1}{'enabled'}) {next;}my $link = getlink($menu->{$k1});if ($link eq '') {next;}if (! is_menu_visible($link)) {next;}if ($menu->{$k1}->{'selected'}) {print "<li><a href=\"$link\" class=\"active\">$menu->{$k1}{'caption'}</a></li>";} else {print "<li><a href=\"$link\">$menu->{$k1}{'caption'}</a></li>";}- }
- print <<EOF
</ul></div>-EOF -; -}
-sub getselected($) {
- my $root = shift;
- if (!$root) {
return 0;- }
- foreach my $item (%$root) {
if ($root->{$item}{'selected'}) {return $root->{$item};}- }
-}
-sub showsubsection($$) {
- my $root = shift;
- if (! $root) {
return;- }
- my $selected = getselected($root);
- if (! $selected) {
return;- }
- my $submenus = $selected->{'subMenu'};
- if (! $submenus) {
return;- }
- print <<EOF
<h4><span>Side</span>menu</h4><ul class="links">-EOF -;
- foreach my $item (sort keys %$submenus) {
my $hash = $submenus->{$item};if (! $hash->{'enabled'}) {next;}my $link = getlink($hash);if ($link eq '') {next;}if (! is_menu_visible($link)) {next;}if ($hash->{'selected'}) {print '<li class="selected">';} else {print '<li>';}print "<a href=\"$link\">$hash->{'caption'}</a></li>";- }
- print <<EOF
</ul>-EOF -; -}
-sub showsubsubsection($) {
- my $root = shift;
- if (!$root) {
return;- }
- my $selected = getselected($root);
- if (! $selected) {
return- }
- if (! $selected->{'subMenu'}) {
return- }
- showsubsection($selected->{'subMenu'}, 'menu-subtop');
-}
-sub openpage {
- my $title = shift;
- my $boh = shift;
- my $extrahead = shift;
- @URI=split ('?', $ENV{'REQUEST_URI'} );
- &General::readhash("${swroot}/main/settings", %settings);
- &genmenu();
- my $h2 = gettitle($menu);
- $title = "IPFire - $title";
- if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
$title = "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'} - $title";- }
- print <<END
-<?xml version='1.0' encoding='UTF-8'?> -<!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>- $extrahead
<link rel="shortcut icon" href="/favicon.ico" />
<link rel="stylesheet" type="text/css" href="/themes/ipfire-legacy/include/style.css" />
<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'}}- </script>
-END -; -if ($settings{'SPEED'} ne 'off') { -print <<END
<script type="text/javascript" src="/include/jquery.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();- });
- </script>
</head>
<body>
-END -; -} -else { -print "</head><body>";} -print <<END -<!-- IPFIRE HEADER -->
-<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><a href='https://www.ipfire.org' style='text-decoration: none;'>IPFire</a></span></h1><br />";}print <<END<h2>$h2</h2></div>-END -;
&showmenu();-print <<END
</div>-</div>
-<div id="main">
<div id="main_inner" class="fixed"><div id="primaryContent_2columns"><div id="columnA_2columns">-END -; -}
-sub openpagewithoutmenu {
- my $title = shift;
- my $boh = shift;
- my $extrahead = shift;
- @URI=split ('?', $ENV{'REQUEST_URI'} );
- &General::readhash("${swroot}/main/settings", %settings);
- &genmenu();
- my $h2 = gettitle($menu);
- $title = "IPFire - $title";
- if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
$title = "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'} - $title";- }
- print <<END
-<?xml version='1.0' encoding='UTF-8'?> -<!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>$extrahead-END -;
- if ($settings{'FX'} ne 'off') {
- print <<END
<meta http-equiv="Page-Enter" content="blendTrans(Duration=0.5,Transition=12)" />
<meta http-equiv="Page-Exit" content="blendTrans(Duration=0.5,Transition=12)" />
-END -;
- }
- print <<END
<link rel="shortcut icon" href="/favicon.ico" />
<link rel="stylesheet" type="text/css" href="/include/style.css" />
<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'}}- </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">-END -; -}
-sub closepage () {
- my $status = &connectionstatus();
- my $uptime = `/usr/bin/uptime|cut -d " " -f 4-`;
- $uptime =~ s/year(s|)/$Lang::tr{'year'}/;
- $uptime =~ s/month(s|)/$Lang::tr{'month'}/;
- $uptime =~ s/day(s|)/$Lang::tr{'day'}/;
- $uptime =~ s/user(s|)/$Lang::tr{'user'}/;
- $uptime =~ s/load average/$Lang::tr{'uptime load average'}/;
- print <<END
</div></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"><b>Status:</b> $status <b>Uptime:</b> $uptime-END -; -if ($settings{'SPEED'} ne 'off') { -print <<END
<br /><b>$Lang::tr{'bandwidth usage'}:</b>$Lang::tr{'incoming'}: <span id="rx_kbs"></span> $Lang::tr{'outgoing'}: <span id="tx_kbs"></span>-END -; -} -print <<END
</div></div>-</div> -</body> -</html> -END -; -}
-sub openbigbox -{ -}
-sub closebigbox -{ -}
-sub openbox -{
$width = $_[0];$align = $_[1];$caption = $_[2];print <<END-<!-- openbox -->
<div class="post" align="$align">-END -;
if ($caption) { print "<h3>$caption</h3>\n"; } else { print " "; }-}
-sub closebox -{
print <<END</div><br class="clear" /><!-- closebox -->-END -; -}
-1; diff --git a/html/html/themes/ipfire-legacy/include/style.css b/html/html/themes/ipfire-legacy/include/style.css deleted file mode 100644 index 2e9ea9266..000000000 --- a/html/html/themes/ipfire-legacy/include/style.css +++ /dev/null @@ -1,450 +0,0 @@ -/*
- Nonzero1.0 by nodethirtythree design
- http://www.nodethirtythree.com
- missing in a maze
-*/
-/* This controls the width of the fluid width layouts */
-div.fluid -{ -width: 90% !important; -}
-/* This controls the width of the fixed width layouts */
-div.fixed -{ -width: 950px !important; -}
-/* Basic Stuff */
-* -{ -margin: 0em; -padding: 0em; -}
-body -{ -background-color: #fff; -color: #585858; -font-size: 9pt; -font-family: "trebuchet ms", helvetica, sans-serif; -}
-h1,h2,h3,h4,h5,h6 -{ -font-weight: normal; -letter-spacing: -1px; -text-transform: lowercase; -text-align: left; -}
-h3,h4,h5,h6 -{ -color: #66000F; -}
-h1 span -{ -font-weight: bold; -}
-h3 span -{ -font-weight: bold; -}
-h4 span -{ -font-weight: bold; -}
-br.clear -{ -clear: both; -}
-img -{ -padding: 3px; -#border: solid 1px #e1e1e1; -}
-img.floatTL -{ -float: left; -margin-right: 1.5em; -margin-bottom: 1.5em; -margin-top: 0.5em; -}
-a -{ -text-decoration: underline; -color: #D90000; -}
-a:hover -{ -text-decoration: none; -}
-ul.links -{ -list-style: none; -}
-ul.links li -{ -line-height: 2em; -}
-ul.links li.first -{ -}
-p -{ -line-height: 1.8em; -}
-/* Header */
-#header -{ -width:100%; -height:122px; -background: #440000 url('../images/n1.gif') repeat-x; -}
-#header_inner -{ -position: relative; -width: 950px; -height:122px; -margin: 0 auto; -}
-/* Logo */
-#logo -{ -position: absolute; -bottom: 0.6em; -}
-#logo h1 -{ -display: inline; -color: #fff; -font-size: 2.6em; -}
-#logo h2 -{ -display: inline; -padding-left: 0.5em; -color: #E5CCD0; -font-size: 1.0em; -}
-/* Menu */
-#menu -{ -position: absolute; -right: 0em; -bottom: 0em; -}
-#menu ul -{ -list-style: none; -}
-#menu li -{ -float: left; -}
-#menu li a -{ -margin-left: 0.5em; -display: block; -padding: 1.1em 1.4em 1.0em 1.4em; -background: #fff url('../images/n4.gif') repeat-x; -border: solid 1px #fff; -color: #616161; -font-weight: bold; -font-size: 1.0em; -text-transform: lowercase; -text-decoration: none; -}
-#menu li a.active -{ -background: #CA2F2F url('../images/n3.gif') repeat-x; -color: #fff; -border: solid 1px #A94B4B; -}
-/* Main */
-#main -{ -background: #fff url('../images/n2.gif') 0px 1px repeat-x; -}
-#main_inner p -{ -text-align: justify; -margin-bottom: 2.0em; -}
-#main_inner ul -{ -margin-bottom: 2.0em; -}
-#main_inner -{ -position: relative; -width: 950px; -margin: 0 auto; -padding-top: 3.5em; -}
-#main_inner h3,h4 -{ -border-bottom: dotted 1px #E1E1E1; -position: relative; -}
-#main_inner h3 -{ -font-size: 2.1em; -padding-bottom: 0.1em; -margin-bottom: 0.8em; -}
-#main_inner h4 -{ -font-size: 1.2em; -padding-bottom: 0.175em; -margin-bottom: 1.4em; -margin-top: 0.95em; -}
-#main_inner .post -{ -position: relative; -}
-#main_inner .post h3 -{ -position: relative; -font-size: 1.7em; -padding-bottom: 0.4em; -}
-#main_inner .post ul.post_info -{ -list-style: none; -position: absolute; -top: 3em; -font-size: 0.8em; -}
-#main_inner .post ul.post_info li -{ -background-position: 0em 0.2em; -background-repeat: no-repeat; -display: inline; -padding-left: 18px; -}
-#main_inner .post ul.post_info li.date -{ -background-image: url('../images/n5.gif'); -}
-#main_inner .post ul.post_info li.comments -{ -background-image: url('../images/n6.gif'); -margin-left: 1.1em; -}
-/* Footer */
-#footer -{ -width: 950px; -margin: 0 auto; -text-align: center; -clear: both; -border-top: dotted 1px #E1E1E1; -margin-top: 1.0em; -margin-bottom: 1.0em; -padding-top: 1.0em; -text-transform: lowercase; -}
-/* Search */
-input -{ -margin: 0.2em; -}
-input.button -{ -background: #CA2F2F url('../images/n3.gif') repeat-x; -color: #fff; -border: solid 1px #A94B4B; -font-weight: bold; -text-transform: lowercase; -font-size: 0.8em; -height: 2.0em; -}
-input.text -{ -border: solid 1px #F1F1F1; -font-size: 1.0em; -padding: 0.25em 0.25em 0.25em 0.25em; -}
-#search -{ -position: relative; -width: 100%; -margin-bottom: 2.0em; -}
-#search input.text -{ -position: absolute; -top: 0em; -left: 0em; -width: 9.5em; -}
-#search input.button -{ -position: absolute; -top: 0em; -right: 0em; -min-width: 2.0em; -max-width: 2.5em; -}
-table.fw-nat tbody tr td {
- height: 2.25em;
-}
-/* LAYOUT - 3 COLUMNS */
- /* Primary content */
- #primaryContent_3columns
- {
- position: relative;
- margin-right: 34em;
- }
- #columnA_3columns
- {
- position: relative;
- float: left;
- width: 100%;
- margin-right: -34em;
- padding-right: 2em;
- }
- /* Secondary Content */
- #secondaryContent_3columns
- {
- float: right;
- }
- #columnB_3columns
- {
- width: 13.0em;
- float: left;
- padding: 0em 2em 0.5em 2em;
- border-left: dotted 1px #E1E1E1;
- }
- #columnC_3columns
- {
- width: 13.0em;
- float: left;
- padding: 0em 0em 0.5em 2em;
- border-left: dotted 1px #E1E1E1;
- }
-/* LAYOUT - 2 COLUMNS */
- /* Primary content */
- #primaryContent_2columns
- {
- position: relative;
- margin-right: 17em;
- }
- #columnA_2columns
- {
- position: relative;
- float: left;
- width: 100%;
- margin-right: -17em;
- padding-right: 2em;
- }
- /* Secondary Content */
- #secondaryContent_2columns
- {
- float: right;
- }
- #columnC_2columns
- {
- width: 13.0em;
- float: left;
- padding: 0em 0em 0.5em 2em;
- border-left: dotted 1px #E1E1E1;
- }
-/* LAYOUT - COLUMNLESS */
- /* Primary content */
- #primaryContent_columnless
- {
- position: relative;
- }
- #columnA_columnless
- {
- position: relative;
- width: 100%;
- }
-/* FOOTER COLORIZE BANDWIDTH */
-#rx_kbs { color: green; }
-#tx_kbs { color: red; }
-iframe.graph {
- min-height: 285px;
- width: 750px;
-} diff --git a/html/html/themes/ipfire/include/css/style-rounded.css b/html/html/themes/ipfire/include/css/style-rounded.css deleted file mode 100644 index 886d61f0f..000000000 --- a/html/html/themes/ipfire/include/css/style-rounded.css +++ /dev/null @@ -1,82 +0,0 @@
-.bigbox {
- margin-top: 1em;
- border-radius: 8px 8px 8px 8px;
- -webkit-border-radius: 8px 8px 8px 8px;
-}
-#main_inner .post {
- border-radius: 8px 8px 8px 8px;
- -webkit-border-radius: 8px 8px 8px 8px;
-}
-#cssmenu a {
- border-radius: 8px 8px 8px 8px;
- -webkit-border-radius: 8px 8px 8px 8px;
-}
-#cssmenu .has-sub ul li a {
- border-radius: 7px 7px 7px 7px;
-}
-#cssmenu .has-sub ul li:hover a {
- box-shadow: inset 0 5px 1px rgba(0, 0, 0, 0.15);
- -webkit-box-shadow: inset 0 5px 1px rgba(0, 0, 0, 0.15);
-}
-/* Table */ -/* when using class='bordered' after tabletag */
-.tbl th:first-child {
- -moz-border-radius: 6px 0 0 0;
- -webkit-border-radius: 6px 0 0 0;
- border-radius: 6px 0 0 0;
-}
-.tbl th:last-child {
- -moz-border-radius: 0 6px 0 0;
- -webkit-border-radius: 0 6px 0 0;
- border-radius: 0 6px 0 0;
-}
-.tbl th:only-child {
- -moz-border-radius: 6px 6px 0 0;
- -webkit-border-radius: 6px 6px 0 0;
- border-radius: 6px 6px 0 0;
-}
-.tbl tr:first-child td:first-child {
- -moz-border-radius: 6px 0 0 0;
- -webkit-border-radius: 6px 0 0 0;
- border-radius: 6px 0 0 0;
-}
-.tbl tr:first-child td:last-child {
- -moz-border-radius: 0 6px 0 0;
- -webkit-border-radius: 0 6px 0 0;
- border-radius: 0 6px 0 0;
-}
-.tbl tr:first-child td:only-child {
- -moz-border-radius: 6px 6px 0 0;
- -webkit-border-radius: 6px 6px 0 0;
- border-radius: 6px 6px 0 0;
-}
-.tbl tr:last-child td:first-child {
- -moz-border-radius: 0 0 0 6px;
- -webkit-border-radius: 0 0 0 6px;
- border-radius: 0 0 0 6px;
-}
-.tbl tr:last-child td:last-child {
- -moz-border-radius: 0 0 6px 0;
- -webkit-border-radius: 0 0 6px 0;
- border-radius: 0 0 6px 0;
-}
-.tbl tr:last-child td:only-child {
- -moz-border-radius: 0 0 6px 6px;
- -webkit-border-radius: 0 0 6px 6px;
- border-radius: 0 0 6px 6px;
-} diff --git a/html/html/themes/maniac/images/IPFire.png b/html/html/themes/maniac/images/IPFire.png deleted file mode 100644 index ec56b7af56e9d1c7ae5dccedd63078aea66f2542..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001
literal 11934 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
diff --git a/html/html/themes/maniac/images/b1.gif b/html/html/themes/maniac/images/b1.gif deleted file mode 100644 index 27e005164fd8cad4cfaa92a12e8c0589b35edf7c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001
literal 1323 zcmZ?wbhEHbv|*@X_|5<VoD2;7Yz*RT46-~7$~+9(f((X&43^>ycH#`~vJBp`457*l z5y}jynhZty3?=#u4W<lz)(mqT7*@G4?DSzc9>j1pg5hx-!^aec|5;!YM~Tr87$PB{ z_>+Z^f#E-c4#>TrJi);6pMjY}#$&^RgUuYmS~?aB79MUFQ1+VRu~F#=lZ0{Bof8`u zAMaN%my__^wB+Pujo?)=nMRGLryC@nn&Y{7+1VM~MX&Ch+`Rn!e23;wISyM^TwLri zSu6I`mle&+0~UMD_1e1X>gpiHjJv0{uD-rL;c(YmsfBB9ZqB&8D)#g?-6+n2$EW6c zZ(nzJcg1tR8>hFgzrVkMnOpA7^rnZ0JA}34&g|Iu_=u>I_dK7So1UJYVH~{ez|PIj z&o6N9mh=7fx%Kjj;MH+wcWr%reU;&fdA_^1y}iAo`1QKE3%9?&f1sIL-fxdZ0q=>) z+VSW1?EL)v!gT5RetWAv-o3Fo`#SIL-QVA@_wN2L?>}$Lv(GOsr`Mg?x3~Iu%j47Y z?Jd^-{r%(PuDj>=*WYGmVAFWez#^9Mppk>G<7yL+S%oOGfSbm{7Ll-whpiHRD-N{D zl)ZS^uF$6Os6$RE;Zdi?vK5cIbhf=n>S8;h@wmt2TE^pEi)S9nj5gn1Jnna3(|j_) z<)6lZi5_YzpG@*Gd--It7n8!%DIsB*Pp3wtt$aEyrtIa@=?QI`&t{}d%X~I7W7*1Q zvvRh*d^Wq_nCA02CD$^a&#id2^7*`)Z!e$EZ(!4Uv7kjP>&3zjwN)<`^_abSv3P=; z*2^VR!m?g2osqWc<+3?tuU;-+(5Cfj#gb`RuU4*Dw(8ZYHQQdjTD{>Iht}&gTdvJY Ibzrat0Bf>0`~Uy|
diff --git a/html/html/themes/maniac/images/b2.gif b/html/html/themes/maniac/images/b2.gif deleted file mode 100644 index 2ae47ed34415fa26401df887af45c3cb2cae8683..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001
literal 1167 zcmZ?wbhEHbv|&(U_|Cw<$-p4a#-Pl@pe@K?D9B(b&R{3b;4aJHEz1z9%n+f>kgCa0 zq|Z>I&(L7X&}Yps$AMv$8^cZ?hT}mDS0fl6$1!|NVfdfLFbYOPU?_%w;!hSv28RC( zIv~e`@&p6Ne+G6A8IKJM4mNWLYw1KRSa`TyK-p`K$3~?i%o4^~cTQ|ve7s-5Tus7r z(~^^uHG)^gWEM4^o^FtQYL4gTWoKvb6ur80a`W=@^BtN$l{jo!adEN7WUbg!UtTmX z4_NFq*K6yltE+<)Gwz<+y88P1gu`8Lr53KaxjEzVs@T)pbfY*69-o@)y?x!?-4)OM zZk*n}{{H?3W^TDR)0-Y1?hw|FJF{cs<0GO<-t&BRZhCrphH>z=13NcAKfl1aTh8~_ z=hn+Bf>+0#-L>`g^;O=d=lRaw^6d7G;`F*RySL{bZ)xV1x3gIP@$rd|yJFAnsl2`M z!eVdn?ybANz7C(Ab^qMl%;xtG4tM9s`|sQH^Yf$pRq^NVEo=Jz;qmGD{`>d+{rySs z#r^a9_y7OTz^0K<&nA-bppipu#e*guvknDD0XL0@Eh1qV4_hVtG!C@Ml)ZS^uF$6O ns6&n|;Zdi?vK5cIbhf=n>S8#e@wmt2TE^pEi)S9m4h+@+Wpmui
diff --git a/html/html/themes/maniac/images/b3.gif b/html/html/themes/maniac/images/b3.gif deleted file mode 100644 index fd3c7d018c27fcf7f6345426465ded2e94d2b443..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001
literal 847 zcmZ?wbhEHbWMt4{_|Cx4WyvtnhGB+1!+a-(Wv&cs-5IucG3@qbI2gciBADTP7{j#) zhP%-WPvRI}Co+6WVfdNO@IQ-T6pV(z@CX6LpDc_F4F4H)K;8l62?h=w26hgWfCC2_ rnK^_sA~rNQGPCo`Idm{6K4NC)l`sgIz;Mu!nU#Y>M1aA;fx#L8VBsRw
diff --git a/html/html/themes/maniac/images/b4.gif b/html/html/themes/maniac/images/b4.gif deleted file mode 100644 index 70337c1a1dbebb776fb2a21d5ec9cbeb5b6f5207..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001
literal 847 zcmZ?wbhEHbWMt4{_|Cxacv9r6sgWONME;l^`F~#I{{@l%7f1eI7Wsc=<o`91|JO(U z-x&FSOXUCUk^gr^{@)w<|3Kvb!;uW5U^E1VMF=SVWMO1r_|KpN@(n0YFmUKFuyd#c u95~R(%ps%^v7y0{nVnzGp@Tv35i>ilgh9vzhJ%jGtQ;I70t^lg4AuYxcQYvf
diff --git a/html/html/themes/maniac/images/b5.gif b/html/html/themes/maniac/images/b5.gif deleted file mode 100644 index a03224278920646cba16f1047d653cc34851d45a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001
literal 72 zcmZ?wbhEHb<YnMxXkcLY|NsB8B?}dQvM@3LfewfO$v7~{xAaS9R<E1kBCsYa^=NM! XztQy{fnpUiGk(pvu&vF3k--`O2p$*w
diff --git a/html/html/themes/maniac/images/b6.gif b/html/html/themes/maniac/images/b6.gif deleted file mode 100644 index ed1781c5ffd981df8bc1bdb63fdae6c2fc77ac62..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001
literal 70 zcmZ?wbhEHb<YnMxXkcLY|NsB8B?}dQvM@3LfewfO$v7~{w)Bgi-1uOTasS2atCI!I VR}>1(2n;owx?soLv%w4u)&T5W7e@d9
diff --git a/html/html/themes/maniac/images/spacer.gif b/html/html/themes/maniac/images/spacer.gif deleted file mode 100644 index 5bfd67a2d6f72ac3a55cbfcea5866e841d22f5d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001
literal 43 mcmZ?wbhEHbWMp7uXkdT>#h)yUAf^t80Ld^gF}W}@SOWlZ0R#L1
diff --git a/html/html/themes/maniac/include/colors.txt b/html/html/themes/maniac/include/colors.txt deleted file mode 100644 index 39961e3be..000000000 --- a/html/html/themes/maniac/include/colors.txt +++ /dev/null @@ -1,25 +0,0 @@ -color1=#CD3700 -color2=#FF4500 -color3=#CD6600 -color4=#FF7F00 -color5=#CD8500 -color6=#FFA500 -color7=#FF7F24 -color8=#FFA54F -color9=#EEAD0E -color10=#EEC900 -color11=#0000FF -color12=#00FF00 -color13=#FF0000 -color14=#FFD700 -color15=#CCCCCC -color16=#40E0D0 -color17=#90EE90 -color18=#F4A460 -color19=#EAE9EE -color20=#1C1C1C -color21=#CD6600 -color22=#4F4F4F -color23=#FF00FF -color24=#6464FF -color25=#FF6464 diff --git a/html/html/themes/maniac/include/functions.pl b/html/html/themes/maniac/include/functions.pl deleted file mode 100644 index 1c0aea1c4..000000000 --- a/html/html/themes/maniac/include/functions.pl +++ /dev/null @@ -1,404 +0,0 @@ -#!/usr/bin/perl -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see http://www.gnu.org/licenses/. # -# # -###############################################################################
-sub showmenu() {
- print <<EOF
<div id="menu"><ul>-EOF -;
- foreach my $k1 ( sort keys %$menu ) {
- if (! $menu->{$k1}{'enabled'}) {
next;- }
- my $link = getlink($menu->{$k1});
- if ($link eq '') {
next;- }
- if (! is_menu_visible($link)) {
next;- }
- if ($menu->{$k1}->{'selected'}) {
print "<li><a href=\"$link\" class=\"active\">$menu->{$k1}{'caption'}</a></li>";- } else {
print "<li><a href=\"$link\">$menu->{$k1}{'caption'}</a></li>";- }
- }
- print <<EOF
</ul></div>-EOF -; -}
-sub getselected($) {
- my $root = shift;
- if (!$root) {
- return 0;
- }
- foreach my $item (%$root) {
- if ($root->{$item}{'selected'}) {
return $root->{$item};- }
- }
-}
-sub showsubsection($$) {
- my $root = shift;
- if (! $root) {
- return;
- }
- my $selected = getselected($root);
- if (! $selected) {
- return;
- }
- my $submenus = $selected->{'subMenu'};
- if (! $submenus) {
- return;
- }
- print <<EOF
<h4><span>Side</span>menu</h4>
<ul class="links">
-EOF -;
- foreach my $item (sort keys %$submenus) {
- my $hash = $submenus->{$item};
- if (! $hash->{'enabled'}) {
next;- }
- my $link = getlink($hash);
- if ($link eq '') {
next;- }
- if (! is_menu_visible($link)) {
next;- }
- if ($hash->{'selected'}) {
print '<li class="selected">';- } else {
print '<li>';- }
- print "<a href="$link">$hash->{'caption'}</a></li>";
- }
- print <<EOF
</ul>
-EOF -; -}
-sub showsubsubsection($) {
- my $root = shift;
- if (!$root) {
- return;
- }
- my $selected = getselected($root);
- if (! $selected) {
- return
- }
- if (! $selected->{'subMenu'}) {
- return
- }
- showsubsection($selected->{'subMenu'}, 'menu-subtop');
-}
-sub openpage {
- my $title = shift;
- my $boh = shift;
- my $extrahead = shift;
- @URI=split ('?', $ENV{'REQUEST_URI'} );
- &General::readhash("${swroot}/main/settings", %settings);
- &genmenu();
- my $h2 = gettitle($menu);
- $title = "-= IPFire - $title =-";
- if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
$title = "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'} - $title";- }
- print <<END
-<?xml version='1.0' encoding='UTF-8'?> -<!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>- $extrahead
<link rel="shortcut icon" href="/favicon.ico" />
<link rel="stylesheet" type="text/css" href="/themes/maniac/include/style.css" />
<script type="text/javascript">
function swapVisibility(id) {el = document.getElementById(id);if(el.style.display != 'block') {el.style.display = 'block'}else {el.style.display = 'none'}}- </script>
-END -; -if ($settings{'SPEED'} ne 'off') { -print <<END
<script type="text/javascript" src="/include/jquery.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();});- </script>
</head>
<body>
-END -; -} -else { -print "</head>\n<body>";} -print <<END -<!-- IPFIRE HEADER -->
-<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><a href='https://www.ipfire.org' style='text-decoration: none;'>-= IPFire =-</a></span></h1><br />";}print <<END<h2>+ $h2 +</h2></div>-END -;
- &showmenu();
-print <<END
</div>
-</div>
-<div id="main">
<div id="main_inner" class="fixed">
<div id="primaryContent_2columns"><div id="columnA_2columns">-END -; -}
-sub openpagewithoutmenu {
- my $title = shift;
- my $boh = shift;
- my $extrahead = shift;
- @URI=split ('?', $ENV{'REQUEST_URI'} );
- &General::readhash("${swroot}/main/settings", %settings);
- &genmenu();
- my $h2 = gettitle($menu);
- $title = "-= IPFire - $title =-";
- if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
$title = "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'} - $title";- }
- print <<END
-<?xml version='1.0' encoding='UTF-8'?> -<!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>$extrahead-END -;
- if ($settings{'FX'} ne 'off') {
- print <<END
<meta http-equiv="Page-Enter" content="blendTrans(Duration=0.5,Transition=12)" />
<meta http-equiv="Page-Exit" content="blendTrans(Duration=0.5,Transition=12)" />
-END -;
- }
- print <<END
<link rel="shortcut icon" href="/favicon.ico" />
<link rel="stylesheet" type="text/css" href="/include/style.css" />
<script type="text/javascript">
function swapVisibility(id) {el = document.getElementById(id);if(el.style.display != 'block') {el.style.display = 'block'}else {el.style.display = 'none'}}- </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">-END -; -}
-sub closepage () {
- my $status = &connectionstatus();
- my $uptime = `/usr/bin/uptime|cut -d " " -f 4-`;
- $uptime =~ s/year(s|)/$Lang::tr{'year'}/;
- $uptime =~ s/month(s|)/$Lang::tr{'month'}/;
- $uptime =~ s/day(s|)/$Lang::tr{'day'}/;
- $uptime =~ s/user(s|)/$Lang::tr{'user'}/;
- $uptime =~ s/load average/$Lang::tr{'uptime load average'}/;
- print <<END
</div></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"><b>Status:</b> $status <b>Uptime:</b> $uptime-END -; -if ($settings{'SPEED'} ne 'off') { -print <<END
<br /><b>$Lang::tr{'bandwidth usage'}:</b>$Lang::tr{'incoming'}: <span id="rx_kbs"></span> $Lang::tr{'outgoing'}: <span id="tx_kbs"></span>-END -; -} -print <<END
</div></div>-</div> -</body> -</html> -END -; -}
-sub openbigbox -{ -}
-sub closebigbox -{ -}
-sub openbox -{
- $width = $_[0];
- $align = $_[1];
- $caption = $_[2];
- print <<END
-<!-- openbox -->
<div class="post" align="$align">
-END -;
- if ($caption) { print "<h3>$caption</h3>\n"; } else { print " "; }
-}
-sub closebox -{
- print <<END
</div>
<br class="clear" />
<!-- closebox -->
-END -; -}
-1; diff --git a/html/html/themes/maniac/include/style.css b/html/html/themes/maniac/include/style.css deleted file mode 100644 index 27d3982a6..000000000 --- a/html/html/themes/maniac/include/style.css +++ /dev/null @@ -1,479 +0,0 @@ -/*
- Nonzero1.0 by nodethirtythree design
- http://www.nodethirtythree.com
- missing in a maze
-*/
-/* This controls the width of the fluid width layouts */
-div.fluid -{ -width: 90% !important; -}
-/* This controls the width of the fixed width layouts */
-div.fixed -{ -width: 950px !important; -}
-/* Basic Stuff */
-* -{ -margin: 0em; -padding: 0em; -}
-body -{ -background-color: #000000; -color: rgb(255,128,0); -font-size: 9pt; -font-family: "trebuchet ms", helvetica, sans-serif; -}
-h1,h2,h3,h4,h5,h6 -{ -background-color: #000000; -font-weight: normal; -letter-spacing: -1px; -text-transform: lowercase; -text-align: left; -}
-h3,h4,h5,h6 -{ -background-color: #000000; -color: silver; -}
-h1 span -{ -font-weight: bold; -color: rgb(255,128,0); -}
-h3 span -{ -background-color: #000000; -font-weight: bold; -}
-h4 span -{ -background-color: #000000; -font-weight: bold; -}
-br.clear -{ -background-color: #000000; -clear: both; -}
-img -{ -}
-img.floatTL -{ -float: left; -margin-right: 1.5em; -margin-bottom: 1.5em; -margin-top: 0.5em; -}
-a -{ -text-decoration: underline; -color: white; -}
-a:hover -{ -text-decoration: none; -}
-ul.links -{ -list-style: none; -}
-ul.links li -{ -line-height: 2em; -}
-ul.links li.first -{ -}
-p -{ -line-height: 1.8em; -}
-/* Header */
-#header -{ -width:100%; -height:100px; -background: #000000 url('/themes/maniac/images/b1.gif') repeat-x; -}
-#header_inner -{ -position: relative; -width: 700px; -height:110px; -margin: 0 auto; -}
-/* Logo */
-#logo -{ -position: absolute; -bottom: 0.6em; -}
-#logo h1 -{ -display: inline; -color: #fff; -font-size: 2.6em; -}
-#logo h2 -{ -display: inline; -padding-left: 0.5em; -color: white; -font-size: 1.0em; -}
-/* Menu */
-#menu -{ -position: absolute; -right: 0em; -bottom: 0em; -}
-#menu ul -{ -list-style: none; -}
-#menu li -{ -float: left; -}
-#menu li a -{ -margin-left: 0.5em; -display: block; -padding: 1.1em 1.4em 1.0em 1.4em; -background: url('/themes/maniac/images/b4.gif') repeat-x; -border: solid 1px #fff; -color: #616161; -font-weight: bold; -font-size: 1.0em; -text-transform: lowercase; -text-decoration: none; -}
-#menu li a.active -{ -background: url('/themes/maniac/images/b3.gif') repeat-x; -color: #fff; -border: solid 1px silver; -}
-/* Main */
-#main -{ -background: #000000 url('/themes/maniac/images/b2.gif') 0px 1px repeat-x; -}
-#main_inner p -{ -text-align: justify; -margin-bottom: 2.0em; -}
-#main_inner ul -{ -margin-bottom: 2.0em; -}
-#main_inner -{ -position: relative; -width: 950px; -margin: 0 auto; -padding-top: 3.5em; -}
-#main_inner h3,h4 -{ -border-bottom: dotted 1px #E1E1E1; -position: relative; -padding-bottom: 0.4em; -}
-#main_inner h3 -{ -font-size: 2.1em; -padding-bottom: 0.1em; -}
-#main_inner h4 -{ -font-size: 1.2em; -padding-bottom: 0.175em; -margin-bottom: 1.4em; -margin-top: 0.95em; -}
-#main_inner .post -{ -position: relative; -}
-#main_inner .post h3 -{ -position: relative; -font-size: 1.7em; -padding-bottom: 0.4em; -}
-#main_inner .post ul.post_info -{ -list-style: none; -position: absolute; -top: 3em; -font-size: 0.8em; -}
-#main_inner .post ul.post_info li -{ -background-position: 0em 0.2em; -background-repeat: no-repeat; -display: inline; -padding-left: 18px; -}
-#main_inner .post ul.post_info li.date -{ -background-image: url('/themes/maniac/images/b5.gif'); -}
-#main_inner .post ul.post_info li.comments -{ -background-image: url('/themes/maniac/images/b6.gif'); -margin-left: 1.1em; -}
-/* Footer */
-#footer -{ -width: 950px; -margin: 0 auto; -text-align: center; -clear: both; -border-top: dotted 1px #E1E1E1; -margin-top: 1.0em; -margin-bottom: 1.0em; -padding-top: 1.0em; -text-transform: lowercase; -}
-/* Search */
-select -{ -margin: 0.2em; -background-color: rgb(255,128,0); color:black; border:1px solid silver; -}
-textarea -{ -margin: 0.2em; -background-color: rgb(255,128,0); color:black; border:1px solid silver; -}
-checkbox -{ -margin: 0.2em; -background-color: rgb(255,128,0); color:black; border:1px solid silver; -}
-radio -{ -margin: 0.2em; -background-color: rgb(255,128,0); color:black; border:1px solid silver; -}
-input -{ -margin: 0.2em; -background-color: rgb(255,128,0); color:black; border:1px solid silver; -}
-input.button -{ -background: #CA2F2F url('/themes/maniac/images/b3.gif') repeat-x; -color: #fff; -border: solid 1px #2941BC; -font-weight: bold; -text-transform: lowercase; -font-size: 0.8em; -height: 2.0em; -}
-input.text -{ -border: solid 1px #F1F1F1; -font-size: 1.0em; -padding: 0.25em 0.25em 0.25em 0.25em; -}
-#search -{ -position: relative; -width: 100%; -margin-bottom: 2.0em; -}
-#search input.text -{ -position: absolute; -top: 0em; -left: 0em; -width: 9.5em; -}
-#search input.button -{ -position: absolute; -top: 0em; -right: 0em; -min-width: 2.0em; -max-width: 2.5em; -}
-table.fw-nat tbody tr td {
- height: 2.25em;
-}
-/* LAYOUT - 3 COLUMNS */
- /* Primary content */
- #primaryContent_3columns
- {
- position: relative;
- margin-right: 34em;
- }
- #columnA_3columns
- {
- position: relative;
- float: left;
- width: 100%;
- margin-right: -34em;
- padding-right: 2em;
- }
- /* Secondary Content */
- #secondaryContent_3columns
- {
- float: right;
- }
- #columnB_3columns
- {
- width: 13.0em;
- float: left;
- padding: 0em 2em 0.5em 2em;
- border-left: dotted 1px #E1E1E1;
- }
- #columnC_3columns
- {
- width: 13.0em;
- float: left;
- padding: 0em 0em 0.5em 2em;
- border-left: dotted 1px #E1E1E1;
- }
-/* LAYOUT - 2 COLUMNS */
- /* Primary content */
- #primaryContent_2columns
- {
- position: relative;
- margin-right: 17em;
- }
- #columnA_2columns
- {
- position: relative;
- float: left;
- width: 100%;
- margin-right: -17em;
- padding-right: 2em;
- }
- /* Secondary Content */
- #secondaryContent_2columns
- {
- float: right;
- }
- #columnC_2columns
- {
- width: 13.0em;
- float: left;
- padding: 0em 0em 0.5em 2em;
- border-left: dotted 1px #E1E1E1;
- }
-/* LAYOUT - COLUMNLESS */
- /* Primary content */
- #primaryContent_columnless
- {
- position: relative;
- }
- #columnA_columnless
- {
- position: relative;
- width: 100%;
- }
-/* FOOTER COLORIZE BANDWIDTH */
-#rx_kbs { color: green; }
-#tx_kbs { color: red; }
-iframe.graph {
- width: 100%;
- min-height: 300px;
-} diff --git a/lfs/web-user-interface b/lfs/web-user-interface index 7b04ef803..bce6d8eb8 100644 --- a/lfs/web-user-interface +++ b/lfs/web-user-interface @@ -70,7 +70,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) chmod -R 755 /srv/web/ipfire/cgi-bin chmod -R 644 /srv/web/ipfire/html chmod 755 /srv/web/ipfire/html /srv/web/ipfire/html/{index.cgi,redirect.cgi,images,include,themes,themes/*,themes/*/*}
ln -svf ipfire /srv/web/ipfire/html/themes/ipfire-rounded
# Reset permissions of redirect templates and theme directories find /srv/web/ipfire/html/{captive,redirect-templates,themes} -type d | xargs chmod -v 755
-- 2.20.1
Hello,
Can we not avoid loading %mainsettings in many of the CGI scripts?
-Michael
On 8 Apr 2021, at 09:36, Jonatan Schlag jonatan.schlag@ipfire.org wrote:
This disables the theme support and makes it impossible to use any other themes than the ipfire default theme.
The only intention of this patch is to hardcode the theme to ipfire. To change any cgi we have is an ugly way, but the only way to do this fast. The colour handling needs certainly to be improved as well, but this will and should be done in other patches.
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org
config/cfgroot/graphs.pl | 4 +- config/cfgroot/header.pl | 3 +- html/cgi-bin/atm-status.cgi | 2 +- html/cgi-bin/backup.cgi | 2 +- html/cgi-bin/captive.cgi | 2 +- html/cgi-bin/connscheduler.cgi | 2 +- html/cgi-bin/ddns.cgi | 2 +- html/cgi-bin/dhcp.cgi | 2 +- html/cgi-bin/dns.cgi | 2 +- html/cgi-bin/dnsforward.cgi | 2 +- html/cgi-bin/firewall.cgi | 2 +- html/cgi-bin/fwhosts.cgi | 2 +- html/cgi-bin/guardian.cgi | 2 +- html/cgi-bin/gui.cgi | 45 -------------------- html/cgi-bin/hardwaregraphs.cgi | 2 +- html/cgi-bin/hosts.cgi | 2 +- html/cgi-bin/ids.cgi | 2 +- html/cgi-bin/index.cgi | 2 +- html/cgi-bin/ipinfo.cgi | 2 +- html/cgi-bin/location-block.cgi | 2 +- html/cgi-bin/logs.cgi/firewalllog.dat | 2 +- html/cgi-bin/logs.cgi/firewalllogcountry.dat | 2 +- html/cgi-bin/logs.cgi/firewalllogip.dat | 2 +- html/cgi-bin/logs.cgi/firewalllogport.dat | 2 +- html/cgi-bin/logs.cgi/ids.dat | 2 +- html/cgi-bin/logs.cgi/log.dat | 2 +- html/cgi-bin/logs.cgi/ovpnclients.dat | 2 +- html/cgi-bin/logs.cgi/proxylog.dat | 2 +- html/cgi-bin/logs.cgi/urlfilter.dat | 2 +- html/cgi-bin/mail.cgi | 2 +- html/cgi-bin/mdstat.cgi | 2 +- html/cgi-bin/media.cgi | 2 +- html/cgi-bin/memory.cgi | 2 +- html/cgi-bin/mpfire.cgi | 2 +- html/cgi-bin/netexternal.cgi | 2 +- html/cgi-bin/netinternal.cgi | 2 +- html/cgi-bin/netother.cgi | 2 +- html/cgi-bin/netovpnrw.cgi | 2 +- html/cgi-bin/netovpnsrv.cgi | 2 +- html/cgi-bin/ovpnmain.cgi | 2 +- html/cgi-bin/p2p-block.cgi | 2 +- html/cgi-bin/pakfire.cgi | 2 +- html/cgi-bin/pppsetup.cgi | 2 +- html/cgi-bin/proxy.cgi | 2 +- html/cgi-bin/qos.cgi | 2 +- html/cgi-bin/remote.cgi | 2 +- html/cgi-bin/routing.cgi | 2 +- html/cgi-bin/samba.cgi | 2 +- html/cgi-bin/services.cgi | 2 +- html/cgi-bin/system.cgi | 2 +- html/cgi-bin/tor.cgi | 2 +- html/cgi-bin/traffic.cgi | 2 +- html/cgi-bin/updatexlrator.cgi | 2 +- html/cgi-bin/vpnmain.cgi | 2 +- html/cgi-bin/vulnerabilities.cgi | 2 +- html/cgi-bin/wakeonlan.cgi | 2 +- html/cgi-bin/wirelessclient.cgi | 2 +- html/cgi-bin/wlanap.cgi | 2 +- html/html/themes/ipfire/include/functions.pl | 10 ++--- src/scripts/makegraphs | 2 +- src/squid-accounting/accounting.cgi | 2 +- src/wio/wio-graphs.pl | 2 +- src/wio/wio.cgi | 2 +- 63 files changed, 64 insertions(+), 116 deletions(-)
diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl index cf4a30de3..441d4c483 100644 --- a/config/cfgroot/graphs.pl +++ b/config/cfgroot/graphs.pl @@ -62,14 +62,12 @@ my @GRAPH_ARGS = ( "--alt-y-grid", );
-# Read the global settings files to get the current theme and after this load -# colors for this theme
my %color = (); my %mainsettings = (); my %sensorsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
if ( $mainsettings{'RRDLOG'} eq "" ){ $mainsettings{'RRDLOG'}="/var/log/rrd"; diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl index 8dea804d0..83ef01951 100644 --- a/config/cfgroot/header.pl +++ b/config/cfgroot/header.pl @@ -91,11 +91,10 @@ if ( -d "/var/ipfire/langs/${language}/" ) { }; };
-our $THEME_NAME = $settings{'THEME'};
require "${swroot}/langs/en.pl"; require "${swroot}/langs/${language}.pl"; -eval `/bin/cat /srv/web/ipfire/html/themes/$THEME_NAME/include/functions.pl`; +eval `/bin/cat /srv/web/ipfire/html/themes/ipfire/include/functions.pl`;
sub green_used() { if ($ethsettings{'GREEN_DEV'} && $ethsettings{'GREEN_DEV'} ne "") { diff --git a/html/cgi-bin/atm-status.cgi b/html/cgi-bin/atm-status.cgi index c2a9914f7..49f19209d 100644 --- a/html/cgi-bin/atm-status.cgi +++ b/html/cgi-bin/atm-status.cgi @@ -33,7 +33,7 @@ my %color = (); my %mainsettings = ();
&General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
&Header::showhttpheaders(); &Header::openpage($Lang::tr{'status information'}, 1, ''); diff --git a/html/cgi-bin/backup.cgi b/html/cgi-bin/backup.cgi index cac4146ab..683f8add4 100644 --- a/html/cgi-bin/backup.cgi +++ b/html/cgi-bin/backup.cgi @@ -42,7 +42,7 @@ my @backupisos = ""; $a = new CGI;
&General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
$cgiparams{'ACTION'} = ''; $cgiparams{'FILE'} = ''; diff --git a/html/cgi-bin/captive.cgi b/html/cgi-bin/captive.cgi index 8204eb7b3..51c5d45f2 100755 --- a/html/cgi-bin/captive.cgi +++ b/html/cgi-bin/captive.cgi @@ -69,7 +69,7 @@ unless (-e $settingsfile) { system("touch $settingsfile"); } &Header::getcgihash(%cgiparams);
&General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color); &General::readhash("$settingsfile", %settings) if(-f $settingsfile); &General::readhash("${General::swroot}/ethernet/settings", %netsettings);
diff --git a/html/cgi-bin/connscheduler.cgi b/html/cgi-bin/connscheduler.cgi index 90aae52fb..1393df65f 100644 --- a/html/cgi-bin/connscheduler.cgi +++ b/html/cgi-bin/connscheduler.cgi @@ -34,7 +34,7 @@ require '/var/ipfire/connscheduler/lib.pl'; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
my $buttontext = $Lang::tr{'add'}; my $hiddenvalue = 'add'; diff --git a/html/cgi-bin/ddns.cgi b/html/cgi-bin/ddns.cgi index 9b58db895..7e4ddb5b7 100644 --- a/html/cgi-bin/ddns.cgi +++ b/html/cgi-bin/ddns.cgi @@ -37,7 +37,7 @@ undef (@dummy); my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
# Config file for basic configuration. my $settingsfile = "${General::swroot}/ddns/settings"; diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi index 867614f2a..dd379dc47 100644 --- a/html/cgi-bin/dhcp.cgi +++ b/html/cgi-bin/dhcp.cgi @@ -111,7 +111,7 @@ foreach my $itf (@ITFs) { &General::readhash("${General::swroot}/ethernet/settings", %netsettings); &General::readhash("${General::swroot}/main/settings", %mainsettings); &General::readhash("${General::swroot}/time/settings", %timesettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
#Get GUI values &Header::getcgihash(%dhcpsettings); diff --git a/html/cgi-bin/dns.cgi b/html/cgi-bin/dns.cgi index 337166ccf..7dc113582 100755 --- a/html/cgi-bin/dns.cgi +++ b/html/cgi-bin/dns.cgi @@ -65,7 +65,7 @@ my $check_servers; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
&Header::showhttpheaders(); &Header::getcgihash(%cgiparams); diff --git a/html/cgi-bin/dnsforward.cgi b/html/cgi-bin/dnsforward.cgi index ed373c09a..749d1216a 100644 --- a/html/cgi-bin/dnsforward.cgi +++ b/html/cgi-bin/dnsforward.cgi @@ -43,7 +43,7 @@ my $changed = 'no'; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
&Header::showhttpheaders();
diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi index 532f99f91..4f4d63cc8 100644 --- a/html/cgi-bin/firewall.cgi +++ b/html/cgi-bin/firewall.cgi @@ -99,7 +99,7 @@ my $checkorange=''; my @protocols; &General::readhash("${General::swroot}/firewall/settings", %fwdfwsettings); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color); &General::readhash($fwoptions, %optionsfw); &General::readhash($ifacesettings, %ifaces); &General::readhash("$configovpn", %ovpnsettings); diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi index fe5117ae5..84b018459 100644 --- a/html/cgi-bin/fwhosts.cgi +++ b/html/cgi-bin/fwhosts.cgi @@ -83,7 +83,7 @@ unless (-e $configsrvgrp) { system("touch $configsrvgrp"); } unless (-e $configlocationgrp) { system("touch $configlocationgrp"); }
&General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color); &General::readhash("${General::swroot}/ethernet/settings", %ownnet); &General::readhash("$configovpn", %ovpnsettings); &General::readhasharray("$configipsec", %ipsecconf); diff --git a/html/cgi-bin/guardian.cgi b/html/cgi-bin/guardian.cgi index 7dc6b0149..fb16be00e 100644 --- a/html/cgi-bin/guardian.cgi +++ b/html/cgi-bin/guardian.cgi @@ -60,7 +60,7 @@ our %netsettings = (); our %color = (); our %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
# File declarations. my $settingsfile = "${General::swroot}/guardian/settings"; diff --git a/html/cgi-bin/gui.cgi b/html/cgi-bin/gui.cgi index f06b0f923..1b316a2a2 100644 --- a/html/cgi-bin/gui.cgi +++ b/html/cgi-bin/gui.cgi @@ -88,7 +88,6 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}") $mainsettings{'WINDOWWITHHOSTNAME'} = $cgiparams{'WINDOWWITHHOSTNAME'}; $mainsettings{'PPPUPDOWNBEEP'} = $cgiparams{'PPPUPDOWNBEEP'}; $mainsettings{'SPEED'} = $cgiparams{'SPEED'};
- $mainsettings{'THEME'} = $cgiparams{'theme'}; $mainsettings{'REFRESHINDEX'} = $cgiparams{'REFRESHINDEX'}; &General::writehash("${General::swroot}/main/settings", %mainsettings); &Lang::reload($cgiparams{'lang'});
@@ -106,12 +105,6 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}") $cgiparams{'PPPUPDOWNBEEP'} = 'on'; }
- if ($mainsettings{'THEME'}) {
$cgiparams{'THEME'} = $mainsettings{'THEME'};- } else {
$cgiparams{'THEME'} = 'ipfire';- }
- if($mainsettings{'REFRESHINDEX'}) { $cgiparams{'REFRESHINDEX'} = $mainsettings{'REFRESHINDEX'}; } else {
@@ -134,7 +127,6 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'restore defaults'}") $cgiparams{'PPPUPDOWNBEEP'} = 'on'; $cgiparams{'REFRESHINDEX'} = 'off'; $cgiparams{'SPEED'} = 'on';
- $cgiparams{'THEME'} = 'ipfire';
}
$checked{'WINDOWWITHHOSTNAME'}{'off'} = ''; @@ -210,43 +202,6 @@ END ; }
-print <<END -</select></td></tr> -</table> -END -; -&Header::closebox(); -&Header::openbox('100%','left',$Lang::tr{'theme'}); -print<<END; -<table> -<tr>
<td> </td>
<td><select name='theme'>
-END -;
-my $dir = "/srv/web/ipfire/html/themes"; -local *DH; -my ($item, $file); -my @files;
-# Foreach directory create am theme entry to be selected by user
-opendir (DH, $dir); -while ($file = readdir (DH)) {
- next if ( $file =~ /^./ );
- push (@files, $file);
-} -closedir (DH);
-foreach $item (sort (@files)) {
- if ( "$mainsettings{'THEME'}" eq "$item" ) {
print "<option value='$item' selected='selected'>$item</option>\n";- } else {
print "<option value='$item'>$item</option>\n";- }
-}
print <<END </select></td></tr>
</table> diff --git a/html/cgi-bin/hardwaregraphs.cgi b/html/cgi-bin/hardwaregraphs.cgi index 5c677d815..813d32f7b 100644 --- a/html/cgi-bin/hardwaregraphs.cgi +++ b/html/cgi-bin/hardwaregraphs.cgi @@ -33,7 +33,7 @@ require "${General::swroot}/graphs.pl"; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", \%mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", \%color);
my %sensorsettings = ();
diff --git a/html/cgi-bin/hosts.cgi b/html/cgi-bin/hosts.cgi index 1c9df5a62..d9e9cb0af 100644 --- a/html/cgi-bin/hosts.cgi +++ b/html/cgi-bin/hosts.cgi @@ -40,7 +40,7 @@ our $datafile = "${General::swroot}/main/hosts"; #(our: used in subroutine) my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
our %settings = (); #Settings1 diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index 83d5f52ba..85c5ddd86 100644 --- a/html/cgi-bin/ids.cgi +++ b/html/cgi-bin/ids.cgi @@ -44,7 +44,7 @@ my %ignored=();
# Read-in main settings, for language, theme and colors. &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
# Get the available network zones, based on the config type of the system and store # the list of zones in an array. diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index fdf62361d..4ac237d0f 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -70,7 +70,7 @@ $pppsettings{'PROFILENAME'} = 'None'; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
my $connstate = &Header::connectionstatus();
diff --git a/html/cgi-bin/ipinfo.cgi b/html/cgi-bin/ipinfo.cgi index 31b4a16d4..fd490b08e 100644 --- a/html/cgi-bin/ipinfo.cgi +++ b/html/cgi-bin/ipinfo.cgi @@ -36,7 +36,7 @@ require "${General::swroot}/location-functions.pl"; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
my %cgiparams=();
diff --git a/html/cgi-bin/location-block.cgi b/html/cgi-bin/location-block.cgi index 5bd70dfb5..df3f397a6 100644 --- a/html/cgi-bin/location-block.cgi +++ b/html/cgi-bin/location-block.cgi @@ -42,7 +42,7 @@ my %cgiparams = (); &General::readhash("$settingsfile", %settings);
&General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
&Header::showhttpheaders();
diff --git a/html/cgi-bin/logs.cgi/firewalllog.dat b/html/cgi-bin/logs.cgi/firewalllog.dat index 361bf0432..e326d65c0 100644 --- a/html/cgi-bin/logs.cgi/firewalllog.dat +++ b/html/cgi-bin/logs.cgi/firewalllog.dat @@ -27,7 +27,7 @@ require "${General::swroot}/header.pl"; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
use POSIX();
diff --git a/html/cgi-bin/logs.cgi/firewalllogcountry.dat b/html/cgi-bin/logs.cgi/firewalllogcountry.dat index e3901b945..a55b80511 100644 --- a/html/cgi-bin/logs.cgi/firewalllogcountry.dat +++ b/html/cgi-bin/logs.cgi/firewalllogcountry.dat @@ -405,7 +405,7 @@ my $color=0; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
if ($showpie != 2 && $pienumber <= 50 && $pienumber != 0) { my $mygraph = GD::Graph::pie->new(500, 350); diff --git a/html/cgi-bin/logs.cgi/firewalllogip.dat b/html/cgi-bin/logs.cgi/firewalllogip.dat index 6de4081af..4474a8c59 100644 --- a/html/cgi-bin/logs.cgi/firewalllogip.dat +++ b/html/cgi-bin/logs.cgi/firewalllogip.dat @@ -378,7 +378,7 @@ my $color=0; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
if ($showpie != 2 && $pienumber <= 50 && $pienumber != 0) { my $mygraph = GD::Graph::pie->new(500, 350); diff --git a/html/cgi-bin/logs.cgi/firewalllogport.dat b/html/cgi-bin/logs.cgi/firewalllogport.dat index 67fe6aa6e..bcaffad70 100644 --- a/html/cgi-bin/logs.cgi/firewalllogport.dat +++ b/html/cgi-bin/logs.cgi/firewalllogport.dat @@ -378,7 +378,7 @@ use GD::Graph::colour qw( :files ); my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
if ($showpie != 2 && $pienumber <= 50 && $pienumber != 0) { my $mygraph = GD::Graph::pie->new(500, 350); diff --git a/html/cgi-bin/logs.cgi/ids.dat b/html/cgi-bin/logs.cgi/ids.dat index 74cad6267..b9c19aa17 100644 --- a/html/cgi-bin/logs.cgi/ids.dat +++ b/html/cgi-bin/logs.cgi/ids.dat @@ -25,7 +25,7 @@ require "${General::swroot}/header.pl"; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
use POSIX();
diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat index 1fec05c35..e467e1d2e 100644 --- a/html/cgi-bin/logs.cgi/log.dat +++ b/html/cgi-bin/logs.cgi/log.dat @@ -22,7 +22,7 @@ require "${General::swroot}/header.pl"; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
use POSIX();
diff --git a/html/cgi-bin/logs.cgi/ovpnclients.dat b/html/cgi-bin/logs.cgi/ovpnclients.dat index a064893a1..5e2c1ff49 100755 --- a/html/cgi-bin/logs.cgi/ovpnclients.dat +++ b/html/cgi-bin/logs.cgi/ovpnclients.dat @@ -34,7 +34,7 @@ require "${General::swroot}/header.pl"; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
# Path and file of the OVPN connections database. my $database = "/var/ipfire/ovpn/clients.db"; diff --git a/html/cgi-bin/logs.cgi/proxylog.dat b/html/cgi-bin/logs.cgi/proxylog.dat index 1d1844e7c..8724768ea 100644 --- a/html/cgi-bin/logs.cgi/proxylog.dat +++ b/html/cgi-bin/logs.cgi/proxylog.dat @@ -35,7 +35,7 @@ my $errormessage = ''; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
my @shortmonths = ( 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec' ); diff --git a/html/cgi-bin/logs.cgi/urlfilter.dat b/html/cgi-bin/logs.cgi/urlfilter.dat index 221ed74ac..554169ab0 100644 --- a/html/cgi-bin/logs.cgi/urlfilter.dat +++ b/html/cgi-bin/logs.cgi/urlfilter.dat @@ -24,7 +24,7 @@ require "${General::swroot}/header.pl"; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
my $dbdir = "${General::swroot}/urlfilter/blacklists"; my $logdir = "/var/log/squidGuard"; diff --git a/html/cgi-bin/mail.cgi b/html/cgi-bin/mail.cgi index 7865a1da6..68c516660 100755 --- a/html/cgi-bin/mail.cgi +++ b/html/cgi-bin/mail.cgi @@ -43,7 +43,7 @@ my $errormessage=''; #Read all parameters for site &Header::getcgihash(%cgiparams); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
#Show Headers &Header::showhttpheaders(); diff --git a/html/cgi-bin/mdstat.cgi b/html/cgi-bin/mdstat.cgi index e22856f1f..d476e074d 100644 --- a/html/cgi-bin/mdstat.cgi +++ b/html/cgi-bin/mdstat.cgi @@ -33,7 +33,7 @@ my %color = (); my %mainsettings = ();
&General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
&Header::showhttpheaders(); &Header::openpage($Lang::tr{'status information'}, 1, ''); diff --git a/html/cgi-bin/media.cgi b/html/cgi-bin/media.cgi index 5753bc301..f574729ed 100644 --- a/html/cgi-bin/media.cgi +++ b/html/cgi-bin/media.cgi @@ -33,7 +33,7 @@ require "${General::swroot}/graphs.pl"; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
#workaround to suppress a warning when a variable is used only once my @dummy = ( ${Header::colourred} ); diff --git a/html/cgi-bin/memory.cgi b/html/cgi-bin/memory.cgi index 1708b0f32..204365294 100644 --- a/html/cgi-bin/memory.cgi +++ b/html/cgi-bin/memory.cgi @@ -33,7 +33,7 @@ require "${General::swroot}/graphs.pl"; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
my @querry = split(/?/,$ENV{'QUERY_STRING'}); $querry[0] = '' unless defined $querry[0]; diff --git a/html/cgi-bin/mpfire.cgi b/html/cgi-bin/mpfire.cgi index 6cec8ff33..c8cfc4b11 100644 --- a/html/cgi-bin/mpfire.cgi +++ b/html/cgi-bin/mpfire.cgi @@ -47,7 +47,7 @@ my $errormessage = ""; my @songs;
&General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
&Header::showhttpheaders();
diff --git a/html/cgi-bin/netexternal.cgi b/html/cgi-bin/netexternal.cgi index 781633c1d..a31502dd0 100644 --- a/html/cgi-bin/netexternal.cgi +++ b/html/cgi-bin/netexternal.cgi @@ -38,7 +38,7 @@ my %mainsettings = (); my %netsettings=(); &General::readhash("${General::swroot}/ethernet/settings", %netsettings); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
my @graphs=(); my %dhcpinfo=(); diff --git a/html/cgi-bin/netinternal.cgi b/html/cgi-bin/netinternal.cgi index 3f2fb56cc..3c2828fbf 100644 --- a/html/cgi-bin/netinternal.cgi +++ b/html/cgi-bin/netinternal.cgi @@ -35,7 +35,7 @@ my %mainsettings = (); my %netsettings=(); &General::readhash("${General::swroot}/ethernet/settings", %netsettings); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
my @graphs=(); my @wireless=(); diff --git a/html/cgi-bin/netother.cgi b/html/cgi-bin/netother.cgi index 6524ad575..cbd2bc228 100755 --- a/html/cgi-bin/netother.cgi +++ b/html/cgi-bin/netother.cgi @@ -33,7 +33,7 @@ require "${General::swroot}/graphs.pl"; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
my @pings=();
diff --git a/html/cgi-bin/netovpnrw.cgi b/html/cgi-bin/netovpnrw.cgi index cae7770bb..00ef35337 100755 --- a/html/cgi-bin/netovpnrw.cgi +++ b/html/cgi-bin/netovpnrw.cgi @@ -33,7 +33,7 @@ require "${General::swroot}/graphs.pl"; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
my @vpns=();
diff --git a/html/cgi-bin/netovpnsrv.cgi b/html/cgi-bin/netovpnsrv.cgi index ab3548713..a53090f0f 100755 --- a/html/cgi-bin/netovpnsrv.cgi +++ b/html/cgi-bin/netovpnsrv.cgi @@ -33,7 +33,7 @@ require "${General::swroot}/graphs.pl"; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
my %vpnsettings = (); &General::readhasharray("${General::swroot}/vpn/config", %vpnsettings); diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 68a70d147..b98d88529 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -47,7 +47,7 @@ undef (@dummy); my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
### ### Initialize variables diff --git a/html/cgi-bin/p2p-block.cgi b/html/cgi-bin/p2p-block.cgi index 04f133142..d14725504 100644 --- a/html/cgi-bin/p2p-block.cgi +++ b/html/cgi-bin/p2p-block.cgi @@ -41,7 +41,7 @@ my %color = (); my %mainsettings = ();
&General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
&Header::showhttpheaders(); &Header::getcgihash(%fwdfwsettings); diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi index dd96a92e9..a9e12d23c 100644 --- a/html/cgi-bin/pakfire.cgi +++ b/html/cgi-bin/pakfire.cgi @@ -49,7 +49,7 @@ sub refreshpage{&Header::openbox( 'Waiting', 1, "<meta http-equiv='refresh' cont &Header::getcgihash(%cgiparams);
&General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
&Header::openpage($Lang::tr{'pakfire configuration'}, 1); &Header::openbigbox('100%', 'left', '', $errormessage); diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi index 4b9b7271b..7597bfbc7 100644 --- a/html/cgi-bin/pppsetup.cgi +++ b/html/cgi-bin/pppsetup.cgi @@ -44,7 +44,7 @@ my $kernel=`/bin/uname -r | /usr/bin/tr -d '\012'`; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
&Header::showhttpheaders();
diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index a63e1c2df..b6d71db84 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -39,7 +39,7 @@ my $https_port='444'; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
my %proxysettings=(); my %netsettings=(); diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi index 8211a3ca0..1825aca11 100644 --- a/html/cgi-bin/qos.cgi +++ b/html/cgi-bin/qos.cgi @@ -109,7 +109,7 @@ $qossettings{'RED_DEV'} = `cat /var/ipfire/red/iface`; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
my @querry = split(/?/,$ENV{'QUERY_STRING'}); $querry[0] = '' unless defined $querry[0]; diff --git a/html/cgi-bin/remote.cgi b/html/cgi-bin/remote.cgi index 9e566201d..c76f5129e 100644 --- a/html/cgi-bin/remote.cgi +++ b/html/cgi-bin/remote.cgi @@ -40,7 +40,7 @@ my $errormessage=''; my $counter = 0;
&General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
&Header::showhttpheaders();
diff --git a/html/cgi-bin/routing.cgi b/html/cgi-bin/routing.cgi index be21007fa..d2d3bdd26 100644 --- a/html/cgi-bin/routing.cgi +++ b/html/cgi-bin/routing.cgi @@ -40,7 +40,7 @@ our $datafile = "${General::swroot}/main/routing"; #(our: used in subroutine) my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
our %settings = ();
diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 4e0f14a01..72e8ac63e 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -48,7 +48,7 @@ my %shares = &config("${General::swroot}/samba/shares");
&General::readhash("${General::swroot}/ethernet/settings", %netsettings); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
############################################################################################################################ #################################### Initialisierung von Samba Variablen fr global Settings ############################### diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi index 36954ba70..38b89ef1e 100644 --- a/html/cgi-bin/services.cgi +++ b/html/cgi-bin/services.cgi @@ -34,7 +34,7 @@ my %color = (); my %mainsettings = (); my %netsettings=(); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color); &General::readhash("${General::swroot}/ethernet/settings", %netsettings);
#workaround to suppress a warning when a variable is used only once diff --git a/html/cgi-bin/system.cgi b/html/cgi-bin/system.cgi index 0548dddda..67c479736 100644 --- a/html/cgi-bin/system.cgi +++ b/html/cgi-bin/system.cgi @@ -33,7 +33,7 @@ require "${General::swroot}/graphs.pl"; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
my @querry = split(/?/,$ENV{'QUERY_STRING'}); $querry[0] = '' unless defined $querry[0]; diff --git a/html/cgi-bin/tor.cgi b/html/cgi-bin/tor.cgi index ea340b612..f39c0d8da 100644 --- a/html/cgi-bin/tor.cgi +++ b/html/cgi-bin/tor.cgi @@ -88,7 +88,7 @@ our %netsettings = (); our %color = (); our %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
our %settings = ();
diff --git a/html/cgi-bin/traffic.cgi b/html/cgi-bin/traffic.cgi index e19bea20a..cafccf73f 100644 --- a/html/cgi-bin/traffic.cgi +++ b/html/cgi-bin/traffic.cgi @@ -32,7 +32,7 @@ require "${General::swroot}/header.pl"; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
my %cgiparams; my %pppsettings; diff --git a/html/cgi-bin/updatexlrator.cgi b/html/cgi-bin/updatexlrator.cgi index c94c34ec1..ec7b75228 100644 --- a/html/cgi-bin/updatexlrator.cgi +++ b/html/cgi-bin/updatexlrator.cgi @@ -103,7 +103,7 @@ my @metadata=(); &General::readhash("${General::swroot}/ethernet/settings", %netsettings); &General::readhash("${General::swroot}/main/settings", %mainsettings); &General::readhash("${General::swroot}/proxy/settings", %proxysettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
$xlratorsettings{'ACTION'} = ''; $xlratorsettings{'ENABLE_LOG'} = 'off'; diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index db442e111..f200f1002 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -54,7 +54,7 @@ my $errormessage = ''; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
&General::readhash("${General::swroot}/ethernet/settings", %netsettings);
diff --git a/html/cgi-bin/vulnerabilities.cgi b/html/cgi-bin/vulnerabilities.cgi index d5f81cdc1..926f043b8 100644 --- a/html/cgi-bin/vulnerabilities.cgi +++ b/html/cgi-bin/vulnerabilities.cgi @@ -47,7 +47,7 @@ my $notice = ""; my %mainsettings = (); my %color = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
my %settings = ( "ENABLE_SMT" => "auto", diff --git a/html/cgi-bin/wakeonlan.cgi b/html/cgi-bin/wakeonlan.cgi index 1f7fde54a..289dc224a 100644 --- a/html/cgi-bin/wakeonlan.cgi +++ b/html/cgi-bin/wakeonlan.cgi @@ -51,7 +51,7 @@ our $datafile = "/var/ipfire/wakeonlan/clients.conf"; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
my %netsettings = (); &General::readhash("${General::swroot}/ethernet/settings", %netsettings); diff --git a/html/cgi-bin/wirelessclient.cgi b/html/cgi-bin/wirelessclient.cgi index 63218a021..a7a9881b8 100644 --- a/html/cgi-bin/wirelessclient.cgi +++ b/html/cgi-bin/wirelessclient.cgi @@ -43,7 +43,7 @@ our $datafile = "${General::swroot}/ethernet/wireless"; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
our %settings = (); our %netsettings = (); diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi index 575b696d7..01dcaeea2 100644 --- a/html/cgi-bin/wlanap.cgi +++ b/html/cgi-bin/wlanap.cgi @@ -54,7 +54,7 @@ my $country = ''; my $txpower = '';
&General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color); &General::readhash("/var/ipfire/ethernet/settings", %netsettings);
$wlanapsettings{'APMODE'} = 'on'; diff --git a/html/html/themes/ipfire/include/functions.pl b/html/html/themes/ipfire/include/functions.pl index c76af336d..9f12bbe59 100644 --- a/html/html/themes/ipfire/include/functions.pl +++ b/html/html/themes/ipfire/include/functions.pl @@ -114,10 +114,6 @@ sub openpage { $headline = "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}"; }
- my @stylesheets = ("style.css");
- if ($THEME_NAME eq "ipfire-rounded") {
push(@stylesheets, "style-rounded.css");- }
print <<END;
<!DOCTYPE html>
@@ -137,9 +133,9 @@ print <<END; </script> END
- foreach my $stylesheet (@stylesheets) {
print "<link href=\"/themes/ipfire/include/css/$stylesheet\" rel=\"stylesheet\" type=\"text/css\" />\n";- }
+print "<link href="/themes/ipfire/include/css/style.css" rel="stylesheet" type="text/css" />\n";
if ($settings{'SPEED'} ne 'off') { print <<END diff --git a/src/scripts/makegraphs b/src/scripts/makegraphs index 1dc14b8a3..f8f6f70a9 100644 --- a/src/scripts/makegraphs +++ b/src/scripts/makegraphs @@ -36,7 +36,7 @@ my $path_smartctl = "/usr/sbin/smartctl"; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
if ( $mainsettings{'RRDLOG'} eq "" ){ $mainsettings{'RRDLOG'}="/var/log/rrd"; diff --git a/src/squid-accounting/accounting.cgi b/src/squid-accounting/accounting.cgi index 0fe5ff6b3..751b6e8a5 100755 --- a/src/squid-accounting/accounting.cgi +++ b/src/squid-accounting/accounting.cgi @@ -60,7 +60,7 @@ my $mailfile="${General::swroot}/dma/mail.conf";
&Header::getcgihash(%cgiparams); &General::readhash("${General::swroot}/main/settings", %mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color); &General::readhash("$settingsfile", %settings) if(-f $settingsfile);
if ( -f $mailfile){ diff --git a/src/wio/wio-graphs.pl b/src/wio/wio-graphs.pl index 0cfac20d6..78b6f99dc 100644 --- a/src/wio/wio-graphs.pl +++ b/src/wio/wio-graphs.pl @@ -45,7 +45,7 @@ require '/var/ipfire/lang.pl'; my ( %mainsettings, %color ) = ();
&General::readhash('/var/ipfire/main/settings', %mainsettings); -&General::readhash('/srv/web/ipfire/html/themes/'.$mainsettings{'THEME'}.'/include/colors.txt', %color); +&General::readhash('/srv/web/ipfire/html/themes/ipfire/include/colors.txt', %color);
sub wiograph { my $hostid = $_[0]; diff --git a/src/wio/wio.cgi b/src/wio/wio.cgi index ac8fc1220..1dcec52fe 100644 --- a/src/wio/wio.cgi +++ b/src/wio/wio.cgi @@ -62,7 +62,7 @@ my ( %mainsettings, %mailsettings, %wiosettings, %cgiparams, %netsettings, %ipsh &General::readhash('/var/ipfire/ethernet/settings', %netsettings); &General::readhash('/var/ipfire/dma/mail.conf', %mailsettings); &General::readhash('/var/ipfire/wio/wio.conf', %wiosettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color); &General::readhasharray('/var/ipfire/ovpn/ovpnconfig', %ovpnconfighash); &General::readhash('/var/ipfire/ovpn/settings', %ovpnsettings); &General::readhasharray('/var/ipfire/ovpn/ccd.conf', %ovpnccdconfhash); -- 2.20.1
-
Jonatan Schlag -
Michael Tremer