Author: chatellier Date: 2011-01-23 19:49:45 +0000 (Sun, 23 Jan 2011) New Revision: 541 Log: Move texts to first page for each part. Remove download map as pdf. Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/com/facade.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/com/graph.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/map/facade.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/map/map.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/pop/facade.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/pop/graph.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/source/facade.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/source/source.jsp Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/com/facade.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/com/facade.jsp 2011-01-22 19:30:18 UTC (rev 540) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/com/facade.jsp 2011-01-23 19:49:45 UTC (rev 541) @@ -32,6 +32,8 @@ <h2><s:text name="message.com.title" /></h2> + <p><s:text name="message.com.paragraph1" /></p> + <img src="<s:url value='/images/zonesmap.jpg' />" /> <br /> Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/com/graph.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/com/graph.jsp 2011-01-22 19:30:18 UTC (rev 540) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/com/graph.jsp 2011-01-23 19:49:45 UTC (rev 541) @@ -31,8 +31,6 @@ <body> <h2><s:text name="message.com.title" /></h2> - - <p><s:text name="message.com.paragraph1" /></p> <img src="<s:url action='graph-data'> <s:param name="zone" value="%{zone}" /> Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/map/facade.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/map/facade.jsp 2011-01-22 19:30:18 UTC (rev 540) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/map/facade.jsp 2011-01-23 19:49:45 UTC (rev 541) @@ -32,6 +32,14 @@ <h2><s:text name="message.map.title" /></h2> + <p><s:text name="message.map.paragraph1" /></p> + <p><s:text name="message.map.paragraph2" /></p> + + <p style="border: 1px solid black"> + <span style="font-weight:bold"><s:text name="message.map.warning" /></span><br /> + <s:text name="message.map.warningcontent" /> + </p> + <img src="<s:url value='/images/zonesmap.jpg' />" /> <br /> @@ -40,5 +48,16 @@ <s:select name="facade" list="facades" label="%{getText('message.common.selectfacade')}" /> <s:submit label="Suite"/> </s:form> + + <p> + <s:text name="message.map.linkarchimer"> + <s:param><a href="http://archimer.ifremer.fr/doc/00000/6976/">http://archimer.ifremer.fr/doc/00000/6976/</a></s:param> + </s:text> + </p> + <p> + <span style="font-weight:bold"><s:text name="message.map.citationtitle" /></span> : <s:text name="message.map.citation"> + <s:param><a href="http://archimer.ifremer.fr/doc/00000/6976/">http://archimer.ifremer.fr/doc/00000/6976/</a></s:param> + </s:text> + </p> </body> </html> \ No newline at end of file Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/map/map.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/map/map.jsp 2011-01-22 19:30:18 UTC (rev 540) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/map/map.jsp 2011-01-23 19:49:45 UTC (rev 541) @@ -32,35 +32,10 @@ <h2><s:text name="message.map.title" /></h2> - <p><s:text name="message.map.paragraph1" /></p> - <p><s:text name="message.map.paragraph2" /></p> - - <p style="border: 1px solid black"> - <span style="font-weight:bold"><s:text name="message.map.warning" /></span><br /> - <s:text name="message.map.warningcontent" /> - </p> - <img src="<s:url action='map-data'> <s:param name="survey" value="%{survey}" /> <s:param name="species" value="%{species}" /> </s:url>" /> - - <p><s:a action="map-pdf"> - <s:param name="survey" value="%{survey}" /> - <s:param name="species" value="%{species}" /> - <s:text name="message.map.downloadaspdf"></s:text> - </s:a>.</p> - - <p> - <s:text name="message.map.linkarchimer"> - <s:param><a href="http://archimer.ifremer.fr/doc/00000/6976/">http://archimer.ifremer.fr/doc/00000/6976/</a></s:param> - </s:text> - </p> - <p> - <span style="font-weight:bold"><s:text name="message.map.citationtitle" /></span> : <s:text name="message.map.citation"> - <s:param><a href="http://archimer.ifremer.fr/doc/00000/6976/">http://archimer.ifremer.fr/doc/00000/6976/</a></s:param> - </s:text> - </p> </body> </html> \ No newline at end of file Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/pop/facade.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/pop/facade.jsp 2011-01-22 19:30:18 UTC (rev 540) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/pop/facade.jsp 2011-01-23 19:49:45 UTC (rev 541) @@ -32,6 +32,9 @@ <h2><s:text name="message.pop.title" /></h2> + <p><s:text name="message.pop.paragraph1" /></p> + <p><s:text name="message.pop.paragraph2" /></p> + <img src="<s:url value='/images/zonesmap.jpg' />" /> <br /> Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/pop/graph.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/pop/graph.jsp 2011-01-22 19:30:18 UTC (rev 540) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/pop/graph.jsp 2011-01-23 19:49:45 UTC (rev 541) @@ -33,9 +33,6 @@ <h2><s:text name="message.pop.title" /></h2> - <p><s:text name="message.pop.paragraph1" /></p> - <p><s:text name="message.pop.paragraph2" /></p> - <img src="<s:url action='graph-data'> <s:param name="zone" value="%{zone}" /> <s:param name="species" value="%{species}" /> Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/source/facade.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/source/facade.jsp 2011-01-22 19:30:18 UTC (rev 540) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/source/facade.jsp 2011-01-23 19:49:45 UTC (rev 541) @@ -32,6 +32,16 @@ <h2><s:text name="message.source.title" /></h2> + <p><s:text name="message.source.paragraph1" /></p> + <p> + <s:text name="message.source.paragraph2"> + <s:param><a href="mailto:harmonie at ifremer.fr">harmonie at ifremer.fr</a></s:param> + </s:text> + </p> + + <p><s:text name="message.source.paragraph3" /></p> + <p><s:text name="message.source.paragraph4" /></p> + <img src="<s:url value='/images/zonesmap.jpg' />" /> <br /> Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/source/source.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/source/source.jsp 2011-01-22 19:30:18 UTC (rev 540) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/source/source.jsp 2011-01-23 19:49:45 UTC (rev 541) @@ -31,16 +31,6 @@ <body> <h2><s:text name="message.source.title" /></h2> - - <p><s:text name="message.source.paragraph1" /></p> - <p> - <s:text name="message.source.paragraph2"> - <s:param><a href="mailto:harmonie at ifremer.fr">harmonie at ifremer.fr</a></s:param> - </s:text> - </p> - - <p><s:text name="message.source.paragraph3" /></p> - <p><s:text name="message.source.paragraph4" /></p> <img src="<s:url value='/images/zones/' /><s:property value='zonePicture' />" style="width: 590px; heigth: 812px" />