From b7bad73e2388cb40d224a3a0cbdff68335800b90 Mon Sep 17 00:00:00 2001 From: Florent Bruneau Date: Thu, 20 Jan 2011 22:18:34 +0100 Subject: [PATCH] Merge css files. Signed-off-by: Florent Bruneau --- Makefile | 10 ++++++++-- classes/xnetpage.php | 2 +- classes/xorgpage.php | 2 +- htdocs/css/base.css | 8 ++++++++ htdocs/css/print.css | 4 ---- modules/admin.php | 4 +--- modules/profile.php | 1 - modules/search.php | 3 --- modules/survey.php | 6 +----- templates/search/adv.form.tpl | 2 -- templates/skin/common.header.tpl | 1 - 11 files changed, 20 insertions(+), 23 deletions(-) delete mode 100644 htdocs/css/print.css diff --git a/Makefile b/Makefile index 4171e6b..6bb43bc 100644 --- a/Makefile +++ b/Makefile @@ -184,7 +184,7 @@ JQUERY_PLUGINS=color form JQUERY_PLUGINS_PATHES=$(addprefix htdocs/javascript/jquery.,$(addsuffix .js,$(JQUERY_PLUGINS))) JQUERY_UI_VERSION=1.8.7 -JQUERY_UI=core tabs datepicker widget +JQUERY_UI=core widget tabs datepicker JQUERY_UI_PATHES=$(addprefix htdocs/javascript/jquery.ui.,$(addsuffix .js,$(JQUERY_UI))) JQUERY_TMPL_VERSION=vBeta1.0.0 @@ -196,7 +196,13 @@ JSTREE_PATH=htdocs/javascript/jquery.jstree.js # 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) $(JQUERY_TMPL_PATH) $(JSTREE_PATH) htdocs/javascript/jquery.ui.datepicker-fr.js +jquery: htdocs/javascript/jquery.xorg.js htdocs/javascript/jquery.ui.xorg.js $(JSTREE_PATH) + +htdocs/javascript/jquery.xorg.js: htdocs/javascript/jquery.js $(JQUERY_PLUGINS_PATHES) $(JQUERY_TMPL_PATH) htdocs/javascript/jquery.autocomplete.js + cat $^ > $@ + +htdocs/javascript/jquery.ui.xorg.js: $(JQUERY_UI_PATHES) htdocs/javascript/jquery.ui.datepicker-fr.js + cat $^ > $@ htdocs/javascript/jquery-$(JQUERY_VERSION).min.js: DOWNLOAD_SRC = http://jquery.com/src/$(@F) htdocs/javascript/jquery-$(JQUERY_VERSION).min.js: diff --git a/classes/xnetpage.php b/classes/xnetpage.php index 022ab4e..1969dd0 100644 --- a/classes/xnetpage.php +++ b/classes/xnetpage.php @@ -41,7 +41,7 @@ class XnetPage extends PlPage $this->assign('is_admin', may_update()); $this->assign('is_member', is_member()); } - $this->addJsLink('jquery.js'); + $this->addJsLink('jquery.xorg.js'); $this->addJsLink('overlib.js'); $this->addJsLink('core.js'); $this->addJsLink('xorg.js'); diff --git a/classes/xorgpage.php b/classes/xorgpage.php index a1a465e..3d12187 100644 --- a/classes/xorgpage.php +++ b/classes/xorgpage.php @@ -27,7 +27,7 @@ class XorgPage extends PlPage // Set the default page $this->changeTpl('platal/index.tpl'); - $this->addJsLink('jquery.js'); + $this->addJsLink('jquery.xorg.js'); $this->addJsLink('overlib.js'); $this->addJsLink('secure_hash.js'); $this->addJsLink('core.js'); diff --git a/htdocs/css/base.css b/htdocs/css/base.css index 10890c6..710172e 100644 --- a/htdocs/css/base.css +++ b/htdocs/css/base.css @@ -145,4 +145,12 @@ color: #777; } +/* print */ +@media print { + #body-menu, #body-top, #body-logo, #body-bottom, #dev, .backtrace, .xdx, .noprint + { display:none; } + + table#body, img { border:0px; } +} + /* vim: set et ts=4 sts=4 sw=4: */ diff --git a/htdocs/css/print.css b/htdocs/css/print.css deleted file mode 100644 index d548d4a..0000000 --- a/htdocs/css/print.css +++ /dev/null @@ -1,4 +0,0 @@ -#body-menu, #body-top, #body-logo, #body-bottom, #dev, .backtrace, .xdx, .noprint -{ display:none; } - -table#body, img { border:0px; } diff --git a/modules/admin.php b/modules/admin.php index 75ab39a..5ee9ccb 100644 --- a/modules/admin.php +++ b/modules/admin.php @@ -675,9 +675,7 @@ class AdminModule extends PLModule // }}} - $page->addJsLink('jquery.ui.core.js'); - $page->addJsLink('jquery.ui.widget.js'); - $page->addJsLink('jquery.ui.tabs.js'); + $page->addJsLink('jquery.ui.xorg.js'); $page->addJsLink('password.js'); // Displays last login and last host information. diff --git a/modules/profile.php b/modules/profile.php index 98c94f3..d4a5c8a 100644 --- a/modules/profile.php +++ b/modules/profile.php @@ -332,7 +332,6 @@ class ProfileModule extends PLModule $page->addJsLink('education.js', false); /* dynamic content */ $page->addJsLink('grades.js', false); /* dynamic content */ $page->addJsLink('profile.js'); - $page->addJsLink('jquery.autocomplete.js'); $wiz = new PlWizard('Profil', PlPage::getCoreTpl('plwizard.tpl'), true, true, false); $wiz->addUserData('profile', $profile); $wiz->addUserData('owner', $profile->owner()); diff --git a/modules/search.php b/modules/search.php index 64adb5f..eb01b60 100644 --- a/modules/search.php +++ b/modules/search.php @@ -151,7 +151,6 @@ class SearchModule extends PLModule { global $globals; $page->assign('advanced',1); - $page->addJsLink('jquery.autocomplete.js'); $networks = DirEnum::getOptions(DirEnum::NETWORKS); $networks[-1] = 'Tous types'; @@ -376,8 +375,6 @@ class SearchModule extends PLModule $res = XDB::query("SELECT count(distinct pid) FROM profile_mentor_term"); $page->assign('mentors_number', $res->fetchOneCell()); - $page->addJsLink('jquery.autocomplete.js'); - // Search for mentors matching filters require_once 'ufbuilder.inc.php'; $ufb = new UFB_MentorSearch(); diff --git a/modules/survey.php b/modules/survey.php index d1626a8..5a6069f 100644 --- a/modules/survey.php +++ b/modules/survey.php @@ -40,11 +40,7 @@ class SurveyModule extends PLModule private function setup_page(PlPage $page) { $this->load('survey.inc.php'); - $page->addJsLink('jquery.ui.core.js'); - $page->addJsLink('jquery.ui.widget.js'); - $page->addJsLink('jquery.ui.datepicker.js'); - $page->addJsLink('jquery.ui.datepicker-fr.js'); - $page->addJsLink('jquery.tmpl.js'); + $page->addJsLink('jquery.ui.xorg.js'); $page->addJsLink('survey.js'); } diff --git a/templates/search/adv.form.tpl b/templates/search/adv.form.tpl index d3bc2d8..985e6eb 100644 --- a/templates/search/adv.form.tpl +++ b/templates/search/adv.form.tpl @@ -26,8 +26,6 @@

Voulez-vous télécharger le tableau des adresses postales pour la recette précédente ?

{/if} -{javascript name=jquery.form} -