[Mpuls-commits] r166 - in waska/trunk: . waskaweb/i18n/de/LC_MESSAGES waskaweb/model waskaweb/public/styles waskaweb/templates/casemanagement

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2008-09-16 10:44:33 +0200 (Tue, 16 Sep 2008)
New Revision: 166

Modified:
   waska/trunk/ChangeLog.txt
   waska/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
   waska/trunk/waskaweb/model/phases_factory.py
   waska/trunk/waskaweb/public/styles/screen.css
   waska/trunk/waskaweb/templates/casemanagement/phase.mako
Log:
Small layout and text changes. Changed version string to 1.4.0 rc2


Modified: waska/trunk/ChangeLog.txt
===================================================================
--- waska/trunk/ChangeLog.txt	2008-09-16 07:47:27 UTC (rev 165)
+++ waska/trunk/ChangeLog.txt	2008-09-16 08:44:33 UTC (rev 166)
@@ -4,6 +4,15 @@
 
 	* waskaweb/lib/search.py: Changed date.
 
+	Small layout and text changes. Changed version string to 1.4.0 rc2
+
+	* waskaweb/i18n/de/LC_MESSAGES/waskaweb.po: Changed version string And
+	  text changes.
+	* waskaweb/model/phases_factory.py,
+	  waskaweb/public/styles/screen.css,
+	  waskaweb/templates/casemanagement/phase.mako: Small layout changes
+	  on phase page.
+
 2008-09-15	Torsten Irlaender  <torsten.irlaender at intevation.de>
 
 	Added support for displaying only relevant phases (commented out yet).

Modified: waska/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
===================================================================
--- waska/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po	2008-09-16 07:47:27 UTC (rev 165)
+++ waska/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po	2008-09-16 08:44:33 UTC (rev 166)
@@ -530,7 +530,7 @@
 
 #: waskaweb/templates/main.mako:197
 msgid "footer_version"
-msgstr "15.09.2008 | Version 1.4.0 rc1"
+msgstr "16.09.2008 | Version 1.4.0 rc2"
 
 #: waskaweb/templates/main_login.mako:38
 #: waskaweb/templates/start/responsible.mako:149
@@ -1840,11 +1840,11 @@
 
 #: waskaweb/templates/casemanagement/main.mako:57
 msgid "cm_menu_link_print"
-msgstr "Gesamte Akte drucken"
+msgstr "Akte drucken"
 
 #: waskaweb/templates/casemanagement/main.mako:58
 msgid "cm_menu_link_printempty"
-msgstr "Gesamte Akte leer drucken"
+msgstr "Akte leer drucken"
 
 #: waskaweb/templates/casemanagement/main.mako:60
 msgid "cm_menu_link_create_reminder"

Modified: waska/trunk/waskaweb/model/phases_factory.py
===================================================================
--- waska/trunk/waskaweb/model/phases_factory.py	2008-09-16 07:47:27 UTC (rev 165)
+++ waska/trunk/waskaweb/model/phases_factory.py	2008-09-16 08:44:33 UTC (rev 166)
@@ -260,9 +260,9 @@
 
 PAIRS = (
     (CLEAR_START,    CLEAR_ENDE,    u"Clearing"),
-    (CM_START,       CM_ENDE,       u"Case-Management"),
+    (CM_START,       CM_ENDE,       u"Case-&#8203;Management"),
     (BERATUNG_START, BERATUNG_ENDE, u"Beratung"),
-    (NB_START,       NB_ENDE,       u"Nachbetreuung"))
+    (NB_START,       NB_ENDE,       u"Nach&shy;betreuung"))
 
 def phases_pairs(required_fields, current_phase, navigation = None, link = None):
 

Modified: waska/trunk/waskaweb/public/styles/screen.css
===================================================================
--- waska/trunk/waskaweb/public/styles/screen.css	2008-09-16 07:47:27 UTC (rev 165)
+++ waska/trunk/waskaweb/public/styles/screen.css	2008-09-16 08:44:33 UTC (rev 166)
@@ -544,6 +544,7 @@
 }
 
 table#cmphases td.cm_phase_state {
+	font-size:0.95em;
 	text-align: center;
 	font-weight: bold;
 }

Modified: waska/trunk/waskaweb/templates/casemanagement/phase.mako
===================================================================
--- waska/trunk/waskaweb/templates/casemanagement/phase.mako	2008-09-16 07:47:27 UTC (rev 165)
+++ waska/trunk/waskaweb/templates/casemanagement/phase.mako	2008-09-16 08:44:33 UTC (rev 166)
@@ -22,7 +22,7 @@
     <% p1, p2 = phase_pair.getStart(), phase_pair.getEnd()  %>
     <tr>
       <td rowspan="2" class="cm_phase_state ${(count%2) and 'table_row_h' or ''}">
-        ${phase_pair.getDescription() | h}
+        ${phase_pair.getDescription()}
         % if p1.isRunning():
             <br>(läuft)
         % elif c.current_phase.hasPredecessor(p1):
@@ -83,7 +83,7 @@
     <% total = None %>
     % for phase_pair in c.phase_pairs:
     <tr>
-      <td>${phase_pair.getDescription()|h}</td>
+      <td>${phase_pair.getDescription()}</td>
       <td style="text-align:right">
       <% 
         t = phase_pair.getDuration();