X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/08c4165052deb2d08132bfb30b126389f4915f2b..31f67094578292b834139406a9aaea3a15123218:/forum/skins/default/templates/index.html?ds=sidebyside

diff --git a/forum/skins/default/templates/index.html b/forum/skins/default/templates/index.html
index c4dd802..dce3ca1 100644
--- a/forum/skins/default/templates/index.html
+++ b/forum/skins/default/templates/index.html
@@ -1,26 +1,30 @@
-{% extends "questions.html" %}
-<!-- index.html -->
-{% load general_sidebar_tags %}
-{% load question_list_tags %}
-{% load i18n %}
-{% block title %}{% spaceless %}{{ settings.APP_TITLE }}{% endspaceless %}{% 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>
-    {% endif %}
-    {% question_list_count %}
-    {% if request.user.is_authenticated %}
-        {% tag_selector %}
-    {% endif %}
-    {% recent_tags %}
-    {% recent_awards %}
-{% endblock %}
-<!-- index.html -->
-
+{% extends "questions.html" %}
+<!-- index.html -->
+{% load general_sidebar_tags %}
+{% load question_list_tags %}
+{% load i18n %}
+{% block fulltitle %}{{ settings.APP_TITLE }}{% endblock %}
+{% block sidebar %}
+    {% if not request.user.is_authenticated %}
+        {% 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 %}
+    {% include "question_list/count.html" %}
+    {% sidebar_upper %}
+    {% if request.user.is_authenticated %}
+        {% tag_selector %}
+    {% endif %}
+    {% sidebar_lower %}
+    {% recent_tags %}
+    {% recent_awards %}
+{% endblock %}
+<!-- index.html -->
+