# HG changeset patch # User Tim Englich # Date 1253109749 0 # Node ID 4ef6e4e9ef1580d8f0c227ec1bba9538150864c7 # Parent a52aecf5bb9be0d46c53c404333f992c138a0c54 Intergate the new Pageinfrastructure into the old Layout gnv/trunk@99 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r a52aecf5bb9b -r 4ef6e4e9ef15 gnv/Changelog --- 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 + + * 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 * src/main/webapp/WEB-INF/jsp/header.jsp Added, diff -r a52aecf5bb9b -r 4ef6e4e9ef15 gnv/src/main/webapp/WEB-INF/config/struts-config.xml --- 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"> + path="/WEB-INF/jsp/mainlayout.jsp"/> + path="/WEB-INF/jsp/mainlayout.jsp"/> + path="/WEB-INF/jsp/mainlayout.jsp"/> + + diff -r a52aecf5bb9b -r 4ef6e4e9ef15 gnv/src/main/webapp/WEB-INF/jsp/index.jsp --- 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"%> +<%@page import="java.util.Iterator"%> <%Object ui = request.getAttribute("ui"); String action = (ui == null ? "selectArtifactFactory.do" : "next.do"); %> - -
- -<% - - SessionModel sm = SessionModelFactory.getInstance().getSessionModel(request); - Collection artifactFactories = sm.getArtifactFactories(); - if (artifactFactories != null && ui == null){ -%> - -<% -} -%> - - - <%=ui != null ? ui.toString() : "" %> - - - - - +
+
+
+ + <% + + SessionModel sm = SessionModelFactory.getInstance().getSessionModel(request); + Collection artifactFactories = sm.getArtifactFactories(); + if (artifactFactories != null && ui == null){ + %> + + <% + } + %> + + + <%=ui != null ? ui.toString() : "" %> + + +
+
+
\ No newline at end of file diff -r a52aecf5bb9b -r 4ef6e4e9ef15 gnv/src/main/webapp/WEB-INF/jsp/mainlayout.jsp --- 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 @@ - -<%@ 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" %> - + <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