From 82d89ccd27404b07c27a0715998988222d7f11bb Mon Sep 17 00:00:00 2001 From: Pasi Eronen Date: Thu, 14 Jan 2010 22:19:43 +0000 Subject: [PATCH] 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 --- LICENSE | 6 +- ietf/context_processors.py | 3 - ietf/settings.py | 7 +- ietf/templates/idrfc/base.html | 10 +- ietf/templates/idrfc/doc_main.html | 1 - static/css/yui/yui.css | 35 +++++++ .../images/yui/menu-button-arrow-disabled.png | Bin 0 -> 173 bytes static/images/yui/menu-button-arrow.png | Bin 0 -> 173 bytes .../yui/menubaritem_submenuindicator.png | Bin 0 -> 3618 bytes .../menubaritem_submenuindicator_disabled.png | Bin 0 -> 3618 bytes static/images/yui/menuitem_checkbox.png | Bin 0 -> 3625 bytes .../images/yui/menuitem_checkbox_disabled.png | Bin 0 -> 3625 bytes .../images/yui/menuitem_submenuindicator.png | Bin 0 -> 3617 bytes .../menuitem_submenuindicator_disabled.png | Bin 0 -> 3617 bytes .../images/yui/split-button-arrow-active.png | Bin 0 -> 280 bytes .../yui/split-button-arrow-disabled.png | Bin 0 -> 185 bytes .../images/yui/split-button-arrow-focus.png | Bin 0 -> 185 bytes .../images/yui/split-button-arrow-hover.png | Bin 0 -> 185 bytes static/images/yui/split-button-arrow.png | Bin 0 -> 185 bytes static/images/yui/sprite.png | Bin 0 -> 3745 bytes static/js/yui/yui.js | 91 ++++++++++++++++++ test/download_yui.pl | 64 ++++++++++++ 22 files changed, 198 insertions(+), 19 deletions(-) create mode 100644 static/css/yui/yui.css create mode 100644 static/images/yui/menu-button-arrow-disabled.png create mode 100644 static/images/yui/menu-button-arrow.png create mode 100644 static/images/yui/menubaritem_submenuindicator.png create mode 100644 static/images/yui/menubaritem_submenuindicator_disabled.png create mode 100644 static/images/yui/menuitem_checkbox.png create mode 100644 static/images/yui/menuitem_checkbox_disabled.png create mode 100644 static/images/yui/menuitem_submenuindicator.png create mode 100644 static/images/yui/menuitem_submenuindicator_disabled.png create mode 100644 static/images/yui/split-button-arrow-active.png create mode 100644 static/images/yui/split-button-arrow-disabled.png create mode 100644 static/images/yui/split-button-arrow-focus.png create mode 100644 static/images/yui/split-button-arrow-hover.png create mode 100644 static/images/yui/split-button-arrow.png create mode 100644 static/images/yui/sprite.png create mode 100644 static/js/yui/yui.js create mode 100644 test/download_yui.pl diff --git a/LICENSE b/LICENSE index dd5183361..68baf955c 100644 --- a/LICENSE +++ b/LICENSE @@ -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 diff --git a/ietf/context_processors.py b/ietf/context_processors.py index b76b51dd5..dac8d442b 100644 --- a/ietf/context_processors.py +++ b/ietf/context_processors.py @@ -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} diff --git a/ietf/settings.py b/ietf/settings.py index 8d4286695..3d51f72b7 100644 --- a/ietf/settings.py +++ b/ietf/settings.py @@ -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 * diff --git a/ietf/templates/idrfc/base.html b/ietf/templates/idrfc/base.html index 96de3fff1..fdfae18e2 100644 --- a/ietf/templates/idrfc/base.html +++ b/ietf/templates/idrfc/base.html @@ -37,8 +37,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. {% block title %}No title{% endblock %}{% ifnotequal server_mode "production" %} - {{ server_mode|upper }} MODE{% endifnotequal %} - - +