From d2bef48797fa3e1068da8eba727862147dac3e1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Oudot?= <clement@oodo.net>
Date: Thu, 16 Sep 2010 15:23:05 +0000
Subject: [PATCH] New Menu in impact skin (#29)

---
 .../lemonldap-ng-portal/example/index_skin.pl |  2 +-
 .../example/skins/impact/login.tpl            | 14 ++++++++++
 .../example/skins/impact/menu.tpl             | 28 +++++++++++++++----
 .../example/skins/impact/password.tpl         |  2 --
 4 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/modules/lemonldap-ng-portal/example/index_skin.pl b/modules/lemonldap-ng-portal/example/index_skin.pl
index 66700fb05..5ad62f1a9 100755
--- a/modules/lemonldap-ng-portal/example/index_skin.pl
+++ b/modules/lemonldap-ng-portal/example/index_skin.pl
@@ -79,7 +79,7 @@ if ( $portal->process() ) {
         # Initialize menu elements
         $portal->_sub('menuInit');
 
-        $skinfile = 'menu2.tpl';
+        $skinfile = 'menu.tpl';
 
         %templateParams = (
             AUTH_USER => $portal->{sessionInfo}->{ $portal->{portalUserAttr} },
diff --git a/modules/lemonldap-ng-portal/example/skins/impact/login.tpl b/modules/lemonldap-ng-portal/example/skins/impact/login.tpl
index 7e4689b28..4630a3054 100644
--- a/modules/lemonldap-ng-portal/example/skins/impact/login.tpl
+++ b/modules/lemonldap-ng-portal/example/skins/impact/login.tpl
@@ -143,6 +143,20 @@
 
     </TMPL_IF>
 
+    <TMPL_IF NAME="DISPLAY_PASSWORD">
+
+      <div id="content-all">
+      <div class="title">
+        <img src="/skins/<TMPL_VAR NAME="SKIN">/images/logo-info.png" />
+        <lang en="Password change" fr="Changement de mot de passe" />
+      </div>
+      <hr class="solid" />
+      <p class="text-error"><TMPL_VAR NAME="AUTH_ERROR"></p>
+      <TMPL_INCLUDE NAME="password.tpl">
+      </div>
+
+    </TMPL_IF>
+
     <TMPL_IF NAME="PORTAL_URL">
     <div id="content-all">
       <div class="title">
diff --git a/modules/lemonldap-ng-portal/example/skins/impact/menu.tpl b/modules/lemonldap-ng-portal/example/skins/impact/menu.tpl
index 93a792bc7..8d23243e2 100644
--- a/modules/lemonldap-ng-portal/example/skins/impact/menu.tpl
+++ b/modules/lemonldap-ng-portal/example/skins/impact/menu.tpl
@@ -9,26 +9,36 @@
       </div>
       <hr class="solid" />
       <p>
-        <span class="text-error"><lang en="Connected as" fr="Connect&eacute; en tant que" />: <u><TMPL_VAR NAME="AUTH_USER"></u></span>
+        <span class="text-error"><lang en="Connected as" fr="Connect&eacute; en tant que " />: <u><TMPL_VAR NAME="AUTH_USER"></u></span>
       </p>
 
       <div id="menu">
+
+      <TMPL_IF DISPLAY_MODULES>
         <ul>
-          <TMPL_IF NAME="DISPLAY_APPSLIST">
+        <TMPL_LOOP NAME="DISPLAY_MODULES">
+          <TMPL_IF NAME="Appslist">
           <li><a href="#appslist"><span><img src="/skins/common/application_cascade.png" width="16" height="16" alt="appslist" /> <lang en="Your applications" fr="Vos applications" /></span></a></li>
           </TMPL_IF>
-          <TMPL_IF NAME="DISPLAY_PASSWORD">
+          <TMPL_IF NAME="ChangePassword">
           <li><a href="#password"><span><img src="/skins/common/vcard_edit.png" width="16" height="16" alt="password" /> <lang en="Password" fr="Mot de passe" /></span></a></li>
           </TMPL_IF>
-          <TMPL_IF NAME="DISPLAY_LOGOUT">
+          <TMPL_IF NAME="Logout">
           <li><a href="#logout"><span><img src="/skins/common/door_out.png" width="16" height="16" alt="logout" /> <lang en="Logout" fr="Se d&eacute;connecter" /></span></a></li>
           </TMPL_IF>
+        </TMPL_LOOP>
         </ul>
+      </TMPL_IF>
+
       </div>
 
       <div id="content-all-info2">
 
-        <TMPL_IF NAME="DISPLAY_APPSLIST">
+      <TMPL_IF DISPLAY_MODULES>
+
+        <TMPL_LOOP NAME="DISPLAY_MODULES">
+
+        <TMPL_IF NAME="Appslist">
         <div id="appslist">
           <br/><br/>
           <p class="text-label">
@@ -39,9 +49,11 @@
         </div>
         </TMPL_IF>
 
+	<TMPL_IF NAME="ChangePassword">
         <TMPL_INCLUDE NAME="password.tpl">
+        </TMPL_IF>
 
-        <TMPL_IF NAME="DISPLAY_LOGOUT">
+        <TMPL_IF NAME="Logout">
         <div id="logout">
           <br/><br/><br/>
           <p class="text-label">
@@ -53,6 +65,10 @@
         </div>
         </TMPL_IF>
 
+	</TMPL_LOOP>
+
+      </TMPL_IF>
+
       </div>
     </div>
   </div>
diff --git a/modules/lemonldap-ng-portal/example/skins/impact/password.tpl b/modules/lemonldap-ng-portal/example/skins/impact/password.tpl
index c3b126ca6..fb26c671b 100644
--- a/modules/lemonldap-ng-portal/example/skins/impact/password.tpl
+++ b/modules/lemonldap-ng-portal/example/skins/impact/password.tpl
@@ -1,4 +1,3 @@
-        <TMPL_IF NAME="DISPLAY_PASSWORD">
         <div id="password">
         <form action="#" method="post" class="password">
         <h3><lang en="Change your password" fr="Changez votre mot de passe" /></h3>
@@ -29,4 +28,3 @@
         </td></tr></table>
         </form>
         </div>
-        </TMPL_IF>