Reverts some changes in a previous commit.

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

diff --git a/forum/skins/default/templates/base_content.html b/forum/skins/default/templates/base_content.html
index 62d2176f7434729bfc08e4135954ddcdace6f1ee..76eec6e2923469d760ee99fe02cb9b76812cdb45 100644 (file)
--- a/forum/skins/default/templates/base_content.html
+++ b/forum/skins/default/templates/base_content.html
@@ -33,7 +33,12 @@
                 message: "{% trans "Message:" %}",
                 cancel: "{% trans "Cancel" %}",
                 close: "{% trans "Close" %}",
-                ok: "{% trans "Ok" %}"
+                ok: "{% trans "Ok" %}",
+                matching_tags_url: "{% url matching_tags %}",
+                word: "{% trans "word" %}",
+                words: "{% trans "words" %}",
+                character: "{% trans "character" %}",
+                characters: "{% trans "characters" %}"
             }
         /* ]] */
         </script>
@@ -51,7 +56,7 @@
         </script>
         {% endif %}
         {% if settings.USE_CUSTOM_HEAD|or_preview:request %}
-            {{ settings.CUSTOM_HEAD|or_preview:request|safe }}
+            {{ settings.CUSTOM_HEAD|or_preview:request|markdown:"settingsparser" }}
         {% endif %}
         {% block forejs %}{% endblock %}
         <link rel="search" type="application/opensearchdescription+xml" href="{% url opensearch %}" title="{{ settings.APP_SHORT_NAME }} Search" />
@@ -70,7 +75,7 @@
         </div>
         {% if settings.USE_CUSTOM_HEADER|or_preview:request %}
             <div id="custom_header">
-                {{ settings.CUSTOM_HEADER|or_preview:request|markdown:"settingsparser" }}    
+                {{ settings.CUSTOM_HEADER|or_preview:request|safe }}
             </div>
         {% endif %}
         {% include "header.html" %}