Download as
Browse Code »

Commit cdd61ed323f5b26bb651009124742a8e0f9df2d3

Authored by Sergio Oliveira
1 parent 155d19ac
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Replaced STATIC_URL by static template tag

Showing 5 changed files with 21 additions and 21 deletions   Show diff stats
src/search/templates/search/search.html
  Diff comments   View file @cdd61ed
1 {% extends "base.html" %} 1 {% extends "base.html" %}
2 -{% load i18n highlight superarchives %} 2 +{% load i18n highlight superarchives static %}
3 3
4 {% block title %}{% trans 'search'|title %}{% endblock %} 4 {% block title %}{% trans 'search'|title %}{% endblock %}
5 5
6 {% block head_js %} 6 {% block head_js %}
7 -<script type="text/javascript" src="{{ STATIC_URL }}third-party/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js"></script> 7 +<script type="text/javascript" src="{% static 'third-party/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js' %}"></script>
8 {% if use_language %} 8 {% if use_language %}
9 - <script type="text/javascript" src="{{ STATIC_URL }}third-party/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.{{ use_language }}.js"></script> 9 + <script type="text/javascript" src="{% static 'third-party/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.{{ use_language }}.js' %}"></script>
10 {% endif %} 10 {% endif %}
11 11
12 <script type="text/javascript"> 12 <script type="text/javascript">
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
32 {% endblock %} 32 {% endblock %}
33 33
34 {% block head_css %} 34 {% block head_css %}
35 -<link rel="stylesheet" href="{{ STATIC_URL }}third-party/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css"/> 35 +<link rel="stylesheet" href="{% static 'third-party/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css' %}"/>
36 {% endblock %} 36 {% endblock %}
37 37
38 {% block main-content %} 38 {% block main-content %}
src/templates/base.html
  Diff comments   View file @cdd61ed
@@ -14,20 +14,20 @@ @@ -14,20 +14,20 @@
14 14
15 <title>{% block title %}Colab{% endblock %} - Colab</title> 15 <title>{% block title %}Colab{% endblock %} - Colab</title>
16 16
17 - <link rel="shortcut icon" type="image/x-icon" href="{{ STATIC_URL }}img/interlegis.ico"> 17 + <link rel="shortcut icon" type="image/x-icon" href="{% static 'img/interlegis.ico' %}">
18 18
19 - <link rel="stylesheet" href="{{ STATIC_URL }}third-party/bootstrap/css/bootstrap.min.css" type="text/css" media="screen, projection" /> 19 + <link rel="stylesheet" href="{% static 'third-party/bootstrap/css/bootstrap.min.css' %}" type="text/css" media="screen, projection" />
20 20
21 <link rel="stylesheet" 21 <link rel="stylesheet"
22 - href="{{ STATIC_URL }}third-party/font-awesome/css/font-awesome.min.css" 22 + href="{% static 'third-party/font-awesome/css/font-awesome.min.css' %}"
23 type="text/css" media="screen" /> 23 type="text/css" media="screen" />
24 24
25 25
26 <!-- JQuery 2+ won't work for IE < 9 --> 26 <!-- JQuery 2+ won't work for IE < 9 -->
27 - <script type="text/javascript" src="{{ STATIC_URL }}third-party/jquery-2.0.3.min.js"></script>  
28 - <script type="text/javascript" src="{{ STATIC_URL }}third-party/jquery.debouncedresize.js"></script>  
29 - <script type="text/javascript" src="{{ STATIC_URL }}third-party/jquery.cookie.js"></script>  
30 - <script src="{{ STATIC_URL }}third-party/bootstrap/js/bootstrap.min.js"></script> 27 + <script type="text/javascript" src="{% static 'third-party/jquery-2.0.3.min.js' %}"></script>
  28 + <script type="text/javascript" src="{% static 'third-party/jquery.debouncedresize.js' %}"></script>
  29 + <script type="text/javascript" src="{% static 'third-party/jquery.cookie.js' %}"></script>
  30 + <script src="{% static 'third-party/bootstrap/js/bootstrap.min.js' %}"></script>
31 31
32 {% block head_js %}{% endblock %} 32 {% block head_js %}{% endblock %}
33 {% block head_css %}{% endblock %} 33 {% block head_css %}{% endblock %}
@@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
36 {% conversejs_static %} 36 {% conversejs_static %}
37 {% endif %} 37 {% endif %}
38 38
39 - <link rel="stylesheet" href="{{ STATIC_URL }}css/screen.css" 39 + <link rel="stylesheet" href="{% static 'css/screen.css' %}"
40 type="text/css" media="screen" /> 40 type="text/css" media="screen" />
41 41
42 {% endblock %} 42 {% endblock %}
@@ -206,8 +206,8 @@ @@ -206,8 +206,8 @@
206 <p class="col-lg-12 text-center">{% trans "Last email imported at" %} {{ last_imported_message.received_time|date:'DATETIME_FORMAT' }}</p> 206 <p class="col-lg-12 text-center">{% trans "Last email imported at" %} {{ last_imported_message.received_time|date:'DATETIME_FORMAT' }}</p>
207 {% endif %} 207 {% endif %}
208 <p class="col-lg-12 text-center"> 208 <p class="col-lg-12 text-center">
209 - <a href="{% url 'opendata' %}"><img src="{{ STATIC_URL }}img/opendata3.png"/></a>  
210 - <a href="http://creativecommons.org/licenses/by-sa/4.0/deed.pt_BR"><img src="{{ STATIC_URL }}img/cc_by_sa.png"/></a> 209 + <a href="{% url 'opendata' %}"><img src="{% static 'img/opendata3.png' %}"/></a>
  210 + <a href="http://creativecommons.org/licenses/by-sa/4.0/deed.pt_BR"><img src="{% static 'img/cc_by_sa.png' %}"/></a>
211 </p> 211 </p>
212 <p class="col-lg-12 text-center"> 212 <p class="col-lg-12 text-center">
213 {% trans "The contents of this site is published under license" %}: 213 {% trans "The contents of this site is published under license" %}:
src/templates/doughnut-chart.html
  Diff comments   View file @cdd61ed
1 -{% load i18n %} 1 +{% load i18n static %}
2 2
3 -<script src="{{ STATIC_URL }}third-party/chartjs/js/Chart.min.js"></script>  
4 -<script src="{{ STATIC_URL }}third-party/chroma/js/chroma.min.js"></script> 3 +<script src="{% static 'third-party/chartjs/js/Chart.min.js' %}"></script>
  4 +<script src="{% static 'third-party/chroma/js/chroma.min.js' %}"></script>
5 5
6 <script> 6 <script>
7 $(function () { 7 $(function () {
src/templates/dpaste/base.html
  Diff comments   View file @cdd61ed
1 {% extends 'base.html' %} 1 {% extends 'base.html' %}
  2 +{% load static %}
2 3
3 {% block head_css %} 4 {% block head_css %}
4 -<link rel="stylesheet" href="{{ STATIC_URL }}dpaste/css/theme.css"  
5 - type="text/css" media="screen" /> 5 +<link rel="stylesheet" href="{% static 'dpaste/css/theme.css' %}" type="text/css" media="screen" />
6 {% endblock %} 6 {% endblock %}
7 7
8 {% block header %} 8 {% block header %}
src/templates/pizza-chart.html
  Diff comments   View file @cdd61ed
1 -{% load i18n %} 1 +{% load i18n static %}
2 2
3 -<script src="{{ STATIC_URL }}third-party/highcharts/js/highcharts.js"></script> 3 +<script src="{% static 'third-party/highcharts/js/highcharts.js' %}"></script>
4 <script> 4 <script>
5 $(function () { 5 $(function () {
6 $('#{{ chart_div }}').highcharts({ 6 $('#{{ chart_div }}').highcharts({