X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/08c4165052deb2d08132bfb30b126389f4915f2b..7fc0c9f2c94f090d9f743798cd9ef835757dcbc2:/forum/skins/default/templates/index.html

diff --git a/forum/skins/default/templates/index.html b/forum/skins/default/templates/index.html
index c4dd802..94552e6 100644
--- a/forum/skins/default/templates/index.html
+++ b/forum/skins/default/templates/index.html
@@ -3,22 +3,26 @@
 {% load general_sidebar_tags %}
 {% load question_list_tags %}
 {% load i18n %}
-{% block title %}{% spaceless %}{{ settings.APP_TITLE }}{% endspaceless %}{% endblock %}
+{% block fulltitle %}{{ settings.APP_TITLE }}{% endblock %}
 {% block sidebar %}
     {% if not request.user.is_authenticated %}
-    <div class="boxA">
-        <h3>{% trans "welcome to " %}{{ settings.APP_SHORT_NAME }}</h3>
-        <div class="body">
-          {{ settings.APP_INTRO|safe }}
-          <div class="more"><a href="{% url about %}">{% trans "about" %} </a></div>
-          <div class="more"><a href="{% url faq %}">{% trans "faq" %} </a></div>
-        </div>
-    </div>
+        {% if settings.SHOW_WELCOME_BOX %}
+            <div class="boxA">
+                <h3>{% trans "welcome to " %}{{ settings.APP_SHORT_NAME }}</h3>
+                <div class="body">
+                  {{ settings.APP_INTRO|safe }}
+                  <div class="more"><a href="{% url about %}">{% trans "about" %} </a></div>
+                  <div class="more"><a href="{% url faq %}">{% trans "faq" %} </a></div>
+                </div>
+            </div>
+        {% endif %}
     {% endif %}
-    {% question_list_count %}
+    {% include "question_list/count.html" %}
+    {% sidebar_upper %}
     {% if request.user.is_authenticated %}
         {% tag_selector %}
     {% endif %}
+    {% sidebar_lower %}
     {% recent_tags %}
     {% recent_awards %}
 {% endblock %}