Migrate to Django 1.6

[osqa.git] / forum / skins / default / templates / index.html

diff --git a/forum/skins/default/templates/index.html b/forum/skins/default/templates/index.html
index 29d0502191fb26c499504e1e59db496bfd86507f..dce3ca189fc98b8d4ff47e4f0de74e94159ae7bc 100644 (file)
--- a/forum/skins/default/templates/index.html
+++ b/forum/skins/default/templates/index.html
@@ -1,26 +1,30 @@
-{% extends "questions.html" %}\r
-<!-- index.html -->\r
-{% load general_sidebar_tags %}\r
-{% load question_list_tags %}\r
-{% load i18n %}\r
-{% block fulltitle %}{{ settings.APP_TITLE }}{% endblock %}\r
-{% block sidebar %}\r
-    {% if not request.user.is_authenticated %}\r
-    <div class="boxA">\r
-        <h3>{% trans "welcome to " %}{{ settings.APP_SHORT_NAME }}</h3>\r
-        <div class="body">\r
-          {{ settings.APP_INTRO|safe }}\r
-          <div class="more"><a href="{% url about %}">{% trans "about" %} </a></div>\r
-          <div class="more"><a href="{% url faq %}">{% trans "faq" %} </a></div>\r
-        </div>\r
-    </div>\r
-    {% endif %}\r
-    {% question_list_count %}\r
-    {% if request.user.is_authenticated %}\r
-        {% tag_selector %}\r
-    {% endif %}\r
-    {% recent_tags %}\r
-    {% recent_awards %}\r
-{% endblock %}\r
-<!-- index.html -->\r
-\r
+{% 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 -->
+