Reordered the sidebar block so subscription block is above upper user-defined block.

[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..e163d73095ea1c090012b3b24040c2d2a642d4d1 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; }