[Mpuls-commits] r3821 - in wasko/trunk: . waskoweb/templates/casemanagement

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-09-29 11:21:28 +0200 (Wed, 29 Sep 2010)
New Revision: 3821

Modified:
   wasko/trunk/ChangeLog
   wasko/trunk/wasko.json
   wasko/trunk/waskoweb/templates/casemanagement/main.mako
Log:
Issue1027: Added optional hyphen to the phase description. Therefore do not escape the phasedescription.


Modified: wasko/trunk/ChangeLog
===================================================================
--- wasko/trunk/ChangeLog	2010-09-29 09:19:04 UTC (rev 3820)
+++ wasko/trunk/ChangeLog	2010-09-29 09:21:28 UTC (rev 3821)
@@ -1,5 +1,11 @@
 2010-09-29  Torsten Irländer <torsten.irlaender at intevation.de>
 
+	* waskoweb/templates/casemanagement/main.mako,
+	  wasko.json: Issue1027: Added optional hyphen to the phase
+	  description. Therefore do not escape the phasedescription.
+
+2010-09-29  Torsten Irländer <torsten.irlaender at intevation.de>
+
 	* wasko.json: Issue1114: Added phase unknown to the config
 
 2010-09-28  Bernhard Herzog  <bh at intevation.de>

Modified: wasko/trunk/wasko.json
===================================================================
--- wasko/trunk/wasko.json	2010-09-29 09:19:04 UTC (rev 3820)
+++ wasko/trunk/wasko.json	2010-09-29 09:21:28 UTC (rev 3821)
@@ -23,9 +23,9 @@
 		"changemode" : "0",
 		"description": [{
 			"-1": "Unbekannt",
-			"0": "Eingangsdokumentation",
+			"0": "Eingangs&shy;dokumentation",
 			"1": "Case Management",
-			"2": "Nachbetreuung"
+			"2": "Nach&shy;betreuung"
 		}],
 		"shortdescription": [{
 			"-1": "U",

Modified: wasko/trunk/waskoweb/templates/casemanagement/main.mako
===================================================================
--- wasko/trunk/waskoweb/templates/casemanagement/main.mako	2010-09-29 09:19:04 UTC (rev 3820)
+++ wasko/trunk/waskoweb/templates/casemanagement/main.mako	2010-09-29 09:21:28 UTC (rev 3821)
@@ -24,7 +24,7 @@
       ${h.shorten(case.get_value(f.alias), 15)  | F.NA}
       <br>
     % endfor
-    <strong>${_('cm_info_phase')}:</strong> ${ case.getState().getPhaseDescription() | F.NA}<br>
+    <strong>${_('cm_info_phase')}:</strong> ${ h.literal(case.getState().getPhaseDescription()) | F.NA}<br>
     <strong>${_('cm_info_status')}:</strong>
        ${case.getState().getStateLabel()  | F.NA}<br>
   </div>