[git.ipfire.org] IPFire 2.x development tree branch, next, updated. a2069a37b80a2f3f19ab0170d03a0ec35e9257aa - IPFire-SCM

29 Jul 2015

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, next has been updated
       via  a2069a37b80a2f3f19ab0170d03a0ec35e9257aa (commit)
       via  60f8111d5356be1e537141b901e194f2b3b81f47 (commit)
      from  a46b97969c2a15a9347dbb2d5ae5a273825a31ed (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 a2069a37b80a2f3f19ab0170d03a0ec35e9257aa
Author: Larsen larsen007@web.de
Date:   Tue Jun 9 22:00:30 2015 +0200
Link the IPFire logo to ipfire.org
Signed-off-by: Lars Schuhmacher larsen007@web.de
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 60f8111d5356be1e537141b901e194f2b3b81f47
Author: Larsen larsen007@web.de
Date:   Mon Jun 1 22:43:06 2015 +0200
squid-accounting: Fix typos in src/squid-accounting/acct.en.pl
Fix typos in src/squid-accounting/acct.en.pl
Signed-off-by: Lars Schuhmacher larsen007@web.de
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes:
 html/html/themes/darkdos/include/functions.pl       | 2 +-
 html/html/themes/ipfire-legacy/include/functions.pl | 2 +-
 html/html/themes/ipfire/include/css/style.css       | 1 -
 html/html/themes/ipfire/include/functions.pl        | 6 ++++--
 html/html/themes/maniac/include/functions.pl        | 2 +-
 src/squid-accounting/acct.en.pl                     | 4 ++--
 6 files changed, 9 insertions(+), 8 deletions(-)
Difference in files:

diff --git a/html/html/themes/darkdos/include/functions.pl b/html/html/themes/darkdos/include/functions.pl
index 737e051..7d803b6 100644
--- a/html/html/themes/darkdos/include/functions.pl
+++ b/html/html/themes/darkdos/include/functions.pl
@@ -227,7 +227,7 @@ 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 "<h1><span><a href='http://www.ipfire.org' style='text-decoration: none;'>-= IPFire =-</a></span></h1><br />";
    	}
    	print <<END
    		<h2>+ $h2 +</h2>
diff --git a/html/html/themes/ipfire-legacy/include/functions.pl b/html/html/themes/ipfire-legacy/include/functions.pl
index 1401030..5288253 100644
--- a/html/html/themes/ipfire-legacy/include/functions.pl
+++ b/html/html/themes/ipfire-legacy/include/functions.pl
@@ -227,7 +227,7 @@ 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 "<h1><span><a href='http://www.ipfire.org' style='text-decoration: none;'>IPFire</a></span></h1><br />";
                 }
                 print <<END
                         <h2>$h2</h2>
diff --git a/html/html/themes/ipfire/include/css/style.css b/html/html/themes/ipfire/include/css/style.css
index e0ac3cd..1cc18f8 100644
--- a/html/html/themes/ipfire/include/css/style.css
+++ b/html/html/themes/ipfire/include/css/style.css
@@ -115,7 +115,6 @@ iframe {
 #logo {
    height: 65px;
    margin-top: 1em;
-	background: url('../../images/tux2.png') no-repeat;
 }
#logo h1 {
diff --git a/html/html/themes/ipfire/include/functions.pl b/html/html/themes/ipfire/include/functions.pl
index 63740d4..eedf069 100644
--- a/html/html/themes/ipfire/include/functions.pl
+++ b/html/html/themes/ipfire/include/functions.pl
@@ -152,12 +152,14 @@ print <<END
    <body>
    	<div id="header" class="fixed">
    		<div id="logo">
+				<a href="http://www.ipfire.org" style="text-decoration: none;">
+					<img src="/themes/ipfire/images/tux2.png" style="float:left; margin-left: -3px; margin-top: -3px;"/>
 END
 ;
    if ($settings{'WINDOWWITHHOSTNAME'} ne 'off') {
-		print "<h1>$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}</h1>";
+		print "</a><h1>$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}</h1>";
    } else {
-		print "<h1>IPFire</h1>";
+		print "<h1>IPFire</h1></a>";
    }
print <<END
diff --git a/html/html/themes/maniac/include/functions.pl b/html/html/themes/maniac/include/functions.pl
index e8514ad..4866fcd 100644
--- a/html/html/themes/maniac/include/functions.pl
+++ b/html/html/themes/maniac/include/functions.pl
@@ -227,7 +227,7 @@ 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 "<h1><span><a href='http://www.ipfire.org' style='text-decoration: none;'>-= IPFire =-</a></span></h1><br />";
    	}
    	print <<END
    		<h2>+ $h2 +</h2>
diff --git a/src/squid-accounting/acct.en.pl b/src/squid-accounting/acct.en.pl
index bdbf5b2..3e3ed19 100644
--- a/src/squid-accounting/acct.en.pl
+++ b/src/squid-accounting/acct.en.pl
@@ -104,7 +104,7 @@
 'acct plz' => 'Postcode',
 'acct preview' => 'Bill preview',
 'acct price pp' => 'Unit price',
-'acct proxy_enable' => 'Please actiavte proxy first',
+'acct proxy_enable' => 'Please activate proxy first',
 'acct pos' => 'Pos.',
 'acct sum total' => 'Total',
 'acct name' => 'Description',
@@ -113,7 +113,7 @@
 'acct settings' => 'Accounting settings',
 'acct skipurl' => 'Skip these URLs (Intranet)',
 'acct status' => 'Status',
-'acct str' => 'Steet',
+'acct str' => 'Street',
 'acct str_nr' => 'No.',
 'acct subject' => 'Subject',
 'acct sum' => 'Sum',
hooks/post-receive
--
IPFire 2.x development tree

    