From: x2003bruneau Date: Thu, 13 Jul 2006 15:40:00 +0000 (+0000) Subject: In order to use last svn of banana X-Git-Tag: xorg/0.9.11~437 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=aafe5c0975907390c51db0a321112568f498a795;p=platal.git In order to use last svn of banana git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@463 839d8a87-29fc-0310-9880-83ba4fa771e5 --- diff --git a/include/banana.inc.php b/include/banana.inc.php index 4f009f8..5ae5210 100644 --- a/include/banana.inc.php +++ b/include/banana.inc.php @@ -37,6 +37,12 @@ function hook_checkcancel($_headers) { return ($_headers['x-org-id'] == Session::get('forlife') or has_perms()); } +function hook_shortcuts() +{ + global $globals; + return 'Préférences'; +} + function hook_makeLink($params) { global $globals; $base = $globals->baseurl . '/banana'; @@ -75,7 +81,7 @@ function hook_makeLink($params) { function hook_makeImg($img, $alt, $height, $width) { global $globals; - $url = $globals->baseurl . '/images/banana/' . $img . '.gif'; + $url = $globals->baseurl . '/images/banana/' . $img; if (!is_null($width)) { $width = ' width="' . $width . '"'; diff --git a/modules/banana.php b/modules/banana.php index f45d8b2..578f37f 100644 --- a/modules/banana.php +++ b/modules/banana.php @@ -43,7 +43,10 @@ class BananaModule extends PLModule if (!is_null($action)) { if ($action == 'new') { $get['action'] = 'new'; - } elseif (($action == 'reply' || $action == 'cancel') && !is_null($artid)) { + } elseif ($action == 'reply' && !is_null($artid)) { + $get['action'] = 'new'; + $get['artid'] = $artid; + } elseif ($action == 'cancel' && !is_null($artid)) { $get['action'] = $action; $get['artid'] = $artid; } elseif ($action == 'from' && !is_null($artid)) { diff --git a/templates/banana/index.tpl b/templates/banana/index.tpl index 27c8385..dd42b7b 100644 --- a/templates/banana/index.tpl +++ b/templates/banana/index.tpl @@ -20,12 +20,9 @@ {* *} {**************************************************************************} -

Options

- {if !$banana->profile.autoup} [Mettre à jour] {/if} -[Profil]