]> 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 https for various URLs
[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 22c1647ffa874b0c999806b32933a0711ce38c9d..e1e506533f5fa8ea2ee5315736f11b0f59f323f2 100644 (file)
--- a/forum/skins/default/templates/base_content.html
+++ b/forum/skins/default/templates/base_content.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!-- base_content.html -->
-{% load i18n extra_tags extra_filters markup ui_registry %}
+{% load i18n extra_tags extra_filters 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 %}" />
@@ -14,25 +14,26 @@
         <link rel="shortcut icon" href="{{ settings.APP_FAVICON }}" />
         <link href="{% media  "/media/style/style.css" %}" rel="stylesheet" type="text/css" />
         {% if settings.USE_CUSTOM_CSS|or_preview:request %}
-        <link href="{% url custom_css %}" rel="stylesheet" type="text/css" />
+        <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" />
+        <link rel="stylesheet" type="text/css" href="https://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 src="https://www.google.com/jsapi" type="text/javascript"></script>
         <script type="text/javascript">
-            google.load("jquery", "1.4.2");
+        /*<![CDATA[*/
+            google.load("jquery", "1");
             google.load("jqueryui", "1", {autoload:true});
-        </script>
-        <script type="text/javascript">
-        /* <![CDATA[ */
-            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 }}',
@@ -43,16 +44,15 @@
                 cancel: "{% trans "Cancel" %}",
                 close: "{% trans "Close" %}",
                 ok: "{% trans "Ok" %}",
-                matching_tags_url: "{% url matching_tags %}",
+                matching_tags_url: "{% url "matching_tags" %}",
                 word: "{% trans "word" %}",
                 words: "{% trans "words" %}",
                 character: "{% trans "character" %}",
                 characters: "{% trans "characters" %}"
             }
-        /* ]]> */
+        /*]]>*/
         </script>
-        <script type="text/javascript" src="{% media  "/media/js/osqa.main.js" %}?{% random 1 1000000 %}"></script>
-        <script type="text/javascript" src="{% media  "/media/js/jquery.copy.js" %}?{% random 1 1000000 %}"></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; }
@@ -69,20 +69,11 @@
             {{ 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" />
+        <link rel="search" type="application/opensearchdescription+xml" href="{% url "opensearch" %}" title="{{ settings.APP_SHORT_NAME }} Search" />
         {% 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 }}
@@ -143,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