[Webflysuesk-commits] r37 - in webflysuesk/branches/openlayers-integration: . webflys/src/main/webapp/pages

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Wed Mar 25 12:01:41 CET 2009


Author: iweinzierl
Date: 2009-03-25 12:01:39 +0100 (Wed, 25 Mar 2009)
New Revision: 37

Modified:
   webflysuesk/branches/openlayers-integration/ChangeLog.txt
   webflysuesk/branches/openlayers-integration/webflys/src/main/webapp/pages/main.jsp
   webflysuesk/branches/openlayers-integration/webflys/src/main/webapp/pages/style.css
Log:
Created a div container where the map shall be displayed.

Modified: webflysuesk/branches/openlayers-integration/ChangeLog.txt
===================================================================
--- webflysuesk/branches/openlayers-integration/ChangeLog.txt	2009-03-25 09:53:15 UTC (rev 36)
+++ webflysuesk/branches/openlayers-integration/ChangeLog.txt	2009-03-25 11:01:39 UTC (rev 37)
@@ -1,3 +1,9 @@
+2009-03-25  Ingo Weinzierl <ingo.weinzierl at intevation.de>
+
+	* webflys/src/main/webapp/pages/main.jsp,
+	  webflys/src/main/webapp/pages/style.css: Added a div container besides the
+	  parameter panel where the map shall be displayed.
+
 2008-10-30  stephan.holl at intevation.de
 
 	* doc/webflysuesk-schnittstelle.txt: New. Included a small

Modified: webflysuesk/branches/openlayers-integration/webflys/src/main/webapp/pages/main.jsp
===================================================================
--- webflysuesk/branches/openlayers-integration/webflys/src/main/webapp/pages/main.jsp	2009-03-25 09:53:15 UTC (rev 36)
+++ webflysuesk/branches/openlayers-integration/webflys/src/main/webapp/pages/main.jsp	2009-03-25 11:01:39 UTC (rev 37)
@@ -37,132 +37,135 @@
         <html:base/>
     </head>
 	<body>
-        <div>
-	    <div id="errormessage">
-                	<html:errors/>
-				</div>
-				<logic:present name="success">
-					<div id="successmessage"><bean:write name="success"/></div>
-				</logic:present>
-            <br>
-            <html:form action="/startCalculation" acceptCharset="UTF-8">
-               	<fieldset id="menu">
-                   	<legend><bean:message key="main.river.legend"/></legend>
-                   	<bean:write name="parameters" property="river" filter="true" ignore="true"/>
-               	</fieldset>
+        <div id="wrapper">
+            <div id="wsplgen">
+            <div id="errormessage">
+                        <html:errors/>
+                    </div>
+                    <logic:present name="success">
+                        <div id="successmessage"><bean:write name="success"/></div>
+                        <br>
+                    </logic:present>
+                <html:form action="/startCalculation" acceptCharset="UTF-8">
+                    <fieldset id="menu">
+                        <legend><bean:message key="main.river.legend"/></legend>
+                        <bean:write name="parameters" property="river" filter="true" ignore="true"/>
+                    </fieldset>
 
-                <fieldset id="menu">
-                    <legend><bean:message key="main.gauge.legend"/></legend>
-                    <logic:empty name="gauge">
-                        <bean:message key="main.gauge.no.information" />
-                    </logic:empty>
-                    <logic:notEmpty name="gauge">
+                    <fieldset id="menu">
+                        <legend><bean:message key="main.gauge.legend"/></legend>
+                        <logic:empty name="gauge">
+                            <bean:message key="main.gauge.no.information" />
+                        </logic:empty>
+                        <logic:notEmpty name="gauge">
+                            <table id="table">
+                                <tr>
+                                    <td width="35%"><bean:message key="main.gauge.name" /></td>
+                                    <td width="65%"><bean:write name="gauge" property="name" /> (<bean:write name="gauge" property="km"/> km)</td>
+                                </tr>
+                                <tr>
+                                    <td><bean:message key="main.gauge.w.range" /></td>
+                                    <td><bean:write name="gauge" property="minW"/> - <bean:write name="gauge" property="maxW"/></td>
+                                </tr>
+                                <tr>
+                                    <td><bean:message key="main.gauge.q.range" /></td>
+                                    <td><bean:write name="gauge" property="minQ"/> - <bean:write name="gauge" property="maxQ"/></td>
+                                </tr>
+                                <tr>
+                                    <td><bean:message key="main.gauge.aeo" /></td>
+                                    <td><bean:write name="gauge" property="aeo"/></td>
+                                </tr>
+                                <tr>
+                                    <td><bean:message key="main.gauge.zero" /></td>
+                                    <td><bean:write name="gauge" property="zero"/></td>
+                                </tr>
+                                <tr>
+                                    <td><bean:message key="main.gauge.validity" /></td>
+                                    <td><bean:write name="gauge" property="from"/> - <bean:write name="gauge" property="to"/></td>
+                                </tr>
+                            </table>
+                        </logic:notEmpty>
+                    </fieldset>
+
+                    <fieldset id="menu">
+                        <legend><bean:message key="main.dem.legend"/></legend>
+                            <table id="table">
+                                <tr>
+                                <td><bean:message key="main.demfrom" />&nbsp;
+                                <logic:notEmpty name="dem">
+                                    <bean:write name="dem"
+                                                property="demfrom" />
+                                </logic:notEmpty>	
+                                </td>
+                                <td><bean:message key="main.demto" />&nbsp;
+                                <logic:notEmpty name="dem">
+                                    <bean:write name="dem"
+                                                property="demto" />
+                                </logic:notEmpty>
+                                </td>
+                                </tr>
+                            </table>
+                    </fieldset>
+
+                    <fieldset id="menu">
+                        <legend><bean:message key="main.wst.legend"/></legend>
+                        <logic:empty name="wst">
+                            <bean:message key="main.wst.no.wst.selected" />
+                        </logic:empty>
+                        <logic:notEmpty name="wst">
+                            <tt><bean:write name="wst"
+                                            property="filename" 
+                                            filter="true" 
+                                            ignore="true"/></tt>
+                                <html:select property="column">
+                                    <html:optionsCollection
+                                          name="wst"
+                                          property="columns"
+                                          value="columnNum"
+                                          label="label" />
+                                </html:select>
+                        </logic:notEmpty>
+                        <html:image page="/images/basket_add.png" property="" altKey="main.to.wst.upload" border="0" 
+                                                                                                          title="<%= wstsubmit %>"/>
+                    </fieldset>
+                    <fieldset id="menu">
+                        <legend><bean:message key="main.range.legend"/></legend>
+                            <%-- TODO: <label for="id"> would be fine here but I cannot see
+                                 how to match the 'id' attributes with Struts --%>
+                        <bean:message key="main.range.from" />
+                        <html:text property="from" size="5" />
+                        <bean:message key="main.range.to" />
+                        <html:text property="to" size="5" />
+                    </fieldset>
+                    <fieldset id="menu">
+                        <legend><bean:message key="main.diff.dlegend"/></legend>
                         <table id="table">
-                            <tr>
-                                <td width="35%"><bean:message key="main.gauge.name" /></td>
-                                <td width="65%"><bean:write name="gauge" property="name" /> (<bean:write name="gauge" property="km"/> km)</td>
+                            <tr><td><div><bean:message key="main.diff.dfrom" /></div></td>
+                                <td><html:text property="dfrom" size="5"/></td>
                             </tr>
                             <tr>
-                                <td><bean:message key="main.gauge.w.range" /></td>
-                                <td><bean:write name="gauge" property="minW"/> - <bean:write name="gauge" property="maxW"/></td>
+                                <td><div><bean:message key="main.diff.dto" /></div></td>
+                                <td><html:text property="dto" size="5" /></td>
                             </tr>
-                            <tr>
-                                <td><bean:message key="main.gauge.q.range" /></td>
-                                <td><bean:write name="gauge" property="minQ"/> - <bean:write name="gauge" property="maxQ"/></td>
+                            <tr><td><div><bean:message key="main.diff.ddiff" /></div></td>
+                                <td><html:text property="ddiff" size="5"/></td>
                             </tr>
-                            <tr>
-                                <td><bean:message key="main.gauge.aeo" /></td>
-                                <td><bean:write name="gauge" property="aeo"/></td>
-                            </tr>
-                            <tr>
-                                <td><bean:message key="main.gauge.zero" /></td>
-                                <td><bean:write name="gauge" property="zero"/></td>
-                            </tr>
-                            <tr>
-                                <td><bean:message key="main.gauge.validity" /></td>
-                                <td><bean:write name="gauge" property="from"/> - <bean:write name="gauge" property="to"/></td>
-                            </tr>
                         </table>
-                    </logic:notEmpty>
-                </fieldset>
-
-				<fieldset id="menu">
-					<legend><bean:message key="main.dem.legend"/></legend>
-						<table id="table">
-							<tr>
-							<td><bean:message key="main.demfrom" />&nbsp;
-							<logic:notEmpty name="dem">
-								<bean:write name="dem"
-								     		property="demfrom" />
-							</logic:notEmpty>	
-							</td>
-							<td><bean:message key="main.demto" />&nbsp;
-							<logic:notEmpty name="dem">
-								<bean:write name="dem"
-											property="demto" />
-							</logic:notEmpty>
-							</td>
-							</tr>
-						</table>
-				</fieldset>
-
-                <fieldset id="menu">
-                    <legend><bean:message key="main.wst.legend"/></legend>
-                    <logic:empty name="wst">
-                        <bean:message key="main.wst.no.wst.selected" />
-                    </logic:empty>
-                    <logic:notEmpty name="wst">
-                        <tt><bean:write name="wst"
-                                        property="filename" 
-                                        filter="true" 
-                                        ignore="true"/></tt>
-                            <html:select property="column">
-                                <html:optionsCollection
-                                      name="wst"
-                                      property="columns"
-                                      value="columnNum"
-                                      label="label" />
-                            </html:select>
-                    </logic:notEmpty>
-					<html:image page="/images/basket_add.png" property="" altKey="main.to.wst.upload" border="0" 
-																									  title="<%= wstsubmit %>"/>
-                </fieldset>
-                <fieldset id="menu">
-                    <legend><bean:message key="main.range.legend"/></legend>
-                        <%-- TODO: <label for="id"> would be fine here but I cannot see
-                             how to match the 'id' attributes with Struts --%>
-                    <bean:message key="main.range.from" />
-                    <html:text property="from" size="5" />
-                    <bean:message key="main.range.to" />
-                    <html:text property="to" size="5" />
-                </fieldset>
-				<fieldset id="menu">
-				    <legend><bean:message key="main.diff.dlegend"/></legend>
-					<table id="table">
-						<tr><td><div><bean:message key="main.diff.dfrom" /></div></td>
-							<td><html:text property="dfrom" size="5"/></td>
-						</tr>
-						<tr>
-							<td><div><bean:message key="main.diff.dto" /></div></td>
-							<td><html:text property="dto" size="5" /></td>
-						</tr>
-						<tr><td><div><bean:message key="main.diff.ddiff" /></div></td>
-							<td><html:text property="ddiff" size="5"/></td>
-						</tr>
-					</table>
-				</fieldset>
-				<fieldset id="menu">
-					<legend><bean:message key="main.area.legend"/></legend>	
-					<html:checkbox property="area" value="1" /> <bean:message key="main.area.digitized.scenario"/>
-				</fieldset>		
-				<fieldset id="menu">
-					<legend><bean:message key="main.job.legend"/></legend>
-					<html:text property="jobname" size="25"/>
-				</fieldset>	
-				<br>
-                <input type="submit"
-                       value="<bean:message key='main.calculation.submit' />" id="button" >
-            </html:form>
+                    </fieldset>
+                    <fieldset id="menu">
+                        <legend><bean:message key="main.area.legend"/></legend>	
+                        <html:checkbox property="area" value="1" /> <bean:message key="main.area.digitized.scenario"/>
+                    </fieldset>		
+                    <fieldset id="menu">
+                        <legend><bean:message key="main.job.legend"/></legend>
+                        <html:text property="jobname" size="25"/>
+                    </fieldset>	
+                    <br>
+                    <input type="submit"
+                           value="<bean:message key='main.calculation.submit' />" id="button" >
+                </html:form>
+            </div>
+            <div id="map"></div>
         </div>
     </body>
 </html:html>

Modified: webflysuesk/branches/openlayers-integration/webflys/src/main/webapp/pages/style.css
===================================================================
--- webflysuesk/branches/openlayers-integration/webflys/src/main/webapp/pages/style.css	2009-03-25 09:53:15 UTC (rev 36)
+++ webflysuesk/branches/openlayers-integration/webflys/src/main/webapp/pages/style.css	2009-03-25 11:01:39 UTC (rev 37)
@@ -1,8 +1,23 @@
 body {
 	font-size: 8pt;
    	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
-	width: 300px;
 }
+#wrapper {
+    width: 1100px;
+    height: 650x;
+    padding: 0px;
+}
+#wsplgen {
+    width: 400px;
+    height: 650px;
+    float: left;
+}
+#map {
+    width: 600px;
+    height: 600px;
+    border: 1px solid #669FD1;
+    float: right;
+}
 #menu {
 	border: 1px solid #669FD1;
 	width : 300px;



More information about the Webflysuesk-commits mailing list