X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/1a949f7c97dc2f34c135f5cdf088df2927d3d652..dcacc3b4c2ba2f550806a2d22b183f6fac4f63ff:/forum/skins/default/templates/index.html

diff --git a/forum/skins/default/templates/index.html b/forum/skins/default/templates/index.html
index 901c409..dce3ca1 100644
--- a/forum/skins/default/templates/index.html
+++ b/forum/skins/default/templates/index.html
@@ -1,16 +1,30 @@
-{% extends "questions.html" %}
-<!-- index.html -->
-{% load general_sidebar_tags %}
-{% load question_list_tags %}
-{% load cache %}
-
-{% block sidebar %}
-{% cache 60 index_sidebar settings.APP_URL %}
-    {% question_list_count %}
-    {% tag_selector %}
-    {% recent_tags %}
-    {% recent_awards %}
-{% endcache %}
-{% 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 -->
+