[Mpuls-commits] r309 - in wasko/trunk: . waskaweb/public/styles waskaweb/templates/casemanagement

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Thu Feb 26 14:22:17 CET 2009


Author: torsten
Date: 2009-02-26 14:22:15 +0100 (Thu, 26 Feb 2009)
New Revision: 309

Modified:
   wasko/trunk/ChangeLog.txt
   wasko/trunk/waskaweb/public/styles/screen.css
   wasko/trunk/waskaweb/templates/casemanagement/digest_body.mako
Log:
Fixed rendering problem in IE7


Modified: wasko/trunk/ChangeLog.txt
===================================================================
--- wasko/trunk/ChangeLog.txt	2009-02-26 11:23:53 UTC (rev 308)
+++ wasko/trunk/ChangeLog.txt	2009-02-26 13:22:15 UTC (rev 309)
@@ -9,6 +9,10 @@
 	* waskaweb/public/styles/color3.css: Rows of Radiomatrix are now
 	  rendered with altering background.
 
+	* waskaweb/public/styles/screen.css,
+	  waskaweb/templates/casemanagement/digest_body.mako: Fixed broken
+	  rendering of formular pages in IE7.
+
 2009-02-25	Sascha L. Teichmann <teichmann at intevation.de>
 
 	* waskaweb/model/phases_factory.py: Fixed problem with access to var cache.

Modified: wasko/trunk/waskaweb/public/styles/screen.css
===================================================================
--- wasko/trunk/waskaweb/public/styles/screen.css	2009-02-26 11:23:53 UTC (rev 308)
+++ wasko/trunk/waskaweb/public/styles/screen.css	2009-02-26 13:22:15 UTC (rev 309)
@@ -148,23 +148,23 @@
 	margin-top: 0.8em;
 	margin-left: 0.397em;
 	float: right;
-	width: 53.5em;
+	width: 52.5em;
 }
 
 div#main {
 	margin-top: 0.4em;
-	width: 70em; /* total fixed width */
+	width: 72em; /* total fixed width */
 	clear:both;
 }
 
 div.left {
-	width: 15.8em;
+	width: 16.8em;
 	float: left;
 }
 
 div.right {
-	margin-left: 16.2em;
-	width: 52.5em;
+	margin-left: 17.2em;
+	width: 51.5em;
 }
 
 div#footer {
@@ -356,8 +356,8 @@
 
 div#content {
 	padding: 0em 0.4em 0.5em 0.4em;
-	width:52.7em!important;
-	width:52.5em;
+	//width:51.7em!important;
+	//width:50.5em;
 	min-height:490px;
   	height:auto !important;
   	height:375px;
@@ -377,12 +377,12 @@
 }
 
 div#content_header {
-	width:52.5em;
+	width:51.5em;
 	height:6.6em;
 }
 
 div#content_header_small {
-	width:52.5em;
+	width:51.5em;
 	height:3em;
 }
 
@@ -529,14 +529,9 @@
 }
 
 .digest_table_left, .digest_table_right {
-	float:left;
-	width:26em;
+	width:25em;
 }
 	
-.digest_table_left {
-	margin-right:0.4em;
-}
-
 table#cmphases td {
 	min-height: 2.5em;
 }

Modified: wasko/trunk/waskaweb/templates/casemanagement/digest_body.mako
===================================================================
--- wasko/trunk/waskaweb/templates/casemanagement/digest_body.mako	2009-02-26 11:23:53 UTC (rev 308)
+++ wasko/trunk/waskaweb/templates/casemanagement/digest_body.mako	2009-02-26 13:22:15 UTC (rev 309)
@@ -49,115 +49,145 @@
   % endif
 % endif
 <h2>${_('cm_header_digest_youth')}</h2>
-<table class="digest_table_left">
-	<tr>
-		<td class="label table_header_v table_width_mid_l">${_('cm_digest_tbl_label_lastname')}</td>
-		<td class="table_row_v">${c.digest.last_name | F.NA, h}</td>
-	</tr>
-	<tr>
-		<td class="label">${_('cm_digest_tbl_label_firstname')}</td>
-		<td class="table_row_v_2">${c.digest.first_name | F.NA, h}</td>
-	</tr>
-	<tr>
-		<td class="label table_header_v">${_('cm_digest_tbl_label_caseid')}</td>
-		<td class="table_row_v">${c.digest.knr | F.NA, h}</td>
-	</tr>
-	<tr>
-		<td class="label">${_('cm_digest_tbl_label_age')}</td>
-		<td class="table_row_v_2">${c.digest.age | F.NA, h}</td>
-	</tr>
-        <tr>
-                <td class="label table_header_v">${_('cm_digest_tbl_label_email')}</td>
-                % if c.digest.email != "None":
-                  <td class="table_row_v"><a href="mailto:${c.digest.email | F.NA, h}">${c.digest.email | F.NA, h}</a></td>
-                % else:
-                  <td class="table_row_v">${c.digest.email | F.NA, h}</td>
-                % endif
-        </tr>
+<table>
+  <tr>
+    <td>
+      <table class="digest_table_left">
+              <tr>
+                      <td class="label table_header_v table_width_mid_l">${_('cm_digest_tbl_label_lastname')}</td>
+                      <td class="table_row_v">${c.digest.last_name | F.NA, h}</td>
+              </tr>
+              <tr>
+                      <td class="label">${_('cm_digest_tbl_label_firstname')}</td>
+                      <td class="table_row_v_2">${c.digest.first_name | F.NA, h}</td>
+              </tr>
+              <tr>
+                      <td class="label table_header_v">${_('cm_digest_tbl_label_caseid')}</td>
+                      <td class="table_row_v">${c.digest.knr | F.NA, h}</td>
+              </tr>
+              <tr>
+                      <td class="label">${_('cm_digest_tbl_label_age')}</td>
+                      <td class="table_row_v_2">${c.digest.age | F.NA, h}</td>
+              </tr>
+              <tr>
+                      <td class="label table_header_v">${_('cm_digest_tbl_label_email')}</td>
+                      % if c.digest.email != "None":
+                        <td class="table_row_v"><a href="mailto:${c.digest.email | F.NA, h}">${c.digest.email | F.NA, h}</a></td>
+                      % else:
+                        <td class="table_row_v">${c.digest.email | F.NA, h}</td>
+                      % endif
+              </tr>
+      </table>
+    </td>
+    <td>
+      <table class="digest_table_right">
+              <tr>
+                      <td class="label table_header_v table_width_mid_l">${_('cm_digest_tbl_label_street')}</td>
+                      <td class="table_row_v">${c.digest.street | F.NA, h}</td>
+              </tr>
+              <tr>
+                      <td class="label">${_('cm_digest_tbl_label_plz')}</td>
+                      <td class="table_row_v_2">${c.digest.plz | F.NA, h}</td>
+              </tr>
+              <tr>
+                      <td class="label table_header_v">${_('cm_digest_tbl_label_city')}</td>
+                      <td class="table_row_v">${c.digest.city | F.NA, h}</td>
+              </tr>
+              <tr>
+                      <td class="label">${_('cm_digest_tbl_label_telephone')}</td>
+                      <td class="table_row_v_2">(${c.digest.telephone_1 | F.NA, h}) ${c.digest.telephone_2 | F.NA, h}</td>
+              </tr>
+              <tr>
+                      <td class="label table_header_v">${_('cm_digest_tbl_label_mobiletelephone')}</td>
+                      <td class="table_row_v">(${c.digest.mobiletel | F.NA, h})</td>
+              </tr>
+              <tr>
+                      <td class="label">${_('cm_digest_tbl_label_telephone_more')}</td>
+                      <td class="table_row_v_2">${c.digest.telephone_more | }</td>
+              </tr>
+      </table>
+    </td>
+  </tr>
 </table>
-<table class="digest_table_right">
-	<tr>
-		<td class="label table_header_v table_width_mid_l">${_('cm_digest_tbl_label_street')}</td>
-		<td class="table_row_v">${c.digest.street | F.NA, h}</td>
-	</tr>
-	<tr>
-		<td class="label">${_('cm_digest_tbl_label_plz')}</td>
-		<td class="table_row_v_2">${c.digest.plz | F.NA, h}</td>
-	</tr>
-	<tr>
-		<td class="label table_header_v">${_('cm_digest_tbl_label_city')}</td>
-		<td class="table_row_v">${c.digest.city | F.NA, h}</td>
-	</tr>
-	<tr>
-		<td class="label">${_('cm_digest_tbl_label_telephone')}</td>
-		<td class="table_row_v_2">(${c.digest.telephone_1 | F.NA, h}) ${c.digest.telephone_2 | F.NA, h}</td>
-	</tr>
-	<tr>
-		<td class="label table_header_v">${_('cm_digest_tbl_label_mobiletelephone')}</td>
-		<td class="table_row_v">(${c.digest.mobiletel | F.NA, h})</td>
-	</tr>
-	<tr>
-		<td class="label">${_('cm_digest_tbl_label_telephone_more')}</td>
-		<td class="table_row_v_2">${c.digest.telephone_more | }</td>
-	</tr>
-</table>
 
 <h2>${_('cm_header_digest_parent')}</h2>
 <h3>Mutter</h3>
-<table class="digest_table_left">
+<table>
   <tr>
-    <td class="label table_header_v table_width_mid_l">${_('cm_digest_tbl_label_lastname')}</td>
-    <td class="table_row_v">${c.digest.parent_last_name | F.NA, h}</td>
+    <td>
+      <table class="digest_table_left">
+        <tr>
+          <td class="label table_header_v table_width_mid_l">${_('cm_digest_tbl_label_lastname')}</td>
+          <td class="table_row_v">${c.digest.parent_last_name | F.NA, h}</td>
+        </tr>
+        <tr>
+          <td class="label">${_('cm_digest_tbl_label_firstname')}</td>
+          <td class="table_row_v_2">${c.digest.parent_first_name | F.NA, h}</td>
+        </tr>
+        <tr>
+          <td class="label table_header_v">${_('cm_digest_tbl_label_email')}</td>
+          % if c.digest.parent_email != "None":
+            <td class="table_row_v"><a href="mailto:${c.digest.parent_email | F.NA, h}">${c.digest.parent_email | F.NA, h}</a></td>
+          % else:
+            <td class="table_row_v">${c.digest.parent_email | F.NA, h}</td>
+          % endif
+        </tr>
+      </table>
+    </td>
+    <td>
+      <table class="digest_table_right"> 
+        <tr>
+          <td class="label table_header_v table_width_mid_l">${_('cm_digest_tbl_label_telephone')}</td>
+          <td class="table_row_v">(${c.digest.parent_telephone_1 | F.NA, h}) ${c.digest.parent_telephone_2 | F.NA, h}</td>
+        </tr>
+        <tr>
+          <td class="label">${_('cm_digest_tbl_label_mobiletelephone')}</td>
+          <td class="table_row_v_2">(${c.digest.parent_mobiletel | F.NA, h})</td>
+        </tr>
+        <tr>
+          <td colspan="2">&nbsp;</td>
+        </tr>
+      </table>
+    </td>
   </tr>
-  <tr>
-    <td class="label">${_('cm_digest_tbl_label_firstname')}</td>
-    <td class="table_row_v_2">${c.digest.parent_first_name | F.NA, h}</td>
-  </tr>
-  <tr>
-    <td class="label table_header_v">${_('cm_digest_tbl_label_email')}</td>
-    % if c.digest.parent_email != "None":
-      <td class="table_row_v"><a href="mailto:${c.digest.parent_email | F.NA, h}">${c.digest.parent_email | F.NA, h}</a></td>
-    % else:
-      <td class="table_row_v">${c.digest.parent_email | F.NA, h}</td>
-    % endif
-  </tr>
 </table>
-<table class="digest_table_right"> 
-  <tr>
-    <td class="label table_header_v table_width_mid_l">${_('cm_digest_tbl_label_telephone')}</td>
-    <td class="table_row_v">(${c.digest.parent_telephone_1 | F.NA, h}) ${c.digest.parent_telephone_2 | F.NA, h}</td>
-  </tr>
-  <tr>
-    <td class="label">${_('cm_digest_tbl_label_mobiletelephone')}</td>
-    <td class="table_row_v_2">(${c.digest.parent_mobiletel | F.NA, h})</td>
-  </tr>
-</table>
 <h3>Vater</h3>
-<table class="digest_table_left">
+<table>
   <tr>
-    <td class="label table_header_v table_width_mid_l">${_('cm_digest_tbl_label_lastname')}</td>
-    <td class="table_row_v">${c.digest.parent_last_name | F.NA, h}</td>
+    <td>
+      <table class="digest_table_left">
+        <tr>
+          <td class="label table_header_v table_width_mid_l">${_('cm_digest_tbl_label_lastname')}</td>
+          <td class="table_row_v">${c.digest.parent_last_name | F.NA, h}</td>
+        </tr>
+        <tr>
+          <td class="label">${_('cm_digest_tbl_label_firstname')}</td>
+          <td class="table_row_v_2">${c.digest.parent_first_name | F.NA, h}</td>
+        </tr>
+        <tr>
+          <td class="label table_header_v">${_('cm_digest_tbl_label_email')}</td>
+          % if c.digest.parent_email != "None":
+            <td class="table_row_v"><a href="mailto:${c.digest.parent_email | F.NA, h}">${c.digest.parent_email | F.NA, h}</a></td>
+          % else:
+            <td class="table_row_v">${c.digest.parent_email | F.NA, h}</td>
+          % endif
+        </tr>
+      </table>
+    </td>
+    <td>
+      <table class="digest_table_right"> 
+        <tr>
+          <td class="label table_header_v table_width_mid_l">${_('cm_digest_tbl_label_telephone')}</td>
+          <td class="table_row_v">(${c.digest.parent_telephone_1 | F.NA, h}) ${c.digest.parent_telephone_2 | F.NA, h}</td>
+        </tr>
+        <tr>
+          <td class="label">${_('cm_digest_tbl_label_mobiletelephone')}</td>
+          <td class="table_row_v_2">(${c.digest.parent_mobiletel | F.NA, h})</td>
+        </tr>
+        <tr>
+          <td colspan="2">&nbsp;</td>
+        </tr>
+      </table>
+    </td>
   </tr>
-  <tr>
-    <td class="label">${_('cm_digest_tbl_label_firstname')}</td>
-    <td class="table_row_v_2">${c.digest.parent_first_name | F.NA, h}</td>
-  </tr>
-  <tr>
-    <td class="label table_header_v">${_('cm_digest_tbl_label_email')}</td>
-    % if c.digest.parent_email != "None":
-      <td class="table_row_v"><a href="mailto:${c.digest.parent_email | F.NA, h}">${c.digest.parent_email | F.NA, h}</a></td>
-    % else:
-      <td class="table_row_v">${c.digest.parent_email | F.NA, h}</td>
-    % endif
-  </tr>
 </table>
-<table class="digest_table_right"> 
-  <tr>
-    <td class="label table_header_v table_width_mid_l">${_('cm_digest_tbl_label_telephone')}</td>
-    <td class="table_row_v">(${c.digest.parent_telephone_1 | F.NA, h}) ${c.digest.parent_telephone_2 | F.NA, h}</td>
-  </tr>
-  <tr>
-    <td class="label">${_('cm_digest_tbl_label_mobiletelephone')}</td>
-    <td class="table_row_v_2">(${c.digest.parent_mobiletel | F.NA, h})</td>
-  </tr>
-</table>



More information about the Mpuls-commits mailing list