[Mpuls-commits] r620 - in wasko/branches/1.0: . waskaweb/public/styles waskaweb/templates/evaluation

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2009-10-06 10:33:35 +0200 (Tue, 06 Oct 2009)
New Revision: 620

Modified:
   wasko/branches/1.0/ChangeLog.txt
   wasko/branches/1.0/waskaweb/public/styles/all.css
   wasko/branches/1.0/waskaweb/public/styles/screen.css
   wasko/branches/1.0/waskaweb/templates/evaluation/evaluate.mako
   wasko/branches/1.0/waskaweb/templates/evaluation/result.mako
Log:
Open evaluation result in a new page


Modified: wasko/branches/1.0/ChangeLog.txt
===================================================================
--- wasko/branches/1.0/ChangeLog.txt	2009-10-06 07:46:09 UTC (rev 619)
+++ wasko/branches/1.0/ChangeLog.txt	2009-10-06 08:33:35 UTC (rev 620)
@@ -10,6 +10,14 @@
 	  sql query is generated which is used to build the base amount of
 	  cases for the evaluation.
 
+	Open resultpage in a new windown (workaround for layout issues)
+
+	* waskaweb/public/styles/all.css,
+	  waskaweb/public/styles/screen.css,
+	  waskaweb/templates/evaluation/result.mako,
+	  waskaweb/templates/evaluation/evaluate.mako: Display result of the
+	  evaluation in a new window. Created new styles. 
+
 2009-10-05	Torsten Irlaender	<torsten.irlaender at intevation.de> 
 
 	Fixed logbuch evalauation

Modified: wasko/branches/1.0/waskaweb/public/styles/all.css
===================================================================
--- wasko/branches/1.0/waskaweb/public/styles/all.css	2009-10-06 07:46:09 UTC (rev 619)
+++ wasko/branches/1.0/waskaweb/public/styles/all.css	2009-10-06 08:33:35 UTC (rev 620)
@@ -78,7 +78,8 @@
 	vertical-align: top;
 }
 
-tr {width:50em}
+//tr {width:50em}
+tr {width:auto}
 
 .table_checkbox {
 	width:1.6em;
@@ -126,6 +127,11 @@
 	//overflow: hidden;
 }
 
+div.evaluation table {
+	width:auto;
+	//overflow: hidden;
+}
+
 .table_checkbox {
 	width: 1.5em;
 }

Modified: wasko/branches/1.0/waskaweb/public/styles/screen.css
===================================================================
--- wasko/branches/1.0/waskaweb/public/styles/screen.css	2009-10-06 07:46:09 UTC (rev 619)
+++ wasko/branches/1.0/waskaweb/public/styles/screen.css	2009-10-06 08:33:35 UTC (rev 620)
@@ -386,7 +386,12 @@
 	height:3em;
 }
 
+div#content_header_large {
+	width:auto;
+	height:3em;
+}
 
+
 div#content_ueberschrift {
 	float:left;	
 	width: 23em;
@@ -396,13 +401,13 @@
 	margin:0;
 }
 
-#content_header #content_ueberschrift ul, #content_header_small #content_ueberschrift ul {
+#content_header #content_ueberschrift ul, #content_header_small #content_ueberschrift ul, #content_header_large #content_ueberschrift ul {
 	list-style-type:none;
 	margin:0;
 	padding:0 0 0 0;
 }
 
-#content_header #content_ueberschrift li, #content_header_small #content_ueberschrift li{
+#content_header #content_ueberschrift li, #content_header_small #content_ueberschrift li, #content_header_large #content_ueberschrift ul {
 	padding-bottom:0.em;
 }
 
@@ -441,14 +446,14 @@
 }
 
 
-#content_header #modusfield ul, #content_header #modusfield li, #content_header_small #modusfield ul, #content_header_small #modusfield li{
+#content_header #modusfield ul, #content_header #modusfield li, #content_header_small #modusfield ul, #content_header_small #modusfield li, #content_header_large #modusfield ul, #content_header_large #modusfield li{
 	display:inline;
 	list-style-type:none;
 	margin:0;
 	padding:0;
 }
 
-#content_header #modusfield a, #content_header_small #modusfield a {
+#content_header #modusfield a, #content_header_small #modusfield a, #content_header_large #modusfield a {
 	text-decoration:none;
 	padding:0 0.4em 0em 1.4em;
 	background-image:url(../images/arrow.gif);

Modified: wasko/branches/1.0/waskaweb/templates/evaluation/evaluate.mako
===================================================================
--- wasko/branches/1.0/waskaweb/templates/evaluation/evaluate.mako	2009-10-06 07:46:09 UTC (rev 619)
+++ wasko/branches/1.0/waskaweb/templates/evaluation/evaluate.mako	2009-10-06 08:33:35 UTC (rev 620)
@@ -13,7 +13,7 @@
   </div>
 </div>
 <div>
-<form action="/evaluate/evaluateAction" method="POST">
+<form action="/evaluate/evaluateAction" method="POST" target="_blank">
 <input type="hidden" name="id">
 <h2>${_('Setup evaluation')}</h2>
 <table>

Modified: wasko/branches/1.0/waskaweb/templates/evaluation/result.mako
===================================================================
--- wasko/branches/1.0/waskaweb/templates/evaluation/result.mako	2009-10-06 07:46:09 UTC (rev 619)
+++ wasko/branches/1.0/waskaweb/templates/evaluation/result.mako	2009-10-06 08:33:35 UTC (rev 620)
@@ -1,13 +1,28 @@
 ## -*- coding: utf-8 -*-
-<%inherit file="/main.mako"/>
-<div id="content_header_small">
-<div id="modusfield">
-  <div class="actions">
-    <ul>
-      <li><a href="/evaluate/exportXML/evaluation_export.xml" target="_blank">${_('Export XML')}</a></li>
-      <li><a href="/evaluate/exportCSV/evaluation_export.csv" target="_blank">${_('Export CSV')}</a></li>
-    </ul>
-  </div>
-</div>
-</div>
-${c.result}
+<html>
+  <head>
+    <title>WASKO Auswertung Ergebnis</title>
+    <meta name="ROBOTS" content="NOINDEX, NOFOLLOW">
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta http-equiv="content-style-type" content="text/css">
+    <meta http-equiv="expires" content="0">
+
+    <link rel="shortcut icon" type="image/x-icon" href="/images/kompetenz3.ico">
+    <link href="/styles/all.css" media="all" rel="stylesheet" type="text/css">
+    <link href="/styles/screen.css" media="screen" rel="stylesheet" type="text/css">
+    <link href="/styles/print.css" media="print" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+    <div id="content_header_large">
+    <div id="modusfield">
+      <div class="actions">
+        <ul>
+          <li><a href="/evaluate/exportXML/evaluation_export.xml" target="_blank">${_('Export XML')}</a></li>
+          <li><a href="/evaluate/exportCSV/evaluation_export.csv" target="_blank">${_('Export CSV')}</a></li>
+        </ul>
+      </div>
+    </div>
+    </div>
+    ${c.result}
+  </body>
+</html>