Renames validation template and fixes promotion display.

Signed-off-by: Stéphane Jacob <sj@m4x.org>

diff --git a/include/marketing.inc.php b/include/marketing.inc.php
index b142dd0..18f02a6 100644 (file)
--- a/include/marketing.inc.php
+++ b/include/marketing.inc.php
@@ -291,7 +291,7 @@ class AnnuaireMarketing implements MarketingEngine
         $page->assign('intro', $this->getIntro());
         $page->assign('u', $user);
         $page->assign('sign', $this->getSignature());
-        $page->assign('num_users', self::getAliveUsersCount());
+        $page->assign('num_users', Marketing::getAliveUsersCount());
         $page->assign('personal_notes', $this->getPersonalNotes());
     }
 

diff --git a/modules/admin.php b/modules/admin.php
index 341d21c..f0e7208 100644 (file)
--- a/modules/admin.php
+++ b/modules/admin.php
@@ -935,7 +935,7 @@ class AdminModule extends PLModule
 
     function handler_validate(&$page, $action = 'list', $id = null)
     {
-        $page->changeTpl('admin/valider.tpl');
+        $page->changeTpl('admin/validation.tpl');
         $page->setTitle('Administration - Valider une demande');
                 $page->addCssLink('nl.css');
         $page->addJsLink('ajax.js');

diff --git a/templates/admin/valider.tpl b/templates/admin/validation.tpl
similarity index 99%
rename from templates/admin/valider.tpl
rename to templates/admin/validation.tpl
index ce018fe..970e2f9 100644 (file)
--- a/templates/admin/valider.tpl
+++ b/templates/admin/validation.tpl
@@ -47,7 +47,7 @@ function toggleField(name, id, obj) {
     <td class="titre" style="width: 20%">Demandeur&nbsp;:</td>
     <td>
       <a href="profile/{$valid->user->login()}" class="popup2">
-        {$valid->user->fullName()} (X{$valid->user->promo()})
+        {$valid->user->fullName()} ({$valid->user->promo()})
       </a>
     </td>
   </tr>