r631 - in trunk: . coser-web/src/main/resources/fr/ifremer/coser/web coser-web/src/main/webapp/WEB-INF/content
Author: chatellier Date: 2011-02-01 10:18:04 +0000 (Tue, 01 Feb 2011) New Revision: 631 Log: Add top anchor Modified: trunk/changelog.txt 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/changelog.txt =================================================================== --- trunk/changelog.txt 2011-02-01 09:37:07 UTC (rev 630) +++ trunk/changelog.txt 2011-02-01 10:18:04 UTC (rev 631) @@ -4,6 +4,7 @@ 1.0.0-beta3 ----------- + * Add top anchor on survey description page * Fix pdf generation containing non escaped html entities * List projects names sorted alphabetically * Fix website texts 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-02-01 09:37:07 UTC (rev 630) +++ trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package.properties 2011-02-01 10:18:04 UTC (rev 631) @@ -45,6 +45,7 @@ message.index.qualitymessage=Avertissement qualit\u00E9 message.index.surveytitle=Description des campagnes message.index.surveyparagraph=Des manuels des protocoles d\u00E9crivent les modalit\u00E9s techniques de r\u00E9alisation de chaque s\u00E9rie de campagnes. +message.common.anchortop=Top message.common.selectpop=Select a population message.common.selectzone=Select a zone message.common.selectsurvey=Select a survey 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-02-01 09:37:07 UTC (rev 630) +++ trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_fr.properties 2011-02-01 10:18:04 UTC (rev 631) @@ -45,6 +45,7 @@ message.index.qualitymessage=Avertissement qualit\u00E9 message.index.surveytitle=Description des campagnes message.index.surveyparagraph=Des manuels des protocoles d\u00E9crivent les modalit\u00E9s techniques de r\u00E9alisation de chaque s\u00E9rie de campagnes. +message.common.anchortop=Haut message.common.selectpop=S\u00E9lectionnez une population message.common.selectzone=S\u00E9lectionnez une zone message.common.selectsurvey=S\u00E9lectionnez une campagne Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/survey.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/survey.jsp 2011-02-01 09:37:07 UTC (rev 630) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/survey.jsp 2011-02-01 10:18:04 UTC (rev 631) @@ -32,7 +32,7 @@ $(document).ready(function() { // override some default options $('div.expandable').expander({ - slicePoint: 1560, // default is 100 + slicePoint: 1565, // 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]' @@ -42,7 +42,7 @@ </script> </head> <body> - + <a name="top"></a> <h2> <s:text name="message.survey.maintitle" /> </h2> @@ -111,7 +111,10 @@ <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> + + <h4><s:text name="message.survey.merdunord.sudmerdunord" /> + <div style="float:right;text-align:right;font-weight:normal"><a href="#top"><s:text name="message.common.anchortop" /></a></div> + </h4> <p><s:text name="message.survey.merdunord.sudmerdunord.desc" /></p> <p> <s:text name="message.survey.merdunord.sudmerdunord.plus" /> @@ -125,7 +128,9 @@ <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> + <h4><s:text name="message.survey.mancheorientale.mancheorientale" /> + <div style="float:right;text-align:right;font-weight:normal"><a href="#top"><s:text name="message.common.anchortop" /></a></div> + </h4> <p><s:text name="message.survey.mancheorientale.mancheorientale.desc" /></p> <p> <s:text name="message.survey.mancheorientale.mancheorientale.plus" /> @@ -135,7 +140,9 @@ </p> <a name="baiedesomme"></a> - <h4><s:text name="message.survey.mancheorientale.baiedesomme" /></h4> + <h4><s:text name="message.survey.mancheorientale.baiedesomme" /> + <div style="float:right;text-align:right;font-weight:normal"><a href="#top"><s:text name="message.common.anchortop" /></a></div> + </h4> <p><s:text name="message.survey.mancheorientale.baiedesomme.desc" /></p> <p> <s:text name="message.survey.mancheorientale.baiedesomme.plus" /> @@ -148,7 +155,9 @@ <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> + <h4><s:text name="message.survey.mancheoccidentale.flamanville" /> + <div style="float:right;text-align:right;font-weight:normal"><a href="#top"><s:text name="message.common.anchortop" /></a></div> + </h4> <p><s:text name="message.survey.mancheoccidentale.flamanville.desc" /></p> <p> <s:text name="message.survey.mancheoccidentale.flamanville.plus" /> @@ -161,7 +170,9 @@ <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> + <h4><s:text name="message.survey.atlantique.celtique" /> + <div style="float:right;text-align:right;font-weight:normal"><a href="#top"><s:text name="message.common.anchortop" /></a></div> + </h4> <p><s:text name="message.survey.atlantique.celtique.desc" /></p> <p> <s:text name="message.survey.atlantique.celtique.plus" /> @@ -171,7 +182,9 @@ </p> <a name="gascogne"></a> - <h4><s:text name="message.survey.atlantique.gascogne" /></h4> + <h4><s:text name="message.survey.atlantique.gascogne" /> + <div style="float:right;text-align:right;font-weight:normal"><a href="#top"><s:text name="message.common.anchortop" /></a></div> + </h4> <p><s:text name="message.survey.atlantique.gascogne.desc" /></p> <p> <s:text name="message.survey.atlantique.gascogne.plus" /> @@ -181,7 +194,9 @@ </p> <a name="vilaine"></a> - <h4><s:text name="message.survey.atlantique.vilaine" /></h4> + <h4><s:text name="message.survey.atlantique.vilaine" /> + <div style="float:right;text-align:right;font-weight:normal"><a href="#top"><s:text name="message.common.anchortop" /></a></div> + </h4> <p><s:text name="message.survey.atlantique.vilaine.desc" /></p> <p> <s:text name="message.survey.atlantique.vilaine.plus" /> @@ -194,7 +209,9 @@ <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> + <h4><s:text name="message.survey.mediterranee.golfelion" /> + <div style="float:right;text-align:right;font-weight:normal"><a href="#top"><s:text name="message.common.anchortop" /></a></div> + </h4> <p><s:text name="message.survey.mediterranee.golfelion.desc" /></p> <p> <s:text name="message.survey.mediterranee.golfelion.plus" /> @@ -208,7 +225,9 @@ </p> <a name="estcorse"></a> - <h4><s:text name="message.survey.mediterranee.estcorse" /></h4> + <h4><s:text name="message.survey.mediterranee.estcorse" /> + <div style="float:right;text-align:right;font-weight:normal"><a href="#top"><s:text name="message.common.anchortop" /></a></div> + </h4> <p><s:text name="message.survey.mediterranee.estcorse.desc" /></p> <p> <s:text name="message.survey.mediterranee.estcorse.plus" />
participants (1)
-
chatellierï¼ users.labs.libre-entreprise.org