From 028f4c038f51b913e04fd50f4491ae22d322f3ca Mon Sep 17 00:00:00 2001 From: rjy7 Date: Thu, 19 Aug 2010 13:36:00 +0000 Subject: [PATCH] Upgrading to jQuery UI 1.8.4 --- webapp/config/licenser/known_exceptions.txt | 2 +- .../webapp/controller/freemarker/UrlBuilder.java | 4 ++-- .../images/ui-bg_flat_0_aaaaaa_40x100.png | Bin .../images/ui-bg_flat_75_ffffff_40x100.png | Bin .../images/ui-bg_glass_55_fbf9ee_1x400.png | Bin .../images/ui-bg_glass_65_ffffff_1x400.png | Bin .../images/ui-bg_glass_75_dadada_1x400.png | Bin .../images/ui-bg_glass_75_e6e6e6_1x400.png | Bin .../images/ui-bg_glass_95_fef1ec_1x400.png | Bin .../images/ui-bg_highlight-soft_75_cccccc_1x100.png | Bin .../smoothness/images/ui-icons_222222_256x240.png | Bin .../smoothness/images/ui-icons_2e83ff_256x240.png | Bin .../smoothness/images/ui-icons_454545_256x240.png | Bin .../smoothness/images/ui-icons_888888_256x240.png | Bin .../smoothness/images/ui-icons_cd0a0a_256x240.png | Bin .../css/smoothness/jquery-ui-1.8.4.custom.css | 0 .../js/jquery-1.4.2.min.js | 0 .../js/jquery-ui-1.8.4.custom.min.js | 0 18 files changed, 3 insertions(+), 3 deletions(-) rename webapp/web/js/{jquery-ui-1.8.4.custom => jquery-ui}/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png (100%) rename webapp/web/js/{jquery-ui-1.8.4.custom => jquery-ui}/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png (100%) rename webapp/web/js/{jquery-ui-1.8.4.custom => jquery-ui}/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png (100%) rename webapp/web/js/{jquery-ui-1.8.4.custom => jquery-ui}/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png (100%) rename webapp/web/js/{jquery-ui-1.8.4.custom => jquery-ui}/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png (100%) rename webapp/web/js/{jquery-ui-1.8.4.custom => jquery-ui}/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png (100%) rename webapp/web/js/{jquery-ui-1.8.4.custom => jquery-ui}/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png (100%) rename webapp/web/js/{jquery-ui-1.8.4.custom => jquery-ui}/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png (100%) rename webapp/web/js/{jquery-ui-1.8.4.custom => jquery-ui}/css/smoothness/images/ui-icons_222222_256x240.png (100%) rename webapp/web/js/{jquery-ui-1.8.4.custom => jquery-ui}/css/smoothness/images/ui-icons_2e83ff_256x240.png (100%) rename webapp/web/js/{jquery-ui-1.8.4.custom => jquery-ui}/css/smoothness/images/ui-icons_454545_256x240.png (100%) rename webapp/web/js/{jquery-ui-1.8.4.custom => jquery-ui}/css/smoothness/images/ui-icons_888888_256x240.png (100%) rename webapp/web/js/{jquery-ui-1.8.4.custom => jquery-ui}/css/smoothness/images/ui-icons_cd0a0a_256x240.png (100%) rename webapp/web/js/{jquery-ui-1.8.4.custom => jquery-ui}/css/smoothness/jquery-ui-1.8.4.custom.css (100%) rename webapp/web/js/{jquery-ui-1.8.4.custom => jquery-ui}/js/jquery-1.4.2.min.js (100%) rename webapp/web/js/{jquery-ui-1.8.4.custom => jquery-ui}/js/jquery-ui-1.8.4.custom.min.js (100%) diff --git a/webapp/config/licenser/known_exceptions.txt b/webapp/config/licenser/known_exceptions.txt index b7d3e430e..9d6c36f34 100644 --- a/webapp/config/licenser/known_exceptions.txt +++ b/webapp/config/licenser/known_exceptions.txt @@ -37,7 +37,7 @@ services/additions/admin/axis/SOAPMonitorApplet.java # JQuery from jquery.com webapp/web/js/jquery.js -webapp/web/js/jquery-ui-1.8.4/* +webapp/web/js/jquery-ui/* webapp/web/js/jquery_plugins/* # From pajhome.org.uk diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java index 711d5f0bc..8fd28bb84 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java @@ -62,7 +62,7 @@ public class UrlBuilder { public enum Css { CUSTOM_FORM("/edit/forms/css/customForm.css"), - JQUERY_UI("/js/jquery-ui-1.8.4.custom/css/smoothness/jquery-ui-1.8.4.custom.css"); + JQUERY_UI("/js/jquery-ui/css/smoothness/jquery-ui-1.8.4.custom.css"); private final String path; @@ -82,7 +82,7 @@ public class UrlBuilder { public enum JavaScript { CUSTOM_FORM_UTILS("/js/customFormUtils.js"), JQUERY("/js/jquery.js"), - JQUERY_UI("/js/jquery-ui-1.8.4.custom/js/jquery-ui-1.8.4.custom.min.js"), + JQUERY_UI("/js/jquery-ui/js/jquery-ui-1.8.4.custom.min.js"), UTILS("/js/utils.js"); private final String path; diff --git a/webapp/web/js/jquery-ui-1.8.4.custom/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png b/webapp/web/js/jquery-ui/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png similarity index 100% rename from webapp/web/js/jquery-ui-1.8.4.custom/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png rename to webapp/web/js/jquery-ui/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png diff --git a/webapp/web/js/jquery-ui-1.8.4.custom/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png b/webapp/web/js/jquery-ui/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png similarity index 100% rename from webapp/web/js/jquery-ui-1.8.4.custom/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png rename to webapp/web/js/jquery-ui/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png diff --git a/webapp/web/js/jquery-ui-1.8.4.custom/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png b/webapp/web/js/jquery-ui/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png similarity index 100% rename from webapp/web/js/jquery-ui-1.8.4.custom/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png rename to webapp/web/js/jquery-ui/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png diff --git a/webapp/web/js/jquery-ui-1.8.4.custom/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png b/webapp/web/js/jquery-ui/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png similarity index 100% rename from webapp/web/js/jquery-ui-1.8.4.custom/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png rename to webapp/web/js/jquery-ui/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png diff --git a/webapp/web/js/jquery-ui-1.8.4.custom/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png b/webapp/web/js/jquery-ui/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png similarity index 100% rename from webapp/web/js/jquery-ui-1.8.4.custom/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png rename to webapp/web/js/jquery-ui/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png diff --git a/webapp/web/js/jquery-ui-1.8.4.custom/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png b/webapp/web/js/jquery-ui/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png similarity index 100% rename from webapp/web/js/jquery-ui-1.8.4.custom/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png rename to webapp/web/js/jquery-ui/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png diff --git a/webapp/web/js/jquery-ui-1.8.4.custom/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png b/webapp/web/js/jquery-ui/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png similarity index 100% rename from webapp/web/js/jquery-ui-1.8.4.custom/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png rename to webapp/web/js/jquery-ui/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png diff --git a/webapp/web/js/jquery-ui-1.8.4.custom/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/webapp/web/js/jquery-ui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png similarity index 100% rename from webapp/web/js/jquery-ui-1.8.4.custom/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png rename to webapp/web/js/jquery-ui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png diff --git a/webapp/web/js/jquery-ui-1.8.4.custom/css/smoothness/images/ui-icons_222222_256x240.png b/webapp/web/js/jquery-ui/css/smoothness/images/ui-icons_222222_256x240.png similarity index 100% rename from webapp/web/js/jquery-ui-1.8.4.custom/css/smoothness/images/ui-icons_222222_256x240.png rename to webapp/web/js/jquery-ui/css/smoothness/images/ui-icons_222222_256x240.png diff --git a/webapp/web/js/jquery-ui-1.8.4.custom/css/smoothness/images/ui-icons_2e83ff_256x240.png b/webapp/web/js/jquery-ui/css/smoothness/images/ui-icons_2e83ff_256x240.png similarity index 100% rename from webapp/web/js/jquery-ui-1.8.4.custom/css/smoothness/images/ui-icons_2e83ff_256x240.png rename to webapp/web/js/jquery-ui/css/smoothness/images/ui-icons_2e83ff_256x240.png diff --git a/webapp/web/js/jquery-ui-1.8.4.custom/css/smoothness/images/ui-icons_454545_256x240.png b/webapp/web/js/jquery-ui/css/smoothness/images/ui-icons_454545_256x240.png similarity index 100% rename from webapp/web/js/jquery-ui-1.8.4.custom/css/smoothness/images/ui-icons_454545_256x240.png rename to webapp/web/js/jquery-ui/css/smoothness/images/ui-icons_454545_256x240.png diff --git a/webapp/web/js/jquery-ui-1.8.4.custom/css/smoothness/images/ui-icons_888888_256x240.png b/webapp/web/js/jquery-ui/css/smoothness/images/ui-icons_888888_256x240.png similarity index 100% rename from webapp/web/js/jquery-ui-1.8.4.custom/css/smoothness/images/ui-icons_888888_256x240.png rename to webapp/web/js/jquery-ui/css/smoothness/images/ui-icons_888888_256x240.png diff --git a/webapp/web/js/jquery-ui-1.8.4.custom/css/smoothness/images/ui-icons_cd0a0a_256x240.png b/webapp/web/js/jquery-ui/css/smoothness/images/ui-icons_cd0a0a_256x240.png similarity index 100% rename from webapp/web/js/jquery-ui-1.8.4.custom/css/smoothness/images/ui-icons_cd0a0a_256x240.png rename to webapp/web/js/jquery-ui/css/smoothness/images/ui-icons_cd0a0a_256x240.png diff --git a/webapp/web/js/jquery-ui-1.8.4.custom/css/smoothness/jquery-ui-1.8.4.custom.css b/webapp/web/js/jquery-ui/css/smoothness/jquery-ui-1.8.4.custom.css similarity index 100% rename from webapp/web/js/jquery-ui-1.8.4.custom/css/smoothness/jquery-ui-1.8.4.custom.css rename to webapp/web/js/jquery-ui/css/smoothness/jquery-ui-1.8.4.custom.css diff --git a/webapp/web/js/jquery-ui-1.8.4.custom/js/jquery-1.4.2.min.js b/webapp/web/js/jquery-ui/js/jquery-1.4.2.min.js similarity index 100% rename from webapp/web/js/jquery-ui-1.8.4.custom/js/jquery-1.4.2.min.js rename to webapp/web/js/jquery-ui/js/jquery-1.4.2.min.js diff --git a/webapp/web/js/jquery-ui-1.8.4.custom/js/jquery-ui-1.8.4.custom.min.js b/webapp/web/js/jquery-ui/js/jquery-ui-1.8.4.custom.min.js similarity index 100% rename from webapp/web/js/jquery-ui-1.8.4.custom/js/jquery-ui-1.8.4.custom.min.js rename to webapp/web/js/jquery-ui/js/jquery-ui-1.8.4.custom.min.js