Merge master into img-playground. Image support with new management features. Missing...

[redakcja.git] / redakcja / templates / base.html
diff --git a/redakcja/templates/base.html b/redakcja/templates/base.html

index 749fd2a..3e725d4 100644 (file)
--- a/redakcja/templates/base.html
+++ b/redakcja/templates/base.html
@@ -10,7 +10,7 @@
      </head>
      <body id="{% block bodyid %}base{% endblock %}">
  
      </head>
      <body id="{% block bodyid %}base{% endblock %}">
  
-    <div id="loading-overlay" style="display: none;">
+    <div id="loading-overlay">
         <div id="loading-message">
                 <img src="{{STATIC_URL}}img/spinner.gif" />
                 <p>{% trans "Loading" %}</p>
         <div id="loading-message">
                 <img src="{{STATIC_URL}}img/spinner.gif" />
                 <p>{% trans "Loading" %}</p>
@@ -21,7 +21,7 @@
                 <!-- version: {{ APP_VERSION }} -->
          <div id="content">{% block maincontent %} {% endblock %}</div>
          </div>
                 <!-- version: {{ APP_VERSION }} -->
          <div id="content">{% block maincontent %} {% endblock %}</div>
          </div>
-       <!-- <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js" type="text/javascript"></script> -->
+    <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js"></script>
      {% block extrabody %}{% endblock %}
      </body>
  </html>
      {% block extrabody %}{% endblock %}
      </body>
  </html>