From 00026d8bab1aedda881c1817f024ce980996385e Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 15 Oct 2018 21:46:02 +0100 Subject: [PATCH] Add new support page Signed-off-by: Michael Tremer --- Makefile.am | 4 +- src/scss/style.scss | 16 ++-- src/templates/base.html | 2 +- src/templates/index.html | 2 +- src/templates/static/get-support.html | 66 ----------------- src/templates/static/support.html | 102 ++++++++++++++++++++++++++ src/web/__init__.py | 2 +- 7 files changed, 115 insertions(+), 79 deletions(-) delete mode 100644 src/templates/static/get-support.html create mode 100644 src/templates/static/support.html diff --git a/Makefile.am b/Makefile.am index fc856cd0..eb09a4fb 100644 --- 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 4731b066..c375e515 100644 --- 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 ba7b3adb..71afbf27 100644 --- a/src/templates/base.html +++ b/src/templates/base.html @@ -43,7 +43,7 @@
  • - {{ _("Support") }} + {{ _("Support") }}
  • diff --git a/src/templates/index.html b/src/templates/index.html index cb10447a..f413df69 100644 --- a/src/templates/index.html +++ b/src/templates/index.html @@ -201,7 +201,7 @@

    - {{ _("Get Professional Support") }} + {{ _("Get Professional Support") }} {{ _("Hardware Appliances") }}
    diff --git a/src/templates/static/get-support.html b/src/templates/static/get-support.html deleted file mode 100644 index ceb25dd1..00000000 --- a/src/templates/static/get-support.html +++ /dev/null @@ -1,66 +0,0 @@ -{% extends "../base.html" %} - -{% block title %}{{ _("Get Support") }}{% end block %} - -{% block container %} -
    -
    -
    -
    -

    {{ _("Get Support") }}

    - -
    -
    - - -

    {{ _("Documentation") }}

    -     -
    - -
    - - -

    {{ _("Forums") }}

    -     -
    - -
    - - -

    {{ _("Chat") }}

    -     -
    -
    -
    -
    -
    -
    - -
    -
    -
    -

    {{ _("Get Professional Support") }}

    - -

    - Lightning Wire Labs - provides professional support services for companies that use IPFire. -

    - -

    - 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. -

    - -
    - - {{ _("Go to Lightning Wire Labs") }} - -
    -
    -
    -
    - -{% end block %} diff --git a/src/templates/static/support.html b/src/templates/static/support.html new file mode 100644 index 00000000..35a7948c --- /dev/null +++ b/src/templates/static/support.html @@ -0,0 +1,102 @@ +{% extends "../base.html" %} + +{% block title %}{{ _("Support") }}{% end block %} + +{% block container %} +
    +
    +
    +
    +

    {{ _("Support") }}

    + +

    + If you have any questions, IPFire has an active support community + and is also backed by a professional development team +

    +
    +
    +
    +
    + +
    +
    +
    +
    +

    {{ _("Get Professional Support") }}

    + +

    + Lightning Wire Labs + provides professional support services for companies that use IPFire. +

    + +

    + 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. +

    + + + {{ _("Go to Website") }} + +
    + +
    + {{ _( +
    +
    +
    +
    + +
    +
    +

    {{ _("Further Resources") }}

    + +
    +
    +
    +
    {{ _("Documentation") }}
    + +

    + The knowledge base that has everything about IPFire +

    + + + {{ _("Go to Wiki") }} + +
    +
    + +
    +
    +
    {{ _("Forum") }}
    + +

    + The support forums are a great place to ask questions +

    + + + {{ _("Go to Forum") }} + +
    +
    + +
    +
    +
    {{ _("Chat") }}
    + +

    + Live chat to fellow IPFire users +

    + + + {{ _("Go to Chat") }} + +
    +
    +
    +
    +
    +{% end block %} diff --git a/src/web/__init__.py b/src/web/__init__.py index eac0bc0b..fed37d04 100644 --- 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" }), -- 2.47.2