Author: chatellier Date: 2010-12-24 10:14:35 +0000 (Fri, 24 Dec 2010) New Revision: 447 Log: Add site global layout. Added: trunk/coser-web/src/main/webapp/WEB-INF/content/index.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/show-graph.jsp trunk/coser-web/src/main/webapp/WEB-INF/decorators.xml trunk/coser-web/src/main/webapp/WEB-INF/decorators/ trunk/coser-web/src/main/webapp/WEB-INF/decorators/footer.jsp trunk/coser-web/src/main/webapp/WEB-INF/decorators/header.jsp trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp Removed: trunk/coser-web/src/main/webapp/WEB-INF/content/footer.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/header.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/index.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/locale.jsp Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/IndexAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/ShowGraphAction.java trunk/coser-web/src/main/webapp/WEB-INF/content/select-indicator.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/select-species.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/select-zone.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/upload-result-success.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/upload-result.jsp trunk/coser-web/src/main/webapp/WEB-INF/web.xml trunk/coser-web/src/main/webapp/styles/coser.css Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/IndexAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/IndexAction.java 2010-12-24 10:14:05 UTC (rev 446) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/IndexAction.java 2010-12-24 10:14:35 UTC (rev 447) @@ -28,6 +28,11 @@ import java.util.Date; import java.util.Properties; +import javax.servlet.ServletContext; +import javax.servlet.http.HttpServletRequest; + +import org.apache.struts2.ServletActionContext; + import com.opensymphony.xwork2.ActionSupport; import fr.ifremer.coser.web.CoserWebConfig; @@ -55,6 +60,23 @@ return dataUpdateDate; } + /** + * Return l'url de l'application context inclut. + * + * @return l'url du context + */ + public String getContextUrl() { + HttpServletRequest request = ServletActionContext.getRequest(); + + String url = request.getScheme() + "://" + request.getServerName(); + if (request.getServerPort() != 80) { + url += ":" + request.getServerPort(); + } + url += request.getContextPath(); + + return url; + } + @Override public String execute() { Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/ShowGraphAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/ShowGraphAction.java 2010-12-24 10:14:05 UTC (rev 446) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/ShowGraphAction.java 2010-12-24 10:14:35 UTC (rev 447) @@ -108,7 +108,7 @@ // data chartUrl += "&chd=t:10,20,40,80,90,95,99|20,30,40,50,60,70,80"; // legend - chartUrl += "&chdl=Ponies"; + chartUrl += "&chdl=Species"; // legend position chartUrl += "&chdlp=b"; // markers (plot) @@ -117,10 +117,10 @@ chartUrl += "&chxt=x,y"; // taille chartUrl += "&chs=600x300"; - // naffiche aps les lignes : - chartUrl += "&chls=2,0,16"; + // taille de la courbe + chartUrl += "&chls=2"; // titre du graphique - chartUrl += "&chtt=Toto"; + chartUrl += "&chtt=" + zone + ";" + species + ";" + indicator; return SUCCESS; } Deleted: trunk/coser-web/src/main/webapp/WEB-INF/content/footer.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/footer.jsp 2010-12-24 10:14:05 UTC (rev 446) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/footer.jsp 2010-12-24 10:14:35 UTC (rev 447) @@ -1,29 +0,0 @@ -<!-- - #%L - Coser :: Web - - $Id$ - $HeadURL$ - %% - Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - #L% - --> -<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> -<%@taglib uri="/struts-tags" prefix="s" %> - - <div> - Copyright 2010 Ifremer - </div> \ No newline at end of file Deleted: trunk/coser-web/src/main/webapp/WEB-INF/content/header.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/header.jsp 2010-12-24 10:14:05 UTC (rev 446) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/header.jsp 2010-12-24 10:14:35 UTC (rev 447) @@ -1,44 +0,0 @@ -<!-- - #%L - Coser :: Web - - $Id$ - $HeadURL$ - %% - Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - #L% - --> -<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> -<%@taglib uri="/struts-tags" prefix="s" %> - - <div> - <img src="images/logo_sih.gif" /> - <img src="images/logo_ifremer.gif" /> - - <s:url id="localeEN" namespace="/" action="locale"> - <s:param name="request_locale" >en</s:param> - </s:url> - <s:url id="localeFR" namespace="/" action="locale"> - <s:param name="request_locale" >fr</s:param> - </s:url> - - <s:a href="%{localeEN}"><img src="images/gb.png" /></s:a> - <s:a href="%{localeFR}"><img src="images/fr.png" /></s:a> - - </div> - - <hr /> - Deleted: trunk/coser-web/src/main/webapp/WEB-INF/content/index.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/index.jsp 2010-12-24 10:14:05 UTC (rev 446) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/index.jsp 2010-12-24 10:14:35 UTC (rev 447) @@ -1,95 +0,0 @@ -<!-- - #%L - Coser :: Web - - $Id$ - $HeadURL$ - %% - Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - #L% - --> -<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<%@taglib uri="/struts-tags" prefix="s" %> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <title>Coser</title> - <link rel="stylesheet" type="text/css" href="styles/coser.css" /> - </head> - <body> - - <%@ include file="header.jsp" %> - - <h2>Tutu : <s:text name="message.index.title" /></h2> - <!-- <h2>Indices de populations et de communauté issus des campagnes de surveillance halieutique de l'Ifremer</h2> --> - - <p>Ce site présente des indices de populations et de communauté calculés à partir des - données du réseau des campagnes de surveillance halieutiques opérées par l'Ifremer - en mer du Nord, Manche, Atlantique et Méditerranée. - Il contient des informations relatives à 15 séries de campagnes</p> - - <a href="http://www.ifremer.fr/SIH-indices-campagnes/fichiers/Web_EstPopInd_Presentat..." - target="_blank">Les campagnes de surveillance halieutique de l'Ifremer</a> - - <h3>Les indices de populations et de communauté</h3> - <ul> - <li>10 indices de populations et 4 indices de communauté</li> - <li>168 taxons pris en compte</li> - </ul> - - <table> - <tr> - <td>Informations sur les</td> - <td>populations</td> - <td>/</td> - <td>Communautés</td> - </tr> - <tr> - <td>Les indices calculés</td> - <td> - <a href="http://www.ifremer.fr/SIH-indices-campagnes/fichiers/Web_EstPopInd_PresentationIndic_FR.pdf">X</a> - </td> - <td /> - <td> - <a href="http://www.ifremer.fr/SIH-indices-campagnes/fichiers/Web_EstComInd_PresentationIndic_FR.pdf">X</a> - </td> - </tr> - <tr> - <td>Accès aux données</td> - <td> - <s:a action="select-zone">X</s:a> - </td> - <td /> - <td> - <s:a action="select-zone">X</s:a> - </td> - </tr> - </table> - - <p><b>Pour citer ce site :</b> Ifremer <s:date name="dataUpdateDate" format="yyyy" />. Indices de populations et de communautés - issus des campagnes de surveillance halieutique de l'Ifremer. - http://www.ifremer.fr/SIH-indices-campagnes/ <s:date name="dataUpdateDate" format="dd MMMM" />.</p> - - <p>Gestion des données des campagnes océanographiques : - <ul> - <li><a href="http://www.ifremer.fr/sismer/index_FR.htm">le Système d'informations scientifiques pour la mer de l'Ifremer (SISMER)</a></li> - <li><a href="http://www.ifremer.fr/sih">le Système d'information halieutique de l'Ifremer (SIH)</a></li> - </ul></p> - - <%@ include file="footer.jsp" %> - </body> -</html> \ No newline at end of file Added: trunk/coser-web/src/main/webapp/WEB-INF/content/index.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/index.jsp (rev 0) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/index.jsp 2010-12-24 10:14:35 UTC (rev 447) @@ -0,0 +1,89 @@ +<!-- + #%L + Coser :: Web + + $Id$ + $HeadURL$ + %% + Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --> +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<%@taglib uri="/struts-tags" prefix="s" %> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> + <head> + <title>Coser</title> + </head> + <body> + + <div class="maintitle"><s:text name="message.index.title" /></div> + + <p>Ce site présente des indices de populations et de communauté calculés à partir des + données du réseau des campagnes de surveillance halieutiques opérées par l'Ifremer + en mer du Nord, Manche, Atlantique et Méditerranée. + Il contient des informations relatives à 15 séries de campagnes</p> + + <a href="http://www.ifremer.fr/SIH-indices-campagnes/fichiers/Web_EstPopInd_Presentat..." + target="_blank">Les campagnes de surveillance halieutique de l'Ifremer</a> + + <h3>Les indices de populations et de communauté</h3> + <ul> + <li>10 indices de populations et 4 indices de communauté</li> + <li>168 taxons pris en compte</li> + </ul> + + <table> + <tr> + <td>Informations sur les</td> + <td>populations</td> + <td>/</td> + <td>Communautés</td> + </tr> + <tr> + <td>Les indices calculés</td> + <td style="text-align:center"> + <a href="http://www.ifremer.fr/SIH-indices-campagnes/fichiers/Web_EstPopInd_PresentationIndic_FR.pdf">X</a> + </td> + <td /> + <td style="text-align:center"> + <a href="http://www.ifremer.fr/SIH-indices-campagnes/fichiers/Web_EstComInd_PresentationIndic_FR.pdf">X</a> + </td> + </tr> + <tr> + <td>Accès aux données</td> + <td style="text-align:center"> + <s:a action="select-zone">X</s:a> + </td> + <td /> + <td style="text-align:center"> + <s:a action="select-zone">X</s:a> + </td> + </tr> + </table> + + <p><b>Pour citer ce site :</b> Ifremer <s:date name="dataUpdateDate" format="yyyy" />. Indices de populations et de communautés + issus des campagnes de surveillance halieutique de l'Ifremer. + <span style="white-space: nowrap;"><s:property value="contextUrl"/></span> (<s:date name="dataUpdateDate" format="dd MMMM" />).</p> + + <p>Gestion des données des campagnes océanographiques : + <ul> + <li><a href="http://www.ifremer.fr/sismer/index_FR.htm">le Système d'informations scientifiques pour la mer de l'Ifremer (SISMER)</a></li> + <li><a href="http://www.ifremer.fr/sih">le Système d'information halieutique de l'Ifremer (SIH)</a></li> + </ul></p> + + </body> +</html> \ No newline at end of file Deleted: trunk/coser-web/src/main/webapp/WEB-INF/content/locale.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/locale.jsp 2010-12-24 10:14:05 UTC (rev 446) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/locale.jsp 2010-12-24 10:14:35 UTC (rev 447) @@ -1,44 +0,0 @@ -<!-- - #%L - Coser :: Web - - $Id$ - $HeadURL$ - %% - Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - #L% - --> -<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<%@taglib uri="/struts-tags" prefix="s" %> - -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <title>Coser</title> - <link rel="stylesheet" type="text/css" href="styles/coser.css" /> - </head> - <body> - - <%@ include file="header.jsp" %> - - <img src="images/zonesmap.jpg" /> - - <br /> - - <%@ include file="footer.jsp" %> - </body> -</html> \ No newline at end of file Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/select-indicator.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/select-indicator.jsp 2010-12-24 10:14:05 UTC (rev 446) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/select-indicator.jsp 2010-12-24 10:14:35 UTC (rev 447) @@ -27,25 +27,18 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title>Coser</title> - <link rel="stylesheet" type="text/css" href="styles/coser.css" /> </head> <body> - - <%@ include file="header.jsp" %> - <img src="images/zonesmap.jpg" /> <br /> <s:form action="show-graph" method="get"> - <s:select name="indicator" list="indicators" label="Select a country" /> + <s:select name="indicator" list="indicators" label="Select an indicator" /> <s:hidden name="zone" value="zone" /> <s:hidden name="species" value="species" /> <s:submit label="Suite"/> </s:form> - - <%@ include file="footer.jsp" %> </body> </html> \ No newline at end of file Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/select-species.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/select-species.jsp 2010-12-24 10:14:05 UTC (rev 446) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/select-species.jsp 2010-12-24 10:14:35 UTC (rev 447) @@ -27,24 +27,18 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title>Coser</title> - <link rel="stylesheet" type="text/css" href="styles/coser.css" /> </head> <body> - - <%@ include file="header.jsp" %> <img src="images/zonesmap.jpg" /> <br /> <s:form action="select-indicator" method="get"> - <s:select name="species" list="species" label="Select a country" /> + <s:select name="species" list="species" label="Select a species" /> <s:hidden name="zone" value="zone" /> <s:submit label="Suite"/> </s:form> - - <%@ include file="footer.jsp" %> </body> </html> \ No newline at end of file Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/select-zone.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/select-zone.jsp 2010-12-24 10:14:05 UTC (rev 446) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/select-zone.jsp 2010-12-24 10:14:35 UTC (rev 447) @@ -26,13 +26,9 @@ <%@taglib uri="/struts-tags" prefix="s" %> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title>Coser</title> - <link rel="stylesheet" type="text/css" href="styles/coser.css" /> </head> <body> - - <%@ include file="header.jsp" %> <img src="images/zonesmap.jpg" /> @@ -57,7 +53,5 @@ </select> <s:submit label="Suite"/> </s:form> - - <%@ include file="footer.jsp" %> </body> </html> \ No newline at end of file Added: trunk/coser-web/src/main/webapp/WEB-INF/content/show-graph.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/show-graph.jsp (rev 0) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/show-graph.jsp 2010-12-24 10:14:35 UTC (rev 447) @@ -0,0 +1,37 @@ +<!-- + #%L + Coser :: Web + + $Id$ + $HeadURL$ + %% + Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --> +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<%@taglib uri="/struts-tags" prefix="s" %> + +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> + <head> + <title>Coser</title> + </head> + <body> + + <img src="<s:property value="chartUrl"/>" /> + + </body> +</html> \ No newline at end of file Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/upload-result-success.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/upload-result-success.jsp 2010-12-24 10:14:05 UTC (rev 446) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/upload-result-success.jsp 2010-12-24 10:14:35 UTC (rev 447) @@ -26,8 +26,7 @@ <%@taglib uri="/struts-tags" prefix="s" %> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <title>Hello World</title> + <title>Hello World</title> </head> <body> Success !!! Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/upload-result.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/upload-result.jsp 2010-12-24 10:14:05 UTC (rev 446) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/upload-result.jsp 2010-12-24 10:14:35 UTC (rev 447) @@ -26,8 +26,7 @@ <%@taglib uri="/struts-tags" prefix="s" %> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <title>Hello World</title> + <title>Hello World</title> </head> <body> <s:a action="index">Index</s:a> Copied: trunk/coser-web/src/main/webapp/WEB-INF/decorators/footer.jsp (from rev 441, trunk/coser-web/src/main/webapp/WEB-INF/content/footer.jsp) =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/decorators/footer.jsp (rev 0) +++ trunk/coser-web/src/main/webapp/WEB-INF/decorators/footer.jsp 2010-12-24 10:14:35 UTC (rev 447) @@ -0,0 +1,29 @@ +<!-- + #%L + Coser :: Web + + $Id$ + $HeadURL$ + %% + Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --> +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<%@taglib uri="/struts-tags" prefix="s" %> + + <div> + + </div> \ No newline at end of file Copied: trunk/coser-web/src/main/webapp/WEB-INF/decorators/header.jsp (from rev 445, trunk/coser-web/src/main/webapp/WEB-INF/content/header.jsp) =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/decorators/header.jsp (rev 0) +++ trunk/coser-web/src/main/webapp/WEB-INF/decorators/header.jsp 2010-12-24 10:14:35 UTC (rev 447) @@ -0,0 +1,44 @@ +<!-- + #%L + Coser :: Web + + $Id$ + $HeadURL$ + %% + Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --> +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<%@taglib uri="/struts-tags" prefix="s" %> + + <div> + <img src="images/logo_ifremer.gif" style="width:333px;heigth:69px" /> + <img src="images/logo_sih.gif" /> + + <s:url id="localeEN" namespace="/" action="locale"> + <s:param name="request_locale" >en</s:param> + </s:url> + <s:url id="localeFR" namespace="/" action="locale"> + <s:param name="request_locale" >fr</s:param> + </s:url> + + <s:a href="%{localeEN}"><img src="images/gb.png" /></s:a> + <s:a href="%{localeFR}"><img src="images/fr.png" /></s:a> + + </div> + + <hr /> + Added: trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp (rev 0) +++ trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2010-12-24 10:14:35 UTC (rev 447) @@ -0,0 +1,45 @@ +<!-- + #%L + Coser :: Web + + $Id$ + $HeadURL$ + %% + Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --> +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<%@taglib uri="/struts-tags" prefix="s" %> +<%@ taglib uri="http://www.opensymphony.com/sitemesh/decorator" prefix="decorator" %> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <title><decorator:title default="Coser"/></title> + <link rel="stylesheet" type="text/css" href="styles/coser.css" /> + <decorator:head/> + </head> + <body> + + <%@ include file="header.jsp" %> + + <div class="main"> + <decorator:body/> + </div> + + <%@ include file="footer.jsp" %> + </body> +</html> \ No newline at end of file Added: trunk/coser-web/src/main/webapp/WEB-INF/decorators.xml =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/decorators.xml (rev 0) +++ trunk/coser-web/src/main/webapp/WEB-INF/decorators.xml 2010-12-24 10:14:35 UTC (rev 447) @@ -0,0 +1,10 @@ +<decorators defaultdir="/WEB-INF/decorators"> + <excludes> + <pattern>/styles/*</pattern> + <pattern>/images/*</pattern> + </excludes> + + <decorator name="layout" page="layout.jsp"> + <pattern>/*</pattern> + </decorator> +</decorators> \ No newline at end of file Modified: trunk/coser-web/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/web.xml 2010-12-24 10:14:05 UTC (rev 446) +++ trunk/coser-web/src/main/webapp/WEB-INF/web.xml 2010-12-24 10:14:35 UTC (rev 447) @@ -30,13 +30,9 @@ <display-name>Coser</display-name> - <!-- <welcome-file-list> - <welcome-file>index.jsp</welcome-file> - </welcome-file-list> --> - <filter> - <filter-name>struts2</filter-name> - <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class> + <filter-name>struts-prepare</filter-name> + <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareFilter</filter-class> <init-param> <param-name>actionPackages</param-name> <param-value>fr.ifremer.coser.web</param-value> @@ -46,10 +42,34 @@ <param-value>true</param-value> </init-param> </filter> - + + <filter> + <filter-name>struts-execute</filter-name> + <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsExecuteFilter</filter-class> + </filter> + + <filter> + <filter-name>sitemesh</filter-name> + <filter-class>com.opensymphony.sitemesh.webapp.SiteMeshFilter</filter-class> + </filter> + <filter-mapping> - <filter-name>struts2</filter-name> + <filter-name>struts-prepare</filter-name> <url-pattern>/*</url-pattern> </filter-mapping> + + <filter-mapping> + <filter-name>sitemesh</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <filter-mapping> + <filter-name>struts-execute</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + <listener> + <listener-class>org.apache.struts2.dispatcher.ng.listener.StrutsListener</listener-class> + </listener> + </web-app> Modified: trunk/coser-web/src/main/webapp/styles/coser.css =================================================================== --- trunk/coser-web/src/main/webapp/styles/coser.css 2010-12-24 10:14:05 UTC (rev 446) +++ trunk/coser-web/src/main/webapp/styles/coser.css 2010-12-24 10:14:35 UTC (rev 447) @@ -1,13 +1,31 @@ body { background-color: #1F7DCB; color: #2A2A2A; + font-family: Verdana,"Lucida Grande",Lucida,Arial,Helvetica,sans-serif; + width: 960px; + margin: 0 auto; } a { - color: #2C9FF; + color: #0080CB; + text-decoration: none; } a:hover { color: #165A97; } +.main { + background-color: white; + border: 1px solid black; + color: #696969; + margin-left:200px; + padding:2.5em 1.95em 1.5em; +} + +.main .maintitle { + font-weight: bold; + font-size: 125%; + color: #044F90; + border-bottom: 1px solid #044F90; +} \ No newline at end of file