Merge pull request #542 from benjaoming/dj19-static

Use {% static %} instead of deprecated STATIC_URL
django-wiki · May 5, 2016 · 286ac7e · 286ac7e
2 parents 63e9332 + 082a057
commit 286ac7e
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 33 deletions.
diff --git a/wiki/plugins/links/templates/wiki/plugins/links/sidebar.html b/wiki/plugins/links/templates/wiki/plugins/links/sidebar.html
@@ -1,4 +1,4 @@
-{% load i18n sekizai_tags %}
+{% load i18n sekizai_tags static %}
 
 <h4>{% trans "Link to another wiki page" %}</h4>
 
@@ -26,7 +26,7 @@ <h4>{% trans "An external link" %}</h4>
 </p>
 <pre>[Clickable text](http://example.com)</pre>
 
-{% addtoblock "js" %}<script type="text/javascript" src="{{ STATIC_URL }}wiki/js/typeahead.min.js"></script>{% endaddtoblock %}
+{% addtoblock "js" %}<script type="text/javascript" src="{% static "wiki/js/typeahead.min.js" %}"></script>{% endaddtoblock %}
 {% addtoblock "js" %}
 <script type="text/javascript">
   $(document).ready(function() {

diff --git a/wiki/plugins/notifications/templates/wiki/plugins/notifications/menubaritem.html b/wiki/plugins/notifications/templates/wiki/plugins/notifications/menubaritem.html
@@ -1,4 +1,4 @@
-{% load i18n sekizai_tags %}
+{% load i18n sekizai_tags static %}
 
   <li class="divider notification-before-list"></li>
   <li class="notifications-empty"><a href="#"><em>{% trans "No notifications" %}</em></a></li>
@@ -22,4 +22,4 @@
   URL_NOTIFY_GOTO = "{% url "nyt:goto_base" %}";
 </script>
 {% endaddtoblock %}
-{% addtoblock "js" %}<script type="text/javascript" src="{{ STATIC_URL }}wiki/plugins/notifications/js/ui.js"></script>{% endaddtoblock %}
+{% addtoblock "js" %}<script type="text/javascript" src="{% static "wiki/plugins/notifications/js/ui.js" %}"></script>{% endaddtoblock %}
diff --git a/wiki/templates/wiki/base_site.html b/wiki/templates/wiki/base_site.html
@@ -1,4 +1,4 @@
-{% load sekizai_tags i18n wiki_tags %}<!DOCTYPE html>
+{% load sekizai_tags i18n wiki_tags static %}<!DOCTYPE html>
 <html lang="en">
   <head>
     <meta charset="utf-8">
@@ -9,7 +9,7 @@
     <meta name="author" content="www.django-wiki.org">
 
     <!-- Le styles -->
-    <link href="{{ STATIC_URL }}wiki/bootstrap/css/wiki-bootstrap.min.css" rel="stylesheet">
+    <link href="{% static "wiki/bootstrap/css/wiki-bootstrap.min.css" %}" rel="stylesheet">
 
     {% render_block "css" %}
 
@@ -130,7 +130,7 @@
       <footer id="wiki-footer">
         <hr />
         {% block wiki_footer_logo %}
-        <a href="https://github.com/django-wiki/django-wiki" class="pull-right"><img src="{{ STATIC_URL }}wiki/img/github_icon.png" /></a>
+        <a href="https://github.com/django-wiki/django-wiki" class="pull-right"><img src="{% static "wiki/img/github_icon.png" %}" /></a>
         {% endblock %}
         {% block wiki_footer_prepend %}
         {% endblock %}
@@ -143,11 +143,11 @@
 
     {% endblock %}
 
-    <script src="{{ STATIC_URL }}wiki/js/jquery.min.js"></script>
-    <script src="{{ STATIC_URL }}wiki/js/core.js"></script>
-    <script src="{{ STATIC_URL }}wiki/bootstrap/js/bootstrap.min.js"></script>
+    <script src="{% static "wiki/js/jquery.min.js" %}"></script>
+    <script src="{% static "wiki/js/core.js" %}"></script>
+    <script src="{% static "wiki/bootstrap/js/bootstrap.min.js" %}"></script>
     <!-- Optionally enable responsive features in IE8 -->
-    <script src="{{ STATIC_URL }}wiki/js/respond.min.js"></script>
+    <script src="{% static "wiki/js/respond.min.js" %}"></script>
     {% render_block "js" %}
 
   </body>

diff --git a/wiki/templates/wiki/create.html b/wiki/templates/wiki/create.html
@@ -1,13 +1,13 @@
 {% extends "wiki/base.html" %}
-{% load wiki_tags i18n sekizai_tags %}
+{% load wiki_tags i18n sekizai_tags static %}
 
 
 {% block wiki_pagetitle %}{% trans "Add new article" %}{% endblock %}
 
 {% block wiki_contents %}
 
   {% addtoblock "js" %}
-  <script type="text/javascript" src="{{ STATIC_URL }}admin/js/urlify.js"></script>
+  <script type="text/javascript" src="{% static "admin/js/urlify.js" %}"></script>
   <script type="text/javascript">
   // Replacement of django's URLify that doesn't remove any words.
   function URLify(s, num_chars) {

diff --git a/wiki/templates/wiki/create_root.html b/wiki/templates/wiki/create_root.html
@@ -1,20 +1,20 @@
 {% extends "wiki/base.html" %}
-{% load wiki_tags i18n sekizai_tags %}
+{% load wiki_tags i18n sekizai_tags static %}
 
 {% block wiki_pagetitle %}{% trans "Create root article" %}{% endblock %}
 
 {% block wiki_contents %}
 
   {% addtoblock "js" %}
   {% for js in editor.Media.js %}
-  <script type="text/javascript" src="{{ STATIC_URL }}{{ js }}"></script>
+  <script type="text/javascript" src="{% static js %}"></script>
   {% endfor %}
   {% endaddtoblock %}
 
   {% addtoblock "css" %}
   {% for media, srcs in editor.Media.css.items %}
     {% for src in srcs %}
-      <link rel="stylesheet" media="{{ media }}" href="{{ STATIC_URL }}{{ src }}" />
+      <link rel="stylesheet" media="{{ media }}" href="{% static src %}" />
     {% endfor %}
   {% endfor %}
   {% endaddtoblock %}

diff --git a/wiki/templates/wiki/history.html b/wiki/templates/wiki/history.html
@@ -1,5 +1,5 @@
 {% extends "wiki/article.html" %}
-{% load wiki_tags i18n sekizai_tags %}
+{% load wiki_tags i18n sekizai_tags static %}
 
 
 {% block wiki_pagetitle %}{% trans "History" %}: {{ article.current_revision.title }}{% endblock %}
@@ -9,8 +9,8 @@
 {% include "wiki/includes/modals.html" %}
 
 {% addtoblock "js" %}
-<script type="text/javascript" src="{{ STATIC_URL }}wiki/js/diffview.js"></script>
-<script type="text/javascript" src="{{ STATIC_URL }}wiki/js/diff.js"></script>
+<script type="text/javascript" src="{% static "wiki/js/diffview.js" %}"></script>
+<script type="text/javascript" src="{% static "wiki/js/diff.js" %}"></script>
 {% endaddtoblock %}
 {% addtoblock "css" %}
 <style type="text/css">

diff --git a/wiki/templates/wiki/includes/editormedia.html b/wiki/templates/wiki/includes/editormedia.html
@@ -1,15 +1,15 @@
-{% load sekizai_tags %}
+{% load sekizai_tags static %}
 {% addtoblock "js" %}
-<script type="text/javascript" src="{{ STATIC_URL }}wiki/js/editor.js"></script>
+<script type="text/javascript" src="{% static "wiki/js/editor.js" %}"></script>
 {% for js in editor.Media.js %}
-<script type="text/javascript" src="{{ STATIC_URL }}{{ js }}"></script>
+<script type="text/javascript" src="{% static js %}"></script>
 {% endfor %}
 {% endaddtoblock %}
 
 {% addtoblock "css" %}
 {% for media, srcs in editor.Media.css.items %}
   {% for src in srcs %}
-    <link rel="stylesheet" media="{{ media }}" href="{{ STATIC_URL }}{{ src }}" />
+    <link rel="stylesheet" media="{{ media }}" href="{% static src %}" />
   {% endfor %}
 {% endfor %}
 {% endaddtoblock %}
diff --git a/wiki/templates/wiki/includes/modals.html b/wiki/templates/wiki/includes/modals.html
@@ -1,6 +1,6 @@
-{% load sekizai_tags %}
+{% load sekizai_tags static %}
 {% addtoblock "js" %}
-<script type="text/javascript" src="{{ STATIC_URL }}wiki/js/jqueryui/jquery-ui-1.10.0.custom.min.js"></script>
+<script type="text/javascript" src="{% static "wiki/js/jqueryui/jquery-ui-1.10.0.custom.min.js" %}"></script>
 <script type="text/javascript">
 $(document).ready(function() {
   $(".modal-content").on("resizestart", function(event, ui) {
@@ -27,5 +27,5 @@
 </script>
 {% endaddtoblock %}
 {% addtoblock "css" %}
-<link rel="stylesheet" href="{{ STATIC_URL }}wiki/js/jqueryui/jquery-ui-1.10.0.custom.min.css" type="text/css" />
+<link rel="stylesheet" href="{% static "wiki/js/jqueryui/jquery-ui-1.10.0.custom.min.css" %}" type="text/css" />
 {% endaddtoblock %}
diff --git a/wiki/templates/wiki/includes/render.html b/wiki/templates/wiki/includes/render.html
@@ -1,7 +1,7 @@
-{% load wiki_tags i18n cache sekizai_tags %}
+{% load wiki_tags i18n cache sekizai_tags static %}
 
 {% addtoblock "js" %}
-  <script type="text/javascript" src="{{ STATIC_URL }}wiki/js/article.js"></script>
+  <script type="text/javascript" src="{% static "wiki/js/article.js" %}"></script>
 {% endaddtoblock %}
 
 <div class="wiki-article">
@@ -18,14 +18,14 @@
   {% if plugin.RenderMedia.css %}
     {% addtoblock "css" %}
       {% for media, url in plugin.RenderMedia.css.items %}
-        <link rel="stylesheet" href="{{ STATIC_URL }}{{ url }}" />
+        <link rel="stylesheet" href="{% static url %}" />
       {% endfor %}
     {% endaddtoblock %}
   {% endif %}
   {% if plugin.RenderMedia.js %}
     {% addtoblock "js" %}
       {% for url in plugin.RenderMedia.js %}
-        <script type="text/javascript" src="{{ STATIC_URL }}{{ url }}"></script>
+        <script type="text/javascript" src="{% static url %}"></script>
       {% endfor %}
     {% endaddtoblock %}
   {% endif %}

diff --git a/wiki/templates/wiki/preview_inline.html b/wiki/templates/wiki/preview_inline.html
@@ -1,5 +1,5 @@
 {% extends "wiki/base.html" %}
-{% load wiki_tags i18n sekizai_tags %}
+{% load wiki_tags i18n sekizai_tags static %}
 
 {% block wiki_body %}
 
@@ -38,14 +38,14 @@ <h1 class="page-header">{{ title }}</h1>
       {% if plugin.RenderMedia.css %}
         {% addtoblock "css" %}
           {% for media, url in plugin.RenderMedia.css.items %}
-            <link rel="stylesheet" href="{{ STATIC_URL }}{{ url }}" />
+            <link rel="stylesheet" href="{% static url %}" />
           {% endfor %}
         {% endaddtoblock %}
       {% endif %}
       {% if plugin.RenderMedia.js %}
         {% addtoblock "js" %}
           {% for url in plugin.RenderMedia.js %}
-            <script type="text/javascript" src="{{ STATIC_URL }}{{ url }}"></script>
+            <script type="text/javascript" src="{% static url %}"></script>
           {% endfor %}
         {% endaddtoblock %}
       {% endif %}