Fix in the retag template.

[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 c53604ca3afe559be2486688c745d1a6116805b5..0e3a73f7d0805b9ef9fc76770bf9fa60e9670149 100644 (file)
--- a/forum/skins/default/templates/header.html
+++ b/forum/skins/default/templates/header.html
@@ -1,65 +1,48 @@
 <!-- template header.html -->
-{% load extra_tags %}
-{% load i18n %}
-       <div id="roof">
-               <div id="navBar">
-                       <div id="top">
-                {% if request.user.is_authenticated %}
-                    {% if request.user.is_superuser %}
-                        <a href="{% url admin_index %}">{% trans "administration" %}</a>   
-                    {% endif %}
-                    <a href="{% url user_profile id=request.user.id,slug=request.user.username|slugify %}">{{ 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>
-                       </div>
-                       <table width="100%" border="0" cellspacing="0" cellpadding="0">
-                         <tr>
-                               <td width="23%">
-                                       <div id="logo">
-                                               <a href="{% url index %}">
-                                                       <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 id="nav_questions"{% ifequal tab "questions" %} class="on"{% endifequal %} href="{% url questions %}" >{% trans "questions" %}</a>
-                    <a id="nav_tags"{% ifequal tab "tags" %} class="on"{% endifequal %} href="{% url tags %}">{% trans "tags" %}</a>
-                    <a id="nav_users"{% ifequal tab "users" %} class="on"{% endifequal %} href="{% url users %}">{% trans "users" %}</a>
-                    <a id="nav_badges"{% ifequal tab "badges" %} class="on"{% endifequal %} href="{% url badges %}">{% trans "badges" %}</a>
-                    <a id="nav_unanswered"{% ifequal tab "unanswered" %} class="on"{% endifequal %} href="{% url unanswered %}">{% trans "unanswered questions" %}</a>
-                    <div class="focus">
-                    <a id="nav_ask" href="{% url ask %}" class="special">{% trans "ask a question" %}</a>
-                    </div>
-                </div>
+{% load extra_tags ui_registry i18n extra_filters markup %}
 
-              </td>
-                         </tr>
-                       </table>
+       <div id="roof">
+         
+               <div id="logo">
+                       <a href="{% url index %}">
+                               <img src="{{ settings.APP_LOGO }}" title="{% trans "back to home page" %}" alt="{{settings.APP_TITLE}} logo"/>
+                       </a>
                </div>
-               <div id="searchBar">
-                       <table width="100%" border="0" cellpadding="0" cellspacing="0" class="content">
-            <tr>
-                <td align="center" valign="middle">
-                    <form action="{% url search %}" method="get">
-                        <div>
-                            <input type="text" class="searchInput" value="{{ keywords }}" name="q" id="keywords" />
-                            <input type="submit" name="Submit" value="{% trans "search" %}" class="searchBtn" />
-                        </div>
-                        <div class="options">
-                            <input id="type-question" type="radio" value="question" name="t" 
-                                checked="checked" /><label for="type-question">{% trans "questions" %}</label>
-                            <input id="type-tag" type="radio" value="tag" name="t" /><label for="type-tag">{% trans "tags" %}</label>
-                            <input id="type-user" type="radio" value="user" name="t" /><label for="type-user">{% trans "users" %}</label>
-                        </div>
-                    </form>
-                </td>
-            </tr>
-                       </table>
+         
+               <div id="top">
+                   {% loadregistry header_links %}{% endloadregistry %}
                </div>
+
+    <div id="nav">
+        {% 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 %}
+        <a id="nav_ask" href="{% url ask %}" class="special">{% trans "ask a question" %}</a>
+    </div>
+  </div>
+
+  <div class="clear"></div>
+  
+       <div id="searchBar">
+    <form action="{% url search %}" method="get">
+        {% csrf_token %}
+        <div>
+            <input type="text" class="searchInput" value="{{ keywords }}" name="q" id="keywords" />
+            <input type="submit" name="Submit" value="{% trans "search" %}" class="searchBtn" />
+        </div>
+        <div class="options">
+            <input id="type-question" type="radio" value="question" name="t" 
+                checked="checked" /><label for="type-question">{% trans "questions" %}</label>
+            <input id="type-tag" type="radio" value="tag" name="t" /><label for="type-tag">{% trans "tags" %}</label>
+            <input id="type-user" type="radio" value="user" name="t" /><label for="type-user">{% trans "users" %}</label>
+        </div>
+    </form>    
        </div>
+
+       {% if settings.USE_ANNOUNCEMENT_BAR|or_preview:request %}
+  <div id="announcement">
+      {{ settings.ANNOUNCEMENT_BAR|or_preview:request|static_content:settings.ANNOUNCEMENT_BAR_RENDER_MODE }}
+  </div>
+  {% endif %}
+
 <!-- end template header.html -->