From c99ef281118de7ab4b45de299701925ad5ebb26c Mon Sep 17 00:00:00 2001 From: x2000habouzit Date: Sun, 30 Jul 2006 21:27:24 +0000 Subject: [PATCH] make add(Js|Css)Link don't need the extra css/ or javascript/ link, so that x.net and x.org work the same git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@732 839d8a87-29fc-0310-9880-83ba4fa771e5 --- classes/Page.php | 2 +- classes/Platal.php | 4 ++-- htdocs.net/index.php | 2 +- htdocs/index.php | 4 ++-- include/newsletter.inc.php | 2 +- modules/banana.php | 2 +- modules/lists.php | 2 +- modules/platal.php | 4 ++-- modules/profile.php | 6 +++--- modules/register.php | 2 +- templates/skin/common.header.tpl | 4 ++-- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/classes/Page.php b/classes/Page.php index 4b6b302..935f36b 100644 --- a/classes/Page.php +++ b/classes/Page.php @@ -58,7 +58,7 @@ class PlatalPage extends Smarty $this->register_prefilter('at_to_globals'); $this->register_prefilter('trimwhitespace'); - $this->addJsLink('javascript/xorg.js'); + $this->addJsLink('xorg.js'); } // }}} diff --git a/classes/Platal.php b/classes/Platal.php index 71dd37d..c34d34d 100644 --- a/classes/Platal.php +++ b/classes/Platal.php @@ -112,10 +112,10 @@ class Platal { if (S::logged() and !$new_name) { $page->changeTpl('password_prompt_logged.tpl'); - $page->addJsLink('javascript/do_challenge_response_logged.js'); + $page->addJsLink('do_challenge_response_logged.js'); } else { $page->changeTpl('password_prompt.tpl'); - $page->addJsLink('javascript/do_challenge_response.js'); + $page->addJsLink('do_challenge_response.js'); } $page->run(); } diff --git a/htdocs.net/index.php b/htdocs.net/index.php index fd4c3a8..93c1552 100644 --- a/htdocs.net/index.php +++ b/htdocs.net/index.php @@ -113,7 +113,7 @@ $page->assign('wikipage', str_replace('.', '/', $n)); $page->assign('pmwiki', $wikiAll); $page->addCssLink('wiki.css'); -$page->addJsLink('javascript/wiki.js'); +$page->addJsLink('wiki.js'); $page->useMenu(); $page->run(); diff --git a/htdocs/index.php b/htdocs/index.php index b372e97..f9ad7f9 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -115,8 +115,8 @@ $page->assign('has_perms', wiki_may_have_perms('admin')); $page->assign('wikipage', str_replace('.', '/', $n)); $page->assign('pmwiki', $wikiAll); -$page->addCssLink('css/wiki.css'); -$page->addJsLink('javascript/wiki.js'); +$page->addCssLink('wiki.css'); +$page->addJsLink('wiki.js'); $page->run(); diff --git a/include/newsletter.inc.php b/include/newsletter.inc.php index 06d3e54..32fd34a 100644 --- a/include/newsletter.inc.php +++ b/include/newsletter.inc.php @@ -25,7 +25,7 @@ require_once("xorg.misc.inc.php"); require_once("diogenes/diogenes.misc.inc.php"); if (isset($page)) { - $page->addCssLink('css/nl.css'); + $page->addCssLink('nl.css'); } define('FEMME', 1); diff --git a/modules/banana.php b/modules/banana.php index 3441fb5..1658ba0 100644 --- a/modules/banana.php +++ b/modules/banana.php @@ -140,7 +140,7 @@ class BananaModule extends PLModule function run_banana(&$page, $params = null) { $page->changeTpl('banana/index.tpl'); - $page->addCssLink('css/banana.css'); + $page->addCssLink('banana.css'); $page->assign('xorg_title','Polytechnique.org - Forums & PA'); require_once dirname(__FILE__).'/banana/banana.inc.php'; diff --git a/modules/lists.php b/modules/lists.php index a9c452b..422dd77 100644 --- a/modules/lists.php +++ b/modules/lists.php @@ -273,7 +273,7 @@ class ListsModule extends PLModule $page->changeTpl('listes/archives.tpl'); - $page->addCssLink('css/lists.archives.css'); + $page->addCssLink('lists.archives.css'); if (list($det) = $this->client->get_members($liste)) { if (substr($liste,0,5) != 'promo' && ($det['ins'] || $det['priv']) && !$det['own'] && ($det['sub'] < 2)) diff --git a/modules/platal.php b/modules/platal.php index 30cc13d..1fe93ce 100644 --- a/modules/platal.php +++ b/modules/platal.php @@ -190,7 +190,7 @@ class PlatalModule extends PLModule } $page->changeTpl('motdepasse.tpl'); - $page->addJsLink('javascript/motdepasse.js'); + $page->addJsLink('motdepasse.js'); $page->assign('xorg_title','Polytechnique.org - Mon mot de passe'); } @@ -315,7 +315,7 @@ Mail envoy $page->changeTpl('tmpPWD.success.tpl'); } else { $page->changeTpl('motdepasse.tpl'); - $page->addJsLink('javascript/motdepasse.js'); + $page->addJsLink('motdepasse.js'); } } diff --git a/modules/profile.php b/modules/profile.php index 906ffe8..9f603ee 100644 --- a/modules/profile.php +++ b/modules/profile.php @@ -235,7 +235,7 @@ class ProfileModule extends PLModule $user['forlife'].'@'.$globals->mail->domain2); $page->assign('virtualalias', $res->fetchOneCell()); - $page->addJsLink('javascript/close_on_esc.js'); + $page->addJsLink('close_on_esc.js'); } function handler_p_edit(&$page, $opened_tab = 'general') @@ -244,7 +244,7 @@ class ProfileModule extends PLModule $page->changeTpl('profil.tpl'); - $page->addCssLink('css/profil.css'); + $page->addCssLink('profil.css'); $page->assign('xorg_title', 'Polytechnique.org - Mon Profil'); require_once 'tabs.inc.php'; @@ -461,7 +461,7 @@ class ProfileModule extends PLModule WHERE uid = {?}", $user_id); $page->assign('pays', $res->fetchColumn()); - $page->addJsLink('javascript/close_on_esc.js'); + $page->addJsLink('close_on_esc.js'); } function handler_ref_search(&$page) diff --git a/modules/register.php b/modules/register.php index 9d32298..c7785b3 100644 --- a/modules/register.php +++ b/modules/register.php @@ -324,7 +324,7 @@ class RegisterModule extends PLModule $page->assign('mdpok', true); } - $page->addJsLink('javascript/motdepasse.js'); + $page->addJsLink('motdepasse.js'); } } diff --git a/templates/skin/common.header.tpl b/templates/skin/common.header.tpl index 26a9db8..cfe1a38 100644 --- a/templates/skin/common.header.tpl +++ b/templates/skin/common.header.tpl @@ -37,10 +37,10 @@ {foreach from=$xorg_css item=css} - + {/foreach} {foreach from=$xorg_js item=js} - + {/foreach} -- 2.1.4