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

r567 - trunk/coser-business/src/main/java/fr/ifremer/coser/bean
by chatellier＠users.labs.libre-entreprise.org 25 Jan '11

25 Jan '11

Author: chatellier Date: 2011-01-25 09:51:18 +0000 (Tue, 25 Jan 2011) New Revision: 567 Log: Add contructor with name parameter Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java trunk/coser-business/src/main/java/fr/ifremer/coser/bean/RSufiResult.java trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Selection.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java 2011-01-25 09:01:25 UTC (rev 566) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java 2011-01-25 09:51:18 UTC (rev 567) @@ -113,6 +113,10 @@ /** Type especes */ protected DataStorage typeEspeces; + public Project(String name) { + this.name = name; + } + public String getName() { return name; } Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/bean/RSufiResult.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/bean/RSufiResult.java 2011-01-25 09:01:25 UTC (rev 566) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/bean/RSufiResult.java 2011-01-25 09:51:18 UTC (rev 567) @@ -76,6 +76,10 @@ /** Data download allowed. */ protected boolean dataAllowed; + public RSufiResult(String name) { + this.name = name; + } + public Date getCreationDate() { return creationDate; } Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Selection.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Selection.java 2011-01-25 09:01:25 UTC (rev 566) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Selection.java 2011-01-25 09:51:18 UTC (rev 567) @@ -96,8 +96,6 @@ protected List<RSufiResult> rsufiResults; public Selection() { - super(); - // c'est plus facile de ne pas gerer le cas "null" partout dans le code allYears = Collections.EMPTY_LIST; selectedYears = Collections.EMPTY_LIST; @@ -107,6 +105,11 @@ selectedSpeciesSizeAllYear = Collections.EMPTY_LIST; selectedSpeciesMaturity = Collections.EMPTY_LIST; } + + public Selection(String name) { + this(); + this.name = name; + } public String getName() { return name;

1 0

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

25 Jan '11

Author: chatellier Date: 2011-01-25 09:01:25 +0000 (Tue, 25 Jan 2011) New Revision: 566 Log: Use new pictures. Update styles Added: trunk/coser-web/src/main/webapp/images/facadesmap.png Removed: trunk/coser-web/src/main/webapp/images/barre_select.png trunk/coser-web/src/main/webapp/images/bt_suite.png trunk/coser-web/src/main/webapp/images/bt_suitehover.png trunk/coser-web/src/main/webapp/images/footer_01.jpg trunk/coser-web/src/main/webapp/images/ico_carte.png trunk/coser-web/src/main/webapp/images/ico_pdf.png trunk/coser-web/src/main/webapp/images/poisson.jpg trunk/coser-web/src/main/webapp/images/zonesmap.jpg Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/com/facade.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/survey.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/pop/facade.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/zone.jsp trunk/coser-web/src/main/webapp/images/fond_02.jpg trunk/coser-web/src/main/webapp/images/logoSIH.png trunk/coser-web/src/main/webapp/styles/coser.css 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-24 21:23:43 UTC (rev 565) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/com/facade.jsp 2011-01-25 09:01:25 UTC (rev 566) @@ -34,7 +34,7 @@ <p><s:text name="message.com.paragraph1" /></p> - <img src="<s:url value='/images/zonesmap.jpg' />" /> + <img src="<s:url value='/images/facadesmap.png' />" /> <br /> 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-01-24 21:23:43 UTC (rev 565) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/com/zone.jsp 2011-01-25 09:01:25 UTC (rev 566) @@ -43,7 +43,7 @@ </div> </s:iterator> <div id="coserzonemap"> - <img src="<s:url value='/images/zonesmap.jpg' />" /> + <img src="<s:url value='/images/facadesmap.png' />" /> </div> <br /> 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-24 21:23:43 UTC (rev 565) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/map/facade.jsp 2011-01-25 09:01:25 UTC (rev 566) @@ -40,7 +40,7 @@ <s:text name="message.map.warningcontent" /> </p> - <img src="<s:url value='/images/zonesmap.jpg' />" /> + <img src="<s:url value='/images/facadesmap.png' />" /> <br /> 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-01-24 21:23:43 UTC (rev 565) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/map/survey.jsp 2011-01-25 09:01:25 UTC (rev 566) @@ -32,7 +32,7 @@ <h2><s:text name="message.map.title" /></h2> - <img src="<s:url value='/images/zonesmap.jpg' />" /> + <img src="<s:url value='/images/facadesmap.png' />" /> <br /> 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-24 21:23:43 UTC (rev 565) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/pop/facade.jsp 2011-01-25 09:01:25 UTC (rev 566) @@ -35,7 +35,7 @@ <p><s:text name="message.pop.paragraph1" /></p> <p><s:text name="message.pop.paragraph2" /></p> - <img src="<s:url value='/images/zonesmap.jpg' />" /> + <img src="<s:url value='/images/facadesmap.png' />" /> <br /> 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-01-24 21:23:43 UTC (rev 565) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/pop/zone.jsp 2011-01-25 09:01:25 UTC (rev 566) @@ -43,7 +43,7 @@ </div> </s:iterator> <div id="coserzonemap"> - <img src="<s:url value='/images/zonesmap.jpg' />" /> + <img src="<s:url value='/images/facadesmap.png' />" /> </div> <br /> 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-24 21:23:43 UTC (rev 565) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/source/facade.jsp 2011-01-25 09:01:25 UTC (rev 566) @@ -42,7 +42,7 @@ <p><s:text name="message.source.paragraph3" /></p> <p><s:text name="message.source.paragraph4" /></p> - <img src="<s:url value='/images/zonesmap.jpg' />" /> + <img src="<s:url value='/images/facadesmap.png' />" /> <br /> 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-01-24 21:23:43 UTC (rev 565) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/source/zone.jsp 2011-01-25 09:01:25 UTC (rev 566) @@ -43,7 +43,7 @@ </div> </s:iterator> <div id="coserzonemap"> - <img src="<s:url value='/images/zonesmap.jpg' />" /> + <img src="<s:url value='/images/facadesmap.png' />" /> </div> <br /> Deleted: trunk/coser-web/src/main/webapp/images/barre_select.png =================================================================== (Binary files differ) Deleted: trunk/coser-web/src/main/webapp/images/bt_suite.png =================================================================== (Binary files differ) Deleted: trunk/coser-web/src/main/webapp/images/bt_suitehover.png =================================================================== (Binary files differ) Added: trunk/coser-web/src/main/webapp/images/facadesmap.png =================================================================== (Binary files differ) Property changes on: trunk/coser-web/src/main/webapp/images/facadesmap.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/coser-web/src/main/webapp/images/fond_02.jpg =================================================================== (Binary files differ) Deleted: trunk/coser-web/src/main/webapp/images/footer_01.jpg =================================================================== (Binary files differ) Deleted: trunk/coser-web/src/main/webapp/images/ico_carte.png =================================================================== (Binary files differ) Deleted: trunk/coser-web/src/main/webapp/images/ico_pdf.png =================================================================== (Binary files differ) Modified: trunk/coser-web/src/main/webapp/images/logoSIH.png =================================================================== (Binary files differ) Deleted: trunk/coser-web/src/main/webapp/images/poisson.jpg =================================================================== (Binary files differ) Deleted: trunk/coser-web/src/main/webapp/images/zonesmap.jpg =================================================================== (Binary files differ) Modified: trunk/coser-web/src/main/webapp/styles/coser.css =================================================================== --- trunk/coser-web/src/main/webapp/styles/coser.css 2011-01-24 21:23:43 UTC (rev 565) +++ trunk/coser-web/src/main/webapp/styles/coser.css 2011-01-25 09:01:25 UTC (rev 566) @@ -377,9 +377,10 @@ #head a.logoSIH { background: url(../images/logoSIH.png) no-repeat; - width: 250px; + width: 160px; height: 135px; float: left; + margin-left: 55px; } #head a.logoIfremer { @@ -419,12 +420,16 @@ #middle .page .content { /*background: url(../images/warper_page.png) repeat-y;*/ background-color: white; - -moz-border-radius: 10px; - border-radius: 10px; font-size: 140%; color: #2e2e2e; line-height: 1.4em; width: 100%; + + -moz-border-radius: 10px; + border-radius: 10px; + -moz-box-shadow: 1px 1px 0 rgba(0, 0, 0, 0.5); + -webkit-box-shadow: 1px 1px 0 rgba(0, 0, 0, 0.5); + box-shadow: 1px 1px 0 rgba(0, 0, 0, 0.5); } #middle .page span.clb {

1 0

r565 - trunk
by chatellier＠users.labs.libre-entreprise.org 24 Jan '11

24 Jan '11

Author: chatellier Date: 2011-01-24 21:23:43 +0000 (Mon, 24 Jan 2011) New Revision: 565 Log: Update i18n Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-24 20:58:52 UTC (rev 564) +++ trunk/pom.xml 2011-01-24 21:23:43 UTC (rev 565) @@ -320,7 +320,7 @@  <jaxx.version>2.2.5</jaxx.version> - <i18n.version>2.0.1</i18n.version> + <i18n.version>2.1</i18n.version> <struts.version>2.2.1.1</struts.version> </properties>

1 0

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

24 Jan '11

Author: chatellier Date: 2011-01-24 20:58:52 +0000 (Mon, 24 Jan 2011) New Revision: 564 Log: Fix footer 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-24 20:52:01 UTC (rev 563) +++ trunk/coser-web/src/main/webapp/styles/coser.css 2011-01-24 20:58:52 UTC (rev 564) @@ -585,6 +585,7 @@ /*margin: 30px 0;*/ position: relative; text-transform: uppercase; + text-align:center; color: #fff; font-size: 140%; } @@ -595,7 +596,7 @@ } #footer ul li { - float: left; + display:inline; list-style: none; margin: 0 10px; line-height: 30px;

1 0

r563 - in trunk/coser-web/src/main: resources/fr/ifremer/coser/web webapp/WEB-INF/content webapp/js
by chatellier＠users.labs.libre-entreprise.org 24 Jan '11

24 Jan '11

Author: chatellier Date: 2011-01-24 20:52:01 +0000 (Mon, 24 Jan 2011) New Revision: 563 Log: Add anchor and jquery expander (survey desc). Added: trunk/coser-web/src/main/webapp/js/jquery.expander.js Modified: trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package.properties trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_fr.properties trunk/coser-web/src/main/webapp/WEB-INF/content/survey.jsp Modified: trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package.properties =================================================================== --- trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package.properties 2011-01-24 19:16:32 UTC (rev 562) +++ trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package.properties 2011-01-24 20:52:01 UTC (rev 563) @@ -50,6 +50,7 @@ message.common.selectindicator=Select an indicator message.common.noresults=No results available message.common.selectspecies=Select a species +message.common.jsreadmore=Read more message.map.citationtitle=Citation message.map.citation=Trenkel V.M., O. Berthel\u00E9, P. Lorance, J.A. Bertrand, A. Brind''Amour, M.L. Cochard, F. Coppin, J.P. Leaut\u00E9, J.C. Mah\u00E9, J. Morin, M.J. Rochet, M. Salaun, A. Souplet & Y. V\u00E9rin, 2009. Grands invert\u00E9br\u00E9s et poissons observ\u00E9s par les campagnes scientifiques. Atlas de distribution. Bilan 2008. Ifremer, Nantes. EMH : 09-003. {0}. 100 p. message.map.downloadaspdf=Download as PDF Modified: trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_fr.properties =================================================================== --- trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_fr.properties 2011-01-24 19:16:32 UTC (rev 562) +++ trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_fr.properties 2011-01-24 20:52:01 UTC (rev 563) @@ -50,6 +50,7 @@ message.common.selectindicator=Selectionnez un indicateur message.common.selectspecies=Selectionnez une esp\u00E8ces message.common.noresults=Aucun r\u00E9sultat disponible +message.common.jsreadmore=Voir la suite message.map.citationtitle=Citation message.map.citation=Trenkel V.M., O. Berthel\u00E9, P. Lorance, J.A. Bertrand, A. Brind''Amour, M.L. Cochard, F. Coppin, J.P. Leaut\u00E9, J.C. Mah\u00E9, J. Morin, M.J. Rochet, M. Salaun, A. Souplet & Y. V\u00E9rin, 2009. Grands invert\u00E9br\u00E9s et poissons observ\u00E9s par les campagnes scientifiques. Atlas de distribution. Bilan 2008. Ifremer, Nantes. EMH : 09-003. {0}. 100 p. message.map.downloadaspdf=T\u00E9l\u00E9charger en PDF Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/survey.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/survey.jsp 2011-01-24 19:16:32 UTC (rev 562) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/survey.jsp 2011-01-24 20:52:01 UTC (rev 563) @@ -27,36 +27,90 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <title><s:text name="message.quality.title" /></title> + <script type="text/javascript" src="<s:url value='/js/jquery.expander.js' />"></script> + <script type="text/javascript"> + $(document).ready(function() { + // override some default options + $('div.expandable').expander({ + slicePoint: 1560, // default is 100 + expandText: '<s:text name="message.common.jsreadmore" />', // default is 'read more...' + collapseTimer: 0, // re-collapses after 5 seconds; default is 0, so no re-collapsing + userCollapseText: '[^]' // default is '[collapse expanded text]' + }); + + }); + </script> </head> <body> <h2> <s:text name="message.survey.maintitle" /> </h2> - - <p><s:text name="message.survey.paragraph1" /></p> - <p><s:text name="message.survey.paragraph2" /></p> - <p> - <p><s:text name="message.survey.dataengintitle" /></p> - <ul> - <li><s:text name="message.survey.dataenginfond" /></li> - <li><s:text name="message.survey.dataenginperche" /></li> - <li><s:text name="message.survey.dataengincasier" /></li> - </ul> - </p> - - <p><s:text name="message.survey.paragraph3" /></p> - <p><s:text name="message.survey.paragraph4" /></p> - <p><s:text name="message.survey.paragraph5" /></p> - <p><s:text name="message.survey.paragraph6" /></p> + <ul> + <li> + <a href="#merdunord"><s:text name="message.survey.merdunord" /></a> + <ul> + <li><a href="#sudmerdunord"><s:text name="message.survey.merdunord.sudmerdunord" /></a></li> + </ul> + </li> + <li> + <a href="#fmancheorientale"><s:text name="message.survey.mancheorientale" /></a> + <ul> + <li><a href="#mancheorientale"><s:text name="message.survey.mancheorientale.mancheorientale" /></a></li> + <li><a href="#baiedesomme"><s:text name="message.survey.mancheorientale.baiedesomme" /></a></li> + </ul> + </li> + <li> + <a href="#mancheoccidentale"><s:text name="message.survey.mancheoccidentale" /></a> + <ul> + <li><a href="#flamanville"><s:text name="message.survey.mancheoccidentale.flamanville" /></a></li> + </ul> + </li> + <li> + <a href="#atlantique"><s:text name="message.survey.atlantique" /></a> + <ul> + <li><a href="#celtique"><s:text name="message.survey.atlantique.celtique" /></a></li> + <li><a href="#gascogne"><s:text name="message.survey.atlantique.gascogne" /></a></li> + <li><a href="#vilaine"><s:text name="message.survey.atlantique.vilaine" /></a></li> + </ul> + </li> + <li> + <a href="#mediterranee"><s:text name="message.survey.mediterranee" /></a> + <ul> + <li><a href="#golfelion"><s:text name="message.survey.mediterranee.golfelion" /></a></li> + <li><a href="#estcorse"><s:text name="message.survey.mediterranee.estcorse" /></a></li> + </ul> + </li> + </ul> + <div class="expandable"> + <p><s:text name="message.survey.paragraph1" /></p> + <p><s:text name="message.survey.paragraph2" /></p> + + <p> + <p><s:text name="message.survey.dataengintitle" /></p> + <ul> + <li><s:text name="message.survey.dataenginfond" /></li> + <li><s:text name="message.survey.dataenginperche" /></li> + <li><s:text name="message.survey.dataengincasier" /></li> + </ul> + </p> + + <p><s:text name="message.survey.paragraph3" /></p> + <p><s:text name="message.survey.paragraph4" /></p> + <p><s:text name="message.survey.paragraph5" /></p> + <p><s:text name="message.survey.paragraph6" /></p> + </div> + <h2> <s:text name="message.survey.detailstitle" /> </h2>  + <a name="merdunord"></a> <h3><s:text name="message.survey.merdunord" /></h3> + <a name="sudmerdunord"></a> <h4><s:text name="message.survey.merdunord.sudmerdunord" /></h4> <p><s:text name="message.survey.merdunord.sudmerdunord.desc" /></p> <p> @@ -68,7 +122,9 @@ </p>  + <a name="fmancheorientale"></a> <h3><s:text name="message.survey.mancheorientale" /></h3> + <a name="mancheorientale"></a> <h4><s:text name="message.survey.mancheorientale.mancheorientale" /></h4> <p><s:text name="message.survey.mancheorientale.mancheorientale.desc" /></p> <p> @@ -78,6 +134,7 @@ </ul> </p> + <a name="baiedesomme"></a> <h4><s:text name="message.survey.mancheorientale.baiedesomme" /></h4> <p><s:text name="message.survey.mancheorientale.baiedesomme.desc" /></p> <p> @@ -88,7 +145,9 @@ </p>  + <a name="mancheoccidentale"></a> <h3><s:text name="message.survey.mancheoccidentale" /></h3> + <a name="flamanville"></a> <h4><s:text name="message.survey.mancheoccidentale.flamanville" /></h4> <p><s:text name="message.survey.mancheoccidentale.flamanville.desc" /></p> <p> @@ -99,7 +158,9 @@ </p>  + <a name="atlantique"></a> <h3><s:text name="message.survey.atlantique" /></h3> + <a name="celtique"></a> <h4><s:text name="message.survey.atlantique.celtique" /></h4> <p><s:text name="message.survey.atlantique.celtique.desc" /></p> <p> @@ -109,6 +170,7 @@ </ul> </p> + <a name="gascogne"></a> <h4><s:text name="message.survey.atlantique.gascogne" /></h4> <p><s:text name="message.survey.atlantique.gascogne.desc" /></p> <p> @@ -118,6 +180,7 @@ </ul> </p> + <a name="vilaine"></a> <h4><s:text name="message.survey.atlantique.vilaine" /></h4> <p><s:text name="message.survey.atlantique.vilaine.desc" /></p> <p> @@ -128,7 +191,9 @@ </p>  + <a name="mediterranee"></a> <h3><s:text name="message.survey.mediterranee" /></h3> + <a name="golfelion"></a> <h4><s:text name="message.survey.mediterranee.golfelion" /></h4> <p><s:text name="message.survey.mediterranee.golfelion.desc" /></p> <p> @@ -142,6 +207,7 @@ </ul> </p> + <a name="estcorse"></a> <h4><s:text name="message.survey.mediterranee.estcorse" /></h4> <p><s:text name="message.survey.mediterranee.estcorse.desc" /></p> <p> Added: trunk/coser-web/src/main/webapp/js/jquery.expander.js =================================================================== --- trunk/coser-web/src/main/webapp/js/jquery.expander.js (rev 0) +++ trunk/coser-web/src/main/webapp/js/jquery.expander.js 2011-01-24 20:52:01 UTC (rev 563) @@ -0,0 +1,152 @@ +/* + * jQuery Expander plugin + * Version 0.4 (12/09/2008) + * @requires jQuery v1.1.1+ + * + * Dual licensed under the MIT and GPL licenses: + * http://www.opensource.org/licenses/mit-license.php + * http://www.gnu.org/licenses/gpl.html + * + */ + + +(function($) { + + $.fn.expander = function(options) { + + var opts = $.extend({}, $.fn.expander.defaults, options); + var delayedCollapse; + return this.each(function() { + var $this = $(this); + var o = $.meta ? $.extend({}, opts, $this.data()) : opts; + var cleanedTag, startTags, endTags; + var allText = $this.html(); + var startText = allText.slice(0, o.slicePoint).replace(/\w+$/,''); + startTags = startText.match(/<\w[^>]*>/g); + if (startTags) {startText = allText.slice(0,o.slicePoint + startTags.join('').length).replace(/\w+$/,'');} + + if (startText.lastIndexOf('<') > startText.lastIndexOf('>') ) { + startText = startText.slice(0,startText.lastIndexOf('<')); + } + var endText = allText.slice(startText.length); + // create necessary expand/collapse elements if they don't already exist + if (!$('span.details', this).length) { + // end script if text length isn't long enough. + if ( endText.replace(/\s+$/,'').split(' ').length < o.widow ) { return; } + // otherwise, continue... + if (endText.indexOf('</') > -1) { + endTags = endText.match(/<(\/)?[^>]*>/g); + for (var i=0; i < endTags.length; i++) { + + if (endTags[i].indexOf('</') > -1) { + var startTag, startTagExists = false; + for (var j=0; j < i; j++) { + startTag = endTags[j].slice(0, endTags[j].indexOf(' ')).replace(/(\w)$/,'$1>'); + if (startTag == rSlash(endTags[i])) { + startTagExists = true; + } + } + if (!startTagExists) { + startText = startText + endTags[i]; + var matched = false; + for (var s=startTags.length - 1; s >= 0; s--) { + if (startTags[s].slice(0, startTags[s].indexOf(' ')).replace(/(\w)$/,'$1>') == rSlash(endTags[i]) + && matched == false) { + cleanedTag = cleanedTag ? startTags[s] + cleanedTag : startTags[s]; + matched = true; + } + }; + } + } + } + + endText = cleanedTag && cleanedTag + endText || endText; + } + $this.html([ + startText, + '<span class="read-more">', + o.expandPrefix, + '<a href="#">', + o.expandText, + '</a>', + '</span>', + '<span class="details">', + endText, + '</span>' + ].join('') + ); + } + var $thisDetails = $('span.details', this), + $readMore = $('span.read-more', this); + $thisDetails.hide(); + $readMore.find('a').click(function() { + $readMore.hide(); + + if (o.expandEffect === 'show' && !o.expandSpeed) { + o.beforeExpand($this); + $thisDetails.show(); + o.afterExpand($this); + delayCollapse(o, $thisDetails); + } else { + o.beforeExpand($this); + $thisDetails[o.expandEffect](o.expandSpeed, function() { + $thisDetails.css({zoom: ''}); + o.afterExpand($this); + delayCollapse(o, $thisDetails); + }); + } + return false; + }); + if (o.userCollapse) { + $this + .find('span.details').append('<span class="re-collapse">' + o.userCollapsePrefix + '<a href="#">' + o.userCollapseText + '</a></span>'); + $this.find('span.re-collapse a').click(function() { + + clearTimeout(delayedCollapse); + var $detailsCollapsed = $(this).parents('span.details'); + reCollapse($detailsCollapsed); + o.onCollapse($this, true); + return false; + }); + } + }); + function reCollapse(el) { + el.hide() + .prev('span.read-more').show(); + } + function delayCollapse(option, $collapseEl) { + if (option.collapseTimer) { + delayedCollapse = setTimeout(function() { + reCollapse($collapseEl); + option.onCollapse($collapseEl.parent(), false); + }, + option.collapseTimer + ); + } + } + function rSlash(rString) { + return rString.replace(/\//,''); + } + }; + // plugin defaults + $.fn.expander.defaults = { + slicePoint: 100, // the number of characters at which the contents will be sliced into two parts. + // Note: any tag names in the HTML that appear inside the sliced element before + // the slicePoint will be counted along with the text characters. + widow: 4, // a threshold of sorts for whether to initially hide/collapse part of the element's contents. + // If after slicing the contents in two there are fewer words in the second part than + // the value set by widow, we won't bother hiding/collapsing anything. + expandText: 'read more', // text displayed in a link instead of the hidden part of the element. + // clicking this will expand/show the hidden/collapsed text + expandPrefix: '… ', + collapseTimer: 0, // number of milliseconds after text has been expanded at which to collapse the text again + expandEffect: 'fadeIn', + expandSpeed: '', // speed in milliseconds of the animation effect for expanding the text + userCollapse: true, // allow the user to re-collapse the expanded text. + userCollapseText: '[collapse expanded text]', // text to use for the link to re-collapse the text + userCollapsePrefix: ' ', + beforeExpand: function($thisEl) {}, + afterExpand: function($thisEl) {}, + onCollapse: function($thisEl, byUser) {} + }; +})(jQuery);

1 0

r562 - trunk
by chatellier＠users.labs.libre-entreprise.org 24 Jan '11

24 Jan '11

Author: chatellier Date: 2011-01-24 19:16:32 +0000 (Mon, 24 Jan 2011) New Revision: 562 Log: Update mavenpom Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-24 17:13:16 UTC (rev 561) +++ trunk/pom.xml 2011-01-24 19:16:32 UTC (rev 562) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4labs</artifactId> - <version>2.4.1</version> + <version>2.4.2</version> </parent> <groupId>fr.ifremer</groupId>

1 0

r561 - in trunk: coser-business/src/main/java/fr/ifremer/coser coser-business/src/main/resources/i18n coser-business/src/test/java/fr/ifremer/coser/services coser-ui/src/main/java/fr/ifremer/coser
by chatellier＠users.labs.libre-entreprise.org 24 Jan '11

24 Jan '11

Author: chatellier Date: 2011-01-24 17:13:16 +0000 (Mon, 24 Jan 2011) New Revision: 561 Log: Split indicators and maps results in two directories Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/CoserBusinessConfig.java trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/CoserBusinessConfig.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/CoserBusinessConfig.java 2011-01-24 17:12:10 UTC (rev 560) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/CoserBusinessConfig.java 2011-01-24 17:13:16 UTC (rev 561) @@ -142,11 +142,16 @@ return result; } - public File getWebProjectsDirectory() { - File result = getOptionAsFile(CoserBusinessOption.WEB_PROJECTS_DIRECTORY.key); + public File getWebIndicatorsProjectsDirectory() { + File result = getOptionAsFile(CoserBusinessOption.WEB_INDICATORS_PROJECTS_DIRECTORY.key); return result; } + public File getWebMapsProjectsDirectory() { + File result = getOptionAsFile(CoserBusinessOption.WEB_MAPS_PROJECTS_DIRECTORY.key); + return result; + } + public File getWebIndicatorsFile() { File result = getOptionAsFile(CoserBusinessOption.WEB_INDICATORS.key); return result; @@ -195,7 +200,8 @@ /** Server side. */ WEB_PROPERTIES_FILE("coser.web.properties.file", _("coser.config.web.properties.file.description"), "${" + DATABASE_DIRECTORY.key + "}" + File.separator + "web.properties", String.class, false, false), - WEB_PROJECTS_DIRECTORY("coser.web.projects.directory", _("coser.config.web.projects.directory.description"), "${" + DATABASE_DIRECTORY.key + "}" + File.separator + "webprojects", String.class, false, false), + WEB_INDICATORS_PROJECTS_DIRECTORY("coser.web.indicators.projects.directory", _("coser.config.web.indicators.projects.directory.description"), "${" + DATABASE_DIRECTORY.key + "}" + File.separator + "webindicatorsprojects", String.class, false, false), + WEB_MAPS_PROJECTS_DIRECTORY("coser.web.maps.projects.directory", _("coser.config.web.maps.projects.directory.description"), "${" + DATABASE_DIRECTORY.key + "}" + File.separator + "webmapsprojects", String.class, false, false), WEB_INDICATORS("coser.web.indicators.file", _("coser.config.web.indicators.file.description"), "${" + DATABASE_DIRECTORY.key + "}" + File.separator + "webindicators.csv", String.class, false, false), WEB_ZONES("coser.web.zones.file", _("coser.config.web.zones.file.description"), "${" + DATABASE_DIRECTORY.key + "}" + File.separator + "webzones.csv", String.class, false, false), WEB_PUBLICATION_EMAIL("coser.web.newresult.emails", _("coser.config.web.newresult.emails.description"), null, String.class, false, false); Modified: trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2011-01-24 17:12:10 UTC (rev 560) +++ trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2011-01-24 17:13:16 UTC (rev 561) @@ -114,8 +114,9 @@ coser.config.validator.directory.description=Validation files directory location coser.config.web.frontend.description=Coser server url coser.config.web.indicators.file.description=Indicators match file +coser.config.web.indicators.projects.directory.description=Web indicators projects storage directory +coser.config.web.maps.projects.directory.description=Web maps projects storage directory coser.config.web.newresult.emails.description=New results notification receivers -coser.config.web.projects.directory.description=Web projects storage directory coser.config.web.properties.file.description=Web informations properties file coser.config.web.uploadurl.description=Coser server upload result url coser.config.web.zones.file.description=Zones match file Modified: trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2011-01-24 17:12:10 UTC (rev 560) +++ trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2011-01-24 17:13:16 UTC (rev 561) @@ -114,8 +114,9 @@ coser.config.validator.directory.description=Emplacement des fichiers de validations coser.config.web.frontend.description=Adresse du serveur web coser coser.config.web.indicators.file.description=Fichier de correspondance des indicateurs +coser.config.web.indicators.projects.directory.description=Dossier de stockage des projets indicateurs pour le Web +coser.config.web.maps.projects.directory.description=Dossier de stockage des projets cartes pour le Web coser.config.web.newresult.emails.description=Liste des destinataires des notifications de nouveaux r\u00E9sultats -coser.config.web.projects.directory.description=Dossier de stockage des projets pour le Web coser.config.web.properties.file.description=Fichier d'enregistrement des informations serveur coser.config.web.uploadurl.description=Adresse d'envoi des r\u00E9sultats coser.config.web.zones.file.description=Fichier de correspondance des zones Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java 2011-01-24 17:12:10 UTC (rev 560) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java 2011-01-24 17:13:16 UTC (rev 561) @@ -116,14 +116,14 @@ registerUploadedResult("/web/upload2.zip"); // some tests (from first) - assertFileNotExists(config.getWebProjectsDirectory() + "/projet1/selections/selection11/results/result111"); - assertFileExists(config.getWebProjectsDirectory() + "/projet1/selections/selection11/results/result112"); - assertFileNotExists(config.getWebProjectsDirectory() + "/projet1/selections/selection12"); - assertFileNotExists(config.getWebProjectsDirectory() + "/projet2"); + assertFileNotExists(config.getWebIndicatorsProjectsDirectory() + "/projet1/selections/selection11/results/result111"); + assertFileExists(config.getWebIndicatorsProjectsDirectory() + "/projet1/selections/selection11/results/result112"); + assertFileNotExists(config.getWebIndicatorsProjectsDirectory() + "/projet1/selections/selection12"); + assertFileNotExists(config.getWebIndicatorsProjectsDirectory() + "/projet2"); // some tests (from second) - assertFileExists(config.getWebProjectsDirectory() + "/projet1/selections/selection11/results/result113"); - assertFileExists(config.getWebProjectsDirectory() + "/projet1/selections/selection11/results/result114"); - assertFileExists(config.getWebProjectsDirectory() + "/projet3/selections/selection31/results/result311"); + assertFileExists(config.getWebIndicatorsProjectsDirectory() + "/projet1/selections/selection11/results/result113"); + assertFileExists(config.getWebIndicatorsProjectsDirectory() + "/projet1/selections/selection11/results/result114"); + assertFileExists(config.getWebIndicatorsProjectsDirectory() + "/projet3/selections/selection31/results/result311"); } /** Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java 2011-01-24 17:12:10 UTC (rev 560) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java 2011-01-24 17:13:16 UTC (rev 561) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric + * Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as

1 0

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

24 Jan '11

Author: chatellier Date: 2011-01-24 17:12:10 +0000 (Mon, 24 Jan 2011) New Revision: 560 Log: Fix maps size and r?\195?\169partition Modified: 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/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/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 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-01-24 17:11:44 UTC (rev 559) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/com/indicator.jsp 2011-01-24 17:12:10 UTC (rev 560) @@ -32,7 +32,7 @@ <h2><s:text name="message.com.title" /></h2> - <img src="<s:url value='/images/zones/' /><s:property value='zonePicture' />" style="width: 590px; heigth: 812px" /> + <img src="<s:url value='/images/zones/' /><s:property value='zonePicture' />" /> <br /> 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-01-24 17:11:44 UTC (rev 559) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/com/zone.jsp 2011-01-24 17:12:10 UTC (rev 560) @@ -36,7 +36,7 @@ <s:iterator value="zonesPictures.entrySet()"> <div id="coserzonemap<s:property value='%{key}' />" style="display:none"> <div> - <img src="<s:url value='/images/zones/' /><s:property value='%{value}' />" style="width: 590px; heigth: 812px"/> + <img src="<s:url value='/images/zones/' /><s:property value='%{value}' />" /> </div> <s:property value='%{zonesMetaInfo.get(key)}' /> 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-24 17:11:44 UTC (rev 559) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/map/map.jsp 2011-01-24 17:12:10 UTC (rev 560) @@ -32,6 +32,8 @@ <h2><s:text name="message.map.title" /></h2> + <p><s:property value='facade' /> - <s:property value='survey' /> - <s:property value='speciesDisplayName' /></p> + <img src="<s:url action='map-data'> <s:param name="survey" value="%{survey}" /> <s:param name="species" value="%{species}" /> 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-01-24 17:11:44 UTC (rev 559) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/map/species.jsp 2011-01-24 17:12:10 UTC (rev 560) @@ -32,7 +32,9 @@ <h2><s:text name="message.map.title" /></h2> - <img src="<s:url value='/images/zones/' /><s:property value='zonePicture' />" style="width: 590px; heigth: 812px" /> + <img src="<s:url action='map-data'> + <s:param name="survey" value="%{survey}" /> + </s:url>" /> <br /> @@ -42,6 +44,7 @@ <s:else> <s:form action="map" method="get"> <s:select name="species" list="species" label="%{getText('message.common.selectspecies')}" /> + <s:hidden name="facade" property="facade"/> <s:hidden name="survey" property="survey"/> <s:submit label="Suite"/> </s:form> 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-01-24 17:11:44 UTC (rev 559) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/map/survey.jsp 2011-01-24 17:12:10 UTC (rev 560) @@ -42,6 +42,7 @@ <s:else> <s:form action="species" method="get"> <s:select name="survey" list="surveys" label="%{getText('message.common.selectzone')}" /> + <s:hidden name="facade" property="facade"/> <s:submit label="Suite"/> </s:form> </s:else> 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-01-24 17:11:44 UTC (rev 559) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/pop/indicator.jsp 2011-01-24 17:12:10 UTC (rev 560) @@ -33,7 +33,7 @@ <h2><s:text name="message.pop.title" /></h2> - <img src="<s:url value='/images/zones/' /><s:property value='zonePicture' />" style="width: 590px; heigth: 812px" /> + <img src="<s:url value='/images/zones/' /><s:property value='zonePicture' />" /> <br /> 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-01-24 17:11:44 UTC (rev 559) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/pop/species.jsp 2011-01-24 17:12:10 UTC (rev 560) @@ -33,7 +33,7 @@ <h2><s:text name="message.pop.title" /></h2> - <img src="<s:url value='/images/zones/' /><s:property value='zonePicture' />" style="width: 590px; heigth: 812px" /> + <img src="<s:url value='/images/zones/' /><s:property value='zonePicture' />" /> <br /> 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-01-24 17:11:44 UTC (rev 559) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/pop/zone.jsp 2011-01-24 17:12:10 UTC (rev 560) @@ -36,7 +36,7 @@ <s:iterator value="zonesPictures.entrySet()"> <div id="coserzonemap<s:property value='%{key}' />" style="display:none"> <div> - <img src="<s:url value='/images/zones/' /><s:property value='%{value}' />" style="width: 590px; heigth: 812px"/> + <img src="<s:url value='/images/zones/' /><s:property value='%{value}' />" /> </div> <s:property value='%{zonesMetaInfo.get(key)}' />

1 0

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

24 Jan '11

Author: chatellier Date: 2011-01-24 17:11:44 +0000 (Mon, 24 Jan 2011) New Revision: 559 Log: Fix main part content size 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-24 17:11:31 UTC (rev 558) +++ trunk/coser-web/src/main/webapp/styles/coser.css 2011-01-24 17:11:44 UTC (rev 559) @@ -355,12 +355,12 @@ /*fin reset*/ body { background: #1E3471 url(../images/fond_02.jpg) repeat-y scroll center 0; - position: relative; + /*position: relative;*/ } #conteneur,#conteneur_int { width: 1000px; - position: relative; + /*position: relative;*/ margin: 0 auto; } @@ -399,8 +399,10 @@ #middle .page { margin: 23px 22px 10px 60px; float: left; + -moz-border-radius: 10px; border-radius: 10px; text-align: justify; + width: 882px; } #middle .pagemain { @@ -417,10 +419,12 @@ #middle .page .content { /*background: url(../images/warper_page.png) repeat-y;*/ background-color: white; + -moz-border-radius: 10px; border-radius: 10px; font-size: 140%; color: #2e2e2e; line-height: 1.4em; + width: 100%; } #middle .page span.clb { @@ -447,6 +451,8 @@ height: 37px; position: relative; margin-bottom: 20px; + -moz-border-radius: 10px; + border-radius: 10px; } #middle .top_content .accueil { @@ -578,6 +584,9 @@ padding: 10px 20px 15px 20px; /*margin: 30px 0;*/ position: relative; + text-transform: uppercase; + color: #fff; + font-size: 140%; } #footer ul { @@ -594,10 +603,8 @@ } #footer ul li a { - text-transform: uppercase; color: #fff; text-decoration: none; - font-size: 140%; } #footer ul li a:hover { @@ -605,11 +612,12 @@ } #conteneur_int .top_content { - background: url(../images/top_contenu.png) no-repeat; + /*background: url(../images/top_contenu.png) no-repeat;*/ + background-color:white; height: 37px; margin: 23px 22px 10px 60px; padding: 15px 20px; - width: 588px; + /*width: 588px;*/ font-size: 140%; } @@ -639,7 +647,7 @@ position: relative; } -#conteneur_int .part_bottom .barre_select { +/*#conteneur_int .part_bottom .barre_select { background: url(../images/barre_select.png) no-repeat; height: 23px; padding: 20px 20px 30px; @@ -673,4 +681,4 @@ .barre_select select { background-color: #fff; border: 1px solid #ccc; -} +}*/

1 0

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

24 Jan '11

Author: chatellier Date: 2011-01-24 17:11:31 +0000 (Mon, 24 Jan 2011) New Revision: 558 Log: Ajout des facades et de la legende de la carte 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/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 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-24 17:11:07 UTC (rev 557) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/MapAction.java 2011-01-24 17:11:31 UTC (rev 558) @@ -22,6 +22,10 @@ package fr.ifremer.coser.web.actions.map; +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; /** @@ -38,10 +42,20 @@ /** serialVersionUID. */ private static final long serialVersionUID = 1663244944108703571L; + protected String facade; + protected String survey; protected String species; + public void setFacade(String facade) { + this.facade = facade; + } + + public String getFacade() { + return facade; + } + public String getSurvey() { return survey; } @@ -57,4 +71,15 @@ public void setSpecies(String species) { this.species = species; } + + public String getSpeciesDisplayName() { + WebService webService = ServiceFactory.getWebService(); + String displayName = null; + try { + displayName = webService.getSpeciesForSurvey(survey).get(species); + } catch (CoserBusinessException ex) { + throw new CoserWebException("Can't get species display name", ex); + } + return displayName; + } } 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-24 17:11:07 UTC (rev 557) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/MapDataAction.java 2011-01-24 17:11:31 UTC (rev 558) @@ -37,7 +37,7 @@ import fr.ifremer.coser.web.actions.common.CoserAction; /** - * Appéle par le navigateur pour recuperer le contenu de l'image. + * Appelé par le navigateur pour récuperer le contenu de l'image. * * @author chatellier * @version $Revision$ @@ -80,6 +80,7 @@ InputStream input = null; try { + // work with null species (get Repartition-stations map) File mapImage = webService.getMapFile(survey, species); input = new FileInputStream(mapImage); } catch (CoserBusinessException ex) { 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-24 17:11:07 UTC (rev 557) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/SpeciesAction.java 2011-01-24 17:11:31 UTC (rev 558) @@ -49,10 +49,20 @@ private static final Log log = LogFactory.getLog(SpeciesAction.class); + protected String facade; + protected String survey; protected Map<String, String> species; + public void setFacade(String facade) { + this.facade = facade; + } + + public String getFacade() { + return facade; + } + public String getSurvey() { return survey; } 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-24 17:11:07 UTC (rev 557) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/SurveyAction.java 2011-01-24 17:11:31 UTC (rev 558) @@ -46,11 +46,15 @@ protected String facade; + protected Map<String, String> surveys; + public void setFacade(String facade) { this.facade = facade; } - protected Map<String, String> surveys; + public String getFacade() { + return facade; + } public Map<String, String> getSurveys() { return surveys;

1 0