Author: chatellier Date: 2010-12-23 17:03:38 +0000 (Thu, 23 Dec 2010) New Revision: 445 Log: Udpate web ui code. Begin localization. Added: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/LocaleAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/ShowGraphAction.java trunk/coser-web/src/main/resources/fr/ trunk/coser-web/src/main/resources/fr/ifremer/ trunk/coser-web/src/main/resources/fr/ifremer/coser/ trunk/coser-web/src/main/resources/fr/ifremer/coser/web/ trunk/coser-web/src/main/resources/fr/ifremer/coser/web/actions/ trunk/coser-web/src/main/resources/fr/ifremer/coser/web/actions/IndexAction.properties trunk/coser-web/src/main/resources/fr/ifremer/coser/web/actions/IndexAction_en.properties trunk/coser-web/src/main/resources/fr/ifremer/coser/web/actions/IndexAction_fr.properties trunk/coser-web/src/main/webapp/WEB-INF/content/locale.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/select-indicator.jsp trunk/coser-web/src/main/webapp/images/fr.png trunk/coser-web/src/main/webapp/images/gb.png Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultHandler.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/IndexAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/SelectIndicatorAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/UploadResultAction.java trunk/coser-web/src/main/resources/struts.xml 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/select-species.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/select-zone.jsp Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2010-12-23 17:02:43 UTC (rev 444) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2010-12-23 17:03:38 UTC (rev 445) @@ -179,4 +179,88 @@ return result; } + + /** + * Retourne les indicateurs calculables. + * + * @param zone zone + * @param species especes + * @return la liste des indicateurs + */ + public Map<String, String> getIndicators(String zone, String species) { + Map<String, String> indicators = new TreeMap<String, String>(); + + // populations + indicators.put("Abundance", "Abundance"); + indicators.put("lnN", "lnN"); + //indicators.put("Dbar", "Dbar"); + indicators.put("Wbar", "Wbar"); + indicators.put("Biomass", "Biomass"); + indicators.put("Lbar", "Lbar"); + //indicators.put("propMat", "propMat"); + indicators.put("L50", "L50"); + //indicators.put("sexRatio", "sexRatio"); + //indicators.put("Zmoy", "Zmoy"); + + // communauté + indicators.put("Delta", "Delta"); + indicators.put("Gtot", "Gtot"); + //indicators.put("Shannonmod", "Shannonmod"); + indicators.put("meanWbar", "meanWbar"); + indicators.put("NBWtot", "NBWtot"); + //indicators.put("propL", "propL"); + indicators.put("propLW", "propLW"); + indicators.put("meanQuant", "meanQuant"); + //indicators.put("biomSmall", "biomSmall"); + //indicators.put("biomBig", "biomBig"); + + return indicators; + } + + /** + * Generer les données du graph et genere la liste des parametres pour + * les generateurs de graph (eastwood ou jfreechart). + * + * @param zone zone + * @param species species + * @param indicator indicator + * @return chart parameters + * @throws CoserBusinessException + */ + public String getChartParameters(String zone, String species, String indicator) throws CoserBusinessException { + + // charge du fichier EstComInd_survey.txt ou EstPopInd_survey.txt + // suivant le type de resultat demandé (communauté/population) + + File webDirectory = config.getWebServerDirectory(); + File newDirectory = new File(webDirectory, "tutu"); + File[] projectFiles = newDirectory.listFiles(); + if (projectFiles != null) { + for (File projectFile : projectFiles) { + if (projectFile.isDirectory()) { + Project project = projectService.openProject(projectFile.getName(), newDirectory); + + for (Selection selection : project.getSelections().values()) { + boolean resultFound = false; + + for (RSufiResult rsufiResult : selection.getRsufiResults()) { + if (rsufiResult.getZone() != null && rsufiResult.getZone().equals(zone)) { + projectService.loadSelectionData(project, selection); + Map<String, String> resultSpecies = getRsufiResultSpecies(project, selection, rsufiResult); + //result.putAll(resultSpecies); + resultFound = true; + break; + } + } + + if (resultFound) { + break; + } + } + } + } + } + + return null; + } } Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultHandler.java 2010-12-23 17:02:43 UTC (rev 444) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultHandler.java 2010-12-23 17:03:38 UTC (rev 445) @@ -28,10 +28,6 @@ import static org.nuiton.i18n.I18n._; import java.util.Collection; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ExecutionException; import javax.swing.JOptionPane; import javax.swing.SwingWorker; @@ -39,14 +35,10 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jfree.chart.JFreeChart; import fr.ifremer.coser.CoserBusinessException; import fr.ifremer.coser.CoserException; -import fr.ifremer.coser.CoserConstants.ValidationLevel; -import fr.ifremer.coser.control.ControlError; import fr.ifremer.coser.services.ProjectService; -import fr.ifremer.coser.services.PublicationService; import fr.ifremer.coser.ui.common.CommonHandler; import fr.ifremer.coser.ui.util.CoserProgressBar; 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-23 17:02:43 UTC (rev 444) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/IndexAction.java 2010-12-23 17:03:38 UTC (rev 445) @@ -24,7 +24,6 @@ import java.io.File; import java.io.FileInputStream; -import java.io.FileOutputStream; import java.io.IOException; import java.util.Date; import java.util.Properties; @@ -37,7 +36,7 @@ import fr.ifremer.coser.web.ServiceFactory; /** - * Action index, recupere la liste des resultats. + * Action index, ecupere la date de derniere mise à jour. * * @author chatellier * @version $Revision$ @@ -62,23 +61,26 @@ CoserWebConfig config = ServiceFactory.getCoserConfig(); File webProperties = new File(config.getWebServerDirectory(), CoserWebConstants.WEB_PROPERTIES_NAME); - // get update date - Properties props = new Properties(); - try { - props.load(new FileInputStream(webProperties)); - - if (props.containsKey("updateDate")) { - String date = props.getProperty("updateDate"); - long time = Long.parseLong(date); - dataUpdateDate = new Date(time); + if (webProperties.isFile()) { + // get update date + Properties props = new Properties(); + try { + props.load(new FileInputStream(webProperties)); + + if (props.containsKey("updateDate")) { + String date = props.getProperty("updateDate"); + long time = Long.parseLong(date); + dataUpdateDate = new Date(time); + } + + } catch (IOException ex) { + throw new CoserWebException("Can't save properties file", ex); } - else { - dataUpdateDate = new Date(0); - } - - } catch (IOException ex) { - throw new CoserWebException("Can't save properties file", ex); } + + if (dataUpdateDate == null) { + dataUpdateDate = new Date(0); + } return SUCCESS; } Added: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/LocaleAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/LocaleAction.java (rev 0) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/LocaleAction.java 2010-12-23 17:03:38 UTC (rev 445) @@ -0,0 +1,49 @@ +/* + * #%L + * $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% + */ + +package fr.ifremer.coser.web.actions; + +import org.apache.struts2.convention.annotation.Action; +import org.apache.struts2.convention.annotation.Result; + +import com.opensymphony.xwork2.ActionSupport; + +/** + * Action index, recupere la liste des resultats. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class LocaleAction extends ActionSupport { + + /** serialVersionUID. */ + private static final long serialVersionUID = 1663244944108703571L; + + @Override + @Action(results={@Result(location="index", type="redirect")}) + public String execute() { + return SUCCESS; + } +} Property changes on: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/LocaleAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/SelectIndicatorAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/SelectIndicatorAction.java 2010-12-23 17:02:43 UTC (rev 444) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/SelectIndicatorAction.java 2010-12-23 17:03:38 UTC (rev 445) @@ -22,10 +22,13 @@ package fr.ifremer.coser.web.actions; -import java.util.List; +import java.util.Map; import com.opensymphony.xwork2.ActionSupport; +import fr.ifremer.coser.services.WebService; +import fr.ifremer.coser.web.ServiceFactory; + /** * Action index, recupere la liste des resultats. * @@ -40,29 +43,39 @@ /** serialVersionUID. */ private static final long serialVersionUID = 1663244944108703571L; - protected String result; + protected String zone; - protected List<String> indicatorNames; + protected String species; - public String getResult() { - return result; + protected Map<String, String> indicators; + + public String getZone() { + return zone; } - public void setResult(String result) { - this.result = result; + public void setZone(String zone) { + this.zone = zone; } - public List<String> getIndicatorNames() { - return indicatorNames; + public String getSpecies() { + return species; } - public void setIndicatorNames(List<String> indicatorNames) { - this.indicatorNames = indicatorNames; + public void setSpecies(String species) { + this.species = species; } + public Map<String, String> getIndicators() { + return indicators; + } + @Override public String execute() { + WebService webService = ServiceFactory.getWebService(); + + indicators = webService.getIndicators(zone, species); + return SUCCESS; } } Added: 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 (rev 0) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/ShowGraphAction.java 2010-12-23 17:03:38 UTC (rev 445) @@ -0,0 +1,127 @@ +/* + * #%L + * $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% + */ + +package fr.ifremer.coser.web.actions; + +import com.opensymphony.xwork2.ActionSupport; + +import fr.ifremer.coser.web.CoserWebConfig; +import fr.ifremer.coser.web.ServiceFactory; + +/** + * Affiche le graphique demandé. + * + * Parametre : zone, species, indicator. + * + * Based on eastwoood, same doc as google chart api : + * http://code.google.com/apis/chart/docs/making_charts.html + * + * chart?cht=<chart_type>&chd=<chart_data>&chs=<chart_size>&...additional_parameters... + * + * Dans ce cas, on va faire un graphe avec des points pour les valeurs + * et des traits (en dessous/au dessus) pour les ecarts types. + * chd=t: + * 12,16,16,24,26,28,41,51,66,68,13,45,81| + * 16,14,22,34,22,31,31,48,71,64,15,38,84| + * 8,6,4,5,2,13,9,8,7,6,1,8,8 + * chm= + * o,0000FF,0,-1,0| + * h,FF0000,0,0:9:,5| + * h,FF0000,0,0:9:,5 + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class ShowGraphAction extends ActionSupport { + + /** serialVersionUID. */ + private static final long serialVersionUID = 3385467755357775199L; + + protected String zone; + + protected String species; + + protected String indicator; + + protected String chartUrl; + + public String getZone() { + return zone; + } + + public void setZone(String zone) { + this.zone = zone; + } + + public String getSpecies() { + return species; + } + + public void setSpecies(String species) { + this.species = species; + } + + public String getIndicator() { + return indicator; + } + + public void setIndicator(String indicator) { + this.indicator = indicator; + } + + public String getChartUrl() { + return chartUrl; + } + + + @Override + public String execute() { + + CoserWebConfig config = ServiceFactory.getCoserConfig(); + + chartUrl = config.getEastWoodUrl() + "/chart?"; + + // chart type + chartUrl += "&cht=lxy"; + // data + chartUrl += "&chd=t:10,20,40,80,90,95,99|20,30,40,50,60,70,80"; + // legend + chartUrl += "&chdl=Ponies"; + // legend position + chartUrl += "&chdlp=b"; + // markers (plot) + chartUrl += "&chm=o,FF0000,0,-1,5"; + // display x y axis + chartUrl += "&chxt=x,y"; + // taille + chartUrl += "&chs=600x300"; + // naffiche aps les lignes : + chartUrl += "&chls=2,0,16"; + // titre du graphique + chartUrl += "&chtt=Toto"; + + return SUCCESS; + } +} Property changes on: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/ShowGraphAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/UploadResultAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/UploadResultAction.java 2010-12-23 17:02:43 UTC (rev 444) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/UploadResultAction.java 2010-12-23 17:03:38 UTC (rev 445) @@ -24,7 +24,6 @@ import java.io.File; import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.util.Date; @@ -130,7 +129,9 @@ Properties props = new Properties(); try { - props.load(new FileInputStream(webProperties)); + if (webProperties.isFile()) { + props.load(new FileInputStream(webProperties)); + } props.setProperty("updateDate", String.valueOf(new Date().getTime())); props.store(new FileOutputStream(webProperties), "Update data"); Added: trunk/coser-web/src/main/resources/fr/ifremer/coser/web/actions/IndexAction.properties =================================================================== --- trunk/coser-web/src/main/resources/fr/ifremer/coser/web/actions/IndexAction.properties (rev 0) +++ trunk/coser-web/src/main/resources/fr/ifremer/coser/web/actions/IndexAction.properties 2010-12-23 17:03:38 UTC (rev 445) @@ -0,0 +1 @@ +message.index.title=Default Populations and communities indices, resulting from Ifremer monitoring halieutics survey \ No newline at end of file Added: trunk/coser-web/src/main/resources/fr/ifremer/coser/web/actions/IndexAction_en.properties =================================================================== --- trunk/coser-web/src/main/resources/fr/ifremer/coser/web/actions/IndexAction_en.properties (rev 0) +++ trunk/coser-web/src/main/resources/fr/ifremer/coser/web/actions/IndexAction_en.properties 2010-12-23 17:03:38 UTC (rev 445) @@ -0,0 +1 @@ +message.index.title=Populations and communities indices, resulting from Ifremer monitoring halieutics survey \ No newline at end of file Added: trunk/coser-web/src/main/resources/fr/ifremer/coser/web/actions/IndexAction_fr.properties =================================================================== --- trunk/coser-web/src/main/resources/fr/ifremer/coser/web/actions/IndexAction_fr.properties (rev 0) +++ trunk/coser-web/src/main/resources/fr/ifremer/coser/web/actions/IndexAction_fr.properties 2010-12-23 17:03:38 UTC (rev 445) @@ -0,0 +1 @@ +message.index.title=Indices de populations et de communauté issus des campagnes de surveillance halieutique de l'Ifremer \ No newline at end of file Modified: trunk/coser-web/src/main/resources/struts.xml =================================================================== --- trunk/coser-web/src/main/resources/struts.xml 2010-12-23 17:02:43 UTC (rev 444) +++ trunk/coser-web/src/main/resources/struts.xml 2010-12-23 17:03:38 UTC (rev 445) @@ -2,6 +2,4 @@ <!DOCTYPE struts PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN" "http://struts.apache.org/dtds/struts-2.0.dtd"> <struts> <constant name="struts.multipart.maxSize" value="100097152"/> - - </struts> Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/header.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/header.jsp 2010-12-23 17:02:43 UTC (rev 444) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/header.jsp 2010-12-23 17:03:38 UTC (rev 445) @@ -27,6 +27,17 @@ <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 /> Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/index.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/index.jsp 2010-12-23 17:02:43 UTC (rev 444) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/index.jsp 2010-12-23 17:03:38 UTC (rev 445) @@ -31,7 +31,11 @@ <link rel="stylesheet" type="text/css" href="styles/coser.css" /> </head> <body> - <h2>Indices de populations et de communauté issus des campagnes de surveillance halieutique de l'Ifremer</h2> + + <%@ 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 @@ -80,11 +84,12 @@ 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 : + <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/locale.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/locale.jsp (rev 0) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/locale.jsp 2010-12-23 17:03:38 UTC (rev 445) @@ -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"%> +<!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 Added: trunk/coser-web/src/main/webapp/WEB-INF/content/select-indicator.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/select-indicator.jsp (rev 0) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/select-indicator.jsp 2010-12-23 17:03:38 UTC (rev 445) @@ -0,0 +1,51 @@ +<!-- + #%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 /> + + <s:form action="show-graph" method="get"> + <s:select name="indicator" list="indicators" label="Select a country" /> + <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-23 17:02:43 UTC (rev 444) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/select-species.jsp 2010-12-23 17:03:38 UTC (rev 445) @@ -39,10 +39,10 @@ <br /> - <s:form action="select-indicator"> - + <s:form action="select-indicator" method="get"> <s:select name="species" list="species" label="Select a country" /> <s:hidden name="zone" value="zone" /> + <s:submit label="Suite"/> </s:form> <%@ include file="footer.jsp" %> 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-23 17:02:43 UTC (rev 444) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/select-zone.jsp 2010-12-23 17:03:38 UTC (rev 445) @@ -38,7 +38,7 @@ <br /> - <s:form action="select-species"> + <s:form action="select-species" method="get"> <select name="zone"> <option value="manchecgfs">Plateau - Manche CGFS</option> <option value="celtiqueevhoe">Plateau - Celtique EVHOE</option> Added: trunk/coser-web/src/main/webapp/images/fr.png =================================================================== (Binary files differ) Property changes on: trunk/coser-web/src/main/webapp/images/fr.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: trunk/coser-web/src/main/webapp/images/gb.png =================================================================== (Binary files differ) Property changes on: trunk/coser-web/src/main/webapp/images/gb.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream