[Mpuls-commits] r5035 - in base/trunk: . mpulsweb/templates/home

[scm-commit@wald.intevation.org]

Author: ludwig
Date: 2011-05-31 10:53:22 +0200 (Tue, 31 May 2011)
New Revision: 5035

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/templates/home/remindlist.mako
Log:
Issue882: Changed behaviour and icons of manual reminders.

Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2011-05-31 08:07:03 UTC (rev 5034)
+++ base/trunk/ChangeLog	2011-05-31 08:53:22 UTC (rev 5035)
@@ -1,3 +1,11 @@
+2011-05-31  Ludwig Reiter <ludwig.reiter at intevation.de>
+
+	* mpulsweb/templates/home/remindlist.mako:
+	Issue882: Different behaviour of reminders and automatic reminders.
+	Reminders are shown with just a show button and this button opens the
+	reminder. Old icon is used, because of the missing refresh icon the 
+	reminders can be differentiated.
+
 2011-05-27  Ludwig Reiter <ludwig.reiter at intevation.de>
 
 	* mpulsweb/lib/validators.py:

Modified: base/trunk/mpulsweb/templates/home/remindlist.mako
===================================================================
--- base/trunk/mpulsweb/templates/home/remindlist.mako	2011-05-31 08:07:03 UTC (rev 5034)
+++ base/trunk/mpulsweb/templates/home/remindlist.mako	2011-05-31 08:53:22 UTC (rev 5035)
@@ -1,16 +1,19 @@
 <%inherit file="/appointments/remindlist_body.mako" />
 <%def name="showAppointmentActions(appointment)">
-  <a href="${h.url_for(controller='/case', action='select',
-                       id=appointment.case_id, confirmed=0)}">
+  
     % if appointment.type in [1]:
-    <img src    = "${h.url_for('/images/icons/edit_22.png')}"
+ 	<a href="${h.url_for(controller='/caseappointment', action='show',
+ 		id=appointment.id, confirmed=0)}"> 
+	<img src    = "${h.url_for('/images/icons/open_active_22.png')}"
          border = "0"
          alt    = "${_('Show')}" 
          title  = "${_('Show')}"
          width  = "22"
          height = "22"></a>
     % else:
-    <img src    = "${h.url_for('/images/icons/open_active_22.png')}"
+    	<a href="${h.url_for(controller='/case', action='select',
+                    id=appointment.case_id, confirmed=0)}">
+    	<img src    = "${h.url_for('/images/icons/open_active_22.png')}"
          border = "0"
          alt    = "${_('Show')}" 
          title  = "${_('Show')}"
@@ -19,20 +22,13 @@
     % endif
 </%def>
 <%def name="showKeepActiveActions(appointment)">
-  <a href="${h.url_for(controller='/case', action='keepActive', id=appointment.case_id, confirmed=0)}">
-    % if appointment.type in [1]:
+    % if not appointment.type in [1]:
+  	<a href="${h.url_for(controller='/case', action='keepActive', id=appointment.case_id, confirmed=0)}">
     <img src    = "${h.url_for('/images/icons/refresh_active_22.png')}"
          border = "0"
          width  = "22"
          height = "22"
          alt    = "${_('Keep longer activated')}" 
          title  = "${_('Keep longer activated')}"></a>
-    % else:
-    <img src    = "${h.url_for('/images/icons/refresh_active_22.png')}"
-         border = "0"
-         width  = "22"
-         height = "22"
-         alt    = "${_('Keep longer activated')}" 
-         title  = "${_('Keep longer activated')}"></a>
     % endif
 </%def>