Author: chatellier Date: 2011-02-04 10:47:43 +0000 (Fri, 04 Feb 2011) New Revision: 668 Log: Add breadcrumb on all pages Added: trunk/coser-web/src/main/webapp/WEB-INF/content/source/source-data.jsp Removed: trunk/coser-web/src/main/webapp/WEB-INF/content/source/source-data-input.jsp Modified: trunk/changelog.txt 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/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/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/GraphDownloadAction.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/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/com/indicator.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/com/zone.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/map/species.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/map/survey.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/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/source/facade.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/source/source-quality.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/source/source.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/source/zone.jsp Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2011-02-04 10:47:16 UTC (rev 667) +++ trunk/changelog.txt 2011-02-04 10:47:43 UTC (rev 668) @@ -4,8 +4,9 @@ 1.0.0-beta4 ----------- + * Update jquery to 1.5 * Fix coser classloader in javawebstart context - * Website locale action stay on same page + * Add breadcrumb on all pages * Add website cumputed indices pdf files * Add coser logo in main view * Move lat/long decimal check control to warning level 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-02-04 10:47:16 UTC (rev 667) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/FacadeAction.java 2011-02-04 10:47:43 UTC (rev 668) @@ -22,14 +22,8 @@ package fr.ifremer.coser.web.actions.com; -import java.util.Map; +import fr.ifremer.coser.web.actions.common.CommonFacade; -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. * @@ -39,30 +33,9 @@ * Last update : $Date$ * By : $Author$ */ -public class FacadeAction extends CoserAction { +public class FacadeAction extends CommonFacade { /** serialVersionUID. */ private static final long serialVersionUID = 3385467755357775199L; - protected Map<String, String> facades; - - public Map<String, String> getFacades() { - return facades; - } - - @Override - public String execute() { - - WebService webService = ServiceFactory.getWebService(); - try { - - // renvoi la liste des facadeid et leur label associé - facades = webService.getFacades(); - - } catch (CoserBusinessException ex) { - throw new CoserWebException("Can't get zone map", ex); - } - - return SUCCESS; - } } 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-02-04 10:47:16 UTC (rev 667) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/GraphAction.java 2011-02-04 10:47:43 UTC (rev 668) @@ -22,6 +22,12 @@ package fr.ifremer.coser.web.actions.com; +import java.util.Locale; + +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; /** @@ -40,10 +46,20 @@ /** serialVersionUID. */ private static final long serialVersionUID = 3385467755357775199L; + protected String facade; + protected String zone; protected String indicator; + public String getFacade() { + return facade; + } + + public void setFacade(String facade) { + this.facade = facade; + } + public String getZone() { return zone; } @@ -60,6 +76,43 @@ this.indicator = indicator; } + public String getFacadeDisplayName() { + WebService webService = ServiceFactory.getWebService(); + String displayName = null; + try { + displayName = webService.getFacades().get(facade); + } catch (CoserBusinessException ex) { + throw new CoserWebException("Can't get facade display name", ex); + } + return displayName; + } + + public String getZoneDisplayName() { + WebService webService = ServiceFactory.getWebService(); + String displayName = null; + try { + displayName = webService.getZoneForFacade(facade, false).get(zone); + } catch (CoserBusinessException ex) { + throw new CoserWebException("Can't get zone display name", ex); + } + return displayName; + } + + public String getIndicatorDisplayName() { + + Locale locale = getLocale(); + String localeCode = locale.getLanguage(); + + WebService webService = ServiceFactory.getWebService(); + String displayName = null; + try { + displayName = webService.getIndicators(zone, null, localeCode).get(indicator); + } catch (CoserBusinessException ex) { + throw new CoserWebException("Can't get species display name", ex); + } + return displayName; + } + @Override public String execute() { return SUCCESS; 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-02-04 10:47:16 UTC (rev 667) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CommonIndicator.java 2011-02-04 10:47:43 UTC (rev 668) @@ -50,6 +50,8 @@ private static final Log log = LogFactory.getLog(CommonIndicator.class); + protected String facade; + protected String zone; protected String species; @@ -58,6 +60,14 @@ protected Map<String, String> indicators; + public String getFacade() { + return facade; + } + + public void setFacade(String facade) { + this.facade = facade; + } + public String getZone() { return zone; } @@ -82,6 +92,39 @@ return zonePicture; } + public String getFacadeDisplayName() { + WebService webService = ServiceFactory.getWebService(); + String displayName = null; + try { + displayName = webService.getFacades().get(facade); + } catch (CoserBusinessException ex) { + throw new CoserWebException("Can't get facade display name", ex); + } + return displayName; + } + + public String getZoneDisplayName() { + WebService webService = ServiceFactory.getWebService(); + String displayName = null; + try { + displayName = webService.getZoneForFacade(facade, false).get(zone); + } catch (CoserBusinessException ex) { + throw new CoserWebException("Can't get zone display name", ex); + } + return displayName; + } + + public String getSpeciesDisplayName() { + WebService webService = ServiceFactory.getWebService(); + String displayName = null; + try { + displayName = webService.getSpecies(zone).get(species); + } catch (CoserBusinessException ex) { + throw new CoserWebException("Can't get species display name", ex); + } + return displayName; + } + @Override public String execute() { 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-02-04 10:47:16 UTC (rev 667) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CommonZone.java 2011-02-04 10:47:43 UTC (rev 668) @@ -52,6 +52,10 @@ protected Map<String, String> zonesMetaInfo; + public String getFacade() { + return facade; + } + public void setFacade(String facade) { this.facade = facade; } @@ -68,6 +72,17 @@ return zonesMetaInfo; } + public String getFacadeDisplayName() { + WebService webService = ServiceFactory.getWebService(); + String displayName = null; + try { + displayName = webService.getFacades().get(facade); + } catch (CoserBusinessException ex) { + throw new CoserWebException("Can't get species display name", ex); + } + return displayName; + } + @Override public String execute() { 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-02-04 10:47:16 UTC (rev 667) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/SpeciesAction.java 2011-02-04 10:47:43 UTC (rev 668) @@ -75,6 +75,17 @@ return species; } + public String getFacadeDisplayName() { + WebService webService = ServiceFactory.getWebService(); + String displayName = null; + try { + displayName = webService.getFacades().get(facade); + } catch (CoserBusinessException ex) { + throw new CoserWebException("Can't get species display name", ex); + } + return displayName; + } + @Override public String execute() { 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-02-04 10:47:16 UTC (rev 667) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/SurveyAction.java 2011-02-04 10:47:43 UTC (rev 668) @@ -59,6 +59,17 @@ public Map<String, String> getSurveys() { return surveys; } + + public String getFacadeDisplayName() { + WebService webService = ServiceFactory.getWebService(); + String displayName = null; + try { + displayName = webService.getFacades().get(facade); + } catch (CoserBusinessException ex) { + throw new CoserWebException("Can't get species display name", ex); + } + return displayName; + } @Override public String execute() { 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-02-04 10:47:16 UTC (rev 667) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/FacadeAction.java 2011-02-04 10:47:43 UTC (rev 668) @@ -22,14 +22,8 @@ package fr.ifremer.coser.web.actions.pop; -import java.util.Map; +import fr.ifremer.coser.web.actions.common.CommonFacade; -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. * @@ -39,29 +33,9 @@ * Last update : $Date$ * By : $Author$ */ -public class FacadeAction extends CoserAction { +public class FacadeAction extends CommonFacade { /** serialVersionUID. */ private static final long serialVersionUID = 3385467755357775199L; - protected Map<String, String> facades; - - public Map<String, String> getFacades() { - return facades; - } - - @Override - public String execute() { - - WebService webService = ServiceFactory.getWebService(); - try { - // renvoi la liste des facadeid et leur label associé - facades = webService.getFacades(); - - } catch (CoserBusinessException ex) { - throw new CoserWebException("Can't get zone map", ex); - } - - return SUCCESS; - } } 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-02-04 10:47:16 UTC (rev 667) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/GraphAction.java 2011-02-04 10:47:43 UTC (rev 668) @@ -22,6 +22,12 @@ package fr.ifremer.coser.web.actions.pop; +import java.util.Locale; + +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; /** @@ -40,12 +46,22 @@ /** serialVersionUID. */ private static final long serialVersionUID = 3385467755357775199L; + protected String facade; + protected String zone; protected String species; protected String indicator; + public String getFacade() { + return facade; + } + + public void setFacade(String facade) { + this.facade = facade; + } + public String getZone() { return zone; } @@ -69,7 +85,55 @@ public void setIndicator(String indicator) { this.indicator = indicator; } + + public String getFacadeDisplayName() { + WebService webService = ServiceFactory.getWebService(); + String displayName = null; + try { + displayName = webService.getFacades().get(facade); + } catch (CoserBusinessException ex) { + throw new CoserWebException("Can't get facade display name", ex); + } + return displayName; + } + + public String getZoneDisplayName() { + WebService webService = ServiceFactory.getWebService(); + String displayName = null; + try { + displayName = webService.getZoneForFacade(facade, false).get(zone); + } catch (CoserBusinessException ex) { + throw new CoserWebException("Can't get zone display name", ex); + } + return displayName; + } + public String getSpeciesDisplayName() { + WebService webService = ServiceFactory.getWebService(); + String displayName = null; + try { + displayName = webService.getSpecies(zone).get(species); + } catch (CoserBusinessException ex) { + throw new CoserWebException("Can't get species display name", ex); + } + return displayName; + } + + public String getIndicatorDisplayName() { + + Locale locale = getLocale(); + String localeCode = locale.getLanguage(); + + WebService webService = ServiceFactory.getWebService(); + String displayName = null; + try { + displayName = webService.getIndicators(zone, species, localeCode).get(indicator); + } catch (CoserBusinessException ex) { + throw new CoserWebException("Can't get species display name", ex); + } + return displayName; + } + @Override public String execute() { return SUCCESS; Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/GraphDownloadAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/GraphDownloadAction.java 2011-02-04 10:47:16 UTC (rev 667) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/GraphDownloadAction.java 2011-02-04 10:47:43 UTC (rev 668) @@ -24,7 +24,6 @@ import java.io.File; import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.InputStream; import java.util.Locale; @@ -33,7 +32,6 @@ import org.apache.struts2.convention.annotation.Action; import org.apache.struts2.convention.annotation.Result; -import fr.ifremer.coser.CoserBusinessException; import fr.ifremer.coser.services.WebService; import fr.ifremer.coser.web.CoserWebException; import fr.ifremer.coser.web.ServiceFactory; 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-02-04 10:47:16 UTC (rev 667) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/SpeciesAction.java 2011-02-04 10:47:43 UTC (rev 668) @@ -49,12 +49,22 @@ private static final Log log = LogFactory.getLog(SpeciesAction.class); + protected String facade; + protected String zone; protected Map<String, String> species; protected String zonePicture; + public String getFacade() { + return facade; + } + + public void setFacade(String facade) { + this.facade = facade; + } + public String getZone() { return zone; } @@ -71,6 +81,28 @@ return zonePicture; } + public String getFacadeDisplayName() { + WebService webService = ServiceFactory.getWebService(); + String displayName = null; + try { + displayName = webService.getFacades().get(facade); + } catch (CoserBusinessException ex) { + throw new CoserWebException("Can't get facade display name", ex); + } + return displayName; + } + + public String getZoneDisplayName() { + WebService webService = ServiceFactory.getWebService(); + String displayName = null; + try { + displayName = webService.getZoneForFacade(facade, false).get(zone); + } catch (CoserBusinessException ex) { + throw new CoserWebException("Can't get zone display name", ex); + } + return displayName; + } + @Override public String execute() { 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-02-04 10:47:16 UTC (rev 667) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/source/SourceAction.java 2011-02-04 10:47:43 UTC (rev 668) @@ -42,10 +42,20 @@ /** serialVersionUID. */ private static final long serialVersionUID = 3385467755357775199L; + protected String facade; + protected String zone; protected String zonePicture; + public String getFacade() { + return facade; + } + + public void setFacade(String facade) { + this.facade = facade; + } + public String getZone() { return zone; } @@ -58,6 +68,28 @@ return zonePicture; } + public String getFacadeDisplayName() { + WebService webService = ServiceFactory.getWebService(); + String displayName = null; + try { + displayName = webService.getFacades().get(facade); + } catch (CoserBusinessException ex) { + throw new CoserWebException("Can't get facade display name", ex); + } + return displayName; + } + + public String getZoneDisplayName() { + WebService webService = ServiceFactory.getWebService(); + String displayName = null; + try { + displayName = webService.getZoneForFacade(facade, false).get(zone); + } catch (CoserBusinessException ex) { + throw new CoserWebException("Can't get zone display name", ex); + } + return displayName; + } + @Override public String execute() { 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-02-04 10:47:16 UTC (rev 667) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/source/SourceDataAction.java 2011-02-04 10:47:43 UTC (rev 668) @@ -35,7 +35,6 @@ 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. @@ -46,25 +45,15 @@ * Last update : $Date$ * By : $Author$ */ -public class SourceDataAction extends CoserAction { +public class SourceDataAction extends SourceAction { /** serialVersionUID. */ private static final long serialVersionUID = 3385467755357775199L; private static final Log log = LogFactory.getLog(SourceDataAction.class); - protected String zone; - protected boolean accepted; - public String getZone() { - return zone; - } - - public void setZone(String zone) { - this.zone = zone; - } - public void setAccepted(boolean accepted) { this.accepted = accepted; } 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-02-04 10:47:16 UTC (rev 667) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/source/SourceQualityAction.java 2011-02-04 10:47:43 UTC (rev 668) @@ -22,8 +22,6 @@ package fr.ifremer.coser.web.actions.source; -import fr.ifremer.coser.web.actions.common.CoserAction; - /** * Affiche l'avertissement qualité avant le téléchargement du zip. * @@ -33,21 +31,12 @@ * Last update : $Date$ * By : $Author$ */ -public class SourceQualityAction extends CoserAction { +public class SourceQualityAction extends SourceAction { /** serialVersionUID. */ private static final long serialVersionUID = 3385467755357775199L; - protected String zone; - - public String getZone() { - return zone; - } - - public void setZone(String zone) { - this.zone = zone; - } - + @Override public String execute() { return SUCCESS; } 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-02-04 10:47:16 UTC (rev 667) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/com/facade.jsp 2011-02-04 10:47:43 UTC (rev 668) @@ -30,6 +30,14 @@ </head> <body> + <!-- breadcrumb --> + <div class="breadcrumb"> + <ul> + <li><s:a action="facade" namespace='/com'><s:text name="message.common.facade" /></s:a></li> + </ul> + </div> + <!-- end breadcrumb --> + <h2><s:text name="message.com.title" /></h2> <img src="<s:url value='/images/facadesmap.png' />" style="float:right;margin-left:10px;width:318px; heigth:318px;" /> 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-02-04 10:47:16 UTC (rev 667) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/com/graph.jsp 2011-02-04 10:47:43 UTC (rev 668) @@ -30,6 +30,35 @@ </head> <body> + <!-- breadcrumb --> + <div class="breadcrumb"> + <ul> + <li><s:a action="facade" namespace='/com'><s:text name="message.common.facade" /></s:a> ></li> + <li> + <s:a action="zone" namespace='/com'> + <s:param name="facade" value="facade" /> + <s:property value='facadeDisplayName' /> + </s:a> > + </li> + <li> + <s:a action="indicator" namespace='/com'> + <s:param name="facade" value="facade" /> + <s:param name="zone" value="zone" /> + <s:property value='zoneDisplayName' /> + </s:a> > + </li> + <li> + <s:a action="graph" namespace='/com'> + <s:param name="facade" value="facade" /> + <s:param name="zone" value="zone" /> + <s:param name="indicator" value="indicator" /> + <s:property value='indicatorDisplayName' /> + </s:a> + </li> + </ul> + </div> + <!-- end breadcrumb --> + <h2><s:text name="message.com.title" /></h2> <img src="<s:url action='graph-data'> Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/com/indicator.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/com/indicator.jsp 2011-02-04 10:47:16 UTC (rev 667) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/com/indicator.jsp 2011-02-04 10:47:43 UTC (rev 668) @@ -30,10 +30,32 @@ </head> <body> + <!-- breadcrumb --> + <div class="breadcrumb"> + <ul> + <li><s:a action="facade" namespace='/com'><s:text name="message.common.facade" /></s:a> ></li> + <li> + <s:a action="zone" namespace='/com'> + <s:param name="facade" value="facade" /> + <s:property value='facadeDisplayName' /> + </s:a> > + </li> + <li> + <s:a action="zone" namespace='/com'> + <s:param name="facade" value="facade" /> + <s:param name="zone" value="zone" /> + <s:property value='zoneDisplayName' /> + </s:a> + </li> + </ul> + </div> + <!-- end breadcrumb --> + <h2><s:text name="message.com.title" /></h2> <s:form action="graph" method="get"> <s:select name="indicator" list="indicators" label="%{getText('message.common.selectindicator')}" /> + <s:hidden name="facade" property="facade"/> <s:hidden name="zone" property="zone"/> <s:submit value="%{getText('message.common.validform')}"/> </s:form> Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/com/zone.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/com/zone.jsp 2011-02-04 10:47:16 UTC (rev 667) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/com/zone.jsp 2011-02-04 10:47:43 UTC (rev 668) @@ -30,6 +30,20 @@ </head> <body> + <!-- breadcrumb --> + <div class="breadcrumb"> + <ul> + <li><s:a action="facade" namespace='/com'><s:text name="message.common.facade" /></s:a> ></li> + <li> + <s:a action="zone" namespace='/com'> + <s:param name="facade" value="facade" /> + <s:property value='facadeDisplayName' /> + </s:a> > + </li> + </ul> + </div> + <!-- end breadcrumb --> + <h2><s:text name="message.com.title" /></h2> <s:if test="%{zones.isEmpty()}"> @@ -37,6 +51,7 @@ </s:if> <s:else> <s:form action="indicator" method="get"> + <s:hidden name="facade" property="facade"/> <s:select name="zone" list="zones" label="%{getText('message.common.selectzone')}" emptyOption="true" onchange="javascript:coserShowSelectedZoneMap(this, 'coserzonemap')"/> <s:submit value="%{getText('message.common.validform')}"/> 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-02-04 10:47:16 UTC (rev 667) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/map/facade.jsp 2011-02-04 10:47:43 UTC (rev 668) @@ -30,11 +30,13 @@ </head> <body> + <!-- breadcrumb --> <div class="breadcrumb"> <ul> <li><s:a action="facade" namespace='/map'><s:text name="message.common.facade" /></s:a></li> </ul> </div> + <!-- end breadcrumb --> <h2><s:text name="message.map.title" /></h2> 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-02-04 10:47:16 UTC (rev 667) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/map/map.jsp 2011-02-04 10:47:43 UTC (rev 668) @@ -30,13 +30,14 @@ </head> <body> + <!-- breadcrumb --> <div class="breadcrumb"> <ul> <li><s:a action="facade" namespace='/map'><s:text name="message.common.facade" /></s:a> ></li> <li> <s:a action="survey" namespace='/map'> <s:param name="facade" value="facade" /> - <s:property value='facade' /> + <s:property value='facadeDisplayName' /> </s:a> > </li> <li> @@ -51,11 +52,12 @@ <s:param name="facade" value="facade" /> <s:param name="survey" value="survey" /> <s:param name="species" value="species" /> - <s:property value='species' /> + <s:property value='speciesDisplayName' /> </s:a> </li> </ul> </div> + <!-- end breadcrumb --> <h2><s:text name="message.map.title" /></h2> Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/map/species.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/map/species.jsp 2011-02-04 10:47:16 UTC (rev 667) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/map/species.jsp 2011-02-04 10:47:43 UTC (rev 668) @@ -30,13 +30,14 @@ </head> <body> + <!-- breadcrumb --> <div class="breadcrumb"> <ul> <li><s:a action="facade" namespace='/map'><s:text name="message.common.facade" /></s:a> ></li> <li> <s:a action="survey" namespace='/map'> <s:param name="facade" value="facade" /> - <s:property value='facade' /> + <s:property value='facadeDisplayName' /> </s:a> > </li> <li> @@ -48,6 +49,7 @@ </li> </ul> </div> + <!-- end breadcrumb --> <h2><s:text name="message.map.title" /></h2> Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/map/survey.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/map/survey.jsp 2011-02-04 10:47:16 UTC (rev 667) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/map/survey.jsp 2011-02-04 10:47:43 UTC (rev 668) @@ -30,17 +30,19 @@ </head> <body> + <!-- breadcrumb --> <div class="breadcrumb"> <ul> <li><s:a action="facade" namespace='/map'><s:text name="message.common.facade" /></s:a> ></li> <li> <s:a action="survey" namespace='/map'> <s:param name="facade" value="facade"/> - <s:property value='facade' /> + <s:property value='facadeDisplayName' /> </s:a> </li> </ul> </div> + <!-- end breadcrumb --> <h2><s:text name="message.map.title" /></h2> 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-02-04 10:47:16 UTC (rev 667) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/pop/facade.jsp 2011-02-04 10:47:43 UTC (rev 668) @@ -30,6 +30,14 @@ </head> <body> + <!-- breadcrumb --> + <div class="breadcrumb"> + <ul> + <li><s:a action="facade" namespace='/pop'><s:text name="message.common.facade" /></s:a></li> + </ul> + </div> + <!-- end breadcrumb --> + <h2><s:text name="message.pop.title" /></h2> <img src="<s:url value='/images/facadesmap.png' />" style="float:right;margin-left:10px;width:318px; heigth:318px;" /> 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-02-04 10:47:16 UTC (rev 667) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/pop/graph.jsp 2011-02-04 10:47:43 UTC (rev 668) @@ -31,6 +31,44 @@ </head> <body> + <!-- breadcrumb --> + <div class="breadcrumb"> + <ul> + <li><s:a action="facade" namespace='/pop'><s:text name="message.common.facade" /></s:a> ></li> + <li> + <s:a action="zone" namespace='/pop'> + <s:param name="facade" value="facade" /> + <s:property value='facadeDisplayName' /> + </s:a> > + </li> + <li> + <s:a action="species" namespace='/pop'> + <s:param name="facade" value="facade" /> + <s:param name="zone" value="zone" /> + <s:property value='zoneDisplayName' /> + </s:a> > + </li> + <li> + <s:a action="indicator" namespace='/pop'> + <s:param name="facade" value="facade" /> + <s:param name="zone" value="zone" /> + <s:param name="species" value="species" /> + <s:property value='speciesDisplayName' /> + </s:a> > + </li> + <li> + <s:a action="graph" namespace='/pop'> + <s:param name="facade" value="facade" /> + <s:param name="zone" value="zone" /> + <s:param name="species" value="species" /> + <s:param name="indicator" value="indicator" /> + <s:property value='indicatorDisplayName' /> + </s:a> + </li> + </ul> + </div> + <!-- end breadcrumb --> + <h2><s:text name="message.pop.title" /></h2> <img src="<s:url action='graph-data'> @@ -43,7 +81,7 @@ <s:param name="zone" value="%{zone}" /> <s:param name="species" value="%{species}" /> <s:param name="indicator" value="%{indicator}" /> - <s:text name="message.com.downloadascsv"></s:text> + <s:text name="message.com.downloadascsv"/> </s:a>.</p> </body> </html> \ No newline at end of file Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/pop/indicator.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/pop/indicator.jsp 2011-02-04 10:47:16 UTC (rev 667) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/pop/indicator.jsp 2011-02-04 10:47:43 UTC (rev 668) @@ -31,10 +31,40 @@ </head> <body> + <!-- breadcrumb --> + <div class="breadcrumb"> + <ul> + <li><s:a action="facade" namespace='/pop'><s:text name="message.common.facade" /></s:a> ></li> + <li> + <s:a action="zone" namespace='/pop'> + <s:param name="facade" value="facade" /> + <s:property value='facadeDisplayName' /> + </s:a> > + </li> + <li> + <s:a action="species" namespace='/pop'> + <s:param name="facade" value="facade" /> + <s:param name="zone" value="zone" /> + <s:property value='zoneDisplayName' /> + </s:a> > + </li> + <li> + <s:a action="indicator" namespace='/pop'> + <s:param name="facade" value="facade" /> + <s:param name="zone" value="zone" /> + <s:param name="species" value="species" /> + <s:property value='speciesDisplayName' /> + </s:a> + </li> + </ul> + </div> + <!-- end breadcrumb --> + <h2><s:text name="message.pop.title" /></h2> <s:form action="graph" method="get"> <s:select name="indicator" list="indicators" label="%{getText('message.common.selectindicator')}" /> + <s:hidden name="facade" property="facade"/> <s:hidden name="zone" property="zone"/> <s:hidden name="species" property="species"/> <s:submit value="%{getText('message.common.validform')}"/> Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/pop/species.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/pop/species.jsp 2011-02-04 10:47:16 UTC (rev 667) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/pop/species.jsp 2011-02-04 10:47:43 UTC (rev 668) @@ -31,10 +31,32 @@ </head> <body> + <!-- breadcrumb --> + <div class="breadcrumb"> + <ul> + <li><s:a action="facade" namespace='/pop'><s:text name="message.common.facade" /></s:a> ></li> + <li> + <s:a action="zone" namespace='/pop'> + <s:param name="facade" value="facade" /> + <s:property value='facadeDisplayName' /> + </s:a> > + </li> + <li> + <s:a action="species" namespace='/pop'> + <s:param name="facade" value="facade" /> + <s:param name="zone" value="zone" /> + <s:property value='zoneDisplayName' /> + </s:a> + </li> + </ul> + </div> + <!-- end breadcrumb --> + <h2><s:text name="message.pop.title" /></h2> <s:form action="indicator" method="get"> <s:select name="species" list="species" label="%{getText('message.common.selectspecies')}" /> + <s:hidden name="facade" property="facade"/> <s:hidden name="zone" property="zone"/> <s:submit value="%{getText('message.common.validform')}"/> </s:form> Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/pop/zone.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/pop/zone.jsp 2011-02-04 10:47:16 UTC (rev 667) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/pop/zone.jsp 2011-02-04 10:47:43 UTC (rev 668) @@ -30,6 +30,20 @@ </head> <body> + <!-- breadcrumb --> + <div class="breadcrumb"> + <ul> + <li><s:a action="facade" namespace='/pop'><s:text name="message.common.facade" /></s:a> ></li> + <li> + <s:a action="zone" namespace='/pop'> + <s:param name="facade" value="facade" /> + <s:property value='facadeDisplayName' /> + </s:a> + </li> + </ul> + </div> + <!-- end breadcrumb --> + <h2><s:text name="message.pop.title" /></h2> <s:if test="%{zones.isEmpty()}"> @@ -37,6 +51,7 @@ </s:if> <s:else> <s:form action="species" method="get"> + <s:hidden name="facade" property="facade"/> <s:select name="zone" list="zones" label="%{getText('message.common.selectzone')}" emptyOption="true" onchange="javascript:coserShowSelectedZoneMap(this, 'coserzonemap')"/> <s:submit value="%{getText('message.common.validform')}"/> 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-02-04 10:47:16 UTC (rev 667) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/source/facade.jsp 2011-02-04 10:47:43 UTC (rev 668) @@ -30,6 +30,14 @@ </head> <body> + <!-- breadcrumb --> + <div class="breadcrumb"> + <ul> + <li><s:a action="facade" namespace='/source'><s:text name="message.common.facade" /></s:a></li> + </ul> + </div> + <!-- end breadcrumb --> + <h2><s:text name="message.source.title" /></h2> <img src="<s:url value='/images/facadesmap.png' />" style="float:right;margin-left:10px;width:318px; heigth:318px;" /> Deleted: trunk/coser-web/src/main/webapp/WEB-INF/content/source/source-data-input.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/source/source-data-input.jsp 2011-02-04 10:47:16 UTC (rev 667) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/source/source-data-input.jsp 2011-02-04 10:47:43 UTC (rev 668) @@ -1,55 +0,0 @@ -<!-- - #%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.source.title" /></title> - </head> - <body> - - <h2><s:text name="message.source.title" /></h2> - - <h3><s:text name="message.quality.title" /></h3> - - <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><a href="mailto:<s:property value='adminEmail' />"><s:property value='adminEmail' /></a></s:param> - </s:text> - </p> - - <s:form action="source-data"> - <s:hidden name="zone" property="zone"/> - <s:checkbox name="accepted" fieldValue="true" label="%{getText('message.quality.acceptance')}"/> - <s:submit value="%{getText('message.source.download')}"></s:submit> - </s:form> - </body> -</html> \ No newline at end of file Copied: trunk/coser-web/src/main/webapp/WEB-INF/content/source/source-data.jsp (from rev 651, trunk/coser-web/src/main/webapp/WEB-INF/content/source/source-data-input.jsp) =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/source/source-data.jsp (rev 0) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/source/source-data.jsp 2011-02-04 10:47:43 UTC (rev 668) @@ -0,0 +1,84 @@ +<!-- + #%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.source.title" /></title> + </head> + <body> + + <!-- breadcrumb --> + <div class="breadcrumb"> + <ul> + <li><s:a action="facade" namespace='/source'><s:text name="message.common.facade" /></s:a> ></li> + <li> + <s:a action="zone" namespace='/source'> + <s:param name="facade" value="facade" /> + <s:property value='facadeDisplayName' /> + </s:a> > + </li> + <li> + <s:a action="source" namespace='/source'> + <s:param name="facade" value="facade" /> + <s:param name="zone" value="zone" /> + <s:property value='zoneDisplayName' /> + </s:a> > + </li> + <li> + <s:a action="source-quality" namespace='/source'> + <s:param name="facade" value="facade" /> + <s:param name="zone" value="zone" /> + <s:text name="message.quality.title" /> + </s:a> + </li> + </ul> + </div> + <!-- end breadcrumb --> + + <h2><s:text name="message.source.title" /></h2> + + <h3><s:text name="message.quality.title" /></h3> + + <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><a href="mailto:<s:property value='adminEmail' />"><s:property value='adminEmail' /></a></s:param> + </s:text> + </p> + + <s:form action="source-data"> + <s:hidden name="facade" property="facade"/> + <s:hidden name="zone" property="zone"/> + <s:checkbox name="accepted" fieldValue="true" label="%{getText('message.quality.acceptance')}"/> + <s:submit value="%{getText('message.source.download')}"></s:submit> + </s:form> + </body> +</html> \ No newline at end of file Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/source/source-quality.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/source/source-quality.jsp 2011-02-04 10:47:16 UTC (rev 667) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/source/source-quality.jsp 2011-02-04 10:47:43 UTC (rev 668) @@ -30,6 +30,34 @@ </head> <body> + <!-- breadcrumb --> + <div class="breadcrumb"> + <ul> + <li><s:a action="facade" namespace='/source'><s:text name="message.common.facade" /></s:a> ></li> + <li> + <s:a action="zone" namespace='/source'> + <s:param name="facade" value="facade" /> + <s:property value='facadeDisplayName' /> + </s:a> > + </li> + <li> + <s:a action="source" namespace='/source'> + <s:param name="facade" value="facade" /> + <s:param name="zone" value="zone" /> + <s:property value='zoneDisplayName' /> + </s:a> > + </li> + <li> + <s:a action="source-quality" namespace='/source'> + <s:param name="facade" value="facade" /> + <s:param name="zone" value="zone" /> + <s:text name="message.quality.title" /> + </s:a> + </li> + </ul> + </div> + <!-- end breadcrumb --> + <h2><s:text name="message.source.title" /></h2> <h3><s:text name="message.quality.title" /></h3> @@ -47,6 +75,7 @@ </p> <s:form action="source-data"> + <s:hidden name="facade" property="facade"/> <s:hidden name="zone" property="zone"/> <s:checkbox name="accepted" fieldValue="true" label="%{getText('message.quality.acceptance')}"/> <s:submit value="%{getText('message.source.download')}"></s:submit> 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-02-04 10:47:16 UTC (rev 667) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/source/source.jsp 2011-02-04 10:47:43 UTC (rev 668) @@ -30,12 +30,34 @@ </head> <body> + <!-- breadcrumb --> + <div class="breadcrumb"> + <ul> + <li><s:a action="facade" namespace='/source'><s:text name="message.common.facade" /></s:a> ></li> + <li> + <s:a action="zone" namespace='/source'> + <s:param name="facade" value="facade" /> + <s:property value='facadeDisplayName' /> + </s:a> > + </li> + <li> + <s:a action="source" namespace='/source'> + <s:param name="facade" value="facade" /> + <s:param name="zone" value="zone" /> + <s:property value='zoneDisplayName' /> + </s:a> + </li> + </ul> + </div> + <!-- end breadcrumb --> + <h2><s:text name="message.source.title" /></h2> <img src="<s:url value='/images/zones/' /><s:property value='zonePicture' />" /> <p><s:a action="source-quality"> <s:param name="zone" value="%{zone}" /> + <s:param name="facade" value="%{facade}"/> <s:text name="message.source.download"></s:text> </s:a>.</p> </body> Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/source/zone.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/source/zone.jsp 2011-02-04 10:47:16 UTC (rev 667) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/source/zone.jsp 2011-02-04 10:47:43 UTC (rev 668) @@ -30,6 +30,20 @@ </head> <body> + <!-- breadcrumb --> + <div class="breadcrumb"> + <ul> + <li><s:a action="facade" namespace='/source'><s:text name="message.common.facade" /></s:a> ></li> + <li> + <s:a action="zone" namespace='/source'> + <s:param name="facade" value="facade" /> + <s:property value='facadeDisplayName' /> + </s:a> + </li> + </ul> + </div> + <!-- end breadcrumb --> + <h2><s:text name="message.source.title" /></h2> <s:if test="%{zones.isEmpty()}"> @@ -37,6 +51,7 @@ </s:if> <s:else> <s:form action="source" method="get"> + <s:hidden name="facade" property="facade"/> <s:select name="zone" list="zones" label="%{getText('message.common.selectzone')}" emptyOption="true" onchange="javascript:coserShowSelectedZoneMap(this, 'coserzonemap')"/> <s:submit value="%{getText('message.common.validform')}"/>