fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
bcdbcc3
..
3e725d4
100644
(file)
--- a/
redakcja/templates/base.html
+++ b/
redakcja/templates/base.html
@@
-9,18
+9,19
@@
{% endblock %}
</head>
<body id="{% block bodyid %}base{% endblock %}">
{% 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>
</div>
<div id="loading-message">
<img src="{{STATIC_URL}}img/spinner.gif" />
<p>{% trans "Loading" %}</p>
</div>
</div>
-
+
<div id="body-wrap">
<div id="body-wrap">
+ <!-- version: {{ APP_VERSION }} -->
<div id="content">{% block maincontent %} {% endblock %}</div>
</div>
<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>