Fix OSQA 269, User messages in new admin don't seem to link properly.

[osqa.git] / forum / skins / default / templates / base.html
diff --git a/forum/skins/default/templates/base.html b/forum/skins/default/templates/base.html

index 1bad79630ac2ad7ccc4e4527f20565361cfcee50..80eb598c9cca38bbb7e2373445d219ca2d53f5b4 100644 (file)
--- a/forum/skins/default/templates/base.html
+++ b/forum/skins/default/templates/base.html
@@ -5,7 +5,7 @@
  {% load i18n %}
  <html xmlns="http://www.w3.org/1999/xhtml">
      <head>
-        <title>{% block title %}{% endblock %} - {{ settings.APP_TITLE }}</title>
+        <title>{% block fulltitle %}{% block title %}{% endblock %} - {{ settings.APP_SHORT_NAME }}{% endblock %}</title>
          {% spaceless %}
          {% block meta %}{% endblock %}
          {% endspaceless %}
@@ -24,7 +24,7 @@
              var osqaSkin = '{{settings.OSQA_SKIN}}';
          /* ]] */
          </script>
-        <script type='text/javascript' src='{% media  "/media/js/osqa.main.min.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; }
@@ -36,9 +36,23 @@
              });
          </script>
          {% endif %}
-      
-        {% block forejs %}
-        {% endblock %}
+        {% block forejs %}{% endblock %}
+
+        <link rel="search" type="application/opensearchdescription+xml" href="{% url opensearch %}" title="{{ settings.APP_SHORT_NAME }} Search" />
+        
+        {% if settings.GOOGLE_ANALYTICS_KEY %}
+            <script type="text/javascript">
+                var _gaq = _gaq || [];
+                _gaq.push(['_setAccount', '{{ settings.GOOGLE_ANALYTICS_KEY }}']);
+                _gaq.push(['_trackPageview']);
+
+                (function() {
+                    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+                    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+                })();
+            </script>
+        {% endif %}
      </head>
      <body>
          <div class="notify" style="display:none">
@@ -76,4 +90,4 @@
          {% endblock %}
      </body>
  </html>
-<!-- end template base.html -->
+ <!-- end template base.html -->