From 889d98079cdcca4a527fbbcfc55e2e5f928b9acf Mon Sep 17 00:00:00 2001 From: Florent Bruneau Date: Sun, 7 Mar 2010 15:25:27 +0100 Subject: [PATCH] jQuery UI files have been renamed. Signed-off-by: Florent Bruneau --- Makefile | 18 ++++++++++++------ modules/admin.php | 4 ++-- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 2a721d9..e928263 100644 --- a/Makefile +++ b/Makefile @@ -174,26 +174,32 @@ JQUERY_PLUGINS_PATHES=$(addprefix htdocs/javascript/jquery.,$(addsuffix .js,$(JQ JQUERY_UI_VERSION=1.7.2 JQUERY_UI=core tabs -JQUERY_UI_PATHES=$(addprefix htdocs/javascript/ui.,$(addsuffix .js,$(JQUERY_UI))) +JQUERY_UI_PATHES=$(addprefix htdocs/javascript/jquery.ui.,$(addsuffix .js,$(JQUERY_UI))) # TODO: jquery.autocomplete.js should rather be downloaded from an official source. The issue # is that the version we use is not available anymore on the Internet, and the latest version # we could use is not backward compatible with our current code. jquery: htdocs/javascript/jquery.js $(JQUERY_PLUGINS_PATHES) $(JQUERY_UI_PATHES) -htdocs/javascript/jquery.js: DOWNLOAD_SRC = http://jquery.com/src/jquery-$(JQUERY_VERSION).min.js -htdocs/javascript/jquery.js: +htdocs/javascript/jquery-$(JQUERY_VERSION).min.js: DOWNLOAD_SRC = http://jquery.com/src/$(@F) +htdocs/javascript/jquery-$(JQUERY_VERSION).min.js: @$(download) +htdocs/javascript/jquery.js: htdocs/javascript/jquery-$(JQUERY_VERSION).min.js + ln -snf $< $@ + $(JQUERY_PLUGINS_PATHES): DOWNLOAD_SRC = http://plugins.jquery.com/files/$(@F).txt $(JQUERY_PLUGINS_PATHES): @$(download) -$(JQUERY_UI_PATHES): DOWNLOAD_SRC = http://jquery-ui.googlecode.com/svn/tags/$(JQUERY_UI_VERSION)/ui/$(@F) -$(JQUERY_UI_PATHES): +htdocs/javascript/jquery.ui-$(JQUERY_UI_VERSION).%.js: DOWNLOAD_SRC = http://jquery-ui.googlecode.com/svn/tags/$(JQUERY_UI_VERSION)/ui/ui.$*.js +htdocs/javascript/jquery.ui-$(JQUERY_UI_VERSION).%.js: @$(download) +$(JQUERY_UI_PATHES): htdocs/javascript/jquery.ui.%.js: htdocs/javascript/jquery.ui-$(JQUERY_UI_VERSION).%.js + ln -snf $< $@ + ################################################################################ -.PHONY: build dist clean core wiki build-wiki banana htdocs/images/banana htdocs/css/banana.css include/banana/banana.inc.php http* check htdocs/javascript/jquery*.js htdocs/javascript/ui.*.js +.PHONY: build dist clean core wiki build-wiki banana htdocs/images/banana htdocs/css/banana.css include/banana/banana.inc.php http* check diff --git a/modules/admin.php b/modules/admin.php index 07dace9..4dff7a8 100644 --- a/modules/admin.php +++ b/modules/admin.php @@ -598,8 +598,8 @@ class AdminModule extends PLModule // }}} - $page->addJsLink('ui.core.js'); - $page->addJsLink('ui.tabs.js'); + $page->addJsLink('jquery.ui.core.js'); + $page->addJsLink('jquery.ui.tabs.js'); // Displays last login and last host information. $res = XDB::query("SELECT start, host -- 2.1.4