took out some unnessisary imports.

[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 d1cf673b6e9eee5d30a522b8cd47de3546775138..ea93bce192ed8d50566811838cfa14517d2fdef4 100644 (file)
--- a/forum/skins/default/templates/base_content.html
+++ b/forum/skins/default/templates/base_content.html
@@ -9,21 +9,21 @@
         {% if settings.GOOGLE_SITEMAP_CODE %}
         <meta name="google-site-verification" content="{{ settings.GOOGLE_SITEMAP_CODE }}" />
         {% endif %}
-        <link rel="shortcut icon" href="{% media  "/media/images/favicon.ico" %}" />
+        <link rel="shortcut icon" href="{{ settings.APP_FAVICON }}" />
         <link href="{% media  "/media/style/style.css" %}" rel="stylesheet" type="text/css" />
         {% spaceless %}
         {% block forestyle %}{% endblock %}
         {% endspaceless %}
         <script src="http://www.google.com/jsapi" type="text/javascript"></script>
-        <script type="text/javascript">google.load("jquery", "1.2.6");</script>
+        <script type="text/javascript">google.load("jquery", "1.4.2");</script>
         <script type="text/javascript">
-            var i18nLang = '{{ settings.LANGUAGE_CODE }}';
+        /* <![CDATA[ */
+            var i18nLang = '{{settings.LANGUAGE_CODE}}';
             var scriptUrl = '/{{settings.FORUM_SCRIPT_ALIAS}}'
             var osqaSkin = '{{settings.OSQA_SKIN}}';
+        /* ]] */
         </script>
-        <script type='text/javascript' src='{% media  "/media/js/com.cnprog.i18n.js" %}'></script>
-        <script type='text/javascript' src='{% media  "/media/js/jquery.i18n.js" %}'></script>
-        <script type='text/javascript' src='{% media  "/media/js/com.cnprog.utils.js" %}'></script>
+        <script type='text/javascript' src='{% media  "/media/js/osqa.main.min.js" %}'></script>
         {% if user_messages %}
         <style type="text/css">
             body { margin-top:2.4em; }