Add new support page

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

diff --git a/Makefile.am b/Makefile.am
index fc856cd08a3da98aa0f9d5fc5c4b645090659075..eb09a4fb86f62d674e96b223e2754fa814d438e9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -174,9 +174,9 @@ templates_static_DATA = \
        src/templates/static/features.html \
        src/templates/static/get-involved.html \
        src/templates/static/get-started.html \
-       src/templates/static/get-support.html \
        src/templates/static/hardware.html \
-       src/templates/static/legal.html
+       src/templates/static/legal.html \
+       src/templates/static/support.html
 
 templates_staticdir = $(templatesdir)/static
 

diff --git a/src/scss/style.scss b/src/scss/style.scss
index 4731b066bad5822e17170b1b94ecf2f5a264dcab..c375e515726815734175c87c97237adcaae5a3fb 100644 (file)
--- a/src/scss/style.scss
+++ b/src/scss/style.scss
@@ -140,6 +140,14 @@ footer {
 
 // Sections
 
+section {
+       padding: 3rem 0;
+
+       @include media-breakpoint-up(sm) {
+               padding: 72px 0;
+       }
+}
+
 .main {
        .intro {
                min-height: 100%;
@@ -154,14 +162,6 @@ footer {
                display: flex;
                align-items: center;
        }
-
-       section {
-               padding: 3rem 0;
-
-               @include media-breakpoint-up(sm) {
-                       padding: 72px 0;
-               }
-       }
 }
 
 .blog-post {

diff --git a/src/templates/base.html b/src/templates/base.html
index ba7b3adba6d6e760ea3853ecf3c1f1f4ae609fbb..71afbf27e81f709a76fda982d7aa2c7028cfb5cc 100644 (file)
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -43,7 +43,7 @@
                                                        </li>
 
                                                        <li class="nav-item">
-                                                               <a class="nav-link {% if request.path == "/get-support" %}active{% end %}" href="/get-support">{{ _("Support") }}</a>
+                                                               <a class="nav-link {% if request.path == "/support" %}active{% end %}" href="/support">{{ _("Support") }}</a>
                                                        </li>
 
                                                        <li class="nav-item">

diff --git a/src/templates/index.html b/src/templates/index.html
index cb10447a8a70f3cc530b80ff504a0c7ea66d6c94..f413df6918f79c8a49f8cf4bbf05298a6fc11e3e 100644 (file)
--- a/src/templates/index.html
+++ b/src/templates/index.html
@@ -201,7 +201,7 @@
                                                </p>
                                        </div>
                                        <div class="col-sm-6 offset-sm-3 col-lg-4 offset-lg-1">
-                                               <a class="btn btn-light btn-lg btn-block px-md-0 mb-4" href="/get-support#professional">{{ _("Get Professional Support") }}</a>
+                                               <a class="btn btn-light btn-lg btn-block px-md-0 mb-4" href="https://www.lightningwirelabs.com/">{{ _("Get Professional Support") }}</a>
                                                <a class="btn btn-light btn-lg btn-block px-md-0" href="/hardware">{{ _("Hardware Appliances") }}</a>
                                        </div>
                                </div>

diff --git a/src/templates/static/get-support.html b/src/templates/static/get-support.html
deleted file mode 100644 (file)
index ceb25dd..0000000
--- a/src/templates/static/get-support.html
+++ /dev/null
@@ -1,66 +0,0 @@
-{% extends "../base.html" %}
-
-{% block title %}{{ _("Get Support") }}{% end block %}
-
-{% block container %}
-       <section id="support" class="content-section">
-               <div class="container">
-                       <div class="row">
-                               <section class="features-content col-12">
-                                       <h2 class="display-2 text-center">{{ _("Get Support") }}</h2>
-                                       
-                                       <div class="row m-5">
-                                               <div class="col-md-4 text-center">
-                                                       <a href="//wiki.ipfire.org" class="link-normal">
-                                                               <span class="fa fa-4x fa-pencil-square-o"></span>
-                                                               <h3>{{ _("Documentation") }}</h3>
-                                                       </a>
-                                               </div>
-                       
-                                               <div class="col-md-4 text-center">
-                                                       <a href="//forum.ipfire.org" class="link-normal">
-                                                               <span class="fa fa-4x fa-users"></span>
-                                                               <h3>{{ _("Forums") }}</h3>
-                                                       </a>
-                                               </div>
-                       
-                                               <div class="col-md-4 text-center">
-                                                       <a href="/chat" class="link-normal">
-                                                               <span class="fa fa-4x fa-wechat"></span>
-                                                               <h3>{{ _("Chat") }}</h3>
-                                                       </a>
-                                               </div>
-                                       </div>
-                               </section>
-                       </div>
-               </div>
-       </section>
-               
-       <div class="container mt-6">    
-               <div class="row">               
-                       <section id="professinal" class="col-12">
-                               <h3 class="headline mb-5">{{ _("Get Professional Support") }}</h3>
-                               
-                               <p class="lead">
-                                       <a href="//www.lightningwirelabs.com">Lightning Wire Labs</a>
-                                       provides professional support services for companies that use IPFire.
-                               </p>
-               
-                               <p class="lead">
-                                       Their team of developers implements custom solutions based on IPFire
-                                       and carries out development of new features. They will help you
-                                       with designing a secure network that is tailored to the specific
-                                       needs of your business and support you with the integration of
-                                       IPFire.
-                               </p>
-                               
-                               <div class="d-flex justify-content-center">
-                                       <a class="btn btn-lg btn-white mt-5" href="//www.lightningwirelabs.com">
-                                               {{ _("Go to Lightning Wire Labs") }}
-                                       </a>
-                               </div>
-                       </section>
-               </div>
-       </div>
-
-{% end block %}

diff --git a/src/templates/static/support.html b/src/templates/static/support.html
new file mode 100644 (file)
index 0000000..35a7948
--- /dev/null
+++ b/src/templates/static/support.html
@@ -0,0 +1,102 @@
+{% extends "../base.html" %}
+
+{% block title %}{{ _("Support") }}{% end block %}
+
+{% block container %}
+       <section>
+               <div class="container">
+                       <div class="row">
+                               <div class="col col-lg-6">
+                                       <h1 class="display-2">{{ _("Support") }}</h1>
+
+                                       <p>
+                                               If you have any questions, IPFire has an active support community
+                                               and is also backed by a professional development team
+                                       </p>
+                               </div>
+                       </div>
+               </div>
+       </section>
+
+       <section class="inverse">
+               <div class="container">
+                       <div class="row justify-content-between">
+                               <div class="col-6">
+                                       <h1 class="display-3">{{ _("Get Professional Support") }}</h1>
+
+                                       <p>
+                                               <a class="text-lwl" href="https://www.lightningwirelabs.com/">Lightning Wire Labs</a>
+                                               provides professional support services for companies that use IPFire.
+                                       </p>
+
+                                       <p>
+                                               The team of developers implements custom solutions based on IPFire and
+                                               carries out development of new features.
+                                               They will help you with designing a secure network that is tailored to
+                                               the specific needs of your business and support you with the integration
+                                               of IPFire.
+                                       </p>
+
+                                       <a class="btn btn-lwl mb-5" href="https:////www.lightningwirelabs.com">
+                                               {{ _("Go to Website") }}
+                                       </a>
+                               </div>
+
+                               <div class="col-3 text-md-right d-flex align-items-center">
+                                       <img class="img-fluid w-100" src="{{ static_url("img/lightningwirelabs-logo.svg") }}"
+                                               alt="{{ _("Lightning Wire Labs") }}">
+                               </div>
+                       </div>
+               </div>
+       </section>
+
+       <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>
+
+                               <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>
+
+                                               <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>
+
+                                               <a class="btn btn-primary btn-block mt-auto align-self-end" href="/chat">
+                                                       {{ _("Go to Chat") }}
+                                               </a>
+                                       </div>
+                               </div>
+                       </div>
+               </div>
+       </section>
+{% end block %}

diff --git a/src/web/__init__.py b/src/web/__init__.py
index eac0bc0b2cbad1a6270a28e1dbc961f8fa2b8c3d..fed37d0464437cad4f0ef0ba5b09d4a7d960cba2 100644 (file)
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -113,9 +113,9 @@ class Application(tornado.web.Application):
                        (r"/features", StaticHandler, { "template" : "features.html" }),
                        (r"/get-involved", StaticHandler, { "template" : "get-involved.html" }),
                        (r"/get-started", StaticHandler, { "template" : "get-started.html" }),
-                       (r"/get-support", StaticHandler, { "template" : "get-support.html" }),
                        (r"/hardware", StaticHandler, { "template" : "hardware.html" }),
                        (r"/legal", StaticHandler, { "template" : "legal.html" }),
+                       (r"/support", StaticHandler, { "template" : "support.html" }),
 
                        # Handle old pages that have moved elsewhere
                        (r"/imprint", tornado.web.RedirectHandler, { "url" : "/legal" }),