BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/304755
Change subject: Use static rather than bootstrap_css and bootstrap_javascript
tags
......................................................................
Use static rather than bootstrap_css and bootstrap_javascript tags
The bootstrap_css and bootstrap_javascript tag provided by the
django-bootstrap3 package do not integrate with the static files
handling app. The URLs they generate reference the base files (e.g.
bootstrap.min.css) rather than the long term cacheable versions of the
files curated by collectstatic (e.g. bootstrap.min.2f624089c65f.css).
In a development environment this really doesn't make any difference,
but for production deployment it will be much nicer to have asset urls
that change when the file content changes so we can set very long
duration cache headers.
Change-Id: I75a5c148cafa424280632f09b02e870873da7310
---
M striker/templates/base.html
1 file changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/labs/striker
refs/changes/55/304755/1
diff --git a/striker/templates/base.html b/striker/templates/base.html
index c83b0c3..6f160ec 100644
--- a/striker/templates/base.html
+++ b/striker/templates/base.html
@@ -14,7 +14,7 @@
<link rel="icon" type="image/icns" sizes="128x128" href="{% static
"img/favicon.icns" %}">
<link rel="icon" type="image/x-icon" sizes="48x48" href="{% static
"img/favicon.ico" %}">
<link rel="icon" type="image/png" sizes="32x32" href="{% static
"img/favicon.png" %}">
- {% bootstrap_css %}
+ <link rel="stylesheet" href="{% static "css/bootstrap.min.css" %}">
<link rel="stylesheet" href="{% static "css/bootstrap-theme.min.css" %}">
<link rel="stylesheet" href="{% static "css/site.css" %}">
{% block css %}{% endblock css %}
@@ -74,8 +74,9 @@
</ul>
</div>
</footer>
- {% bootstrap_javascript %}
{% block js %}
+ <script lang="javascript" src="{% static "js/jquery.min.js" %}"></script>
+ <script lang="javascript" src="{% static "js/bootstrap.min.js"
%}"></script>
<script lang="javascript" src="{% static "js/site.js" %}"></script>
{% endblock js %}
</body>
--
To view, visit https://gerrit.wikimedia.org/r/304755
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I75a5c148cafa424280632f09b02e870873da7310
Gerrit-PatchSet: 1
Gerrit-Project: labs/striker
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <bda...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
