do titles a bit differently

diff --git a/templates/article.html b/templates/article.html
index de10e5f871fe865aa0b09520e8059ea0d94bb226..db501a6c0d2d765adec1908b746edfcd9aaddafc 100644 (file)
--- a/templates/article.html
+++ b/templates/article.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% import "artinfo.html" as artinfo with context %}
+{% set title=article.title %}
 {% block content %}
 <div class="main">
     {{ artinfo.info(article) }}

diff --git a/templates/base.html b/templates/base.html
index 778e5cf00a03b6f0d236cb15a60c3daca363ea22..ecc6c6877a8bdb61661aaf4837e9f4e1d33e0fc6 100644 (file)
--- a/templates/base.html
+++ b/templates/base.html
@@ -8,7 +8,7 @@
     <meta name="theme-color" content="#292f2f">
     <meta name="description" content="freenode IRC network">
     <link rel="icon" href="{{ url_for("static/img/logos/coloured-alphabg-sq-120.png") }}">
-    <title>{{ title }}</title>
+    <title>{% block title %}{{ title }} - {{ config.name }}{% endblock %}</title>
     <link href="{{ url_for("static/css/open-sans.css") }}" rel="stylesheet">
     <link href="{{ url_for("static/css/font-awesome.min.css") }}" rel="stylesheet">
     <link href="{{ url_for("static/css/freenode.css") }}" rel="stylesheet">

diff --git a/templates/index.html b/templates/index.html
index 09cece738e0ec80054a1b883474659054e1b4c4a..c2bb7d2e909a635c63d2c3a3a2db151500c173b5 100644 (file)
--- a/templates/index.html
+++ b/templates/index.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% set title = config.name %}
+{% block title %}{{ config.name }}{% endblock %}
 {% import "artinfo.html" as artinfo %}
 {% block content %}
 <div class="jumbotron">
@@ -21,16 +21,13 @@
 </div>
 <div class="main">
     {% with article = get_module("news").articles[-1] %}
-    <b class="art"><a href="{{ article.url }}">{{ article.title }}</a></b>&nbsp;
-    <span class="art-date">{{ article.author }} on {{ article.datetime }}</span>
-    <p class="art-ingress">{{ article.render() }}</p>
+    {{ artinfo.info(article) }}
+    <div class="art-body">{{ article.render() }}</div>
     {#
     <p class="art-links">
         <a href="{{ next }}">Next</a>&nbsp;
         <a href="{{ previous }}">Previous</a>&nbsp;
     #}
     {% endwith %}
-    <a href="{{ url_for("archive") }}" ckass="art-link">
-                News Archive</a>
 </div>
 {% endblock content %}