Skip to content

Commit 82d89cc

Browse files
committed
Use a local copy of YUI library instead of pointing to Google CDN (this allows us to work with pure IPv6); upgrade to YUI 2.8.0r4
- Legacy-Id: 1938
1 parent da43d5b commit 82d89cc

22 files changed

Lines changed: 198 additions & 19 deletions

LICENSE

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
(for code in the django/ directory, see LICENSE.django file)
1+
For code in the django/ directory, see LICENSE.django file).
2+
3+
For files under static/js/yui/, static/css/yui/ and static/images/yui/,
4+
see http://developer.yahoo.net/yui/license.txt.
5+
26
---------------------------------------------------------------------------
37

48
Copyright (c) 2008, The IETF Trust

ietf/context_processors.py

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

99
def revision_info(request):
1010
return {'revision_time': __date__[7:32], 'revision_date': __date__[34:-3], 'revision_num': __rev__[6:-2], "revision_id": __id__[5:-2], "version_num": __version__ }
11-
12-
def yui_url(request):
13-
return {'yui_url':settings.YUI_URL}

ietf/settings.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,7 @@
112112
'django.core.context_processors.i18n',
113113
'django.core.context_processors.request',
114114
'ietf.context_processors.server_mode',
115-
'ietf.context_processors.revision_info',
116-
'ietf.context_processors.yui_url'
115+
'ietf.context_processors.revision_info'
117116
)
118117

119118
INSTALLED_APPS = (
@@ -186,10 +185,6 @@
186185

187186
IPR_EMAIL_TO = ['ietf-ipr@ietf.org', ]
188187

189-
190-
# Base URL for YUI library
191-
YUI_URL = "https://ajax.googleapis.com/ajax/libs/yui"
192-
193188
# Put SECRET_KEY in here, or any other sensitive or site-specific
194189
# changes. DO NOT commit settings_local.py to svn.
195190
from settings_local import *

ietf/templates/idrfc/base.html

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@
3737
<head>
3838
<!-- v{{version_num}}, {{ revision_num }}, {{ revision_time }} -->
3939
<title>{% block title %}No title{% endblock %}{% ifnotequal server_mode "production" %} - {{ server_mode|upper }} MODE{% endifnotequal %}</title>
40-
<link rel="stylesheet" type="text/css" href="{{yui_url}}/2.7.0/build/fonts/fonts-min.css"></link>
41-
<link rel="stylesheet" type="text/css" href="{{yui_url}}/2.7.0/build/assets/skins/sam/skin.css"></link>
40+
<link rel="stylesheet" type="text/css" href="/css/yui/yui.css"></link>
4241
<link rel="stylesheet" type="text/css" href="/css/base2.css"></link>
4342
<style type="text/css">
4443
{% block morecss %}{% endblock %}
@@ -80,11 +79,7 @@
8079
{% block content %}
8180
{% endblock %}
8281

83-
<script type="text/javascript" src="{{yui_url}}/2.7.0/build/yahoo-dom-event/yahoo-dom-event.js"></script>
84-
<script type="text/javascript" src="{{yui_url}}/2.7.0/build/container/container-min.js"></script>
85-
<script type="text/javascript" src="{{yui_url}}/2.7.0/build/menu/menu-min.js"></script>
86-
<script type="text/javascript" src="{{yui_url}}/2.7.0/build/element/element-min.js"></script>
87-
<script type="text/javascript" src="{{yui_url}}/2.7.0/build/button/button-min.js"></script>
82+
<script type="text/javascript" src="/js/yui/yui.js"></script>
8883

8984
<script type="text/javascript">
9085
//<![CDATA[
@@ -98,7 +93,6 @@
9893
//]]>
9994
</script>
10095

101-
<script type="text/javascript" src="{{yui_url}}/2.7.0/build/connection/connection-min.js"></script>
10296
<script type="text/javascript" src="/js/base.js"></script>
10397
{% block scripts %}
10498
{% endblock %}

ietf/templates/idrfc/doc_main.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,6 @@ <h2 style="margin-top:1em;">Document history</h2>
162162
{% endblock %}{# content #}
163163

164164
{% block scripts %}
165-
<script type="text/javascript" src="{{yui_url}}/2.7.0/build/tabview/tabview-min.js"></script>
166165
<script type="text/javascript">
167166
//<![CDATA[
168167
var tabView = new YAHOO.widget.TabView('mytabs');

static/css/yui/yui.css

Lines changed: 35 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
173 Bytes
Loading
173 Bytes
Loading
3.53 KB
Loading
3.53 KB
Loading

0 commit comments

Comments
 (0)