From: Michael Tremer Date: Sun, 5 Jan 2014 17:51:22 +0000 (+0100) Subject: ipfire-new: Update footer. X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=c3f00878dded2e80bfaba67627d2826ad8d49f89 ipfire-new: Update footer. --- diff --git a/doc/language_issues.es b/doc/language_issues.es index 9ae2c0a33..17a4aecb2 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -828,6 +828,7 @@ WARNING: untranslated string: routing table WARNING: untranslated string: server restart WARNING: untranslated string: snat new source ip address WARNING: untranslated string: static routes +WARNING: untranslated string: support donation WARNING: untranslated string: system information WARNING: untranslated string: tor WARNING: untranslated string: tor accounting diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 7e5a1f576..00b47ffd7 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -819,6 +819,7 @@ WARNING: untranslated string: server restart WARNING: untranslated string: snat new source ip address WARNING: untranslated string: snort working WARNING: untranslated string: static routes +WARNING: untranslated string: support donation WARNING: untranslated string: system information WARNING: untranslated string: tor WARNING: untranslated string: tor accounting diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 10e12db54..3c0231de0 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -737,6 +737,7 @@ WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table WARNING: untranslated string: snat new source ip address +WARNING: untranslated string: support donation WARNING: untranslated string: tor WARNING: untranslated string: tor accounting WARNING: untranslated string: tor accounting bytes diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 9ae2c0a33..17a4aecb2 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -828,6 +828,7 @@ WARNING: untranslated string: routing table WARNING: untranslated string: server restart WARNING: untranslated string: snat new source ip address WARNING: untranslated string: static routes +WARNING: untranslated string: support donation WARNING: untranslated string: system information WARNING: untranslated string: tor WARNING: untranslated string: tor accounting diff --git a/doc/language_issues.ru b/doc/language_issues.ru index f46ba7a05..9257a4caf 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -800,6 +800,7 @@ WARNING: untranslated string: routing table WARNING: untranslated string: server restart WARNING: untranslated string: snat new source ip address WARNING: untranslated string: static routes +WARNING: untranslated string: support donation WARNING: untranslated string: tor WARNING: untranslated string: tor accounting WARNING: untranslated string: tor accounting bytes diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 5bd50a020..60c961de3 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -742,6 +742,7 @@ WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table WARNING: untranslated string: snat new source ip address +WARNING: untranslated string: support donation WARNING: untranslated string: tor directory port WARNING: untranslated string: tor errmsg invalid directory port WARNING: untranslated string: urlfilter redirect template diff --git a/doc/language_missings b/doc/language_missings index e3e5c8efe..86f45b004 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -307,6 +307,7 @@ < snat new source ip address < snort working < static routes +< support donation < system information < tor < tor 0 = disabled @@ -740,6 +741,7 @@ < Set time on boot < snat new source ip address < static routes +< support donation < system information < tor < tor 0 = disabled @@ -1126,6 +1128,7 @@ < server restart < snat new source ip address < static routes +< support donation < tor < tor 0 = disabled < tor accounting @@ -1516,6 +1519,7 @@ < server restart < snat new source ip address < static routes +< support donation < tor < tor 0 = disabled < tor accounting diff --git a/html/html/themes/ipfire-new/include/css/style.css b/html/html/themes/ipfire-new/include/css/style.css index 3bb126cc8..5ad97d063 100644 --- a/html/html/themes/ipfire-new/include/css/style.css +++ b/html/html/themes/ipfire-new/include/css/style.css @@ -99,6 +99,10 @@ iframe { border: 0; } +.pull-right { + float: right !important; +} + /* Header */ #header { @@ -171,6 +175,15 @@ iframe { margin-bottom: 1em; } +#footer a { + color: inherit; + text-decoration: none; +} + +#footer a:hover { + text-decoration: underline; +} + input { margin: 0.2em; } diff --git a/html/html/themes/ipfire-new/include/functions.pl b/html/html/themes/ipfire-new/include/functions.pl index 490b63457..86bc70939 100644 --- a/html/html/themes/ipfire-new/include/functions.pl +++ b/html/html/themes/ipfire-new/include/functions.pl @@ -186,21 +186,22 @@ sub openpagewithoutmenu { # print page closing html layout 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/days/$Lang::tr{'days'}/; - $uptime =~ s/day /$Lang::tr{'day'}/; - $uptime =~ s/user(s|)/$Lang::tr{'user'}/; - $uptime =~ s/load average/$Lang::tr{'uptime load average'}/; + open(FILE, "; + $system_release =~ s/core/Core Update/; + close(FILE); print < diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index d89a4bd3f..01cd3f683 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1946,6 +1946,7 @@ 'successfully refreshed updates list' => 'Update-Liste erfolgreich aktualisiert.', 'summaries kept' => 'Zusammenfassungen aufheben für', 'sunday' => 'Sonntag', +'support donation' => 'Unterstützen Sie das IPFire-Projekt mit Ihrer Spende', 'swap' => 'Swap', 'swap usage per' => 'Nutzung von Auslagerungsspeicher (Swap) pro', 'system' => 'System', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 5754c7d82..dc38129f3 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1980,6 +1980,7 @@ 'successfully refreshed updates list' => 'Successfully refreshed updates list.', 'summaries kept' => 'Keep summaries for', 'sunday' => 'Sunday', +'support donation' => 'Support the IPFire project with your donation', 'swap' => 'Swap', 'swap usage per' => 'Swap usage per', 'system' => 'System',