This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, fifteen has been updated via 660f97283578616426bac2333a14c527770c2c0f (commit) via 36f101c73350fbfc736ecddb741a514927dd980e (commit) via 8e8fb1dada5cf710ffc4199f436618e4a2664e41 (commit) from b7d9509c3aebab95d559a3a7ad64f9d9655a3c07 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 660f97283578616426bac2333a14c527770c2c0f Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 4 18:31:10 2014 +0100

darkdos theme: Fix link to jquery.

commit 36f101c73350fbfc736ecddb741a514927dd980e Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 4 18:29:47 2014 +0100

Add darkdos theme to IPFire 2.15.

commit 8e8fb1dada5cf710ffc4199f436618e4a2664e41 Author: Logan Schmidt logo3801@gmail.com Date: Wed Nov 6 02:06:54 2013 -0600

Added new theme: darkdos

Red styled theme inspired by maniac's theme.

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/core/fifteen/filelists/files | 1 + .../themes/{maniac => darkdos}/images/IPFire.png | Bin html/html/themes/darkdos/images/b1.gif | Bin 0 -> 2446 bytes .../images/b4.gif => darkdos/images/b2.gif} | Bin 847 -> 1124 bytes html/html/themes/{maniac => darkdos}/images/b3.gif | Bin 847 -> 839 bytes html/html/themes/{maniac => darkdos}/images/b4.gif | Bin 847 -> 839 bytes html/html/themes/{maniac => darkdos}/images/b5.gif | Bin html/html/themes/{maniac => darkdos}/images/b6.gif | Bin .../themes/{ipfire => darkdos}/images/spacer.gif | Bin .../themes/{maniac => darkdos}/include/colors.txt | 22 ++++++------- .../{maniac => darkdos}/include/functions.pl | 2 +- .../themes/{maniac => darkdos}/include/style.css | 36 +++++++++------------ 12 files changed, 28 insertions(+), 33 deletions(-) copy html/html/themes/{maniac => darkdos}/images/IPFire.png (100%) create mode 100644 html/html/themes/darkdos/images/b1.gif copy html/html/themes/{maniac/images/b4.gif => darkdos/images/b2.gif} (56%) copy html/html/themes/{maniac => darkdos}/images/b3.gif (75%) copy html/html/themes/{maniac => darkdos}/images/b4.gif (75%) copy html/html/themes/{maniac => darkdos}/images/b5.gif (100%) copy html/html/themes/{maniac => darkdos}/images/b6.gif (100%) copy html/html/themes/{ipfire => darkdos}/images/spacer.gif (100%) copy html/html/themes/{maniac => darkdos}/include/colors.txt (57%) copy html/html/themes/{maniac => darkdos}/include/functions.pl (99%) copy html/html/themes/{maniac => darkdos}/include/style.css (84%)

Difference in files: diff --git a/config/rootfiles/core/fifteen/filelists/files b/config/rootfiles/core/fifteen/filelists/files index c57ea32..345521b 100644 --- a/config/rootfiles/core/fifteen/filelists/files +++ b/config/rootfiles/core/fifteen/filelists/files @@ -10,6 +10,7 @@ srv/web/ipfire/cgi-bin/upnp.cgi srv/web/ipfire/cgi-bin/speed.cgi srv/web/ipfire/cgi-bin/urlfilter.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi +srv/web/ipfire/html/themes/darkdos srv/web/ipfire/html/themes/ipfire/include/functions.pl srv/web/ipfire/html/themes/maniac/include/functions.pl var/ipfire/backup/bin/backup.pl diff --git a/html/html/themes/darkdos/images/IPFire.png b/html/html/themes/darkdos/images/IPFire.png new file mode 100644 index 0000000..ec56b7a Binary files /dev/null and b/html/html/themes/darkdos/images/IPFire.png differ diff --git a/html/html/themes/darkdos/images/b1.gif b/html/html/themes/darkdos/images/b1.gif new file mode 100644 index 0000000..123ff91 Binary files /dev/null and b/html/html/themes/darkdos/images/b1.gif differ diff --git a/html/html/themes/darkdos/images/b2.gif b/html/html/themes/darkdos/images/b2.gif new file mode 100644 index 0000000..0172874 Binary files /dev/null and b/html/html/themes/darkdos/images/b2.gif differ diff --git a/html/html/themes/darkdos/images/b3.gif b/html/html/themes/darkdos/images/b3.gif new file mode 100644 index 0000000..8c8fba3 Binary files /dev/null and b/html/html/themes/darkdos/images/b3.gif differ diff --git a/html/html/themes/darkdos/images/b4.gif b/html/html/themes/darkdos/images/b4.gif new file mode 100644 index 0000000..5964fa7 Binary files /dev/null and b/html/html/themes/darkdos/images/b4.gif differ diff --git a/html/html/themes/darkdos/images/b5.gif b/html/html/themes/darkdos/images/b5.gif new file mode 100644 index 0000000..a032242 Binary files /dev/null and b/html/html/themes/darkdos/images/b5.gif differ diff --git a/html/html/themes/darkdos/images/b6.gif b/html/html/themes/darkdos/images/b6.gif new file mode 100644 index 0000000..ed1781c Binary files /dev/null and b/html/html/themes/darkdos/images/b6.gif differ diff --git a/html/html/themes/darkdos/images/spacer.gif b/html/html/themes/darkdos/images/spacer.gif new file mode 100644 index 0000000..5bfd67a Binary files /dev/null and b/html/html/themes/darkdos/images/spacer.gif differ diff --git a/html/html/themes/darkdos/include/colors.txt b/html/html/themes/darkdos/include/colors.txt new file mode 100644 index 0000000..6efefc5 --- /dev/null +++ b/html/html/themes/darkdos/include/colors.txt @@ -0,0 +1,25 @@ +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 new file mode 100644 index 0000000..82e9b0a --- /dev/null +++ b/html/html/themes/darkdos/include/functions.pl @@ -0,0 +1,414 @@ +#!/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 +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="/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>-= IPFire =-</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>&nbsp;$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 "&nbsp;"; } +} + +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 new file mode 100644 index 0000000..e7140cd --- /dev/null +++ b/html/html/themes/darkdos/include/style.css @@ -0,0 +1,464 @@ +/*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; +} + +/* 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; }

hooks/post-receive -- IPFire 2.x development tree