[Mpuls-commits] r791 - in wasko/branches/2.0: . waskaweb/templates/start

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-01-20 16:29:24 +0100 (Wed, 20 Jan 2010)
New Revision: 791

Modified:
   wasko/branches/2.0/ChangeLog.txt
   wasko/branches/2.0/waskaweb/templates/start/start.mako
Log:
* waskaweb/templates/start/start.mako: Include newslist.mako,
remindlist.mako, appointmentlist.mako, globalappointmentlist.mako
only if the corresponding is enabled.


Modified: wasko/branches/2.0/ChangeLog.txt
===================================================================
--- wasko/branches/2.0/ChangeLog.txt	2010-01-20 15:20:24 UTC (rev 790)
+++ wasko/branches/2.0/ChangeLog.txt	2010-01-20 15:29:24 UTC (rev 791)
@@ -1,5 +1,11 @@
 2010-01-20  Bernhard Herzog  <bh at intevation.de>
 
+	* waskaweb/templates/start/start.mako: Include newslist.mako,
+	remindlist.mako, appointmentlist.mako, globalappointmentlist.mako
+	only if the corresponding is enabled.
+
+2010-01-20  Bernhard Herzog  <bh at intevation.de>
+
 	* waskaweb/templates/start/start.mako: Remove evaluation server
 	specific branch.
 

Modified: wasko/branches/2.0/waskaweb/templates/start/start.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/start/start.mako	2010-01-20 15:20:24 UTC (rev 790)
+++ wasko/branches/2.0/waskaweb/templates/start/start.mako	2010-01-20 15:29:24 UTC (rev 791)
@@ -25,19 +25,34 @@
       <h1>Inkonsistente Fallakten gefunden! ${h.getHelp('inconsistent_cases')}</h1>
         <p>Es wurden ${c.num_error_cases} Fallakte(n) mit unvollständigen oder widersprüchlichen Angaben gefunden. Fallakten deren Daten nicht plausibel sind werden in der Auswertung zu Problemen führen. Bitte nutzen Sie die Funktion zum <a href="${h.url_for(controller='/case_overview', action='listBadCases')}">Aufspüren von inkonsistenten Fallakten.</a></p>
       </div>
-    %endif
-    %if c.news.getList():
+    % endif
+  
+  ## NEWS 
+  % if g.mpuls_config.is_enabled('module', 'news'):
+    % if c.news.getList():
       <div class="news">
         <h2>Aktuelle Hinweise</h2>
         <%include file="/start/newslist.mako"/>
       </div>
     % endif
+  % endif
+
+  ## REMINDERS
+  % if g.mpuls_config.is_enabled('case-module', 'reminders'):
     <h2>Automatisierte Wiedervorlagen</h2>
     <%include file="/start/remindlist.mako"/>
+  % endif
+
+  ## APPOINTMENTS 
+  % if g.mpuls_config.is_enabled('case-module', 'appointments'):
     %if h.hasRole(['cm_ka']):
       <h2>Eigene Termine</h2>
       <%include file="/start/appointmentlist.mako"/>
     % endif
+  % endif
+
+  % if g.mpuls_config.is_enabled('module', 'appointments'):
     <h2>Einrichtungsweite Termine</h2>
     <%include file="/start/globalappointmentlist.mako"/>
+  % endif
 % endif