* Re: [PATCH] Link the IPFire logo to ipfire.org
@ 2015-06-09 20:00 Larsen
0 siblings, 0 replies; 8+ messages in thread
From: Larsen @ 2015-06-09 20:00 UTC (permalink / raw)
To: development
[-- 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>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] Link the IPFire logo to ipfire.org
2015-06-09 12:13 ` Michael Tremer
@ 2015-06-09 12:35 ` Larsen
0 siblings, 0 replies; 8+ messages in thread
From: Larsen @ 2015-06-09 12:35 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 367 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.
Ok, will try this and report back later.
Lars
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] Link the IPFire logo to ipfire.org
2015-06-09 11:13 ` Larsen
@ 2015-06-09 12:13 ` Michael Tremer
2015-06-09 12:35 ` Larsen
0 siblings, 1 reply; 8+ messages in thread
From: Michael Tremer @ 2015-06-09 12:13 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 1302 bytes --]
On Tue, 2015-06-09 at 13:13 +0200, Larsen wrote:
> On Tue, 09 Jun 2015 13:02:15 +0200, Michael Tremer
> <michael.tremer(a)ipfire.org> wrote:
>
> >> I do know that some have JS deactivated and don´t like it, but in this
> >> case there is nothing lost.
> >
> > If someone disables JS they will already have issues with other parts of
> > the web user interface and of course most of the "web 2.0".
> >
> >> Is there anything else wrong with using JS?
> >
> > Not in general. I just find it a rather complex solution for a simple
> > problem. The plain HTML approach would be much better and work for those
> > who disable JS, too.
>
> But then you loose CSS, don´t you?
What do you mean by loose? That should be changed then, yes.
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.
> And if someone has actually disabled JS, they will notice other problems
> as you mentioned before, so it´s unlikely they will even noticed that they
> cannot click on the IPFire logo to get to the homepage.
>
>
> Lars
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] Link the IPFire logo to ipfire.org
2015-06-09 11:02 ` Michael Tremer
@ 2015-06-09 11:13 ` Larsen
2015-06-09 12:13 ` Michael Tremer
0 siblings, 1 reply; 8+ messages in thread
From: Larsen @ 2015-06-09 11:13 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 810 bytes --]
On Tue, 09 Jun 2015 13:02:15 +0200, Michael Tremer
<michael.tremer(a)ipfire.org> wrote:
>> I do know that some have JS deactivated and don´t like it, but in this
>> case there is nothing lost.
>
> If someone disables JS they will already have issues with other parts of
> the web user interface and of course most of the "web 2.0".
>
>> Is there anything else wrong with using JS?
>
> Not in general. I just find it a rather complex solution for a simple
> problem. The plain HTML approach would be much better and work for those
> who disable JS, too.
But then you loose CSS, don´t you?
And if someone has actually disabled JS, they will notice other problems
as you mentioned before, so it´s unlikely they will even noticed that they
cannot click on the IPFire logo to get to the homepage.
Lars
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] Link the IPFire logo to ipfire.org
2015-06-09 10:59 ` Larsen
@ 2015-06-09 11:02 ` Michael Tremer
2015-06-09 11:13 ` Larsen
0 siblings, 1 reply; 8+ messages in thread
From: Michael Tremer @ 2015-06-09 11:02 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 1245 bytes --]
On Tue, 2015-06-09 at 12:59 +0200, Larsen wrote:
> On Tue, 09 Jun 2015 12:53:08 +0200, Michael Tremer
> <michael.tremer(a)ipfire.org> wrote:
>
> > Is there a certain reason why this is done by using Javascript? An <a>
> > tag would have worked fine as well I think. That would require to embed
> > the image by using the <img> tag, but that is probably the cleaner
> > solution any way...
>
> I used this as a starting point:
> http://stackoverflow.com/questions/4465923/a-href-link-for-entire-div-in-html-css
>
> The <a>-tag didn´t work when I wrapped it around the <div>-tag (and it
> would only be allowed for HTML5).
> I didn´t think about using an <img>-tag as I thought that it was cleaner
> as it is by using CSS.
>
> I do know that some have JS deactivated and don´t like it, but in this
> case there is nothing lost.
If someone disables JS they will already have issues with other parts of
the web user interface and of course most of the "web 2.0".
> Is there anything else wrong with using JS?
Not in general. I just find it a rather complex solution for a simple
problem. The plain HTML approach would be much better and work for those
who disable JS, too.
-Michael
>
>
> Lars
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] Link the IPFire logo to ipfire.org
2015-06-09 10:53 ` Michael Tremer
@ 2015-06-09 10:59 ` Larsen
2015-06-09 11:02 ` Michael Tremer
0 siblings, 1 reply; 8+ messages in thread
From: Larsen @ 2015-06-09 10:59 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 829 bytes --]
On Tue, 09 Jun 2015 12:53:08 +0200, Michael Tremer
<michael.tremer(a)ipfire.org> wrote:
> Is there a certain reason why this is done by using Javascript? An <a>
> tag would have worked fine as well I think. That would require to embed
> the image by using the <img> tag, but that is probably the cleaner
> solution any way...
I used this as a starting point:
http://stackoverflow.com/questions/4465923/a-href-link-for-entire-div-in-html-css
The <a>-tag didn´t work when I wrapped it around the <div>-tag (and it
would only be allowed for HTML5).
I didn´t think about using an <img>-tag as I thought that it was cleaner
as it is by using CSS.
I do know that some have JS deactivated and don´t like it, but in this
case there is nothing lost.
Is there anything else wrong with using JS?
Lars
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] Link the IPFire logo to ipfire.org
2015-06-08 20:50 Larsen
@ 2015-06-09 10:53 ` Michael Tremer
2015-06-09 10:59 ` Larsen
0 siblings, 1 reply; 8+ messages in thread
From: Michael Tremer @ 2015-06-09 10:53 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 2950 bytes --]
Hi Lars,
Is there a certain reason why this is done by using Javascript? An <a>
tag would have worked fine as well I think. That would require to embed
the image by using the <img> tag, but that is probably the cleaner
solution any way...
Other than that: I like the idea.
Best,
-Michael
On Mon, 2015-06-08 at 22:50 +0200, Larsen wrote:
> Link the IPFire logo and subsequent text to http://www.ipfire.org
>
> 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/functions.pl | 2 +-
> html/html/themes/maniac/include/functions.pl | 2 +-
> 4 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/html/html/themes/darkdos/include/functions.pl
> b/html/html/themes/darkdos/include/functions.pl
> index 737e051..4b00b4c 100644
> --- a/html/html/themes/darkdos/include/functions.pl
> +++ b/html/html/themes/darkdos/include/functions.pl
> @@ -221,7 +221,7 @@ print <<END
>
> <div id="header_inner" class="fixed">
>
> - <div id="logo">
> + <div id="logo" style="cursor: pointer;"
> onclick="window.location='http://www.ipfire.org/';">
> END
> ;
> if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
> diff --git a/html/html/themes/ipfire-legacy/include/functions.pl
> b/html/html/themes/ipfire-legacy/include/functions.pl
> index 1401030..e1b8cb8 100644
> --- a/html/html/themes/ipfire-legacy/include/functions.pl
> +++ b/html/html/themes/ipfire-legacy/include/functions.pl
> @@ -221,7 +221,7 @@ print <<END
>
> <div id="header_inner" class="fixed">
>
> - <div id="logo">
> + <div id="logo" style="cursor: pointer;"
> onclick="window.location='http://www.ipfire.org/';">
> END
> ;
> if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
> diff --git a/html/html/themes/ipfire/include/functions.pl
> b/html/html/themes/ipfire/include/functions.pl
> index 63740d4..39d972d 100644
> --- a/html/html/themes/ipfire/include/functions.pl
> +++ b/html/html/themes/ipfire/include/functions.pl
> @@ -151,7 +151,7 @@ print <<END
> </head>
> <body>
> <div id="header" class="fixed">
> - <div id="logo">
> + <div id="logo" style="cursor: pointer;"
> onclick="window.location='http://www.ipfire.org/';">
> END
> ;
> if ($settings{'WINDOWWITHHOSTNAME'} ne 'off') {
> diff --git a/html/html/themes/maniac/include/functions.pl
> b/html/html/themes/maniac/include/functions.pl
> index e8514ad..d3d4a73 100644
> --- a/html/html/themes/maniac/include/functions.pl
> +++ b/html/html/themes/maniac/include/functions.pl
> @@ -221,7 +221,7 @@ print <<END
>
> <div id="header_inner" class="fixed">
>
> - <div id="logo">
> + <div id="logo" style="cursor: pointer;"
> onclick="window.location='http://www.ipfire.org/';">
> END
> ;
> if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] Link the IPFire logo to ipfire.org
@ 2015-06-08 20:50 Larsen
2015-06-09 10:53 ` Michael Tremer
0 siblings, 1 reply; 8+ messages in thread
From: Larsen @ 2015-06-08 20:50 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 2469 bytes --]
Link the IPFire logo and subsequent text to http://www.ipfire.org
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/functions.pl | 2 +-
html/html/themes/maniac/include/functions.pl | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/html/html/themes/darkdos/include/functions.pl
b/html/html/themes/darkdos/include/functions.pl
index 737e051..4b00b4c 100644
--- a/html/html/themes/darkdos/include/functions.pl
+++ b/html/html/themes/darkdos/include/functions.pl
@@ -221,7 +221,7 @@ print <<END
<div id="header_inner" class="fixed">
- <div id="logo">
+ <div id="logo" style="cursor: pointer;"
onclick="window.location='http://www.ipfire.org/';">
END
;
if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
diff --git a/html/html/themes/ipfire-legacy/include/functions.pl
b/html/html/themes/ipfire-legacy/include/functions.pl
index 1401030..e1b8cb8 100644
--- a/html/html/themes/ipfire-legacy/include/functions.pl
+++ b/html/html/themes/ipfire-legacy/include/functions.pl
@@ -221,7 +221,7 @@ print <<END
<div id="header_inner" class="fixed">
- <div id="logo">
+ <div id="logo" style="cursor: pointer;"
onclick="window.location='http://www.ipfire.org/';">
END
;
if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
diff --git a/html/html/themes/ipfire/include/functions.pl
b/html/html/themes/ipfire/include/functions.pl
index 63740d4..39d972d 100644
--- a/html/html/themes/ipfire/include/functions.pl
+++ b/html/html/themes/ipfire/include/functions.pl
@@ -151,7 +151,7 @@ print <<END
</head>
<body>
<div id="header" class="fixed">
- <div id="logo">
+ <div id="logo" style="cursor: pointer;"
onclick="window.location='http://www.ipfire.org/';">
END
;
if ($settings{'WINDOWWITHHOSTNAME'} ne 'off') {
diff --git a/html/html/themes/maniac/include/functions.pl
b/html/html/themes/maniac/include/functions.pl
index e8514ad..d3d4a73 100644
--- a/html/html/themes/maniac/include/functions.pl
+++ b/html/html/themes/maniac/include/functions.pl
@@ -221,7 +221,7 @@ print <<END
<div id="header_inner" class="fixed">
- <div id="logo">
+ <div id="logo" style="cursor: pointer;"
onclick="window.location='http://www.ipfire.org/';">
END
;
if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2015-06-09 20:00 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-06-09 20:00 [PATCH] Link the IPFire logo to ipfire.org Larsen
-- 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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox