[Mpuls-commits] r560 - in wasko/trunk: . waskaweb/controllers waskaweb/public/styles waskaweb/templates/formularpage

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2009-07-28 17:17:16 +0200 (Tue, 28 Jul 2009)
New Revision: 560

Modified:
   wasko/trunk/ChangeLog.txt
   wasko/trunk/waskaweb/controllers/case.py
   wasko/trunk/waskaweb/public/styles/screen.css
   wasko/trunk/waskaweb/templates/formularpage/content.mako
   wasko/trunk/waskaweb/templates/formularpage/formular.mako
Log:
Fixed rendering of formular headers


Modified: wasko/trunk/ChangeLog.txt
===================================================================
--- wasko/trunk/ChangeLog.txt	2009-07-28 14:35:32 UTC (rev 559)
+++ wasko/trunk/ChangeLog.txt	2009-07-28 15:17:16 UTC (rev 560)
@@ -95,6 +95,14 @@
 	  waskaweb/controllers/formularpage.py,
 	  waskaweb/lib/navigation.py: Unfold folders on save an proceed.
 
+	Layout of headers adopted to old WASKO-Layout
+
+	* waskaweb/controllers/case.py,
+	  waskaweb/public/styles/screen.css,
+	  waskaweb/templates/formularpage/content.mako,
+	  waskaweb/templates/formularpage/formular.mako: Render Header of the
+	  formular in the similar way like it was in WASKO. 
+
 2009-07-16	Torsten Irlaender  <torsten.irlaender at intevation.de> 
 
 	Set version to 1.0.5

Modified: wasko/trunk/waskaweb/controllers/case.py
===================================================================
--- wasko/trunk/waskaweb/controllers/case.py	2009-07-28 14:35:32 UTC (rev 559)
+++ wasko/trunk/waskaweb/controllers/case.py	2009-07-28 15:17:16 UTC (rev 560)
@@ -299,6 +299,7 @@
 
     @checkRole(('admin_ka', 'cm_ka', 'pt_dlr'))
     def printAll(self, id, empty='0'):
+        c.print_version = 1
         out = []
         case = self._loadCase(id)
         render_mode = session['render_mode']
@@ -312,7 +313,6 @@
             for item in navigation.getAllItems():
                 out.append(unicode(get_rendered_page(item.key), 'utf-8'))
         c.formular = "".join(out)
-        c.print_version = 1
         session['render_mode'] = render_mode 
         session.save()
         return render('/formularpage/formular.mako')

Modified: wasko/trunk/waskaweb/public/styles/screen.css
===================================================================
--- wasko/trunk/waskaweb/public/styles/screen.css	2009-07-28 14:35:32 UTC (rev 559)
+++ wasko/trunk/waskaweb/public/styles/screen.css	2009-07-28 15:17:16 UTC (rev 560)
@@ -409,7 +409,7 @@
 
 div#content_header {
 	width:51.5em;
-	height:6.6em;
+	height:3.0em;
 }
 
 div#content_header_small {

Modified: wasko/trunk/waskaweb/templates/formularpage/content.mako
===================================================================
--- wasko/trunk/waskaweb/templates/formularpage/content.mako	2009-07-28 14:35:32 UTC (rev 559)
+++ wasko/trunk/waskaweb/templates/formularpage/content.mako	2009-07-28 15:17:16 UTC (rev 560)
@@ -1,6 +1,8 @@
 ## -*- coding: utf-8 -*-
 <div class="formularpage">
-${c.formularheader}
+%if c.print_version:
+  ${c.formularheader}
+%endif
 ${c.formularerrors}
 ${c.formular}
 </div>

Modified: wasko/trunk/waskaweb/templates/formularpage/formular.mako
===================================================================
--- wasko/trunk/waskaweb/templates/formularpage/formular.mako	2009-07-28 14:35:32 UTC (rev 559)
+++ wasko/trunk/waskaweb/templates/formularpage/formular.mako	2009-07-28 15:17:16 UTC (rev 560)
@@ -42,7 +42,9 @@
 
 <%def name="buildContentHeader()">
   <div id="content_header">
-    ${self.buildUeberschrift()}
+    %if not c.print_version:
+      <div id="content_ueberschrift">${c.formularheader}</div>
+    %endif
     ${self.buildModusfield()}
   </div><br>
 </%def>