Rework support page and add references to community.ipfire.org

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

diff --git a/Makefile.am b/Makefile.am
index c1e02ec339bbd9eba6f6121323453580f47a5ee5..be16ecf8274d46eee26c323568efbc1c4929bb2b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -268,7 +268,6 @@ templates_people_ssh_keysdir = $(templates_peopledir)/ssh-keys
 
 templates_static_DATA = \
        src/templates/static/blocked.html \
-       src/templates/static/chat.html \
        src/templates/static/features.html \
        src/templates/static/legal.html \
        src/templates/static/support.html

diff --git a/src/templates/auth/messages/register.txt b/src/templates/auth/messages/register.txt
index b8bf73e8b03120505caa1a72d95d2cb56255cc0c..e1adf20ca231c80088bec0aaeacaec40a731ae93 100644 (file)
--- a/src/templates/auth/messages/register.txt
+++ b/src/templates/auth/messages/register.txt
@@ -4,7 +4,7 @@ Subject: {{ _("Welcome to the IPFire Project!") }}
 
 {{ _("Hello %s!") % first_name }}
 
-{{ _("Thank you for registering a new account with us.") }} {{ _("This account will allow you to take part in our project. Either by joining the debates on our forum, writing documentation, or becoming a developer.") }} {{ _("There is many things you can do with your account.") }}
+{{ _("Thank you for registering a new account with us.") }} {{ _("This account will allow you to take part in our project. Either by joining conversations, writing documentation, or becoming a developer.") }} {{ _("There is many things you can do with your account.") }}
 
 {{ _("To activate it, please click on this link:") }}
 

diff --git a/src/templates/base.html b/src/templates/base.html
index 55086919d629fad28057e2dd4204089a0d240aeb..03ce0d40c1e9f752c9ee4dcf682261821a773365 100644 (file)
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -70,6 +70,10 @@
                                                                <li class="nav-item">
                                                                        <a class="nav-link" href="https://blog.ipfire.org/">{{ _("Blog") }}</a>
                                                                </li>
+
+                                                               <li class="nav-item">
+                                                                       <a class="nav-link" href="https://community.ipfire.org/">{{ _("Community") }}</a>
+                                                               </li>
                                                        </ul>
 
                                                        <a class="btn btn-primary mt-2 mt-lg-0 ml-lg-2" href="/donate">

diff --git a/src/templates/static/chat.html b/src/templates/static/chat.html
deleted file mode 100644 (file)
index c517146..0000000
--- a/src/templates/static/chat.html
+++ /dev/null
@@ -1,34 +0,0 @@
-{% extends "../base.html" %}
-               
-{% block title %}{{ _("Chat") }}{% end block %}
-
-{% block container %}
-       <section>
-               <div class="container">
-                       <div class="row">
-                               <div class="col col-lg-6">
-                                       <h1 class="display-2">{{ _("Chat") }}</h1>
-
-                                       <p>
-                                               You can join a live chat with fellow IPFire users and developers
-                                       </p>
-                               </div>
-                       </div>
-               </div>
-       </section>
-
-       <section class="inverse">
-               <div class="container">
-                       <h4 class="mb-5">XMPP</h4>
-
-                       <p>
-                               For chat, we use XMPP (also known as the Jabber Protocol).
-                       </p>
-
-                       <p>
-                               To join our chat room, point your XMPP client to:
-                               <a href="xmpp:ipfire@conference.ipfire.org?join">ipfire@conference.ipfire.org</a>
-                       </p>
-               </div>
-       </section>
-{% end block %}

diff --git a/src/templates/static/support.html b/src/templates/static/support.html
index 5861066006b7781640edcf070d044d55c7704463..341cfbf365472ec4a87adab08375d6e0d15f1d00 100644 (file)
--- a/src/templates/static/support.html
+++ b/src/templates/static/support.html
@@ -18,6 +18,63 @@
                </div>
        </section>
 
+       <section class="inverse">
+               <div class="container">
+                       <div class="row justify-content-between">
+                               <div class="col-12 col-md-7">
+                                       <h1>{{ _("Documentation") }}</h1>
+
+                                       <p>
+                                               The IPFire Wiki is the prime resource for everything
+                                               you need to know about IPFire.
+                                               There is almost nothing that cannot be found there.
+                                       </p>
+
+                                       <p>
+                                               The wiki is written by the community.
+                                               Everyone can join and improve it.
+                                       </p>
+
+                                       <a class="btn btn-primary" href="https://wiki.ipfire.org/">
+                                               {{ _("Go to Wiki") }}
+                                       </a>
+                               </div>
+
+                               <div class="col-12 col-md-3 d-flex align-items-center justify-content-center justify-content-md-end">
+                                       <i class="fas fa-pen-alt icon-large my-5"></i>
+                               </div>
+                       </div>
+               </div>
+       </section>
+
+       <section>
+               <div class="container">
+                       <div class="row justify-content-between">
+                               <div class="col-12 col-md-3 d-flex align-items-center justify-content-center justify-content-md-start">
+                                       <span class="fas fa-hands-helping icon-large my-5"></span>
+                               </div>
+
+                               <div class="col-12 col-md-7">
+                                       <h1>{{ _("Community") }}</h1>
+
+                                       <p>
+                                               Talk to the IPFire Community on our community portal.
+                                       </p>
+
+                                       <p>
+                                               Ask about how to get started with IPFire, how you can
+                                               contribute to the project, and what else you always
+                                               wanted to know about IPFire...
+                                       </p>
+
+                                       <a class="btn btn-secondary" href="https://community.ipfire.org/">
+                                               {{ _("Go to Community") }}
+                                       </a>
+                               </div>
+                       </div>
+               </div>
+       </section>
+
        <section class="inverse">
                <div class="container">
                        <div class="row justify-content-between flex-md-row-reverse">
@@ -26,7 +83,7 @@
                                                alt="{{ _("Lightning Wire Labs") }}">
                                </div>
 
-                               <div class="col-12 col-md-6">
+                               <div class="col-12 col-md-7">
                                        <h1>{{ _("Get Professional Support") }}</h1>
 
                                        <p>
@@ -42,7 +99,7 @@
                                                of IPFire.
                                        </p>
 
-                                       <a class="btn btn-lwl mb-5" href="https:////www.lightningwirelabs.com">
+                                       <a class="btn btn-lwl mb-5" href="https://www.lightningwirelabs.com/">
                                                {{ _("Go to Website") }}
                                        </a>
                                </div>
@@ -52,49 +109,22 @@
 
        <section>
                <div class="container">
-                       <h4 class="mb-5">{{ _("Further Resources") }}</h4>
-
-                       <div class="card-deck">
-                               <div class="card">
-                                       <div class="card-body d-flex flex-column">
-                                               <h5 class="card-title">{{ _("Documentation") }}</h5>
-
-                                               <p>
-                                                       The knowledge base that has everything about IPFire
-                                               </p>
-
-                                               <a class="btn btn-primary btn-block mt-auto align-self-end" href="https://wiki.ipfire.org/">
-                                                       {{ _("Go to Wiki") }}
-                                               </a>
-                                       </div>
+                       <div class="row justify-content-between">
+                               <div class="col-12 col-md-3 d-flex align-items-center justify-content-center justify-content-md-start">
+                                       <span class="fas fa-comments icon-large my-5"></span>
                                </div>
 
-                               <div class="card">
-                                       <div class="card-body d-flex flex-column">
-                                               <h5 class="card-title">{{ _("Forum") }}</h5>
-
-                                               <p>
-                                                       The support forums are a great place to ask questions
-                                               </p>
+                               <div class="col-12 col-md-7">
+                                       <h1>{{ _("Chat") }}</h1>
 
-                                               <a class="btn btn-primary btn-block mt-auto align-self-end" href="https://forum.ipfire.org/">
-                                                       {{ _("Go to Forum") }}
-                                               </a>
-                                       </div>
-                               </div>
-
-                               <div class="card">
-                                       <div class="card-body d-flex flex-column">
-                                               <h5 class="card-title">{{ _("Chat") }}</h5>
-
-                                               <p>
-                                                       Live chat to fellow IPFire users
-                                               </p>
+                                       <p>
+                                               You can chat live with other IPFire users and developers.
+                                               To join our chat room, point your XMPP client to:
+                                       </p>
 
-                                               <a class="btn btn-primary btn-block mt-auto align-self-end" href="/chat">
-                                                       {{ _("Go to Chat") }}
-                                               </a>
-                                       </div>
+                                       <a class="btn btn-light" href="xmpp:ipfire@conference.ipfire.org?join">
+                                               ipfire@conference.ipfire.org
+                                       </a>
                                </div>
                        </div>
                </div>

diff --git a/src/web/__init__.py b/src/web/__init__.py
index 7fff703646afedbb81bfdded5cc697f22a7de2ce..c39dac7995d1c8637fa2b4089d3aa142afae92f5 100644 (file)
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -137,7 +137,6 @@ class Application(tornado.web.Application):
                        (r"/news/(.*)", handlers.NewsHandler),
 
                        # Static Pages
-                       (r"/chat", StaticHandler, { "template" : "chat.html" }),
                        (r"/features", StaticHandler, { "template" : "features.html" }),
                        (r"/legal", StaticHandler, { "template" : "legal.html" }),
                        (r"/support", StaticHandler, { "template" : "support.html" }),