fixed minor typo in english translation of the logout page.

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

old mode 100755 (executable)

new mode 100644 (file)

index 3a1848e..03234eb
--- a/forum/skins/default/templates/base.html
+++ b/forum/skins/default/templates/base.html
@@ -3,9 +3,9 @@
  {% load extra_filters %}
  {% load extra_tags %}
  {% load i18n %}
-<html xmlns="http://www.w3.org/1999/xhtml"{% if fb_api_key %} xmlns:fb="http://www.facebook.com/2008/fbml"{% endif %}>
+<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 %}
@@ -13,10 +13,10 @@
          {% 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" />
          <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">
          /* <![CDATA[ */
              var i18nLang = '{{settings.LANGUAGE_CODE}}';
@@ -24,25 +24,21 @@
              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.js" %}'></script>
          {% if user_messages %}
          <style type="text/css">
              body { margin-top:2.4em; }
          </style>
          <script type="text/javascript">
-        /* <![CDATA[ */
              $(document).ready(function() {
                  $('#validate_email_alert').click(function(){notify.close(true)})
                  notify.show();
              });
-        /* ]] */
          </script>
          {% endif %}
-      
-        {% block forejs %}
-        {% endblock %}
+        {% block forejs %}{% endblock %}
+
+        <link rel="search" type="application/opensearchdescription+xml" href="{% url opensearch %}" title="{{ settings.APP_SHORT_NAME }} Search" />
      </head>
      <body>
          <div class="notify" style="display:none">
@@ -80,4 +76,4 @@
          {% endblock %}
      </body>
  </html>
-<!-- end template base.html -->
+ <!-- end template base.html -->