ipfire-new: Update footer.

diff --git a/doc/language_issues.es b/doc/language_issues.es
index 9ae2c0a3366872d76391143f125888bbed9b8f56..17a4aecb2f632f2c67bba3c76269d53c070d00b1 100644 (file)
--- 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 7e5a1f576b39fbcf2fdf6f9950d2bbdf8cb5248a..00b47ffd7679d28370c27945c6db8b6380d8481b 100644 (file)
--- 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 10e12db540d991bb33ed491f8df45cb07ed968d5..3c0231de03318ac5a4d19450acf6d9a6be2466aa 100644 (file)
--- 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 9ae2c0a3366872d76391143f125888bbed9b8f56..17a4aecb2f632f2c67bba3c76269d53c070d00b1 100644 (file)
--- 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 f46ba7a055c36cc4ddc46b33658f2eee7c4cb08d..9257a4caf2fd8ce23ec5fcf46642fb87c002c03b 100644 (file)
--- 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 5bd50a0200af98e2c36fcf5b0fb2544e8c1db513..60c961de33896bc8a3c473e754268b14964c01cc 100644 (file)
--- 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 e3e5c8efe1673b78421af826c521924185e25d19..86f45b004a3b4f0fed15b92ace404f7c623b7dc1 100644 (file)
--- 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 3bb126cc8e6d90ac2516f381faca040b04e67968..5ad97d063ef7bac30855829189b21c1deaea8cce 100644 (file)
--- 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 490b634572c1a6dc46be44d4a7e1692576083e2a..86bc70939600e1ac20497e2ba3dc9f183c0494e7 100644 (file)
--- 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, "</etc/system-release");
+       my $system_release = <FILE>;
+       $system_release =~ s/core/Core Update/;
+       close(FILE);
 
 print <<END;
                </div>
        </div>
 
        <div id="footer" class='bigbox fixed'>
-               $status   Uptime: $uptime
+               <span class="pull-right">
+                       <a href="http://www.ipfire.org/" target="_blank"><strong>IPFire.org</strong></a> &bull;
+                       <a href="http://www.ipfire.org/donate" target="_blank">$Lang::tr{'support donation'}</a>
+               </span>
+
+               <strong>$system_release</strong>
        </div>
 </body>
 </html>

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index d89a4bd3f4b271123442f70c49e621d268110cb1..01cd3f6831d4d3ea04e18aba0517116dcb28fdf6 100644 (file)
--- 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 5754c7d82e7f1e06384173d4090001f0cfba039b..dc38129f3652ec334dbfc4a96c4a1ccc14b6dae7 100644 (file)
--- 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',