[Mpuls-commits] r4104 - in base/trunk/mpulsweb/templates: . usersettings

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-11-03 12:45:29 +0100 (Wed, 03 Nov 2010)
New Revision: 4104

Modified:
   base/trunk/mpulsweb/templates/main.mako
   base/trunk/mpulsweb/templates/usersettings/show_settings.mako
Log:
Only show administration links if administration is enabled.


Modified: base/trunk/mpulsweb/templates/main.mako
===================================================================
--- base/trunk/mpulsweb/templates/main.mako	2010-11-03 11:44:12 UTC (rev 4103)
+++ base/trunk/mpulsweb/templates/main.mako	2010-11-03 11:45:29 UTC (rev 4104)
@@ -145,7 +145,7 @@
       </div>
     </div>
   % endif
-  % if h.hasRole(['admin_ka']):
+  % if h.hasRole(['admin_ka']) and g.mpuls_config.is_enabled('module', 'administration'):
     <div class="menu">
       <div class="actions">
         <h1>${_('menu_header_adm')}</h1>

Modified: base/trunk/mpulsweb/templates/usersettings/show_settings.mako
===================================================================
--- base/trunk/mpulsweb/templates/usersettings/show_settings.mako	2010-11-03 11:44:12 UTC (rev 4103)
+++ base/trunk/mpulsweb/templates/usersettings/show_settings.mako	2010-11-03 11:45:29 UTC (rev 4104)
@@ -10,7 +10,9 @@
   <div id="modusfield">
     <div class="actions">
       <ul>
-        <li><a href="${h.url_for(controller='/usersettings', action='changePassword', id=h.getUserId())}"> ${_('usersettings_a_change_pw')}</a></li>
+        % if g.mpuls_config.is_enabled('module', 'administration'):
+          <li><a href="${h.url_for(controller='/usersettings', action='changePassword', id=h.getUserId())}"> ${_('usersettings_a_change_pw')}</a></li>
+        % endif
         % if h.hasRole(['cm_ka']):
           % if g.mpuls_config.is_enabled('case-module', 'organisation'):
             <li><a href="${h.url_for(controller='/usersettings', action='editStandin', id=h.getUserId())}"> ${_('usersettings_a_change_replace')}</a></li>