January 2011 - Coser-commits - mailman.cloud.codelutin.com

r547 - trunk/coser-web/src/main/webapp/styles
by chatellier＠users.labs.libre-entreprise.org 23 Jan '11

23 Jan '11

Author: chatellier Date: 2011-01-23 21:27:40 +0000 (Sun, 23 Jan 2011) New Revision: 547 Log: Fix link color Modified: trunk/coser-web/src/main/webapp/styles/coser.css Modified: trunk/coser-web/src/main/webapp/styles/coser.css =================================================================== --- trunk/coser-web/src/main/webapp/styles/coser.css 2011-01-23 21:23:20 UTC (rev 546) +++ trunk/coser-web/src/main/webapp/styles/coser.css 2011-01-23 21:27:40 UTC (rev 547) @@ -556,6 +556,10 @@ } a:hover { + color: #044F90; +} + +.col_droite a:hover { color: #ffe600; }

1 0

r546 - in trunk/coser-web/src/main/webapp: WEB-INF/decorators styles
by chatellier＠users.labs.libre-entreprise.org 23 Jan '11

23 Jan '11

Author: chatellier Date: 2011-01-23 21:23:20 +0000 (Sun, 23 Jan 2011) New Revision: 546 Log: Fix css and layout. Modified: trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp trunk/coser-web/src/main/webapp/styles/coser.css 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-23 21:22:32 UTC (rev 545) +++ trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2011-01-23 21:23:20 UTC (rev 546) @@ -48,8 +48,8 @@ <div id="middle" class="clearfix"> - <div class="page"> - <span class="clt"></span> + <div class="page pagemain"> +  <div class="content"> <div class="degrade"> <div class="top_content"> @@ -67,7 +67,7 @@ </div> </div> - <span class="clb"> </span> +  </div> <div class="col_droite"> <img src="<s:url value='/images/carte_accueil.png'/>" alt="carte des zones de campage en europe" title="carte des zones de campage en europe"/> Modified: trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp 2011-01-23 21:22:32 UTC (rev 545) +++ trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp 2011-01-23 21:23:20 UTC (rev 546) @@ -59,7 +59,7 @@ </div> <div class="page"> - <span class="clt"></span> +  <div class="content"> <div class="clearfix"> @@ -68,7 +68,7 @@ </div> </div> - <span class="clb2"> </span> +  </div> <div class="part_bottom"> <div class="col_droite"> Modified: trunk/coser-web/src/main/webapp/styles/coser.css =================================================================== --- trunk/coser-web/src/main/webapp/styles/coser.css 2011-01-23 21:22:32 UTC (rev 545) +++ trunk/coser-web/src/main/webapp/styles/coser.css 2011-01-23 21:23:20 UTC (rev 546) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2010 - 2011 Ifremer, Codelutin + * 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 @@ -389,11 +389,16 @@ } #middle .page { - width: 626px; margin: 23px 22px 10px 60px; float: left; + border-radius: 10px; + text-align: justify; } +#middle .pagemain { + width: 626px; +} + #middle .page span.clt { background: url(../images/haut_page.png) no-repeat; width: 626px; @@ -402,7 +407,9 @@ } #middle .page .content { - background: url(../images/warper_page.png) repeat-y; + /*background: url(../images/warper_page.png) repeat-y;*/ + background-color: white; + border-radius: 10px; font-size: 140%; color: #2e2e2e; line-height: 1.4em; @@ -423,7 +430,7 @@ } #middle .page .degrade { - background: url(../images/degrade.png) repeat-x 0 bottom; + /*background: url(../images/degrade.png) repeat-x 0 bottom;*/ margin: 0 5px; padding: 5px 20px; }

1 0

r545 - trunk/coser-web/src/main/resources
by chatellier＠users.labs.libre-entreprise.org 23 Jan '11

23 Jan '11

Author: chatellier Date: 2011-01-23 21:22:32 +0000 (Sun, 23 Jan 2011) New Revision: 545 Log: ACtion commune avec code commun et code layout. Added: trunk/coser-web/src/main/resources/coserweb.properties Added: trunk/coser-web/src/main/resources/coserweb.properties =================================================================== --- trunk/coser-web/src/main/resources/coserweb.properties (rev 0) +++ trunk/coser-web/src/main/resources/coserweb.properties 2011-01-23 21:22:32 UTC (rev 545) @@ -0,0 +1,22 @@ +### +# #%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% +### +coser.application.version=${project.version}

1 0

r544 - trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common
by chatellier＠users.labs.libre-entreprise.org 23 Jan '11

23 Jan '11

Author: chatellier Date: 2011-01-23 21:22:24 +0000 (Sun, 23 Jan 2011) New Revision: 544 Log: ACtion commune avec code commun et code layout. Added: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CoserAction.java Added: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CoserAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CoserAction.java (rev 0) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CoserAction.java 2011-01-23 21:22:24 UTC (rev 544) @@ -0,0 +1,67 @@ +/* + * #%L + * $Id: CommonFacade.java 519 2011-01-17 17:03:28Z chatellier $ + * $HeadURL: svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/coser/trunk/coser-web/src/main/java/fr/if… $ + * %% + * 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.common; + +import com.opensymphony.xwork2.ActionSupport; + +import fr.ifremer.coser.web.CoserWebConfig; +import fr.ifremer.coser.web.ServiceFactory; + +/** + * Toutes les actions doivent étendre celle ci. Contient le code commun + * récurent, et notamment les actions utilisé par le layout et devant + * être presentes sur toutes les pages. + * + * @author chatellier + * @version $Revision: 519 $ + * + * Last update : $Date: 2011-01-17 18:03:28 +0100 (lun. 17 janv. 2011) $ + * By : $Author: chatellier $ + */ +public abstract class CoserAction extends ActionSupport { + + /** serialVersionUID. */ + private static final long serialVersionUID = 311574866032741326L; + + /** + * Recupere l'email dans la configuration. + * + * @return admin email + */ + public String getAdminEmail() { + CoserWebConfig config = ServiceFactory.getCoserConfig(); + String email = config.getAdminEmail(); + return email; + } + + /** + * Recupere l'email dans la configuration. + * + * @return admin email + */ + public String getApplicationVersion() { + CoserWebConfig config = ServiceFactory.getCoserConfig(); + String email = config.getApplicationVersion(); + return email; + } +}

1 0

r543 - in trunk/coser-web: . src/main/java/fr/ifremer/coser/web src/main/java/fr/ifremer/coser/web/actions src/main/java/fr/ifremer/coser/web/actions/com src/main/java/fr/ifremer/coser/web/actions/common src/main/java/fr/ifremer/coser/web/actions/map src/main/java/fr/ifremer/coser/web/actions/pop src/main/java/fr/ifremer/coser/web/actions/source src/main/resources/i18n src/main/webapp/WEB-INF/content/source src/main/webapp/WEB-INF/decorators
by chatellier＠users.labs.libre-entreprise.org 23 Jan '11

23 Jan '11

Author: chatellier Date: 2011-01-23 21:03:33 +0000 (Sun, 23 Jan 2011) New Revision: 543 Log: ACtion commune avec code commun et code layout. Modified: trunk/coser-web/pom.xml trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserWebConfig.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/LocaleAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/QualityAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/SurveyAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/UploadResultAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/FacadeAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/GraphAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/GraphCsvAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/GraphDataAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CommonFacade.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CommonIndicator.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CommonZone.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/MapAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/MapDataAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/SpeciesAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/SurveyAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/FacadeAction.java 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/GraphCsvAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/GraphDataAction.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/source/SourceAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/source/SourceDataAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/source/SourceQualityAction.java trunk/coser-web/src/main/resources/i18n/coser-web_en_GB.properties trunk/coser-web/src/main/resources/i18n/coser-web_fr_FR.properties trunk/coser-web/src/main/webapp/WEB-INF/content/source/facade.jsp trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp Modified: trunk/coser-web/pom.xml =================================================================== --- trunk/coser-web/pom.xml 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/pom.xml 2011-01-23 21:03:33 UTC (rev 543) @@ -71,6 +71,22 @@ <build> <finalName>coser-${project.version}</finalName> + <resources> + <resource> + <directory>src/main/resources</directory> + <includes> + <include>coserweb.properties</include> + </includes> + <filtering>true</filtering> + </resource> + <resource> + <directory>src/main/resources</directory> + <excludes> + <exclude>coserweb.properties</exclude> + </excludes> + </resource> + </resources> + <plugins> <plugin> <groupId>org.nuiton.i18n</groupId> 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-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserWebConfig.java 2011-01-23 21:03:33 UTC (rev 543) @@ -46,6 +46,11 @@ } } + public String getApplicationVersion() { + String result = getOption(CoserWebOption.APPLICATION_VERSION.key); + return result; + } + /** * Get administrator email. * @@ -79,6 +84,7 @@ public enum CoserWebOption { CONFIG_FILE(CONFIG_FILE_NAME, _("coser.config.config.file.description"), "coserweb.properties"), + APPLICATION_VERSION("coser.application.version", _("coser.config.application.version.description"), null), ADMIN_EMAIL("coser.admin.email", _("coser.config.config.file.description"), "harmonie at ifremer.fr"), ADMIN_LOGIN("coser.admin.login", _("coser.config.admin.login.description"), null), ADMIN_PASSWORD("coser.admin.password", _("coser.config.admin.password.description"), null); 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 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/IndexAction.java 2011-01-23 21:03:33 UTC (rev 543) @@ -22,25 +22,17 @@ package fr.ifremer.coser.web.actions; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; import java.util.Date; -import java.util.Properties; import javax.servlet.http.HttpServletRequest; -import org.apache.commons.io.IOUtils; import org.apache.struts2.ServletActionContext; -import com.opensymphony.xwork2.ActionSupport; - import fr.ifremer.coser.CoserBusinessException; import fr.ifremer.coser.services.WebService; -import fr.ifremer.coser.web.CoserWebConfig; import fr.ifremer.coser.web.CoserWebException; import fr.ifremer.coser.web.ServiceFactory; +import fr.ifremer.coser.web.actions.common.CoserAction; /** * Action index, recupere la date de derniere mise à jour. @@ -51,7 +43,7 @@ * Last update : $Date$ * By : $Author$ */ -public class IndexAction extends ActionSupport { +public class IndexAction extends CoserAction { /** serialVersionUID. */ private static final long serialVersionUID = 1663244944108703571L; Modified: 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 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/LocaleAction.java 2011-01-23 21:03:33 UTC (rev 543) @@ -25,7 +25,7 @@ import org.apache.struts2.convention.annotation.Action; import org.apache.struts2.convention.annotation.Result; -import com.opensymphony.xwork2.ActionSupport; +import fr.ifremer.coser.web.actions.common.CoserAction; /** * Action index, recupere la liste des resultats. @@ -36,7 +36,7 @@ * Last update : $Date$ * By : $Author$ */ -public class LocaleAction extends ActionSupport { +public class LocaleAction extends CoserAction { /** serialVersionUID. */ private static final long serialVersionUID = 1663244944108703571L; Modified: 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 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/QualityAction.java 2011-01-23 21:03:33 UTC (rev 543) @@ -22,11 +22,8 @@ package fr.ifremer.coser.web.actions; -import com.opensymphony.xwork2.ActionSupport; +import fr.ifremer.coser.web.actions.common.CoserAction; -import fr.ifremer.coser.web.CoserWebConfig; -import fr.ifremer.coser.web.ServiceFactory; - /** * Quality action. * @@ -36,19 +33,9 @@ * Last update : $Date$ * By : $Author$ */ -public class QualityAction extends ActionSupport { +public class QualityAction extends CoserAction { /** 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; - } } Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/SurveyAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/SurveyAction.java 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/SurveyAction.java 2011-01-23 21:03:33 UTC (rev 543) @@ -22,7 +22,7 @@ package fr.ifremer.coser.web.actions; -import com.opensymphony.xwork2.ActionSupport; +import fr.ifremer.coser.web.actions.common.CoserAction; /** * Survey description action. @@ -33,7 +33,7 @@ * Last update : $Date$ * By : $Author$ */ -public class SurveyAction extends ActionSupport { +public class SurveyAction extends CoserAction { /** serialVersionUID. */ private static final long serialVersionUID = -7450643911834502103L; 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 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/UploadResultAction.java 2011-01-23 21:03:33 UTC (rev 543) @@ -31,13 +31,12 @@ import org.apache.struts2.ServletActionContext; import org.nuiton.util.StringUtil; -import com.opensymphony.xwork2.Action; - import fr.ifremer.coser.CoserBusinessException; import fr.ifremer.coser.services.WebService; import fr.ifremer.coser.web.CoserWebConfig; import fr.ifremer.coser.web.CoserWebException; import fr.ifremer.coser.web.ServiceFactory; +import fr.ifremer.coser.web.actions.common.CoserAction; /** * Upload results action. @@ -50,7 +49,7 @@ * Last update : $Date$ * By : $Author$ */ -public class UploadResultAction implements Action { +public class UploadResultAction extends CoserAction { /** serialVersionUID. */ private static final long serialVersionUID = 3887268253160622587L; Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/FacadeAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/FacadeAction.java 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/FacadeAction.java 2011-01-23 21:03:33 UTC (rev 543) @@ -24,12 +24,11 @@ import java.util.Map; -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; +import fr.ifremer.coser.web.actions.common.CoserAction; /** * Action index, affiche la liste des facades majeures. @@ -40,7 +39,7 @@ * Last update : $Date$ * By : $Author$ */ -public class FacadeAction extends ActionSupport { +public class FacadeAction extends CoserAction { /** serialVersionUID. */ private static final long serialVersionUID = 3385467755357775199L; Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/GraphAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/GraphAction.java 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/GraphAction.java 2011-01-23 21:03:33 UTC (rev 543) @@ -22,7 +22,7 @@ package fr.ifremer.coser.web.actions.com; -import com.opensymphony.xwork2.ActionSupport; +import fr.ifremer.coser.web.actions.common.CoserAction; /** * Affiche le graphique demandé. @@ -35,7 +35,7 @@ * Last update : $Date$ * By : $Author$ */ -public class GraphAction extends ActionSupport { +public class GraphAction extends CoserAction { /** serialVersionUID. */ private static final long serialVersionUID = 3385467755357775199L; Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/GraphCsvAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/GraphCsvAction.java 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/GraphCsvAction.java 2011-01-23 21:03:33 UTC (rev 543) @@ -31,12 +31,11 @@ import org.apache.struts2.convention.annotation.Action; import org.apache.struts2.convention.annotation.Result; -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; +import fr.ifremer.coser.web.actions.common.CoserAction; /** * Télécharge les données qui ont servi a généré le graph au format CSV. @@ -49,7 +48,7 @@ * Last update : $Date$ * By : $Author$ */ -public class GraphCsvAction extends ActionSupport { +public class GraphCsvAction extends CoserAction { /** serialVersionUID. */ private static final long serialVersionUID = 3385467755357775199L; Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/GraphDataAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/GraphDataAction.java 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/GraphDataAction.java 2011-01-23 21:03:33 UTC (rev 543) @@ -31,12 +31,11 @@ import org.apache.struts2.convention.annotation.Action; import org.apache.struts2.convention.annotation.Result; -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; +import fr.ifremer.coser.web.actions.common.CoserAction; /** * Affiche le graphique demandé. @@ -49,7 +48,7 @@ * Last update : $Date$ * By : $Author$ */ -public class GraphDataAction extends ActionSupport { +public class GraphDataAction extends CoserAction { /** serialVersionUID. */ private static final long serialVersionUID = 3385467755357775199L; Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CommonFacade.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CommonFacade.java 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CommonFacade.java 2011-01-23 21:03:33 UTC (rev 543) @@ -24,8 +24,6 @@ import java.util.Map; -import com.opensymphony.xwork2.ActionSupport; - import fr.ifremer.coser.CoserBusinessException; import fr.ifremer.coser.services.WebService; import fr.ifremer.coser.web.CoserWebException; @@ -40,7 +38,7 @@ * Last update : $Date$ * By : $Author$ */ -public class CommonFacade extends ActionSupport { +public abstract class CommonFacade extends CoserAction { /** serialVersionUID. */ private static final long serialVersionUID = 3385467755357775199L; Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CommonIndicator.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CommonIndicator.java 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CommonIndicator.java 2011-01-23 21:03:33 UTC (rev 543) @@ -28,8 +28,6 @@ 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; @@ -45,7 +43,7 @@ * Last update : $Date$ * By : $Author$ */ -public class CommonIndicator extends ActionSupport { +public abstract class CommonIndicator extends CoserAction { /** serialVersionUID. */ private static final long serialVersionUID = 1663244944108703571L; Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CommonZone.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CommonZone.java 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CommonZone.java 2011-01-23 21:03:33 UTC (rev 543) @@ -24,8 +24,6 @@ import java.util.Map; -import com.opensymphony.xwork2.ActionSupport; - import fr.ifremer.coser.CoserBusinessException; import fr.ifremer.coser.services.WebService; import fr.ifremer.coser.web.CoserWebException; @@ -41,7 +39,7 @@ * Last update : $Date$ * By : $Author$ */ -public class CommonZone extends ActionSupport { +public abstract class CommonZone extends CoserAction { /** serialVersionUID. */ private static final long serialVersionUID = 3385467755357775199L; Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/MapAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/MapAction.java 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/MapAction.java 2011-01-23 21:03:33 UTC (rev 543) @@ -22,7 +22,7 @@ package fr.ifremer.coser.web.actions.map; -import com.opensymphony.xwork2.ActionSupport; +import fr.ifremer.coser.web.actions.common.CoserAction; /** * Action index, recupere la liste des resultats. @@ -33,7 +33,7 @@ * Last update : $Date$ * By : $Author$ */ -public class MapAction extends ActionSupport { +public class MapAction extends CoserAction { /** serialVersionUID. */ private static final long serialVersionUID = 1663244944108703571L; Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/MapDataAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/MapDataAction.java 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/MapDataAction.java 2011-01-23 21:03:33 UTC (rev 543) @@ -30,12 +30,11 @@ import org.apache.struts2.convention.annotation.Action; import org.apache.struts2.convention.annotation.Result; -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; +import fr.ifremer.coser.web.actions.common.CoserAction; /** * Appéle par le navigateur pour recuperer le contenu de l'image. @@ -46,7 +45,7 @@ * Last update : $Date$ * By : $Author$ */ -public class MapDataAction extends ActionSupport { +public class MapDataAction extends CoserAction { /** serialVersionUID. */ private static final long serialVersionUID = 1663244944108703571L; Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/SpeciesAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/SpeciesAction.java 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/SpeciesAction.java 2011-01-23 21:03:33 UTC (rev 543) @@ -27,12 +27,11 @@ 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; +import fr.ifremer.coser.web.actions.common.CoserAction; /** * Recupere la liste des especes correspondant a une campagne. @@ -43,7 +42,7 @@ * Last update : $Date$ * By : $Author$ */ -public class SpeciesAction extends ActionSupport { +public class SpeciesAction extends CoserAction { /** serialVersionUID. */ private static final long serialVersionUID = 1663244944108703571L; Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/SurveyAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/SurveyAction.java 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/SurveyAction.java 2011-01-23 21:03:33 UTC (rev 543) @@ -24,12 +24,11 @@ import java.util.Map; -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; +import fr.ifremer.coser.web.actions.common.CoserAction; /** * Affiche la liste des sous zones (zone). @@ -40,7 +39,7 @@ * Last update : $Date$ * By : $Author$ */ -public class SurveyAction extends ActionSupport { +public class SurveyAction extends CoserAction { /** serialVersionUID. */ private static final long serialVersionUID = 3385467755357775199L; Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/FacadeAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/FacadeAction.java 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/FacadeAction.java 2011-01-23 21:03:33 UTC (rev 543) @@ -24,12 +24,11 @@ import java.util.Map; -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; +import fr.ifremer.coser.web.actions.common.CoserAction; /** * Action index, affiche la liste des facades majeures. @@ -40,7 +39,7 @@ * Last update : $Date$ * By : $Author$ */ -public class FacadeAction extends ActionSupport { +public class FacadeAction extends CoserAction { /** serialVersionUID. */ private static final long serialVersionUID = 3385467755357775199L; Modified: 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 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/GraphAction.java 2011-01-23 21:03:33 UTC (rev 543) @@ -22,7 +22,7 @@ package fr.ifremer.coser.web.actions.pop; -import com.opensymphony.xwork2.ActionSupport; +import fr.ifremer.coser.web.actions.common.CoserAction; /** * Affiche le graphique demandé. @@ -35,7 +35,7 @@ * Last update : $Date$ * By : $Author$ */ -public class GraphAction extends ActionSupport { +public class GraphAction extends CoserAction { /** serialVersionUID. */ private static final long serialVersionUID = 3385467755357775199L; Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/GraphCsvAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/GraphCsvAction.java 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/GraphCsvAction.java 2011-01-23 21:03:33 UTC (rev 543) @@ -31,12 +31,11 @@ import org.apache.struts2.convention.annotation.Action; import org.apache.struts2.convention.annotation.Result; -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; +import fr.ifremer.coser.web.actions.common.CoserAction; /** * Télécharge les données qui ont servi a généré le graph au format CSV. @@ -49,7 +48,7 @@ * Last update : $Date$ * By : $Author$ */ -public class GraphCsvAction extends ActionSupport { +public class GraphCsvAction extends CoserAction { /** serialVersionUID. */ private static final long serialVersionUID = 3385467755357775199L; Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/GraphDataAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/GraphDataAction.java 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/GraphDataAction.java 2011-01-23 21:03:33 UTC (rev 543) @@ -31,12 +31,11 @@ import org.apache.struts2.convention.annotation.Action; import org.apache.struts2.convention.annotation.Result; -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; +import fr.ifremer.coser.web.actions.common.CoserAction; /** * Affiche le graphique demandé. @@ -49,7 +48,7 @@ * Last update : $Date$ * By : $Author$ */ -public class GraphDataAction extends ActionSupport { +public class GraphDataAction extends CoserAction { /** serialVersionUID. */ private static final long serialVersionUID = 3385467755357775199L; Modified: 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 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/IndicatorAction.java 2011-01-23 21:03:33 UTC (rev 543) @@ -22,7 +22,7 @@ package fr.ifremer.coser.web.actions.pop; -import fr.ifremer.coser.web.actions.common.CommonIndicator; +import fr.ifremer.coser.web.actions.common.CoserAction; /** * Action index, recupere la liste des resultats. @@ -33,7 +33,7 @@ * Last update : $Date$ * By : $Author$ */ -public class IndicatorAction extends CommonIndicator { +public class IndicatorAction extends CoserAction { /** serialVersionUID. */ private static final long serialVersionUID = 1663244944108703571L; Modified: 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 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/SpeciesAction.java 2011-01-23 21:03:33 UTC (rev 543) @@ -27,12 +27,11 @@ 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; +import fr.ifremer.coser.web.actions.common.CoserAction; /** * Action index, recupere la liste des resultats. @@ -43,7 +42,7 @@ * Last update : $Date$ * By : $Author$ */ -public class SpeciesAction extends ActionSupport { +public class SpeciesAction extends CoserAction { /** serialVersionUID. */ private static final long serialVersionUID = 1663244944108703571L; Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/source/SourceAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/source/SourceAction.java 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/source/SourceAction.java 2011-01-23 21:03:33 UTC (rev 543) @@ -22,12 +22,11 @@ package fr.ifremer.coser.web.actions.source; -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; +import fr.ifremer.coser.web.actions.common.CoserAction; /** * Affiche les liens de téléchargement du zip pour le projet choisit. @@ -38,7 +37,7 @@ * Last update : $Date$ * By : $Author$ */ -public class SourceAction extends ActionSupport { +public class SourceAction extends CoserAction { /** serialVersionUID. */ private static final long serialVersionUID = 3385467755357775199L; Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/source/SourceDataAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/source/SourceDataAction.java 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/source/SourceDataAction.java 2011-01-23 21:03:33 UTC (rev 543) @@ -31,12 +31,11 @@ import org.apache.struts2.convention.annotation.Action; import org.apache.struts2.convention.annotation.Result; -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; +import fr.ifremer.coser.web.actions.common.CoserAction; /** * Force le téléchargement du zip. @@ -47,7 +46,7 @@ * Last update : $Date$ * By : $Author$ */ -public class SourceDataAction extends ActionSupport { +public class SourceDataAction extends CoserAction { /** serialVersionUID. */ private static final long serialVersionUID = 3385467755357775199L; Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/source/SourceQualityAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/source/SourceQualityAction.java 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/source/SourceQualityAction.java 2011-01-23 21:03:33 UTC (rev 543) @@ -22,7 +22,7 @@ package fr.ifremer.coser.web.actions.source; -import com.opensymphony.xwork2.ActionSupport; +import fr.ifremer.coser.web.actions.common.CoserAction; /** * Affiche l'avertissement qualité avant le téléchargement du zip. @@ -33,7 +33,7 @@ * Last update : $Date$ * By : $Author$ */ -public class SourceQualityAction extends ActionSupport { +public class SourceQualityAction extends CoserAction { /** serialVersionUID. */ private static final long serialVersionUID = 3385467755357775199L; Modified: trunk/coser-web/src/main/resources/i18n/coser-web_en_GB.properties =================================================================== --- trunk/coser-web/src/main/resources/i18n/coser-web_en_GB.properties 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/resources/i18n/coser-web_en_GB.properties 2011-01-23 21:03:33 UTC (rev 543) @@ -1,3 +1,4 @@ coser.config.admin.login.description= coser.config.admin.password.description= +coser.config.application.version.description= coser.config.config.file.description= Modified: trunk/coser-web/src/main/resources/i18n/coser-web_fr_FR.properties =================================================================== --- trunk/coser-web/src/main/resources/i18n/coser-web_fr_FR.properties 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/resources/i18n/coser-web_fr_FR.properties 2011-01-23 21:03:33 UTC (rev 543) @@ -1,3 +1,4 @@ coser.config.admin.login.description= coser.config.admin.password.description= +coser.config.application.version.description= coser.config.config.file.description= Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/source/facade.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/source/facade.jsp 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/source/facade.jsp 2011-01-23 21:03:33 UTC (rev 543) @@ -35,7 +35,7 @@ <p><s:text name="message.source.paragraph1" /></p> <p> <s:text name="message.source.paragraph2"> - <s:param><a href="mailto:harmonie at ifremer.fr">harmonie at ifremer.fr</a></s:param> + <s:param><a href="mailto:<s:property value='adminEmail' />"><s:property value='adminEmail' /></a></s:param> </s:text> </p> 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-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2011-01-23 21:03:33 UTC (rev 543) @@ -74,8 +74,8 @@ <div class="mgt20"> <h3><s:text name="message.layout.oceanicdatatitle" /></h3> <ul> - <li><a href="http://www.ifremer.fr/sismer/index_FR.htm" class="lien"><s:text name="message.layout.oceanicdata1" /></a></li> - <li><a href="http://www.ifremer.fr/sih/" class="lien"><s:text name="message.layout.oceanicdata2" /></a></li> + <li><a href="http://www.ifremer.fr/sismer/index_FR.htm" class="lien" target="_blank"><s:text name="message.layout.oceanicdata1" /></a></li> + <li><a href="http://www.ifremer.fr/sih/" class="lien" target="_blank"><s:text name="message.layout.oceanicdata2" /></a></li> </ul> </div> </div> @@ -83,8 +83,31 @@ </div> <div id="footer"> <ul class="clearfix"> - <li><a href="harmonie at ifremer.fr">Contact</a></li> - <li><a href="#">Mentions Légales</a></li> + <li> + <a href="http://coser.labs.libre-entreprise.org/" title="Documentation de l'application" target="_blank"> + Coser + </a> + </li> + <li> + <a href="http://coser.labs.libre-entreprise.org/coser/release-note.html" title="Modifications faites pour cette version" target="_blank"> + <s:property value='applicationVersion' /> + </a> + </li> + <li> + <a href="mailto:harmonie at ifremer.fr" title="Contacter un responsable"> + Contact + </a> + </li> + <li> + <a href="http://www.gnu.org/licenses/agpl.html" title="Licence AGPL v3" target="_blank"> + AGPLv3 + </a> + </li> + <li> + Copyright 2010 - 2011 + <a href="http://www.ifremer.fr" title="Ifremer" target="blank">Ifremer</a>, + <a href="http://www.codelutin.com" title="Code Lutin" target="blank">Code Lutin</a> + </li> </ul> </div> </body> Modified: trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp 2011-01-23 19:49:52 UTC (rev 542) +++ trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp 2011-01-23 21:03:33 UTC (rev 543) @@ -85,8 +85,31 @@ </div> <div id="footer"> <ul class="clearfix"> - <li><a href="harmonie at ifremer.fr">Contact</a></li> - <li><a href="#">Mentions Légales</a></li> + <li> + <a href="http://coser.labs.libre-entreprise.org/" title="Documentation de l'application" target="_blank"> + Coser + </a> + </li> + <li> + <a href="http://coser.labs.libre-entreprise.org/coser/release-note.html" title="Modifications faites pour cette version" target="_blank"> + <s:property value='applicationVersion' /> + </a> + </li> + <li> + <a href="mailto:harmonie at ifremer.fr" title="Contacter un responsable"> + Contact + </a> + </li> + <li> + <a href="http://www.gnu.org/licenses/agpl.html" title="Licence AGPL v3" target="_blank"> + AGPLv3 + </a> + </li> + <li> + Copyright 2010 - 2011 + <a href="http://www.ifremer.fr" title="Ifremer" target="blank">Ifremer</a>, + <a href="http://www.codelutin.com" title="Code Lutin" target="blank">Code Lutin</a> + </li> </ul> </div> </body>

1 0

r542 - trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map
by chatellier＠users.labs.libre-entreprise.org 23 Jan '11

23 Jan '11

Author: chatellier Date: 2011-01-23 19:49:52 +0000 (Sun, 23 Jan 2011) New Revision: 542 Log: Move texts to first page for each part. Remove download map as pdf. Removed: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/MapPdfAction.java Deleted: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/MapPdfAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/MapPdfAction.java 2011-01-23 19:49:45 UTC (rev 541) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/MapPdfAction.java 2011-01-23 19:49:52 UTC (rev 542) @@ -1,98 +0,0 @@ -/* - * #%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.map; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.InputStream; - -import org.apache.struts2.convention.annotation.Action; -import org.apache.struts2.convention.annotation.Result; - -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; - -/** - * Génére la carte sous forme de pdf. - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public class MapPdfAction extends ActionSupport { - - /** serialVersionUID. */ - private static final long serialVersionUID = 1663244944108703571L; - - protected String survey; - - protected String species; - - public String getSurvey() { - return survey; - } - - public void setSurvey(String survey) { - this.survey = survey; - } - - public String getSpecies() { - return species; - } - - public void setSpecies(String species) { - this.species = species; - } - - @Action(results= {@Result(type="stream", params={"contentType", "application/pdf", "inputName", "inputStream", "contentDisposition", "attachment; filename=\"${filename}\""})}) - public String execute() { - return SUCCESS; - } - - public String getFilename() { - return survey + "-" + species + ".pdf"; - } - - public InputStream getInputStream() { - WebService webService = ServiceFactory.getWebService(); - - InputStream input = null; - try { - File mapImage = webService.getMapFileAsPDF(survey, species); - input = new FileInputStream(mapImage); - } catch (CoserBusinessException ex) { - throw new CoserWebException("Can't get map pdf", ex); - } catch (FileNotFoundException ex) { - throw new CoserWebException("Can't get map pdf", ex); - } - - return input; - } -}

1 0

r541 - in trunk/coser-web/src/main/webapp/WEB-INF/content: com map pop source
by chatellier＠users.labs.libre-entreprise.org 23 Jan '11

23 Jan '11

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

1 0

r540 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control
by chatellier＠users.labs.libre-entreprise.org 22 Jan '11

22 Jan '11

Author: chatellier Date: 2011-01-22 19:30:18 +0000 (Sat, 22 Jan 2011) New Revision: 540 Log: Fix comment Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java 2011-01-22 19:26:24 UTC (rev 539) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java 2011-01-22 19:30:18 UTC (rev 540) @@ -105,7 +105,7 @@ /** * Return l'intance de la table qui est selectionnée. * - * Les 4 table sont dupliquées juste pour concerver l'etat des colonnes. + * Les 4 tables sont dupliquées juste pour conserver l'etat des colonnes. * * @param view view * @return la table affichée (suivante la categorie)

1 0

r539 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui
by chatellier＠users.labs.libre-entreprise.org 22 Jan '11

22 Jan '11

Author: chatellier Date: 2011-01-22 19:26:24 +0000 (Sat, 22 Jan 2011) New Revision: 539 Log: Remove super() Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/SelectionsListMenuItem.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/SelectionsListMenuItem.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/SelectionsListMenuItem.java 2011-01-22 19:25:25 UTC (rev 538) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/SelectionsListMenuItem.java 2011-01-22 19:26:24 UTC (rev 539) @@ -3,7 +3,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 General Public License as @@ -64,7 +64,6 @@ protected Project project; public SelectionsListMenuItem(CoserFrame view) { - super(); this.view = view; updateMenuContent(); }

1 0

r538 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui
by chatellier＠users.labs.libre-entreprise.org 22 Jan '11

22 Jan '11

Author: chatellier Date: 2011-01-22 19:25:25 +0000 (Sat, 22 Jan 2011) New Revision: 538 Log: Fix potential memory leak, but still present :( Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2011-01-22 18:59:25 UTC (rev 537) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2011-01-22 19:25:25 UTC (rev 538) @@ -238,6 +238,7 @@ */ public void closeProject() { view.setProject(null); + view.removeContextValue(Project.class); view.setTitle(_("coser.ui.mainview.titleempty")); showHomeView(); }

1 0