]> git.ipfire.org Git - ipfire.org.git/commitdiff
Revert "Drop chat page"
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 15 Oct 2018 20:47:09 +0000 (21:47 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 15 Oct 2018 20:47:09 +0000 (21:47 +0100)
This reverts commit 1f4400379e559d734af11bbb0ffb8cc6872eaac6.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Makefile.am
src/templates/static/chat.html [new file with mode: 0644]
src/web/__init__.py

index eb09a4fb86f62d674e96b223e2754fa814d438e9..60806a306b251b1d168fe57cb71c82a2654c3293 100644 (file)
@@ -171,6 +171,7 @@ templates_people_modules_DATA = \
 templates_people_modulesdir = $(templates_peopledir)/modules
 
 templates_static_DATA = \
+       src/templates/static/chat.html \
        src/templates/static/features.html \
        src/templates/static/get-involved.html \
        src/templates/static/get-started.html \
diff --git a/src/templates/static/chat.html b/src/templates/static/chat.html
new file mode 100644 (file)
index 0000000..84fc277
--- /dev/null
@@ -0,0 +1,71 @@
+{% extends "../base.html" %}
+               
+{% block title %}{{ _("Chat") }}{% end block %}
+
+{% block container %}
+<div class="container">
+       <section class="features-content col-12">
+               <h2 class="display-2 text-center">{{ _("Chat") }}</h2>
+               
+               <div class="row mb-5">
+                       <div class="col-md-8 offset-md-2 text-center">
+                               <p class="lead">
+                                       On the IPFire channel, you will find people who can help you
+                                       with your questions about IPFire.
+                               </p>
+                               <p>
+                                       This is a good chance to meet people involved in the project
+                                       or just have a chat.
+                               </p>
+                       </div>
+               </div>
+               
+               <div class="row">       
+                       <div class="col-md-3 offset-md-2">
+                               <h4>
+                                       <a href="xmpp:ipfire@conference.ipfire.org">
+                                               {{ _("Jabber") }}
+                                       </a>
+                               </h4>
+
+                               <dl class="dl-horizontal">
+                                       <dt>{{ _("Room") }}</dt>
+                                       <dd>ipfire</dd>
+
+                                       <dt>{{ _("Server") }}</dt>
+                                       <dd>conference.ipfire.org</dd>
+                               </dl>
+
+                               <p class="ac">
+                                       <small>
+                                               <a href="//planet.ipfire.org/post/opening-the-ipfire-jabber-server">
+                                                       {{ _("Need a Jabber account?") }}
+                                               </a>
+                                       </small>
+                               </p>
+                       </div>
+
+                       <div class="col-md-3 offset-md-2">
+                               <h4>{{ _("IRC") }}</h4>
+
+                               <dl class="dl-horizontal">
+                                       <dt>{{ _("Channel") }}</dt>
+                                       <dd>#ipfire</dd>
+
+                                       <dt>{{ _("Server") }}</dt>
+                                       <dd>irc.freenode.net</dd>
+                               </dl>
+
+                               <p class="ac">
+                                       You can use any IRC client to connect to the server and channel
+                                       above or
+                                       <a href="//webchat.freenode.net/?channels=ipfire">
+                                               use a web client
+                                       </a>.
+                               </p>
+                       </div>
+               </div>
+       </section>
+</div>
+
+{% end block %}
index fed37d0464437cad4f0ef0ba5b09d4a7d960cba2..ee51a85acbd8909030ced07b9e77ef783e24dfd3 100644 (file)
@@ -110,6 +110,7 @@ class Application(tornado.web.Application):
                        (r"/news/(.*)", tornado.web.RedirectHandler, { "url" : "https://blog.ipfire.org/posts/{1}" }),
 
                        # Static Pages
+                       (r"/chat", StaticHandler, { "template" : "chat.html" }),
                        (r"/features", StaticHandler, { "template" : "features.html" }),
                        (r"/get-involved", StaticHandler, { "template" : "get-involved.html" }),
                        (r"/get-started", StaticHandler, { "template" : "get-started.html" }),