public inbox for development@lists.ipfire.org
 help / color / mirror / Atom feed
From: Larsen <larsen007@web.de>
To: development@lists.ipfire.org
Subject: Re: [PATCH] Link the IPFire logo to ipfire.org
Date: Tue, 09 Jun 2015 22:00:30 +0200	[thread overview]
Message-ID: <557745DE.2050600@web.de> (raw)

[-- Attachment #1: Type: text/plain, Size: 4236 bytes --]

>> The final HTML code would look something like this:
>>
>> <div id="logo">
>> 	<a href="http://www.ipfire.org">
>> 		<img src="logo.png" ...>
>> 	</a>
>> </div>
>>
>> The CSS properties should be changed that the background image is
>> removed and the content is centered. The final result should like the
>> same in the end.

Now using HTML instead of JavaScript. Had to use "margin-left: -3px; margin-top: -3px" to get it pixel-perfect.
Also changed: Not linking the hostname if displayed, only "IPFire".


Signed-off-by: Lars Schuhmacher <larsen007(a)web.de>
---
 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 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

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>

             reply	other threads:[~2015-06-09 20:00 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-09 20:00 Larsen [this message]
  -- strict thread matches above, loose matches on Subject: below --
2015-06-08 20:50 Larsen
2015-06-09 10:53 ` Michael Tremer
2015-06-09 10:59   ` Larsen
2015-06-09 11:02     ` Michael Tremer
2015-06-09 11:13       ` Larsen
2015-06-09 12:13         ` Michael Tremer
2015-06-09 12:35           ` Larsen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=557745DE.2050600@web.de \
    --to=larsen007@web.de \
    --cc=development@lists.ipfire.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox