Migrate to Django 1.6

[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 7afaffc2e682ccdb100a11cd33f0c585e7fb155e..6d2c849622ad5aa0f6df4d680501c3e611e4bc18 100644 (file)
--- a/forum/skins/default/templates/header.html
+++ b/forum/skins/default/templates/header.html
@@ -1,10 +1,10 @@
 <!-- template header.html -->
-{% load extra_tags ui_registry i18n extra_filters markup %}
+{% load extra_tags ui_registry i18n extra_filters %}
 
        <div id="roof">
          
                <div id="logo">
-                       <a href="{% url index %}">
+                       <a href="{% url "index" %}">
                                <img src="{{ settings.APP_LOGO }}" title="{% trans "back to home page" %}" alt="{{settings.APP_TITLE}} logo"/>
                        </a>
                </div>
@@ -17,14 +17,15 @@
         {% 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>
+        <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">
+    <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" />
@@ -40,7 +41,7 @@
 
        {% if settings.USE_ANNOUNCEMENT_BAR|or_preview:request %}
   <div id="announcement">
-      {{ settings.ANNOUNCEMENT_BAR|or_preview:request|markdown:"settingsparser" }}
+      {{ settings.ANNOUNCEMENT_BAR|or_preview:request|static_content:settings.ANNOUNCEMENT_BAR_RENDER_MODE }}
   </div>
   {% endif %}