Add an IPFire logo module so that we can customise it depending on time of year

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/Makefile.am b/Makefile.am
index ea3350be29aa34ac7ab0c9d67155218c818b9be0..c691f2d65cded7b2e104d83102a87cbb06001eac 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -265,6 +265,7 @@ templates_messagesdir = $(templatesdir)/messages
 
 templates_modules_DATA = \
        src/templates/modules/christmas-banner.html \
+       src/templates/modules/ipfire-logo.html \
        src/templates/modules/map.html \
        src/templates/modules/progress-bar.html
 

diff --git a/src/sass/main.sass b/src/sass/main.sass
index b1292f76f88b5429f451acc1fd181833e0535499..746724f638b3c4ba3a99269c738a6f3d224486f3 100644 (file)
--- a/src/sass/main.sass
+++ b/src/sass/main.sass
@@ -27,10 +27,18 @@ $success-invert:                #ffffff
 $danger:                                               #ac001a
 $warning:                                              #f3ff50
 
+// Pride Colours
+$pride-red:                                            #e40303
+$pride-orange:                                 #ff8c00
+$pride-yellow:                                 #ffed00
+$pride-green:                                  #008026
+$pride-blue:                                   #24408e
+$pride-purple:                                 #732982
+
 // Custom Colours
-$lwl:                                                   #6534C8
+$lwl:                                                  #6534C8
 
-$custom-colors: ("secondary" : ($secondary, $secondary-invert), "lwl" : ($lwl, $white))
+$custom-colors: ("secondary" : ($secondary, $secondary-invert), "lwl" : ($lwl, $white), "pride-red" : ($pride-red, $white), "pride-orange" : ($pride-orange, $black), "pride-yellow" : ($pride-yellow, $black), "pride-green" : ($pride-green, $white), "pride-blue" : ($pride-blue, $white), "pride-purple" : ($pride-purple, $white))
 
 // Use the primary colour for links
 $link:                                                 $primary

diff --git a/src/templates/base.html b/src/templates/base.html
index 0582c18110b6a74dbea712c8f64756603f436998..d5446cefa856b310e8d1a5273e229c2873aaca28 100644 (file)
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -27,13 +27,13 @@
                                        <a class="navbar-item is-size-4" href="/">
                                                <strong>
                                                        {% if request.path.startswith("/projects/location") %}
-                                                               IPFire<span class="has-text-primary">_</span>Location
+                                                               {% module IPFireLogo("Location") %}
                                                        {% elif hostname.startswith("fireinfo.") %}
-                                                               IPFire<span class="has-text-primary">_</span>Fireinfo
+                                                               {% module IPFireLogo("Fireinfo") %}
                                                        {% elif hostname.startswith("nopaste.") %}
-                                                               IPFire<span class="has-text-primary">_</span>Nopaste
+                                                               {% module IPFireLogo("nopaste") %}
                                                        {% else %}
-                                                               IPFire<span class="has-text-primary">_</span>
+                                                               {% module IPFireLogo() %}
                                                        {% end %}
                                                </strong>
                                        </a>

diff --git a/src/templates/modules/ipfire-logo.html b/src/templates/modules/ipfire-logo.html
new file mode 100644 (file)
index 0000000..ac2d64c
--- /dev/null
+++ b/src/templates/modules/ipfire-logo.html
@@ -0,0 +1,18 @@
+{% 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 "" }} 🎄
+
+{# 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 "" }}
+
+{# Other times of the year #}
+{% else %}
+       IPFire<span class="has-text-primary">_</span>{{ suffix or "" }}
+{% end %}

diff --git a/src/web/__init__.py b/src/web/__init__.py
index 35f7fc25281cdf9b5dabfbfe7cdddb5c4fb75f26..481c32ff3b7f106c67d861a9659f1aa6556f9079 100644 (file)
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -97,6 +97,7 @@ class Application(tornado.web.Application):
 
                                # Misc
                                "ChristmasBanner"      : ui_modules.ChristmasBannerModule,
+                               "IPFireLogo"           : ui_modules.IPFireLogoModule,
                                "Markdown"             : ui_modules.MarkdownModule,
                                "Map"                  : ui_modules.MapModule,
                                "ProgressBar"          : ui_modules.ProgressBarModule,

diff --git a/src/web/ui_modules.py b/src/web/ui_modules.py
index 43cfd9a6b1a3df13bf3bb3e18239a061c31aad8a..574f9ac918a036ea840477f42450ecaf6447207e 100644 (file)
--- a/src/web/ui_modules.py
+++ b/src/web/ui_modules.py
@@ -10,6 +10,11 @@ class UIModule(tornado.web.UIModule):
                return self.handler.backend
 
 
+class IPFireLogoModule(UIModule):
+       def render(self, suffix=None):
+               return self.render_string("modules/ipfire-logo.html", suffix=suffix)
+
+
 class ChristmasBannerModule(UIModule):
        def render(self):
                return self.render_string("modules/christmas-banner.html")