Merge branch 'master' of git.lattuga.net:boyska/sito-hackit-18

themes/hackit0x15/static/css/hackit.css

@@ -52,7 +52,15 @@ a:focus,
 }
 
 
-h2 {
+#content h2 {
+    text-align: center;
+    width: 100%;
+    background-color: white;
+    padding: 1em 0;
+    color: black;
+    margin: 0;
+    left: 0;
+    font-size: 200%;
     text-align: center;
 }
 

themes/hackit0x15/templates/article_list.html

@@ -1,19 +1,24 @@
 {% extends "base.html" %}
+{# questa macro e' utile per mostrare articoli dentro ad una lista; non e' la migliore per mostrare un
+articolo come contenuto principale della pagina #}
+{% macro article_in_list(article) %}
+        <article>
+            <h2><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h2>
+            {% if DISPLAY_ARTICLE_INFO_ON_INDEX %}
+                <div class="well well-sm">
+                    {% include "includes/article_info.html" %}
+                </div>
+            {% endif %}
+            <div class="summary">{{ article.summary }}
+                {% include 'includes/comment_count.html' %}
+                <a class="btn btn-default btn-xs" href="{{ SITEURL }}/{{ article.url }}">more ...</a>
+            </div>
+        </article>
+{% endmacro %}
 {% block content %}
     {% if articles %}
         {% for article in (articles_page.object_list if articles_page else articles) %}
-            <article>
-                <h2><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h2>
-                {% if DISPLAY_ARTICLE_INFO_ON_INDEX %}
-                    <div class="well well-sm">
-                        {% include "includes/article_info.html" %}
-                    </div>
-                {% endif %}
-                <div class="summary">{{ article.summary }}
-                    {% include 'includes/comment_count.html' %}
-                    <a class="btn btn-default btn-xs" href="{{ SITEURL }}/{{ article.url }}">more ...</a>
-                </div>
-            </article>
+            {{ article_in_list(article) }}
             <hr/>
         {% endfor %}
     {% endif %}