# HG changeset patch
# User Ingo Weinzierl <ingo.weinzierl@intevation.de>
# Date 1272371020 0
# Node ID 3b70886b399be87a7994ca48b4bcaec3280cfa09
# Parent  5c36da3d9e17797780220cabde6ce7e12899148a
Added jsp stubs for imprint and info and adjusted links in header and footer (issue225).

gnv/trunk@1000 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 5c36da3d9e17 -r 3b70886b399b gnv/ChangeLog
--- a/gnv/ChangeLog	Tue Apr 27 08:44:22 2010 +0000
+++ b/gnv/ChangeLog	Tue Apr 27 12:23:40 2010 +0000
@@ -1,3 +1,21 @@
+2010-04-27  Ingo Weinzierl <ingo.weinzierl@intevation.de>
+
+	  Issue225
+
+	* src/main/webapp/WEB-INF/config/struts-config.xml: Added global forwards
+	  for imprint and info.
+
+	* src/main/webapp/WEB-INF/jsp/header.jsp,
+	  src/main/webapp/WEB-INF/jsp/footer.jsp: Adapted links for imprint and info
+	  pages.
+
+	* src/main/webapp/WEB-INF/jsp/imprint.jsp,
+	  src/main/webapp/WEB-INF/jsp/info.jsp: New pages for imprint and an info
+	  page.
+
+	* src/main/resources/applicationMessages_en.properties: Renamed 'about' ->
+	  'imprint'.
+
 2010-04-27  Ingo Weinzierl <ingo.weinzierl@intevation.de>
 
 	  Issue225
diff -r 5c36da3d9e17 -r 3b70886b399b gnv/src/main/resources/applicationMessages_en.properties
--- a/gnv/src/main/resources/applicationMessages_en.properties	Tue Apr 27 08:44:22 2010 +0000
+++ b/gnv/src/main/resources/applicationMessages_en.properties	Tue Apr 27 12:23:40 2010 +0000
@@ -6,7 +6,7 @@
 
 gnviewer.footer.home = Home
 gnviewer.footer.contact = Contact
-gnviewer.footer.about = About
+gnviewer.footer.about = Imprint
 
 gnviewer.header.restart = Restart
 gnviewer.header.language = German
diff -r 5c36da3d9e17 -r 3b70886b399b gnv/src/main/webapp/WEB-INF/config/struts-config.xml
--- a/gnv/src/main/webapp/WEB-INF/config/struts-config.xml	Tue Apr 27 08:44:22 2010 +0000
+++ b/gnv/src/main/webapp/WEB-INF/config/struts-config.xml	Tue Apr 27 12:23:40 2010 +0000
@@ -6,9 +6,21 @@
     <global-exceptions/>
      <global-forwards>
         <forward name="entrance" path="/start.do"/>
+        <forward name="imprint" path="/imprint.do"/>
+        <forward name="info" path="/info.do"/>
     </global-forwards>
 
     <action-mappings>
+        <action path="/imprint"
+                type="org.apache.struts.actions.ForwardAction"
+                parameter="/WEB-INF/jsp/imprint.jsp"
+                scope="request"
+                validate="false" />
+        <action path="/info"
+                type="org.apache.struts.actions.ForwardAction"
+                parameter="/WEB-INF/jsp/info.jsp"
+                scope="request"
+                validate="false" />
         <action path="/version"
                 type="de.intevation.gnv.action.ArtifactDatabaseActionBase"
                 scope="request"
diff -r 5c36da3d9e17 -r 3b70886b399b gnv/src/main/webapp/WEB-INF/jsp/footer.jsp
--- a/gnv/src/main/webapp/WEB-INF/jsp/footer.jsp	Tue Apr 27 08:44:22 2010 +0000
+++ b/gnv/src/main/webapp/WEB-INF/jsp/footer.jsp	Tue Apr 27 12:23:40 2010 +0000
@@ -14,11 +14,11 @@
                     <tr>
                         <td align="left"></td>
                         <td align="right">
-                            <a class="footerLineLinks" href=""><bean:message key="gnviewer.footer.home"/></a>
+                            <html:link styleClass="footerLineLinks" href="http://www.bsh.de"><bean:message key="gnviewer.footer.home"/></html:link>
                             <font size="1.5em" color="white">&middot;</font>
-                            <a class="footerLineLinks" href=""><bean:message key="gnviewer.footer.contact"/></a>
+                            <html:link styleClass="footerLineLinks" href="mailto:"><bean:message key="gnviewer.footer.contact"/></html:link>
                             <font size="1.5em" color="white">&middot;</font>
-                            <a class="footerLineLinks" href=""><bean:message key="gnviewer.footer.about"/></a>
+                            <html:link styleClass="footerLineLinks" page="/imprint.do"><bean:message key="gnviewer.footer.about"/></html:link>
                         </td>
                     </tr>
                 </table>
diff -r 5c36da3d9e17 -r 3b70886b399b gnv/src/main/webapp/WEB-INF/jsp/header.jsp
--- a/gnv/src/main/webapp/WEB-INF/jsp/header.jsp	Tue Apr 27 08:44:22 2010 +0000
+++ b/gnv/src/main/webapp/WEB-INF/jsp/header.jsp	Tue Apr 27 12:23:40 2010 +0000
@@ -15,11 +15,11 @@
     <tr>
         <td align="left"></td>
         <td align="right">
-            <a class="headerLineLinks" href="/gnv"><bean:message key="gnviewer.header.restart"/></a>
+            <html:link styleClass="headerLineLinks" page="/start.do"><bean:message key="gnviewer.header.restart"/></html:link>
             <font size="1.5em" color="white">&middot;</font>
             <a class="headerLineLinks" href="<%=response.encodeURL("language.do?uid="+System.currentTimeMillis())%>"><bean:message key="gnviewer.header.language"/></a>
             <font size="1.5em" color="white">&middot;</font>
-            <a class="headerLineLinks" href=""><bean:message key="gnviewer.header.info"/></a>
+            <html:link styleClass="headerLineLinks" page="/info.do"><bean:message key="gnviewer.header.info"/></html:link>
         </td>
     </tr>
 </table>
diff -r 5c36da3d9e17 -r 3b70886b399b gnv/src/main/webapp/WEB-INF/jsp/imprint.jsp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gnv/src/main/webapp/WEB-INF/jsp/imprint.jsp	Tue Apr 27 12:23:40 2010 +0000
@@ -0,0 +1,41 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>
+            <bean:message key="gnviewer.app.title"/>
+        </title>
+        <link href="styles/gnv.css" rel="stylesheet" type="text/css"/>
+    </head>
+
+    <body id="gnviewerbody">
+        <div id="page">
+            <div id="headline">
+                <h1 class="headline">BSH Generischer Viewer</h1>
+            </div>
+
+            <br>
+
+            <div id="headerElement">
+                <table class="headerTableLinks">
+                    <tr>
+                        <td align="left"></td>
+                        <td align="right">
+                            <html:link styleClass="headerLineLinks" page="/start.do"><bean:message key="gnviewer.header.restart"/></html:link>
+                            <font size="1.5em" color="white">&middot;</font>
+                            <html:link styleClass="headerLineLinks" page="/info.do"><bean:message key="gnviewer.header.info"/></html:link>
+                        </td>
+                    </tr>
+                </table>
+            </div>
+            <div id="contentElement" class="contentElement">
+                TODO: Impressum.
+             </div>
+             <div id="footerElement">
+                <jsp:include page="footer.jsp" />
+            </div>
+        </div>
+    </body>
+</html>
diff -r 5c36da3d9e17 -r 3b70886b399b gnv/src/main/webapp/WEB-INF/jsp/info.jsp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gnv/src/main/webapp/WEB-INF/jsp/info.jsp	Tue Apr 27 12:23:40 2010 +0000
@@ -0,0 +1,41 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>
+            <bean:message key="gnviewer.app.title"/>
+        </title>
+        <link href="styles/gnv.css" rel="stylesheet" type="text/css"/>
+    </head>
+
+    <body id="gnviewerbody">
+        <div id="page">
+            <div id="headline">
+                <h1 class="headline">BSH Generischer Viewer</h1>
+            </div>
+
+            <br>
+
+            <div id="headerElement">
+                <table class="headerTableLinks">
+                    <tr>
+                        <td align="left"></td>
+                        <td align="right">
+                            <html:link styleClass="headerLineLinks" page="/start.do"><bean:message key="gnviewer.header.restart"/></html:link>
+                            <font size="1.5em" color="white">&middot;</font>
+                            <html:link styleClass="headerLineLinks" page="/info.do"><bean:message key="gnviewer.header.info"/></html:link>
+                        </td>
+                    </tr>
+                </table>
+            </div>
+            <div id="contentElement" class="contentElement">
+                TODO: Info
+             </div>
+             <div id="footerElement">
+                <jsp:include page="footer.jsp" />
+            </div>
+        </div>
+    </body>
+</html>