Skip to content

Commit a5a7ea1

Browse files
rpcrossrpcross
committed
support variable path for static files, SECR_STATIC_URL
 - Legacy-Id: 5443
1 parent 39f8e27 commit a5a7ea1

71 files changed

Lines changed: 124 additions & 120 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ietf/secr/context_processors.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,6 @@ def server_mode(request):
88

99
def secr_revision_info(request):
1010
return {'secr_revision_time': __date__[7:32], 'secr_revision_date': __date__[7:17], 'secr_revision_num': __rev__[6:-2], "secr_revision_id": __id__[5:-2], "secr_version_num": __version__ }
11+
12+
def static(request):
13+
return {'SECR_STATIC_URL': settings.SECR_STATIC_URL}

‎ietf/secr/templates/announcement/confirm.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{% block title %}Announcement{% endblock %}
44

55
{% block extrahead %}{{ block.super }}
6-
<script type="text/javascript" src="/secr/js/utils.js"></script>
6+
<script type="text/javascript" src="{{ SECR_STATIC_URL }}js/utils.js"></script>
77
{% endblock %}
88

99
{% block breadcrumbs %}{{ block.super }}

‎ietf/secr/templates/areas/add.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{% block title %}Areas - Add{% endblock %}
44

55
{% block extrahead %}{{ block.super }}
6-
<script type="text/javascript" src="/secr/js/utils.js"></script>
6+
<script type="text/javascript" src="{{ SECR_STATIC_URL }}js/utils.js"></script>
77
{% endblock %}
88

99
{% block breadcrumbs %}{{ block.super }}

‎ietf/secr/templates/areas/edit.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{% block title %}Areas - Edit{% endblock %}
44

55
{% block extrahead %}{{ block.super }}
6-
<script type="text/javascript" src="/secr/js/utils.js"></script>
6+
<script type="text/javascript" src="{{ SECR_STATIC_URL }}js/utils.js"></script>
77
{% endblock %}
88

99
{% block breadcrumbs %}{{ block.super }}

‎ietf/secr/templates/areas/list.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{% block title %}Areas{% endblock %}
44

55
{% block extrahead %}{{ block.super }}
6-
<script type="text/javascript" src="/secr/js/utils.js"></script>
6+
<script type="text/javascript" src="{{ SECR_STATIC_URL }}js/utils.js"></script>
77
{% endblock %}
88

99
{% block breadcrumbs %}{{ block.super }}

‎ietf/secr/templates/areas/people.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
{% block title %}Areas - People{% endblock %}
44

55
{% block extrahead %}{{ block.super }}
6-
<link rel="stylesheet" type="text/css" href="/secr/css/jquery-ui-1.8.1.custom.css" />
7-
<link rel="stylesheet" type="text/css" href="/secr/css/jquery.ui.autocomplete.css" />
8-
<script type="text/javascript" src="/secr/js/jquery-ui-1.8.1.custom.min.js"></script>
9-
<script type="text/javascript" src="/secr/js/utils.js"></script>
6+
<link rel="stylesheet" type="text/css" href="{{ SECR_STATIC_URL }}css/jquery-ui-1.8.1.custom.css" />
7+
<link rel="stylesheet" type="text/css" href="{{ SECR_STATIC_URL }}css/jquery.ui.autocomplete.css" />
8+
<script type="text/javascript" src="{{ SECR_STATIC_URL }}js/jquery-ui-1.8.1.custom.min.js"></script>
9+
<script type="text/javascript" src="{{ SECR_STATIC_URL }}js/utils.js"></script>
1010
{% endblock %}
1111

1212
{% block breadcrumbs %}{{ block.super }}

‎ietf/secr/templates/areas/view.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{% block title %}Areas - View{% endblock %}
44

55
{% block extrahead %}{{ block.super }}
6-
<script type="text/javascript" src="/secr/js/utils.js"></script>
6+
<script type="text/javascript" src="{{ SECR_STATIC_URL }}js/utils.js"></script>
77
{% endblock %}
88

99
{% block breadcrumbs %}{{ block.super }}

‎ietf/secr/templates/base_secr.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
33
<head>
44
<title>{% block title %}{% endblock %}</title>
5-
<link rel="stylesheet" type="text/css" href="{% block stylesheet %}/secr/css/base.css{% endblock %}" />
6-
<link rel="stylesheet" type="text/css" href="/secr/css/forms.css" />
7-
<link rel="stylesheet" type="text/css" href="/secr/css/custom.css" />
5+
<link rel="stylesheet" type="text/css" href="{% block stylesheet %}{{ SECR_STATIC_URL }}css/base.css{% endblock %}" />
6+
<link rel="stylesheet" type="text/css" href="{{ SECR_STATIC_URL }}css/forms.css" />
7+
<link rel="stylesheet" type="text/css" href="{{ SECR_STATIC_URL }}css/custom.css" />
88
{% if not server_mode == "production" %}
9-
<link rel="stylesheet" type="text/css" href="/secr/css/test.css" />
9+
<link rel="stylesheet" type="text/css" href="{{ SECR_STATIC_URL }}css/test.css" />
1010
{% endif %}
1111
{% block extrastyle %}{% endblock %}
1212

1313
{% block extrahead %}
14-
<script type="text/javascript" src="/secr/js/jquery-1.5.1.min.js"></script>
14+
<script type="text/javascript" src="{{ SECR_STATIC_URL }}js/jquery-1.5.1.min.js"></script>
1515
{% endblock %}
1616

1717
{% block blockbots %}<meta name="robots" content="NONE,NOARCHIVE" />{% endblock %}

‎ietf/secr/templates/base_site.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ <h1 id="site-name">{% if request.user_is_secretariat %} Secretariat Dashboard {%
3131

3232
</div>
3333
<div id="footer-logo">
34-
<a href="http://www.amsl.com/"><img src="/secr/img/ams_logo.png" alt="AMS" align="right" border="0" hspace="5" /></a>
34+
<a href="http://www.amsl.com/"><img src="{{ SECR_STATIC_URL }}img/ams_logo.png" alt="AMS" align="right" border="0" hspace="5" /></a>
3535
</div>
3636
</div>
3737
{% endblock %}

‎ietf/secr/templates/drafts/abstract.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{% block title %}Drafts - Abstract{% endblock %}
44

55
{% block extrahead %}{{ block.super }}
6-
<script type="text/javascript" src="/secr/js/utils.js"></script>
6+
<script type="text/javascript" src="{{ SECR_STATIC_URL }}js/utils.js"></script>
77
{% endblock %}
88

99
{% block breadcrumbs %}{{ block.super }}

0 commit comments

Comments
 (0)