Merge of jambazov branch to trunk. Adds CC license and failed sign-in referrer bug...

[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 614bc4c461013178055b5acc9ae5bd743ff79eef..94552e60490184e8a83b847fc40643cdb6a5ac1d 100644 (file)
--- a/forum/skins/default/templates/index.html
+++ b/forum/skins/default/templates/index.html
@@ -3,22 +3,26 @@
 {% load general_sidebar_tags %}\r
 {% load question_list_tags %}\r
 {% load i18n %}\r
-{% block title %}{% spaceless %}{% trans "Home" %}{% endspaceless %}{% endblock %}\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
+        {% if settings.SHOW_WELCOME_BOX %}\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
     {% endif %}\r
-    {% question_list_count %}\r
+    {% include "question_list/count.html" %}\r
+    {% sidebar_upper %}\r
     {% if request.user.is_authenticated %}\r
         {% tag_selector %}\r
     {% endif %}\r
+    {% sidebar_lower %}\r
     {% recent_tags %}\r
     {% recent_awards %}\r
 {% endblock %}\r