]> 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
Resolves OSQA-674, be sure that we remove all anchors that trigger JavaScript code.
[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 19a6d738cfa90afc3a91034a647550cbc83578dd..b33cbf58835df5e65a8e82fe6baf8c3d9807c398 100644 (file)
--- 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>
 <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 %}
         {% block meta %}{% endblock %}
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
         {% if settings.GOOGLE_SITEMAP_CODE %}
@@ -17,14 +17,18 @@
         <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 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 %}
         {% block forestyle %}{% endblock %}
+
         <script src="http://www.google.com/jsapi" type="text/javascript"></script>
         <script type="text/javascript">
             google.load("jquery", "1.4.2");
             google.load("jqueryui", "1", {autoload:true});
         <script src="http://www.google.com/jsapi" type="text/javascript"></script>
         <script type="text/javascript">
             google.load("jquery", "1.4.2");
             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 scriptUrl = '{{settings.FORCE_SCRIPT_NAME}}/'
             var osqaSkin = '{{settings.OSQA_SKIN}}';
@@ -44,10 +48,8 @@
                 character: "{% trans "character" %}",
                 characters: "{% trans "characters" %}"
             }
                 character: "{% trans "character" %}",
                 characters: "{% trans "characters" %}"
             }
-        /* ]] */
         </script>
         </script>
-        <script type='text/javascript' src='{% media  "/media/js/osqa.main.js" %}'></script>
-        <script type='text/javascript' src='{% media  "/media/js/jquery.copy.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; }
         {% if user_messages %}
         <style type="text/css">
             body { margin-top:2.4em; }
@@ -76,7 +78,7 @@
                     {% endfor %}
                 {% endif %}
             {% endautoescape %}
                     {% 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">
         </div>
         {% if settings.USE_CUSTOM_HEADER|or_preview:request %}
             <div id="custom_header">
OSQA