support: Rename page and make it more concise

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

diff --git a/Makefile.am b/Makefile.am
index d24a09d7ed3a273be5657a16b2e46570568b3f0c..18b6926f8bb92bf23fbfb269c2ff80a6f69a221d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -325,9 +325,9 @@ templates_people_messagesdir = $(templates_peopledir)/messages
 templates_static_DATA = \
        src/templates/static/about.html \
        src/templates/static/legal.html \
-       src/templates/static/help.html \
        src/templates/static/partners.html \
-       src/templates/static/sitemap.html
+       src/templates/static/sitemap.html \
+       src/templates/static/support.html
 
 templates_staticdir = $(templatesdir)/static
 

diff --git a/src/templates/base.html b/src/templates/base.html
index 26fcf8297dbcfbe1fc6716018cdaaeb34131d8a6..4a48b546ca0331b4c8d12aa8ba22e250c3198ef4 100644 (file)
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -123,7 +123,7 @@
 
                                                                        <a class="navbar-item is-tab" href="https://community.ipfire.org" target="_blank">{{ _("Community") }}</a>
 
-                                                                       <a class="navbar-item is-tab {% if request.path == "/help" %}is-active{% end %}" href="/help">{{ _("Help") }}</a>
+                                                                       <a class="navbar-item is-tab {% if request.path == "/support" %}is-active{% end %}" href="/support">{{ _("Support") }}</a>
                                                                {% end %}
 
                                                                <div class="navbar-item">

diff --git a/src/templates/static/help.html b/src/templates/static/support.html
similarity index 87%
rename from src/templates/static/help.html
rename to src/templates/static/support.html
index 680c49dfc2de7acd6202e4c72a87b7606b3cbd2d..f4ea635d21d5e7c789a157a5ed4c0da9e7e4cd70 100644 (file)
--- a/src/templates/static/help.html
+++ b/src/templates/static/support.html
@@ -1,16 +1,16 @@
 {% extends "../base.html" %}
 
-{% block title %}{{ _("Help") }}{% end block %}
+{% block title %}{{ _("Support") }}{% end block %}
 
 {% block head %}
        {% module OpenGraph(
-               title=_("IPFire - Get Help"),
-               description="Professional Support, Documentation, Community and Bug Reports All in One Place.",
+               title=_("IPFire - Get Support"),
+               description="Professional Support, Documentation, Community and Bug Reports All in One Place",
        ) %}
 {% end block %}
 
 {% block container %}
-       <section class="hero is-primary">
+       <section class="hero is-lwl is-medium">
                <div class="hero-body">
                        <div class="container">
                                <nav class="breadcrumb" aria-label="breadcrumbs">
@@ -19,33 +19,23 @@
                                                        <a href="/">Home</a>
                                                </li>
                                                <li class="is-active">
-                                                       <a href="#" aria-current="page">Help</a>
+                                                       <a href="#" aria-current="page">Support</a>
                                                </li>
                                        </ul>
                                </nav>
 
-                               <h1 class="title">
-                                       {{ _("Get Help with IPFire") }}
-                               </h1>
-                       </div>
-               </div>
-       </section>
-
-       <section class="hero is-lwl">
-               <div class="hero-body">
-                       <div class="container">
                                <div class="columns is-mobile is-vcentered">
                                        <div class="column">
                                                <div class="block">
-                                                       <h3 class="title is-3">
+                                                       <h1 class="title">
                                                                {{ _("Professional Support from Lightning Wire Labs") }}
-                                                       </h3>
+                                                       </h1>
 
                                                        <p>
                                                                If you require dedicated assistance, Lightning Wire Labs
                                                                offers professional support services to ensure your
                                                                IPFire deployment runs smoothly.
-                                                               Their experienced team is ready to provide expert guidance,
+                                                               Our experienced team is ready to provide expert guidance,
                                                                troubleshooting, and tailored solutions for your specific needs.
                                                        </p>
                                                </div>
@@ -59,7 +49,7 @@
                                        </div>
 
                                        <div class="column is-narrow is-hidden-mobile has-text-centered">
-                                               <figure class="image is-128x128">
+                                               <figure class="image is-256x256">
                                                        <img src="{{ static_url("img/lightningwirelabs-logo.svg") }}"
                                                                alt="{{ _("Lightning Wire Labs") }}">
                                                </figure>
@@ -154,6 +144,13 @@
                                                                {{ _("Subscribe To Our Newsletter") }}
                                                        </a>
                                                </div>
+                                       {% else %}
+                                               <div class="block">
+                                                       <p class="has-text-centered">
+                                                               <span class="fa-solid fa-check"></span>
+                                                               {{ _("You are already subscribed to our newsletter") }}
+                                                       </p>
+                                               </div>
                                        {% end %}
                                </div>
                        </div>

diff --git a/src/web/__init__.py b/src/web/__init__.py
index 0e29e4d61fe0341e26a4f0670df9205c1b4a81cd..fda68bdaadb9993e26192bfbf63567fa6702a9db 100644 (file)
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -232,9 +232,9 @@ class Application(tornado.web.Application):
                        # Static Pages
                        (r"/about",  StaticHandler, { "template" : "static/about.html" }),
                        (r"/legal", StaticHandler, { "template" : "static/legal.html" }),
-                       (r"/help", StaticHandler, { "template" : "static/help.html" }),
                        (r"/partners", StaticHandler, { "template" : "static/partners.html" }),
                        (r"/sitemap",  StaticHandler, { "template" : "static/sitemap.html" }),
+                       (r"/support", StaticHandler, { "template" : "static/support.html" }),
 
                        # API
                        (r"/api/check/email", auth.APICheckEmail),
@@ -246,11 +246,11 @@ class Application(tornado.web.Application):
                        (r"/download", tornado.web.RedirectHandler, { "url" : "/downloads" }),
                        (r"/download/([0-9a-z\-\.]+)", tornado.web.RedirectHandler, { "url" : "/downloads/{0}" }),
                        (r"/features", tornado.web.RedirectHandler, { "url" : "/about" }),
+                       (r"/help", tornado.web.RedirectHandler, { "url" : "/support"}),
                        (r"/imprint", tornado.web.RedirectHandler, { "url" : "/legal" }),
                        (r"/news.rss", tornado.web.RedirectHandler, { "url" : "/blog/feed.xml" }),
                        (r"/news/(.*)", tornado.web.RedirectHandler, { "url" : "/blog/{0}" }),
                        (r"/projects(/.*)", tornado.web.RedirectHandler, { "url" : "{0}" }),
-                       (r"/support", tornado.web.RedirectHandler, { "url" : "/help"}),
                        (r"/(de|en)/(.*)", tornado.web.RedirectHandler, { "url" : "/{0}"}),
 
                        # Export arbitrary error pages