Fixes question and answer count in the sidebar.

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

diff --git a/forum/skins/default/templates/header.html b/forum/skins/default/templates/header.html
index cb12bb97998639628fa8bf20ccd2b1a071a18a6d..bf5160bf4c5dee337d35c7e496f52666f2d4f1e0 100644 (file)
--- a/forum/skins/default/templates/header.html
+++ b/forum/skins/default/templates/header.html
@@ -1,37 +1,25 @@
 <!-- template header.html -->
 <!-- template header.html -->

-{% load extra_tags %}
-{% load i18n %}
+{% load extra_tags ui_registry i18n extra_filters markup %}
+

        <div id="roof">
                <div id="navBar">
                        <div id="top">
        <div id="roof">
                <div id="navBar">
                        <div id="top">

-                {% if request.user.is_authenticated %}
-                    <a href="{% url users %}{{ request.user.id }}/{{ request.user.username }}/">{{ request.user.username }}</a> {% get_score_badge request.user %} 
-                    <a href="{% url logout %}">{% trans "logout" %}</a>
-                {% else %}
-                    <a href="{% url auth_signin %}">{% trans "login" %}</a>
-                {% endif %}
-                <a href="{% url about %}">{% trans "about" %}</a>
-                <a href="{% url faq %}">{% trans "faq" %}</a>
+                           {% loadregistry header_links %}{% endloadregistry %}

                        </div>
                        <table width="100%" border="0" cellspacing="0" cellpadding="0">
                          <tr>
                                <td width="23%">
                                        <div id="logo">
                                                <a href="{% url index %}">
                        </div>
                        <table width="100%" border="0" cellspacing="0" cellpadding="0">
                          <tr>
                                <td width="23%">
                                        <div id="logo">
                                                <a href="{% url index %}">

-                                                       <img src="{% media  "/media/images/logo.png" %}" title="{% trans "back to home page" %}" alt="{{settings.APP_TITLE}} logo"/>
+                                                       <img src="{{ settings.APP_LOGO }}" title="{% trans "back to home page" %}" alt="{{settings.APP_TITLE}} logo"/>

                                                </a>
                                        </div>
                </td>
                                <td width="77%" valign="bottom">
                 <div class="nav">
                                                </a>
                                        </div>
                </td>
                                <td width="77%" valign="bottom">
                 <div class="nav">

-                    <a id="nav_questions" href="{% url questions %}" >{% trans "questions" %}</a>
-                    <a id="nav_tags" href="{% url tags %}">{% trans "tags" %}</a>
-                    <a id="nav_users" href="{% url users %}">{% trans "users" %}</a>
-                    {% if settings.BOOKS_ON %}
-                    <a id="nav_books" href="{% url books %}">{% trans "books" %}</a>
-                    {% endif %}
-                    <a id="nav_badges" href="{% url badges %}">{% trans "badges" %}</a>
-                    <a id="nav_unanswered" href="{% url unanswered %}">{% trans "unanswered questions" %}</a>
+                    {% loopregistry page_top_tabs %}{% spaceless %}
+                        <a id="nav_{{ tab_name }}"{% ifequal tab tab_name %} class="on"{% endifequal %} href="{{ tab_url }}" >{{ tab_title }}</a>
+                    {% endspaceless %}{% endloopregistry %}

                     <div class="focus">
                     <a id="nav_ask" href="{% url ask %}" class="special">{% trans "ask a question" %}</a>
                     </div>
                     <div class="focus">
                     <a id="nav_ask" href="{% url ask %}" class="special">{% trans "ask a question" %}</a>
                     </div>


@@ -61,5 +49,10 @@
             </tr>
                        </table>
                </div>
             </tr>
                        </table>
                </div>

-       </div>
+               {% if settings.USE_ANNOUNCEMENT_BAR|or_preview:request %}
+        <div id="announcement">
+            {{ settings.ANNOUNCEMENT_BAR|or_preview:request|markdown:"settingsparser" }}
+        </div>
+        {% endif %}
+       </div>                 

 <!-- end template header.html -->
 <!-- end template header.html -->