From: Michael Tremer Date: Wed, 23 Oct 2019 15:20:07 +0000 (+0100) Subject: Rework support page and add references to community.ipfire.org X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c6610619025b4ad479fd8fe9c235a7258ddebc2;p=ipfire.org.git Rework support page and add references to community.ipfire.org Signed-off-by: Michael Tremer --- diff --git a/Makefile.am b/Makefile.am index c1e02ec3..be16ecf8 100644 --- 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 b8bf73e8..e1adf20c 100644 --- 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 55086919..03ce0d40 100644 --- a/src/templates/base.html +++ b/src/templates/base.html @@ -70,6 +70,10 @@
  • {{ _("Blog") }}
    • + +
  • + {{ _("Community") }} +
    • diff --git a/src/templates/static/chat.html b/src/templates/static/chat.html deleted file mode 100644 index c517146f..00000000 --- a/src/templates/static/chat.html +++ /dev/null @@ -1,34 +0,0 @@ -{% extends "../base.html" %} - -{% block title %}{{ _("Chat") }}{% end block %} - -{% block container %} -
    -
    -
    -
    -

    {{ _("Chat") }}

    - -

    - You can join a live chat with fellow IPFire users and developers -

    -
    -
    -
    -
    - -
    -
    -

    XMPP

    - -

    - For chat, we use XMPP (also known as the Jabber Protocol). -

    - -

    - To join our chat room, point your XMPP client to: - ipfire@conference.ipfire.org -

    -
    -
    -{% end block %} diff --git a/src/templates/static/support.html b/src/templates/static/support.html index 58610660..341cfbf3 100644 --- a/src/templates/static/support.html +++ b/src/templates/static/support.html @@ -18,6 +18,63 @@ +
    +
    +
    +
    +

    {{ _("Documentation") }}

    + +

    + The IPFire Wiki is the prime resource for everything + you need to know about IPFire. + There is almost nothing that cannot be found there. +

    + +

    + The wiki is written by the community. + Everyone can join and improve it. +

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

    {{ _("Community") }}

    + +

    + Talk to the IPFire Community on our community portal. +

    + +

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

    + + + {{ _("Go to Community") }} + +
    +
    +
    +
    +
    @@ -26,7 +83,7 @@ alt="{{ _("Lightning Wire Labs") }}">
    -
    +

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

    @@ -42,7 +99,7 @@ of IPFire.

    - + {{ _("Go to Website") }}
    @@ -52,49 +109,22 @@
    -

    {{ _("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 -

    +
    +

    {{ _("Chat") }}

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

    - Live chat to fellow IPFire users -

    +

    + You can chat live with other IPFire users and developers. + To join our chat room, point your XMPP client to: +

    - - {{ _("Go to Chat") }} - -
    + + ipfire@conference.ipfire.org +
    diff --git a/src/web/__init__.py b/src/web/__init__.py index 7fff7036..c39dac79 100644 --- 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" }),