]> git.ipfire.org Git - ipfire.org.git/commitdiff
projects / ipfire.org.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: fa7a39a)
location: Link back to /location when clicking on brand
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 3 Apr 2024 14:59:49 +0000 (14:59 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 3 Apr 2024 14:59:49 +0000 (14:59 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/templates/base.html patch | blob | blame | history
src/templates/modules/ipfire-logo.html patch | blob | blame | history

diff --git a/src/templates/base.html b/src/templates/base.html
index 7b829a1b6ddc12f794e978301ef9614c0a606b47..c69c7b98b483c0689cccc620f81d394aa6f246dd 100644 (file)
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -23,20 +23,22 @@
        <body class="is-flex is-flex-direction-column">
                <nav class="navbar" role="navigation" aria-label="main navigation">
                        <div class="container">
-                               <div class="navbar-brand">
-                                       <a class="navbar-item is-size-4" href="/">
-                                               <strong>
-                                                       {% if request.path.startswith("/location") %}
-                                                               {% module IPFireLogo("Location") %}
-                                                       {% elif request.path.startswith("/fireinfo") %}
+                               <div class="navbar-brand is-size-4">
+                                       {% if request.path.startswith("/location") %}
+                                               <a class="navbar-item" href="/location">
+                                                       {% module IPFireLogo("Location") %}
+                                               </a>
+                                       {% else %}
+                                               <a class="navbar-item" href="/">
+                                                       {% if request.path.startswith("/fireinfo") %}
                                                                {% module IPFireLogo("Fireinfo") %}
                                                        {% elif hostname.startswith("nopaste.") %}
                                                                {% module IPFireLogo("NoPaste") %}
                                                        {% else %}
                                                                {% module IPFireLogo() %}
                                                        {% end %}
-                                               </strong>
-                                       </a>
+                                               </a>
+                                       {% end %}
 
                                        <a role="button" class="navbar-burger" aria-label="menu" aria-expanded="false" data-target="navbarMainMenu">
                                                <span aria-hidden="true"></span>
diff --git a/src/templates/modules/ipfire-logo.html b/src/templates/modules/ipfire-logo.html
index ac2d64c3a66fec27ffb68ce2073af00fef60ebc6..f5840d73937819e22723bb062551af027df5d8bf 100644 (file)
--- a/src/templates/modules/ipfire-logo.html
+++ b/src/templates/modules/ipfire-logo.html
@@ -1,18 +1,20 @@
 {% set pride_colors = ("pride-red", "pride-orange", "pride-yellow", "pride-green", "pride-blue", "pride-purple") %}
 
-{# Christmas #}
-{% if now.month == 12 %}
-       IPFire<span class="has-text-primary">_</span>{{ suffix or "" }} ðŸŽ„
+<strong>
+       {# Christmas #}
+       {% if now.month == 12 %}
+               IPFire<span class="has-text-primary">_</span>{{ suffix or "" }} ðŸŽ„
 
-{# Halloween #}
-{% elif now.month == 10 and now.day >= 28 %}
-       IPFire<span class="has-text-primary">_</span>{{ suffix or "" }} ðŸŽƒ
+       {# Halloween #}
+       {% elif now.month == 10 and now.day >= 28 %}
+               IPFire<span class="has-text-primary">_</span>{{ suffix or "" }} ðŸŽƒ
 
-{# Pride Month #}
-{% elif now.month == 7 %}
-       {% for color, i in zip(pride_colors, "IPFire") %}<span class="has-text-{{ color }}">{{ i }}</span>{% end %}_{{ suffix or "" }}
+       {# Pride Month #}
+       {% elif now.month == 7 %}
+               {% for color, i in zip(pride_colors, "IPFire") %}<span class="has-text-{{ color }}">{{ i }}</span>{% end %}_{{ suffix or "" }}
 
-{# Other times of the year #}
-{% else %}
-       IPFire<span class="has-text-primary">_</span>{{ suffix or "" }}
-{% end %}
+       {# Other times of the year #}
+       {% else %}
+               IPFire<span class="has-text-primary">_</span>{{ suffix or "" }}
+       {% end %}
+</strong>
The website of ipfire.org.