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
This commit is contained in:
Pasi Eronen 2010-01-14 22:19:43 +00:00
parent da43d5b1d7
commit 82d89ccd27
22 changed files with 198 additions and 19 deletions

View file

@ -1,4 +1,8 @@
(for code in the django/ directory, see LICENSE.django file)
For code in the django/ directory, see LICENSE.django file).
For files under static/js/yui/, static/css/yui/ and static/images/yui/,
see http://developer.yahoo.net/yui/license.txt.
---------------------------------------------------------------------------
Copyright (c) 2008, The IETF Trust

View file

@ -8,6 +8,3 @@ def server_mode(request):
def revision_info(request):
return {'revision_time': __date__[7:32], 'revision_date': __date__[34:-3], 'revision_num': __rev__[6:-2], "revision_id": __id__[5:-2], "version_num": __version__ }
def yui_url(request):
return {'yui_url':settings.YUI_URL}

View file

@ -112,8 +112,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
'django.core.context_processors.i18n',
'django.core.context_processors.request',
'ietf.context_processors.server_mode',
'ietf.context_processors.revision_info',
'ietf.context_processors.yui_url'
'ietf.context_processors.revision_info'
)
INSTALLED_APPS = (
@ -186,10 +185,6 @@ else:
IPR_EMAIL_TO = ['ietf-ipr@ietf.org', ]
# Base URL for YUI library
YUI_URL = "https://ajax.googleapis.com/ajax/libs/yui"
# Put SECRET_KEY in here, or any other sensitive or site-specific
# changes. DO NOT commit settings_local.py to svn.
from settings_local import *

View file

@ -37,8 +37,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<head>
<!-- v{{version_num}}, {{ revision_num }}, {{ revision_time }} -->
<title>{% block title %}No title{% endblock %}{% ifnotequal server_mode "production" %} - {{ server_mode|upper }} MODE{% endifnotequal %}</title>
<link rel="stylesheet" type="text/css" href="{{yui_url}}/2.7.0/build/fonts/fonts-min.css"></link>
<link rel="stylesheet" type="text/css" href="{{yui_url}}/2.7.0/build/assets/skins/sam/skin.css"></link>
<link rel="stylesheet" type="text/css" href="/css/yui/yui.css"></link>
<link rel="stylesheet" type="text/css" href="/css/base2.css"></link>
<style type="text/css">
{% block morecss %}{% endblock %}
@ -80,11 +79,7 @@ IETF.user_groups = { {% for group in user.groups.all %}"{{group}}":true{% if not
{% block content %}
{% endblock %}
<script type="text/javascript" src="{{yui_url}}/2.7.0/build/yahoo-dom-event/yahoo-dom-event.js"></script>
<script type="text/javascript" src="{{yui_url}}/2.7.0/build/container/container-min.js"></script>
<script type="text/javascript" src="{{yui_url}}/2.7.0/build/menu/menu-min.js"></script>
<script type="text/javascript" src="{{yui_url}}/2.7.0/build/element/element-min.js"></script>
<script type="text/javascript" src="{{yui_url}}/2.7.0/build/button/button-min.js"></script>
<script type="text/javascript" src="/js/yui/yui.js"></script>
<script type="text/javascript">
//<![CDATA[
@ -98,7 +93,6 @@ YAHOO.util.Event.onContentReady("search_submit_button", function () {
//]]>
</script>
<script type="text/javascript" src="{{yui_url}}/2.7.0/build/connection/connection-min.js"></script>
<script type="text/javascript" src="/js/base.js"></script>
{% block scripts %}
{% endblock %}

View file

@ -162,7 +162,6 @@ document.getElementById('history_content').style.display = 'none';
{% endblock %}{# content #}
{% block scripts %}
<script type="text/javascript" src="{{yui_url}}/2.7.0/build/tabview/tabview-min.js"></script>
<script type="text/javascript">
//<![CDATA[
var tabView = new YAHOO.widget.TabView('mytabs');

35
static/css/yui/yui.css Normal file

File diff suppressed because one or more lines are too long

Binary file not shown.

After

Width:  |  Height:  |  Size: 173 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 173 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 280 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 185 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 185 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 185 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 185 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

91
static/js/yui/yui.js vendored Normal file

File diff suppressed because one or more lines are too long

64
test/download_yui.pl Normal file
View file

@ -0,0 +1,64 @@
# Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved. Contact: Pasi Eronen <pasi.eronen@nokia.com>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#
# * Redistributions in binary form must reproduce the above
# copyright notice, this list of conditions and the following
# disclaimer in the documentation and/or other materials provided
# with the distribution.
#
# * Neither the name of the Nokia Corporation and/or its
# subsidiary(-ies) nor the names of its contributors may be used
# to endorse or promote products derived from this software
# without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
unless (-d 'images/yui' && -d 'js/yui' && -d 'css/yui') {
die "run this script under /static/\n";
}
# From: http://developer.yahoo.com/yui/articles/hosting/?button&connection&container&event&fonts&menu&tabview&yahoo&MIN&norollup
$css_url = 'http://yui.yahooapis.com/combo?2.8.0r4/build/fonts/fonts-min.css&2.8.0r4/build/container/assets/skins/sam/container.css&2.8.0r4/build/menu/assets/skins/sam/menu.css&2.8.0r4/build/button/assets/skins/sam/button.css&2.8.0r4/build/tabview/assets/skins/sam/tabview.css';
$js_url = 'http://yui.yahooapis.com/combo?2.8.0r4/build/yahoo/yahoo-min.js&2.8.0r4/build/event/event-min.js&2.8.0r4/build/connection/connection-min.js&2.8.0r4/build/dom/dom-min.js&2.8.0r4/build/container/container-min.js&2.8.0r4/build/menu/menu-min.js&2.8.0r4/build/element/element-min.js&2.8.0r4/build/button/button-min.js&2.8.0r4/build/tabview/tabview-min.js';
$cmd = "wget '$css_url' -O css/yui/yui-original.css";
print $cmd; system $cmd;
$cmd = "wget '$js_url' -O js/yui/yui.js";
print $cmd; system $cmd;
open(I, "css/yui/yui-original.css") || die "yui-original.css: $!\n";
open(O, ">css/yui/yui.css") || die "yui.css: $!\n";
$/ = '(';
%done = ();
while ($_ = <I>) {
if (m!(http://[^/]+)(/.*?/)([^)./]+)(.png)!) {
if (!exists $done{"$3$4"}) {
$cmd = "wget -nd $1$2$3$4 -O images/yui/$3$4\n";
print $cmd; system $cmd;
$done{"$3$4"} = 1;
}
s!(http://[^/]+)(/.*?/)([^)./]+)(.png)!/images/yui/$3$4!;
}
print O ;
}
close I;
close O;
unlink "css/yui/yui-original.css";