X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/f76d8997ce081a9f2dfca9b875405362ece3608e..4447439079a88835d69524ab36ba88ecda384142:/forum/skins/default/templates/base_content.html?ds=inline

diff --git a/forum/skins/default/templates/base_content.html b/forum/skins/default/templates/base_content.html
index 76eec6e..b33cbf5 100644
--- a/forum/skins/default/templates/base_content.html
+++ b/forum/skins/default/templates/base_content.html
@@ -4,8 +4,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <title>{% block fulltitle %}{% block title %}{% endblock %} - {{ settings.APP_SHORT_NAME }}{% endblock %}</title>
-        <meta name="description" content="{% block metadescription %}{{ settings.APP_DESCRIPTION }}{% endblock %}">
-        <meta name="keywords" content="{% block metakeywords %}{{ settings.APP_KEYWORDS }}{% endblock %}">
+        <meta name="description" content="{% block metadescription %}{{ settings.APP_DESCRIPTION }}{% endblock %}" />
+        <meta name="keywords" content="{% block metakeywords %}{{ settings.APP_KEYWORDS }}{% endblock %}" />
         {% block meta %}{% endblock %}
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
         {% if settings.GOOGLE_SITEMAP_CODE %}
@@ -16,13 +16,21 @@
         {% if settings.USE_CUSTOM_CSS|or_preview:request %}
         <link href="{% url custom_css %}" rel="stylesheet" type="text/css" />
         {% endif %}
+        <link rel="stylesheet" type="text/css" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1/themes/base/jquery-ui.css" />
+        <!--[if IE 6]>
+        <style type="text/css">
+        img, div, a { behavior: url({% media "/media/iepngfix/iepngfix.htc" %}) }
+        </style>
+        <![endif]-->
         {% block forestyle %}{% endblock %}
+
         <script src="http://www.google.com/jsapi" type="text/javascript"></script>
-        <script type="text/javascript">google.load("jquery", "1.4.2");</script>
         <script type="text/javascript">
-        /* <![CDATA[ */
+            google.load("jquery", "1.4.2");
+            google.load("jqueryui", "1", {autoload:true});
+
             var i18nLang = '{{settings.LANGUAGE_CODE}}';
-            var scriptUrl = '/{{settings.FORUM_SCRIPT_ALIAS}}'
+            var scriptUrl = '{{settings.FORCE_SCRIPT_NAME}}/'
             var osqaSkin = '{{settings.OSQA_SKIN}}';
 
             var messages = {
@@ -40,9 +48,8 @@
                 character: "{% trans "character" %}",
                 characters: "{% trans "characters" %}"
             }
-        /* ]] */
         </script>
-        <script type='text/javascript' src='{% media  "/media/js/osqa.main.js" %}'></script>
+        <script type="text/javascript" src="{% media  "/media/js/osqa.main.js" %}"></script>
         {% if user_messages %}
         <style type="text/css">
             body { margin-top:2.4em; }
@@ -56,7 +63,7 @@
         </script>
         {% endif %}
         {% if settings.USE_CUSTOM_HEAD|or_preview:request %}
-            {{ settings.CUSTOM_HEAD|or_preview:request|markdown:"settingsparser" }}
+            {{ settings.CUSTOM_HEAD|or_preview:request|safe }}
         {% endif %}
         {% block forejs %}{% endblock %}
         <link rel="search" type="application/opensearchdescription+xml" href="{% url opensearch %}" title="{{ settings.APP_SHORT_NAME }} Search" />
@@ -71,11 +78,11 @@
                     {% endfor %}
                 {% endif %}
             {% endautoescape %}
-            <a id="close-notify" onclick="notify.close(true)">&times;</a>
+            <a id="close-notify" onclick="notify.close(true)">&#215;</a>
         </div>
         {% if settings.USE_CUSTOM_HEADER|or_preview:request %}
             <div id="custom_header">
-                {{ settings.CUSTOM_HEADER|or_preview:request|safe }}
+                {{ settings.CUSTOM_HEADER|or_preview:request|static_content:settings.CUSTOM_HEADER_RENDER_MODE }}
             </div>
         {% endif %}
         {% include "header.html" %}
@@ -98,19 +105,19 @@
         {% if settings.USE_CUSTOM_FOOTER|or_preview:request %}
             {% ifequal settings.CUSTOM_FOOTER_MODE|or_preview:request "above" %}
                 <div id="custom_footer">
-                    {{ settings.CUSTOM_FOOTER|or_preview:request|markdown:"settingsparser" }}
+                    {{ settings.CUSTOM_FOOTER|or_preview:request|static_content:settings.CUSTOM_FOOTER_RENDER_MODE }}
                 </div>
             {% endifequal %}
             <div id="ground">
                 {% ifequal settings.CUSTOM_FOOTER_MODE|or_preview:request "replace" %}
-                    {{ settings.CUSTOM_FOOTER|or_preview:request|markdown:"settingsparser" }}
+                    {{ settings.CUSTOM_FOOTER|or_preview:request|static_content:settings.CUSTOM_FOOTER_RENDER_MODE }}
                 {% else %}
                     {% include "footer.html" %}
                 {% endifequal %}
             </div>
             {% ifequal settings.CUSTOM_FOOTER_MODE|or_preview:request "below" %}
                 <div id="custom_footer">
-                    {{ settings.CUSTOM_FOOTER|or_preview:request|markdown:"settingsparser" }}
+                    {{ settings.CUSTOM_FOOTER|or_preview:request|static_content:settings.CUSTOM_FOOTER_RENDER_MODE }}
                 </div>
             {% endifequal %}
         {% else %}
