]> git.openstreetmap.org Git - osqa.git/blobdiff - forum/skins/default/templates/base_content.html
projects / osqa.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
use latest jQuery version
[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 8bae0ea4d34d36d3ecb141f2293c84b384521045..789710d2177d359b05464d750375450c1427c2cc 100644 (file)
--- a/forum/skins/default/templates/base_content.html
+++ b/forum/skins/default/templates/base_content.html
@@ -2,7 +2,7 @@
 <!-- base_content.html -->
 {% load i18n extra_tags extra_filters markup ui_registry %}
 <html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
+    <head>{% block after_head_js %}{% endblock %}
         <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 %}" />
@@ -27,12 +27,13 @@
         <script src="http://www.google.com/jsapi" type="text/javascript"></script>
         <script type="text/javascript">
         /*<![CDATA[*/
-            google.load("jquery", "1.4.2");
+            google.load("jquery", "1");
             google.load("jqueryui", "1", {autoload:true});
 
-            var i18nLang = '{{settings.LANGUAGE_CODE}}';
-            var scriptUrl = '{{settings.FORCE_SCRIPT_NAME}}/'
-            var osqaSkin = '{{settings.OSQA_SKIN}}';
+            var i18nLang = '{{ settings.LANGUAGE_CODE }}';
+            var appUrl = '{{ settings.APP_URL }}'
+            var scriptUrl = '{{ settings.FORCE_SCRIPT_NAME }}/'
+            var osqaSkin = '{{ settings.OSQA_SKIN }}';
 
             var messages = {
                 username: '{{ user.username }}',
@@ -72,16 +73,7 @@
         {% loadregistry head_content %}{% endloadregistry %}
     </head>
     <body>
-        <div class="notify" style="display:none">
-            {% autoescape off %}
-                {% if user_messages %}
-                    {% for message in user_messages %}
-                          <p class="darkred">{{ message }}</p>
-                    {% endfor %}
-                {% endif %}
-            {% endautoescape %}
-            <a id="close-notify" onclick="notify.close(true)">&#215;</a>
-        </div>
+        <div class="wrapper">
         {% if settings.USE_CUSTOM_HEADER|or_preview:request %}
             <div id="custom_header">
                 {{ settings.CUSTOM_HEADER|or_preview:request|static_content:settings.CUSTOM_HEADER_RENDER_MODE }}
@@ -142,6 +134,19 @@
                 })();
             </script>
         {% endif %}
+        </div>
+
+        <!-- Put all elements with fixed position here, IE6 fixed position fix: http://ryanfait.com/position-fixed-ie6/ -->
+        <div class="notify" style="display:none">
+            {% autoescape off %}
+                {% if user_messages %}
+                    {% for message in user_messages %}
+                          <p class="darkred">{{ message }}</p>
+                    {% endfor %}
+                {% endif %}
+            {% endautoescape %}
+            <a id="close-notify" onclick="notify.close(true)">&#215;</a>
+        </div>
     </body>
 </html>
 <!-- end template base_content.html -->
OSQA