Mercurial > dive4elements > gnv-client

changeset 16:4ef6e4e9ef15

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Intergate the new Pageinfrastructure into the old Layout gnv/trunk@99 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Tim Englich <tim.englich@intevation.de>
date Wed, 16 Sep 2009 14:02:29 +0000
parents a52aecf5bb9b
children d7e5a929fc34
files gnv/Changelog gnv/src/main/webapp/WEB-INF/config/struts-config.xml gnv/src/main/webapp/WEB-INF/jsp/index.jsp gnv/src/main/webapp/WEB-INF/jsp/mainlayout.jsp
diffstat 4 files changed, 58 insertions(+), 57 deletions(-) [+]
line wrap: on
line diff
--- a/gnv/Changelog	Wed Sep 16 13:57:42 2009 +0000
+++ b/gnv/Changelog	Wed Sep 16 14:02:29 2009 +0000
@@ -1,3 +1,13 @@
+2009-09-16  Tim Englich  <tim.englich@intevation.de>
+
+    * src/main/webapp/WEB-INF/jsp/mainlayout.jsp Edited, 
+      src/main/webapp/WEB-INF/jsp/index.jsp Edited: 
+      Integrate the new Pageinfrastructur into the Mainlayout
+    
+    * src/main/webapp/WEB-INF/config/struts-config.xml Edited:
+      Integrate message-resources into the Strutsconfiguration and change
+      the mainpage from index.jsp to mainlayout.jsp 
+      
 009-09-16  Tim Englich  <tim.englich@intevation.de>
 
     * src/main/webapp/WEB-INF/jsp/header.jsp Added, 
--- a/gnv/src/main/webapp/WEB-INF/config/struts-config.xml	Wed Sep 16 13:57:42 2009 +0000
+++ b/gnv/src/main/webapp/WEB-INF/config/struts-config.xml	Wed Sep 16 14:02:29 2009 +0000
@@ -11,7 +11,7 @@
                 validate="false">
            <forward
                 name="success"
-                path="/WEB-INF/jsp/index.jsp"/>
+                path="/WEB-INF/jsp/mainlayout.jsp"/>
         </action>
         <action path="/selectArtifactFactory" 
                 type="de.intevation.gnv.action.SelectArtifactFactoryAction"
@@ -19,7 +19,7 @@
                 validate="false">
            <forward
                 name="success"
-                path="/WEB-INF/jsp/index.jsp"/>
+                path="/WEB-INF/jsp/mainlayout.jsp"/>
         </action>
         <action path="/next" 
                 type="de.intevation.gnv.action.NextArtifactStepAction"
@@ -27,7 +27,7 @@
                 validate="false">
            <forward
                 name="success"
-                path="/WEB-INF/jsp/index.jsp"/>
+                path="/WEB-INF/jsp/mainlayout.jsp"/>
         </action>
                 <action path="/out" 
                 type="de.intevation.gnv.action.DoOutputAction"
@@ -35,5 +35,7 @@
                 validate="false">
         </action>
        </action-mappings>
+       
+       <message-resources parameter="applicationMessages" null="false"/>
 </struts-config>
 
--- a/gnv/src/main/webapp/WEB-INF/jsp/index.jsp	Wed Sep 16 13:57:42 2009 +0000
+++ b/gnv/src/main/webapp/WEB-INF/jsp/index.jsp	Wed Sep 16 14:02:29 2009 +0000
@@ -3,40 +3,41 @@
 <%@page import="de.intevation.gnv.artifactdatabase.objects.ArtifactObject"%>
 <%@page import="de.intevation.gnv.action.sessionmodel.SessionModel"%>
 <%@page import="de.intevation.gnv.action.sessionmodel.SessionModelFactory"%>
-<%@page import="java.util.Iterator"%><html>
+<%@page import="java.util.Iterator"%>
 <%Object ui = request.getAttribute("ui");
   String action = (ui == null ? "selectArtifactFactory.do" : "next.do");
 %>
-<body>
-<form action="<%=action%>" method="post">
-
-<%
-  
-  SessionModel sm = SessionModelFactory.getInstance().getSessionModel(request);
-  Collection<ArtifactObject> artifactFactories = sm.getArtifactFactories();
-  if (artifactFactories != null && ui == null){
-%>
-<select name="artifactFactory">
-<%
-      Iterator<ArtifactObject> it = artifactFactories.iterator();
-      while (it.hasNext()){
-          ArtifactObject ao = it.next();
-      
-%>
-    
-      <option value="<%=ao.getId()%>" <%=(ao.isSelected() ? "selected=\"selected\"" : "")%> ><%=ao.getName()%></option>
-<%
-      }
-%>
-    </select>
-<%
-}
-%>
-
-    
-    <%=ui != null ? ui.toString() : "" %>
-    
-    <input type="submit" value="Auswählen" />
-</form>
-</body>
-</html>
+<div id="basefilter">
+	<form id="fisSelectionForm" action="<%=action%>" method="post">
+	   <fieldset>
+	
+	<%
+	  
+	  SessionModel sm = SessionModelFactory.getInstance().getSessionModel(request);
+	  Collection<ArtifactObject> artifactFactories = sm.getArtifactFactories();
+	  if (artifactFactories != null && ui == null){
+	%>
+	       <select name="artifactFactory">
+	<%
+	      Iterator<ArtifactObject> it = artifactFactories.iterator();
+	      while (it.hasNext()){
+	          ArtifactObject ao = it.next();
+	      
+	%>
+	    
+	           <option value="<%=ao.getId()%>" <%=(ao.isSelected() ? "selected=\"selected\"" : "")%> ><%=ao.getName()%></option>
+	<%
+	      }
+	%>
+	       </select>
+	<%
+	}
+	%>
+	
+	    
+	    <%=ui != null ? ui.toString() : "" %>
+	    
+	       <input type="submit" value="Auswählen" />
+	    </fieldset>
+	</form>
+</div>
\ No newline at end of file
--- a/gnv/src/main/webapp/WEB-INF/jsp/mainlayout.jsp	Wed Sep 16 13:57:42 2009 +0000
+++ b/gnv/src/main/webapp/WEB-INF/jsp/mainlayout.jsp	Wed Sep 16 14:02:29 2009 +0000
@@ -1,12 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" language="java" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
 <%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-tiles" prefix="tiles" %>
-<html:html xhtml="true" locale="true">
+<html xhtml="true" locale="true">
     <head>
         <title>
             <bean:message key="gnviewer.app.title"/>
@@ -20,15 +15,6 @@
         <meta name="robots" content="noindex"/>
         <link href="styles/default.css" rel="stylesheet" type="text/css"/>
         <link href="styles/calendar-blue.css" rel="stylesheet" type="text/css"/>
-        <!--[if IE]>
-            <style type="text/css">
-            #overlay {
-                filter:Alpha(opacity=50, finishopacity=50, style=2);
-            }
-            </style>
-        <![endif]-->
-        <script type="text/javascript" src="scripts/gnviewer.js"></script>
-        <script type="text/javascript" src="scripts/prototype.js"></script>
         <script type="text/javascript" src="scripts/calendar.js"></script>
         <script type="text/javascript" src="scripts/calendar-de.js"></script>
         <script type="text/javascript" src="scripts/calendar-setup.js"></script>
@@ -38,13 +24,15 @@
     <div id="overlay"></div>
     <div style="width:100%;left:0;top:0;width:100%;height:100%;position:absolute">
         <div id="overlayContent">
-            <p><bean:message key="gnviewer.productselection.overlay.title"/></p>
+            <p>
+                <bean:message key="gnviewer.productselection.overlay.title"/>
+            </p>
         </div>
     </div>
     <div id="page">
-        <tiles:insert attribute="header" ignore="true"/>
-        <tiles:insert attribute="body" ignore="true"/>
-        <tiles:insert attribute="footer" ignore="true"/>
+        <jsp:include page="header.jsp" />
+         <jsp:include page="index.jsp" />
+        <jsp:include page="footer.jsp" />
     </div>
     </body>
-</html:html>
\ No newline at end of file
+</html>
\ No newline at end of file
http://dive4elements.wald.intevation.org