Author: chatellier Date: 2011-01-05 14:19:47 +0000 (Wed, 05 Jan 2011) New Revision: 464 Log: Refactoring navigation pop/com Added: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/QualityAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/GraphAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/IndicatorAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/SpeciesAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/ZoneAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/pop/ trunk/coser-web/src/main/resources/ftl/ trunk/coser-web/src/main/resources/ftl/decharge.ftl trunk/coser-web/src/main/webapp/WEB-INF/content/pop/ trunk/coser-web/src/main/webapp/WEB-INF/content/pop/graph.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/pop/indicator.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/pop/species.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/pop/zone.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/quality.jsp Removed: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/SelectIndicatorAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/SelectSpeciesAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/SelectZoneAction.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/show-graph.jsp Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserWebConfig.java trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package.properties trunk/coser-web/src/main/webapp/WEB-INF/content/index.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/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 Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserWebConfig.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserWebConfig.java 2011-01-05 13:11:17 UTC (rev 463) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserWebConfig.java 2011-01-05 14:19:47 UTC (rev 464) @@ -47,6 +47,16 @@ } /** + * Get administrator email. + * + * @return admin email + */ + public String getAdminEmail() { + String result = getOption(CoserWebOption.ADMIN_EMAIL.key); + return result; + } + + /** * Get admin password. * * @return admin password @@ -69,9 +79,8 @@ public enum CoserWebOption { CONFIG_FILE(CONFIG_FILE_NAME, _("coser.config.config.file.description"), "coserweb.properties"), - + ADMIN_EMAIL("coser.admin.email", _("coser.config.config.file.description"), "harmonie at ifremer.fr"), ADMIN_PASSWORD("coser.admin.password", _("coser.config.admin.password.description"), null), - EASTWOOD_URL("coser.eastwood.url", _("coser.config.eastwood.url.description"), "http://www.ifremer.fr/eastwood"); protected String key; Added: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/QualityAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/QualityAction.java (rev 0) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/QualityAction.java 2011-01-05 14:19:47 UTC (rev 464) @@ -0,0 +1,54 @@ +/* + * #%L + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 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; + +/** + * Quality action. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class QualityAction extends ActionSupport { + + /** serialVersionUID. */ + private static final long serialVersionUID = 1663244944108703571L; + + /** + * Recupere l'email dans la configuration. + * + * @return admin email + */ + public String getAdminEmail() { + CoserWebConfig config = ServiceFactory.getCoserConfig(); + String email = config.getAdminEmail(); + return email; + } +} Property changes on: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/QualityAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Deleted: 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 2011-01-05 13:11:17 UTC (rev 463) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/SelectIndicatorAction.java 2011-01-05 14:19:47 UTC (rev 464) @@ -1,96 +0,0 @@ -/* - * #%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 java.util.Map; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import com.opensymphony.xwork2.ActionSupport; - -import fr.ifremer.coser.CoserBusinessException; -import fr.ifremer.coser.services.WebService; -import fr.ifremer.coser.web.CoserWebException; -import fr.ifremer.coser.web.ServiceFactory; - -/** - * Action index, recupere la liste des resultats. - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public class SelectIndicatorAction extends ActionSupport { - - /** serialVersionUID. */ - private static final long serialVersionUID = 1663244944108703571L; - - private static final Log log = LogFactory.getLog(SelectIndicatorAction.class); - - protected String zone; - - protected String species; - - protected Map<String, String> indicators; - - 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 Map<String, String> getIndicators() { - return indicators; - } - - @Override - public String execute() { - - if (log.isInfoEnabled()) { - log.info(String.format("Looking for indicator for zone %s and species %s", zone, species)); - } - - WebService webService = ServiceFactory.getWebService(); - - try { - indicators = webService.getIndicators(zone, species); - } catch (CoserBusinessException ex) { - throw new CoserWebException("Can't get indicators", ex); - } - - return SUCCESS; - } -} Deleted: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/SelectSpeciesAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/SelectSpeciesAction.java 2011-01-05 13:11:17 UTC (rev 463) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/SelectSpeciesAction.java 2011-01-05 14:19:47 UTC (rev 464) @@ -1,90 +0,0 @@ -/* - * #%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 java.util.Map; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import com.opensymphony.xwork2.ActionSupport; - -import fr.ifremer.coser.CoserBusinessException; -import fr.ifremer.coser.services.WebService; -import fr.ifremer.coser.web.CoserWebException; -import fr.ifremer.coser.web.ServiceFactory; - -/** - * Action index, recupere la liste des resultats. - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public class SelectSpeciesAction extends ActionSupport { - - /** serialVersionUID. */ - private static final long serialVersionUID = 1663244944108703571L; - - private static final Log log = LogFactory.getLog(SelectSpeciesAction.class); - - protected String zone; - - protected Map<String, String> species; - - public String getZone() { - return zone; - } - - public void setZone(String zone) { - this.zone = zone; - } - - public Map<String, String> getSpecies() { - return species; - } - - @Override - public String execute() { - - if (log.isInfoEnabled()) { - log.info("Looking for species for zone " + zone); - } - - WebService webService = ServiceFactory.getWebService(); - - try { - species = webService.getSpecies(zone); - - if (log.isDebugEnabled()) { - log.debug("Species are : " + species); - } - } catch (CoserBusinessException e) { - throw new CoserWebException("Can't get zone species"); - } - - return SUCCESS; - } -} Deleted: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/SelectZoneAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/SelectZoneAction.java 2011-01-05 13:11:17 UTC (rev 463) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/SelectZoneAction.java 2011-01-05 14:19:47 UTC (rev 464) @@ -1,46 +0,0 @@ -/* - * #%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; - -/** - * Action index, affiche une liste fixe de 10 zones. - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public class SelectZoneAction extends ActionSupport { - - /** serialVersionUID. */ - private static final long serialVersionUID = 3385467755357775199L; - - @Override - public String execute() { - - return SUCCESS; - } -} Deleted: 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 2011-01-05 13:11:17 UTC (rev 463) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/ShowGraphAction.java 2011-01-05 14:19:47 UTC (rev 464) @@ -1,127 +0,0 @@ -/* - * #%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=Species"; - // 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"; - // taille de la courbe - chartUrl += "&chls=2"; - // titre du graphique - chartUrl += "&chtt=" + zone + ";" + species + ";" + indicator; - - return SUCCESS; - } -} Added: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/GraphAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/GraphAction.java (rev 0) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/GraphAction.java 2011-01-05 14:19:47 UTC (rev 464) @@ -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.pop; + +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 GraphAction 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=Species"; + // 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"; + // taille de la courbe + chartUrl += "&chls=2"; + // titre du graphique + chartUrl += "&chtt=" + zone + ";" + species + ";" + indicator; + + return SUCCESS; + } +} Property changes on: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/GraphAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/IndicatorAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/IndicatorAction.java (rev 0) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/IndicatorAction.java 2011-01-05 14:19:47 UTC (rev 464) @@ -0,0 +1,96 @@ +/* + * #%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.pop; + +import java.util.Map; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import com.opensymphony.xwork2.ActionSupport; + +import fr.ifremer.coser.CoserBusinessException; +import fr.ifremer.coser.services.WebService; +import fr.ifremer.coser.web.CoserWebException; +import fr.ifremer.coser.web.ServiceFactory; + +/** + * Action index, recupere la liste des resultats. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class IndicatorAction extends ActionSupport { + + /** serialVersionUID. */ + private static final long serialVersionUID = 1663244944108703571L; + + private static final Log log = LogFactory.getLog(IndicatorAction.class); + + protected String zone; + + protected String species; + + protected Map<String, String> indicators; + + 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 Map<String, String> getIndicators() { + return indicators; + } + + @Override + public String execute() { + + if (log.isInfoEnabled()) { + log.info(String.format("Looking for indicator for zone %s and species %s", zone, species)); + } + + WebService webService = ServiceFactory.getWebService(); + + try { + indicators = webService.getIndicators(zone, species); + } catch (CoserBusinessException ex) { + throw new CoserWebException("Can't get indicators", ex); + } + + return SUCCESS; + } +} Property changes on: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/IndicatorAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/SpeciesAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/SpeciesAction.java (rev 0) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/SpeciesAction.java 2011-01-05 14:19:47 UTC (rev 464) @@ -0,0 +1,90 @@ +/* + * #%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.pop; + +import java.util.Map; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import com.opensymphony.xwork2.ActionSupport; + +import fr.ifremer.coser.CoserBusinessException; +import fr.ifremer.coser.services.WebService; +import fr.ifremer.coser.web.CoserWebException; +import fr.ifremer.coser.web.ServiceFactory; + +/** + * Action index, recupere la liste des resultats. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class SpeciesAction extends ActionSupport { + + /** serialVersionUID. */ + private static final long serialVersionUID = 1663244944108703571L; + + private static final Log log = LogFactory.getLog(SpeciesAction.class); + + protected String zone; + + protected Map<String, String> species; + + public String getZone() { + return zone; + } + + public void setZone(String zone) { + this.zone = zone; + } + + public Map<String, String> getSpecies() { + return species; + } + + @Override + public String execute() { + + if (log.isInfoEnabled()) { + log.info("Looking for species for zone " + zone); + } + + WebService webService = ServiceFactory.getWebService(); + + try { + species = webService.getSpecies(zone); + + if (log.isDebugEnabled()) { + log.debug("Species are : " + species); + } + } catch (CoserBusinessException ex) { + throw new CoserWebException("Can't get zone species", ex); + } + + return SUCCESS; + } +} Property changes on: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/SpeciesAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/ZoneAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/ZoneAction.java (rev 0) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/ZoneAction.java 2011-01-05 14:19:47 UTC (rev 464) @@ -0,0 +1,70 @@ +/* + * #%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.pop; + +import java.util.HashMap; +import java.util.Map; + +import com.opensymphony.xwork2.ActionSupport; + +/** + * Action index, affiche une liste fixe de 10 zones. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class ZoneAction extends ActionSupport { + + /** serialVersionUID. */ + private static final long serialVersionUID = 3385467755357775199L; + + protected Map<String, String> zones; + + public Map<String, String> getZones() { + return zones; + } + + @Override + public String execute() { + + zones = new HashMap<String, String>(); + zones.put("manchecgfs", "Plateau - Manche CGFS"); + zones.put("celtiqueevhoe", "Plateau - Celtique EVHOE"); + zones.put("gascogneevhoe", "Plateau - Gascogne EVHOE"); + zones.put("gascogneressgasc01", "Plateau - Gascogne RESSGASC_01"); + zones.put("gascogneressgasc02", "Plateau - Gascogne RESSGASC_02"); + zones.put("gascogneressgasc03", "Plateau - Gascogne RESSGASC_03"); + zones.put("gascogneressgasc04", "Plateau - Gascogne RESSGASC_04"); + zones.put("lionmedtis", "Plateau - Lion MEDITS"); + zones.put("estcorsemedits", "Plateau - Est-Corse MEDITS"); + zones.put("sommenoursom", "Baie - Somme NOURSOM"); + zones.put("seinenoursei", "Baie - Seine NOURSEI"); + zones.put("vilainenourvil", "Baie - Vilaine NOURVIL"); + zones.put("crustaflamjuin", "Cap - Flamanville CRUSTAFLAM Juin"); + + return SUCCESS; + } +} Property changes on: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/ZoneAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package.properties =================================================================== --- trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package.properties 2011-01-05 13:11:17 UTC (rev 463) +++ trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package.properties 2011-01-05 14:19:47 UTC (rev 464) @@ -39,3 +39,9 @@ message.index.quotemessage=Ifremer {0,date,yyyy}. Indices de populations et de communautés issus des campagnes de surveillance halieutique de l''Ifremer. {1} ({0,date,dd MMMM}) message.index.qualitytitle=Avertissement qualit\u00E9 message.index.qualitymessage=Avertissement qualit\u00E9 +message.quality.title=Avertissement qualit\u00E9 +message.quality.paragraph1=Bien que les donn\u00E9es aient \u00E9t\u00E9 pr\u00E9cautionneusement contr\u00F4l\u00E9es par l''Ifremer, des d\u00E9fauts inh\u00E9rents \u00E0 l''agr\u00E9gation des informations peuvent persister. Par exemple\u00A0: +message.quality.paragraph2=En d\u00E9pit du fait que toutes les donn\u00E9es de toutes les s\u00E9ries de campagnes soient pr\u00E9sent\u00E9es selon le m\u00EAme format, sauf cas particuliers des diff\u00E9rences dans les strat\u00E9gies d''observation emp\u00EAchent la combinaison de donn\u00E9es de diff\u00E9rentes campagnes dans une m\u00EAme analyse. Par exemple, la capturabilit\u00E9 d\'une m\u00EAme esp\u00E8ce varie selon le type d''engin d''\u00E9chantillonnage utilis\u00E9. Il en r\u00E9sulte que chaque engin capture un sous-ensemble particulier des bioc\u00E9noses \u00E9chantillonn\u00E9es. +message.quality.paragraph3=Une propri\u00E9t\u00E9 commune aux s\u00E9ries d''observations \u00E0 la mer est l''\u00E9volution dans le temps de la comp\u00E9tence des \u00E9quipes embarqu\u00E9es pour la d\u00E9termination des esp\u00E8ces. Il peut en r\u00E9sulter des apparitions, des disparitions ou des assignations sous un m\u00EAme nom de taxons proches dans les jeux de donn\u00E9es, non repr\u00E9sentatifs de l''\u00E9volution des populations concern\u00E9es dans l''\u00E9cosyst\u00E8me. +message.quality.paragraph4=Pour les campagnes d\'une m\u00EAme s\u00E9rie, des changements dans les proc\u00E9dures d''\u00E9chantillonnage, dans les caract\u00E9ristiques des engins, dans la p\u00E9riode de r\u00E9alisation de la campagne et la zone couverte peuvent influencer les captures. Pour pr\u00E9venir les risques de biais dans les analyses en raison de ces facteurs, les jeux de donn\u00E9es doivent \u00EAtre pr\u00E9alablement filtr\u00E9s ad\u00E9quatement. +message.quality.paragraph5=Il est vivement recommand\u00E9 aux utilisateurs de donn\u00E9es de les traiter avec pr\u00E9caution. Si des utilisateurs s''interrogent sur la validit\u00E9 de donn\u00E9es, ils sont invit\u00E9s \u00E0 contacter l''administrateur de la base de donn\u00E9es ({0}). Added: trunk/coser-web/src/main/resources/ftl/decharge.ftl =================================================================== --- trunk/coser-web/src/main/resources/ftl/decharge.ftl (rev 0) +++ trunk/coser-web/src/main/resources/ftl/decharge.ftl 2011-01-05 14:19:47 UTC (rev 464) @@ -0,0 +1,79 @@ +Réaction +======== +Merci d'avoir téléchargé des données de ce site. Si vous avez identifié des +problèmes dans ces données, ou souhaitez fournir des remarques pour aider à +améliorer le service, vous êtes invités à adresser un courriel à +l'administrateur du site (harmonie at ifremer.fr). + +Important +========= +Les données téléchargées sont issues de la série CGFS. + +Vous êtes invités à consulter les informations relatives à cette série de +campagnes... Ce site comprend des informations spécifiques concernant l'usage de +ces données, les limitations et les problèmes connus. + +Vous vous engagez à citer la source de ces données dans tout produit et +publication utilisant ces données. En téléchargeant des données à partir du +site http://www.ifremer.fr/SIH-indices-campagnes/, vous acceptez les termes et +conditions d'usage décrites dans ce document et dans tout document cité dans ce +texte. + +Contact +======= +Pour toute question concernant les données téléchargées du site +http://www.ifremer.fr/SIH-indices-campagnes/, vous pouvez adresser un courriel à +l'administrateur du site (harmonie at ifremer.fr). + +Informations particulières sur les données téléchargées +======================================================= +Les données des campagnes halieutiques de ce site sont mises à libre disposition +pour téléchargement. En dépit des soins mis à la préparation de ces données, des +défauts inhérents à l'agrégation des informations peuvent persister. +Par exemple : + +* En dépit du fait que toutes les données de toutes les séries de campagnes + soient présentées selon le même format, sauf cas particuliers des différences + dans les stratégies d'observation empêchent la combinaison de données de + différentes campagnes dans une même analyse. Par exemple, la capturabilité + d'une même espèce varie selon le type d'engin d'échantillonnage utilisé. + Il en résulte que chaque engin capture un sous-ensemble particulier des + biocénoses échantillonnées. + +* Une propriété commune aux séries d'observations à la mer est l'évolution dans + le temps de la compétence des équipes embarquées pour la détermination des + espèces. Il peut en résulter des apparitions, des disparitions ou des + assignations sous un même nom de taxons proches dans les jeux de données, non + représentatifs de l'évolution des populations concernées dans l'écosystème. + +* Pour les campagnes d'une même série, des changements dans les procédures +d'échantillonnage, dans les caractéristiques des engins, dans la période de +réalisation de la campagne et la zone couverte peuvent influencer les captures. +Pour prévenir les risques de biais dans les analyses en raison de ces facteurs, +les jeux de données doivent être préalablement filtrés adéquatement. + +Il est vivement recommandé aux utilisateurs de données de les traiter avec +précaution. Si des utilisateurs s'interrogent sur la validité de données, ils +sont invités à contacter l'administrateur de la base de données +(harmonie at ifremer.fr). + +Citation de l'origine des données +================================= +Ifremer ANNEE. Données des campagnes de surveillance halieutique de l’Ifremer. +http://www.ifremer.fr/SIH-indices-campagnes/ (JOUR MOIS). + +Conditions d'usage des données +============================== +L'Ifremer met les données des campagnes de surveillance halieutique conduites +par l'institut en libre accès, mais : +- l'interprétation et l'usage approprié de ces données sont de la seule + responsabilité de leurs utilisateurs, +- les utilisateurs des données ne doivent d'aucune façon impliquer l'Ifremer en + tant que fournisseur de données dans leurs résultats, conclusions et/ou + recommandations. +- la source des données doit être dûment citée, +- les utilisateurs de données doivent respecter toutes les restrictions + d'usage et de reproduction des données, incluant les restrictions pour un + usage commercial, +- les utilisateurs des données doivent informer l'Ifremer de tout problème + soupçonné dans les données. Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/index.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/index.jsp 2011-01-05 13:11:17 UTC (rev 463) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/index.jsp 2011-01-05 14:19:47 UTC (rev 464) @@ -24,7 +24,7 @@ <%@ 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"> +<html xmlns="http://www.w3.org/1999/xhtml"> <head> <title><s:text name="message.index.title" /></title> </head> @@ -41,10 +41,10 @@ <p> <span style="font-weight:bold"><s:text name="message.index.datatypetitle" /> :</span><br /> <ul> - <li><s:a action="select-zone"><s:text name="message.index.datatype1" /></s:a></li> - <li><s:a action="select-zone"><s:text name="message.index.datatype2" /></s:a></li> - <li><s:a action="select-zone"><s:text name="message.index.datatype3" /></s:a></li> - <li><s:a action="select-zone"><s:text name="message.index.datatype4" /></s:a></li> + <li><s:a action="zone"><s:text name="message.index.datatype1" /></s:a></li> + <li><s:a action="map/zone"><s:text name="message.index.datatype2" /></s:a></li> + <li><s:a action="pop/zone"><s:text name="message.index.datatype3" /></s:a></li> + <li><s:a action="com/zone"><s:text name="message.index.datatype4" /></s:a></li> </ul> </p> Added: trunk/coser-web/src/main/webapp/WEB-INF/content/pop/graph.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/pop/graph.jsp (rev 0) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/pop/graph.jsp 2011-01-05 14:19:47 UTC (rev 464) @@ -0,0 +1,37 @@ +<!-- + #%L + Coser :: Web + + $Id$ + $HeadURL$ + %% + Copyright (C) 2010 - 2011 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"> + <head> + <title>Coser</title> + </head> + <body> + + <img src="<s:property value="chartUrl"/>" /> + + </body> +</html> \ No newline at end of file Added: trunk/coser-web/src/main/webapp/WEB-INF/content/pop/indicator.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/pop/indicator.jsp (rev 0) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/pop/indicator.jsp 2011-01-05 14:19:47 UTC (rev 464) @@ -0,0 +1,44 @@ +<!-- + #%L + Coser :: Web + + $Id$ + $HeadURL$ + %% + Copyright (C) 2010 - 2011 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"> + <head> + <title>Coser</title> + </head> + <body> + <img src="<s:url value='/images/zonesmap.jpg' />" /> + + <br /> + + <s:form action="graph" method="get"> + <s:select name="indicator" list="indicators" label="Select an indicator" /> + <s:hidden name="zone" property="zone"/> + <s:hidden name="species" property="species"/> + <s:submit label="Suite"/> + </s:form> + </body> +</html> \ No newline at end of file Added: trunk/coser-web/src/main/webapp/WEB-INF/content/pop/species.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/pop/species.jsp (rev 0) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/pop/species.jsp 2011-01-05 14:19:47 UTC (rev 464) @@ -0,0 +1,44 @@ +<!-- + #%L + Coser :: Web + + $Id$ + $HeadURL$ + %% + Copyright (C) 2010 - 2011 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"> + <head> + <title>Coser</title> + </head> + <body> + + <img src="<s:url value='/images/zonesmap.jpg' />" /> + + <br /> + + <s:form action="indicator" method="get"> + <s:select name="species" list="species" label="Select a species" /> + <s:hidden name="zone" property="zone"/> + <s:submit label="Suite"/> + </s:form> + </body> +</html> \ No newline at end of file Added: trunk/coser-web/src/main/webapp/WEB-INF/content/pop/zone.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/pop/zone.jsp (rev 0) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/pop/zone.jsp 2011-01-05 14:19:47 UTC (rev 464) @@ -0,0 +1,42 @@ +<!-- + #%L + Coser :: Web + + $Id$ + $HeadURL$ + %% + Copyright (C) 2010 - 2011 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"> + <head> + <title>Coser</title> + </head> + <body> + + <img src="<s:url value='/images/zonesmap.jpg' />" /> + + <br /> + + <s:form action="species" method="get"> + <s:select name="zone" list="zones" label="Select a zone" /> + <s:submit label="Suite"/> + </s:form> + </body> +</html> \ No newline at end of file Added: trunk/coser-web/src/main/webapp/WEB-INF/content/quality.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/quality.jsp (rev 0) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/quality.jsp 2011-01-05 14:19:47 UTC (rev 464) @@ -0,0 +1,49 @@ +<!-- + #%L + Coser :: Web + + $Id$ + $HeadURL$ + %% + Copyright (C) 2010 - 2011 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"> + <head> + <title><s:text name="message.quality.title" /></title> + </head> + <body> + + <div class="maintitle"> + <s:text name="message.quality.title" /> + </div> + + <p><s:text name="message.quality.paragraph1" /></p> + <ul> + <li><s:text name="message.quality.paragraph2" /></li> + <li><s:text name="message.quality.paragraph3" /></li> + <li><s:text name="message.quality.paragraph4" /></li> + </ul> + <p> + <s:text name="message.quality.paragraph5"> + <s:param value="adminEmail"/> + </s:text> + </p> + </body> +</html> \ No newline at end of file Deleted: trunk/coser-web/src/main/webapp/WEB-INF/content/select-indicator.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/select-indicator.jsp 2011-01-05 13:11:17 UTC (rev 463) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/select-indicator.jsp 2011-01-05 14:19:47 UTC (rev 464) @@ -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> - <title>Coser</title> - </head> - <body> - <img src="images/zonesmap.jpg" /> - - <br /> - - <s:form action="show-graph" method="get"> - <s:select name="indicator" list="indicators" label="Select an indicator" /> - <s:hidden name="zone" property="zone"/> - <s:hidden name="species" property="species"/> - <s:submit label="Suite"/> - </s:form> - </body> -</html> \ No newline at end of file Deleted: trunk/coser-web/src/main/webapp/WEB-INF/content/select-species.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/select-species.jsp 2011-01-05 13:11:17 UTC (rev 463) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/select-species.jsp 2011-01-05 14:19:47 UTC (rev 464) @@ -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> - <title>Coser</title> - </head> - <body> - - <img src="images/zonesmap.jpg" /> - - <br /> - - <s:form action="select-indicator" method="get"> - <s:select name="species" list="species" label="Select a species" /> - <s:hidden name="zone" property="zone"/> - <s:submit label="Suite"/> - </s:form> - </body> -</html> \ No newline at end of file Deleted: trunk/coser-web/src/main/webapp/WEB-INF/content/select-zone.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/select-zone.jsp 2011-01-05 13:11:17 UTC (rev 463) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/select-zone.jsp 2011-01-05 14:19:47 UTC (rev 464) @@ -1,57 +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> - <title>Coser</title> - </head> - <body> - - <img src="images/zonesmap.jpg" /> - - <br /> - - <s:form action="select-species" method="get"> - <select name="zone"> - <option value="manchecgfs">Plateau - Manche CGFS</option> - <option value="celtiqueevhoe">Plateau - Celtique EVHOE</option> - <option value="gascogneevhoe">Plateau - Gascogne EVHOE</option> - <option value="gascogneressgasc01">Plateau - Gascogne RESSGASC_01</option> - <option value="gascogneressgasc02">Plateau - Gascogne RESSGASC_02</option> - <option value="gascogneressgasc03">Plateau - Gascogne RESSGASC_03</option> - <option value="gascogneressgasc04">Plateau - Gascogne RESSGASC_04</option> - <option value="lionmedtis">Plateau - Lion MEDITS</option> - <option value="estcorsemedits">Plateau - Est-Corse MEDITS</option> - <option value="sommenoursom">Baie - Somme NOURSOM</option> - <option value="seinenoursei">Baie - Seine NOURSEI</option> - <option value="vilainenourvil">Baie - Vilaine NOURVIL</option> - <option value="crustaflamjuin">Cap - Flamanville CRUSTAFLAM Juin</option> - <option value="crustaflamsept">Cap - Flamanville CRUSTAFLAM Septembre</option> - </select> - <s:submit label="Suite"/> - </s:form> - </body> -</html> \ No newline at end of file Deleted: trunk/coser-web/src/main/webapp/WEB-INF/content/show-graph.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/show-graph.jsp 2011-01-05 13:11:17 UTC (rev 463) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/show-graph.jsp 2011-01-05 14:19:47 UTC (rev 464) @@ -1,37 +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> - <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 2011-01-05 13:11:17 UTC (rev 463) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/upload-result-success.jsp 2011-01-05 14:19:47 UTC (rev 464) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2010 - 2011 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 @@ -24,7 +24,7 @@ <%@ 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"> +<html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>Hello World</title> </head> 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 2011-01-05 13:11:17 UTC (rev 463) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/upload-result.jsp 2011-01-05 14:19:47 UTC (rev 464) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2010 - 2011 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 @@ -24,7 +24,7 @@ <%@ 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"> +<html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>Hello World</title> </head> Modified: trunk/coser-web/src/main/webapp/WEB-INF/decorators/footer.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/decorators/footer.jsp 2011-01-05 13:11:17 UTC (rev 463) +++ trunk/coser-web/src/main/webapp/WEB-INF/decorators/footer.jsp 2011-01-05 14:19:47 UTC (rev 464) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2010 - 2011 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 Modified: trunk/coser-web/src/main/webapp/WEB-INF/decorators/header.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/decorators/header.jsp 2011-01-05 13:11:17 UTC (rev 463) +++ trunk/coser-web/src/main/webapp/WEB-INF/decorators/header.jsp 2011-01-05 14:19:47 UTC (rev 464) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2010 - 2011 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 @@ -25,8 +25,8 @@ <%@taglib uri="/struts-tags" prefix="s" %> <div> - <img src="images/logo_ifremer.gif" style="width:333px;heigth:69px" /> - <img src="images/logo_sih.png" style="width:178px;heigth:89px" /> + <img src="<s:url value='/images/logo_ifremer.gif' />" style="width:333px;heigth:69px" /> + <img src="<s:url value='/images/logo_sih.png' />" style="width:178px;heigth:89px" /> <s:url id="localeEN" namespace="/" action="locale"> <s:param name="request_locale" >en</s:param> @@ -35,8 +35,8 @@ <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> + <s:a href="%{localeEN}"><img src="<s:url value='/images/gb.png' />" /></s:a> + <s:a href="%{localeFR}"><img src="<s:url value='/images/fr.png' />" /></s:a> </div> Modified: trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2011-01-05 13:11:17 UTC (rev 463) +++ trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2011-01-05 14:19:47 UTC (rev 464) @@ -25,11 +25,11 @@ <!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"> +<html xmlns="http://www.w3.org/1999/xhtml"> <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" /> + <link rel="stylesheet" type="text/css" href="<s:url value='/styles/coser.css' />" /> <decorator:head/> </head> <body>