Skip to content

Commit 54aac4e

Browse files
levkowetzlevkowetz
committed
Updated templates to use the 'static' template tag to dynamically point to the correct static files location.
 - Legacy-Id: 9889
1 parent f9fa3eb commit 54aac4e

19 files changed

+71
-70
lines changed

‎ietf/templates/base.html‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!DOCTYPE html> {% load ietf_filters %}
1+
<!DOCTYPE html> {% load ietf_filters staticfiles %}
22
{# Copyright The IETF Trust 2015, All Rights Reserved #}
33
{% load origin %}{% origin %}
44
<html lang="en">
@@ -8,18 +8,18 @@
88
<title>{% block title %}No title{% endblock %}</title>
99
<meta name="viewport" content="width=device-width, initial-scale=1">
1010

11-
<link href="/fonts/PTMono/stylesheet.css" rel='stylesheet' type='text/css'>
12-
<link href="/fonts/PTSans/stylesheet.css" rel='stylesheet' type='text/css'>
13-
<link href="/fonts/PTSerif/stylesheet.css" rel='stylesheet' type='text/css'>
11+
<link href="{% static 'ptmono/stylesheet.css' %}" rel='stylesheet' type='text/css'>
12+
<link href="{% static 'ptsans/stylesheet.css' %}" rel='stylesheet' type='text/css'>
13+
<link href="{% static 'ptserif/stylesheet.css' %}" rel='stylesheet' type='text/css'>
1414
{% comment %}
1515
<!-- Halloween
1616
<link href='https://fonts.googleapis.com/css?family=IM+Fell+English+SC|IM+Fell+DW+Pica:400,400italic|Nova+Mono|IM+Fell+English:400,400italic&subset=latin-ext,latin' rel='stylesheet' type='text/css'>
1717
-->
1818
{% endcomment %}
1919

20+
<link rel="stylesheet" href="{% static 'font-awesome/css/font-awesome.min.css' %}">
2021
<link rel="stylesheet" href="/css/bootstrap.min.css">
2122
<link rel="stylesheet" href="/css/bootstrap-theme.min.css">
22-
<link rel="stylesheet" href="/css/font-awesome.min.css">
2323
<link rel="stylesheet" href="/css/ietf.css">
2424
<style>
2525
{% block morecss %}{% endblock %}
@@ -148,16 +148,15 @@
148148
</footer>
149149
{% include "debug.html" %}
150150
</div>
151-
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
152-
<script>window.jQuery || document.write('<script src="/js/lib/jquery-1.11.2.min.js"><\/script>')</script>
151+
<script src="{% static 'jquery/jquery.min.js' %}"></script>
153152
{% comment %}
154153
<!-- Remove the *-nojs attributes if we are running js. This depends on jQuery's removeClass(): -->
155154
<!-- Do this as early as possible (after loading the page and jQuery) to avoid rendering changes -->
156155
{% endcomment %}
157156
<script>$(".visible-nojs").removeClass("visible-nojs");</script>
158157
<script>$(".hidden-nojs").removeClass("hidden-nojs");</script>
159-
<script src="/js/lib/jquery.cookie.min.js"></script>
160-
<script src="/js/lib/bootstrap.min.js"></script>
158+
<script src="{% static 'jquery.cookie/jquery.cookie.js' %}"></script>
159+
<script src="{% static 'bootstrap/js/bootstrap.min.js' %}"></script>
161160
<script src="/js/ietf.js"></script>
162161
{% block js %}{% endblock %}
163162
</body>

‎ietf/templates/doc/change_shepherd.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{% extends "base.html" %}
22
{# Copyright The IETF Trust 2015, All Rights Reserved #}
33
{% load origin %}
4-
4+
{% load staticfiles %}
55
{% load bootstrap3 %}
66

77
{% block title %}Change document shepherd for {{ doc.name }}-{{ doc.rev }}{% endblock %}
88

99
{% block pagehead %}
10-
<link rel="stylesheet" href="/css/lib/select2.css">
11-
<link rel="stylesheet" href="/css/lib/select2-bootstrap.css">
10+
<link rel="stylesheet" href="{% static 'select2/select2.css' %}">
11+
<link rel="stylesheet" href="{% static 'select2-bootstrap-css/select2-bootstrap.min.css' %}">
1212
{% endblock %}
1313

1414
{% block content %}
@@ -32,6 +32,6 @@ <h1>Change document shepherd<br><small>{{ doc.name }}-{{ doc.rev }}</small></h1>
3232
{% endblock %}
3333

3434
{% block js %}
35-
<script src="/js/lib/select2-3.5.2.min.js"></script>
35+
<script src="{% static 'select2/select2.min.js' %}"></script>
3636
<script src="/js/select2-field.js"></script>
3737
{% endblock %}

‎ietf/templates/doc/draft/change_replaces.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{% extends "base.html" %}
22
{# Copyright The IETF Trust 2015, All Rights Reserved #}
33
{% load origin %}
4-
4+
{% load staticfiles %}
55
{% load bootstrap3 %}
66

77
{% block title %}Change documents replaced by {{ doc }}{% endblock %}
88

99
{% bootstrap_messages %}
1010

1111
{% block pagehead %}
12-
<link rel="stylesheet" href="/css/lib/select2.css">
13-
<link rel="stylesheet" href="/css/lib/select2-bootstrap.css">
12+
<link rel="stylesheet" href="{% static 'select2/select2.css' %}">
13+
<link rel="stylesheet" href="{% static 'select2-bootstrap-css/select2-bootstrap.min.css' %}">
1414
{% endblock %}
1515

1616
{% block content %}
@@ -31,6 +31,6 @@ <h1>Change documents replaced by<br><small>{{ doc }}</small></h1>
3131
{% endblock %}
3232

3333
{% block js %}
34-
<script src="/js/lib/select2-3.5.2.min.js"></script>
34+
<script src="{% static 'select2/select2.min.js' %}"></script>
3535
<script src="/js/select2-field.js"></script>
3636
{% endblock %}

‎ietf/templates/doc/status_change/make_last_call.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{% extends "base.html" %}
22
{# Copyright The IETF Trust 2015, All Rights Reserved #}
33
{% load origin %}
4-
4+
{% load staticfiles %}
55
{% load bootstrap3 %}
66

77
{% block pagehead %}
8-
<link rel="stylesheet" href="/css/lib/datepicker3.css">
8+
<link rel="stylesheet" href="{% static 'bootstrap-datepicker/css/datepicker3.css' %}">
99
{% endblock %}
1010

1111
{% block title %}Make last call for {{ doc.name }}{% endblock %}
@@ -36,7 +36,7 @@ <h1>Make last call<br><small>{{doc.name}}</small></h1>
3636

3737

3838
{% block js %}
39-
<script src="/js/lib/bootstrap-datepicker.js"></script>
39+
<script src="{% static 'bootstrap-datepicker/js/bootstrap-datepicker.js' %}"></script>
4040
<script>
4141
$('#id_last_call_sent_date, #id_last_call_expiration_date').datepicker({
4242
format: "yyyy-mm-dd",

‎ietf/templates/group/edit.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{% extends "base.html" %}
22
{# Copyright The IETF Trust 2015, All Rights Reserved #}
33
{% load origin %}
4-
4+
{% load staticfiles %}
55
{% load bootstrap3 %}
66
{% load ietf_filters %}
77

@@ -14,8 +14,8 @@
1414
{% endblock %}
1515

1616
{% block pagehead %}
17-
<link rel="stylesheet" href="/css/lib/select2.css">
18-
<link rel="stylesheet" href="/css/lib/select2-bootstrap.css">
17+
<link rel="stylesheet" href="{% static 'select2/select2.css' %}">
18+
<link rel="stylesheet" href="{% static 'select2-bootstrap-css/select2-bootstrap.min.css' %}">
1919
{% endblock %}
2020

2121
{% block content %}
@@ -54,7 +54,7 @@ <h1>
5454
{% endblock %}
5555

5656
{% block js %}
57-
<script src="/js/lib/select2-3.5.2.min.js"></script>
57+
<script src="{% static 'select2/select2.min.js' %}"></script>
5858
<script src="/js/select2-field.js"></script>
5959
<script>
6060
$(document).ready(function () {

‎ietf/templates/group/edit_milestones.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{% extends "base.html" %}
22
{# Copyright The IETF Trust 2015, All Rights Reserved #}
33
{% load origin %}
4-
4+
{% load staticfiles %}
55
{% load bootstrap3 %}
66

77
{% block pagehead %}
8-
<link rel="stylesheet" href="/css/lib/select2.css">
9-
<link rel="stylesheet" href="/css/lib/select2-bootstrap.css">
10-
<link rel="stylesheet" href="/css/lib/datepicker3.css">
8+
<link rel="stylesheet" href="{% static 'select2/select2.css' %}">
9+
<link rel="stylesheet" href="{% static 'select2-bootstrap-css/select2-bootstrap.min.css' %}">
10+
<link rel="stylesheet" href="{% static 'bootstrap-datepicker/css/datepicker3.css' %}">
1111
{% endblock %}
1212

1313
{% block title %}{{ title }}{% endblock %}
@@ -96,8 +96,8 @@ <h1>{{ title }}</h1>
9696
{% endblock %}
9797

9898
{% block js %}
99-
<script src="/js/lib/select2-3.5.2.min.js"></script>
99+
<script src="{% static 'select2/select2.min.js' %}"></script>
100100
<script src="/js/select2-field.js"></script>
101-
<script src="/js/lib/bootstrap-datepicker.js"></script>
101+
<script src="{% static 'bootstrap-datepicker/js/bootstrap-datepicker.js' %}"></script>
102102
<script src="/js/edit-milestones.js"></script>
103103
{% endblock %}

‎ietf/templates/group/stream_edit.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{% extends "base.html" %}
22
{# Copyright The IETF Trust 2015, All Rights Reserved #}
33
{% load origin %}
4-
4+
{% load staticfiles %}
55
{% load ietf_filters %}
66
{% load bootstrap3 %}
77

88
{% block title %}Manage {{ group.name }} RFC stream{% endblock %}
99

1010
{% block pagehead %}
11-
<link rel="stylesheet" href="/css/lib/select2.css">
12-
<link rel="stylesheet" href="/css/lib/select2-bootstrap.css">
11+
<link rel="stylesheet" href="{% static 'select2/select2.css' %}">
12+
<link rel="stylesheet" href="{% static 'select2-bootstrap-css/select2-bootstrap.min.css' %}">
1313
{% endblock %}
1414

1515
{% block content %}
@@ -45,6 +45,6 @@ <h1>Manage {{ group.name }} RFC stream</h1>
4545
{% endblock %}
4646

4747
{% block js %}
48-
<script src="/js/lib/select2-3.5.2.min.js"></script>
48+
<script src="{% static 'select2/select2.min.js' %}"></script>
4949
<script src="/js/select2-field.js"></script>
5050
{% endblock %}

‎ietf/templates/ipr/details_edit.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{% extends "base.html" %}
22
{# Copyright The IETF Trust 2015, All Rights Reserved #}
33
{% load origin %}
4-
4+
{% load staticfiles %}
55
{% load ietf_filters ipr_filters bootstrap3 widget_tweaks %}
66
{% load future %}
77

88
{% block title %}{% if form.instance %}Edit IPR #{{ form.instance.id }}{% else %}New IPR{% endif %}{% endblock %}
99

1010
{% block pagehead %}
11-
<link rel="stylesheet" href="/css/lib/select2.css">
12-
<link rel="stylesheet" href="/css/lib/select2-bootstrap.css">
11+
<link rel="stylesheet" href="{% static 'select2/select2.css' %}">
12+
<link rel="stylesheet" href="{% static 'select2-bootstrap-css/select2-bootstrap.min.css' %}">
1313
{% endblock %}
1414

1515
{% block content %}
@@ -245,8 +245,8 @@ <h2>{% cycle section %}. Other notes</h2>
245245
{% endblock %}
246246

247247
{% block js %}
248-
<script src="/js/lib/select2-3.5.2.min.js"></script>
248+
<script src="{% static 'select2/select2.min.js' %}"></script>
249249
<script src="/js/select2-field.js"></script>
250-
<script src="/js/lib/bootstrap-datepicker.js"></script>
250+
<script src="{% static 'bootstrap-datepicker/js/bootstrap-datepicker.js' %}"></script>
251251
<script src="/js/ipr-edit.js"></script>
252252
{% endblock %}

‎ietf/templates/ipr/email.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{% extends "base.html" %}
22
{# Copyright The IETF Trust 2015, All Rights Reserved #}
33
{% load origin %}
4-
4+
{% load staticfiles %}
55
{% load bootstrap3 %}
66

77
{% block title %}Email submitter of {{ ipr.title }}{% endblock %}
88

99
{% block pagehead %}
10-
<link rel="stylesheet" href="/css/lib/datepicker3.css">
10+
<link rel="stylesheet" href="{% static 'bootstrap-datepicker/css/datepicker3.css' %}">
1111
{% endblock %}
1212

1313
{% block content %}
@@ -29,5 +29,5 @@ <h1>Email submitter<br><small>{{ ipr.title }}</small></h1>
2929
{% endblock %}
3030

3131
{% block js %}
32-
<script src="/js/lib/bootstrap-datepicker.js"></script>
32+
<script src="{% static 'bootstrap-datepicker/js/bootstrap-datepicker.js' %}"></script>
3333
{% endblock %}

‎ietf/templates/liaisons/edit.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{% extends "base.html" %}
22
{# Copyright The IETF Trust 2015, All Rights Reserved #}
33
{% load origin %}
4-
4+
{% load staticfiles %}
55
{% load bootstrap3 %}
66

77
{% block title %}{% if liaison %}Edit liaison: {{ liaison }}{% else %}Send Liaison Statement{% endif %}{% endblock %}
88

99
{% block pagehead %}
10-
<link rel="stylesheet" href="/css/lib/datepicker3.css">
11-
<link rel="stylesheet" href="/css/lib/select2.css">
12-
<link rel="stylesheet" href="/css/lib/select2-bootstrap.css">
10+
<link rel="stylesheet" href="{% static 'bootstrap-datepicker/css/datepicker3.css' %}">
11+
<link rel="stylesheet" href="{% static 'select2/select2.css' %}">
12+
<link rel="stylesheet" href="{% static 'select2-bootstrap-css/select2-bootstrap.min.css' %}">
1313
{% endblock %}
1414

1515
{% block morecss %}
@@ -66,8 +66,8 @@ <h2>{{ fieldset.name }}</h2>
6666
{% endblock %}
6767

6868
{% block js %}
69-
<script src="/js/lib/bootstrap-datepicker.js"></script>
70-
<script src="/js/lib/select2-3.5.2.min.js"></script>
69+
<script src="{% static 'bootstrap-datepicker/js/bootstrap-datepicker.js' %}"></script>
70+
<script src="{% static 'select2/select2.min.js' %}"></script>
7171
<script src="/js/select2-field.js"></script>
7272
<script src="/js/liaisons.js"></script>
7373
{% endblock %}

0 commit comments

Comments
 (0)