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

r788 - in trunk: . coser-business/src/main/java/fr/ifremer/coser/validators coser-business/src/main/resources/validators/fr/ifremer/coser/data coser-business/src/test/java/fr/ifremer/coser/services
by chatellier＠users.labs.libre-entreprise.org 18 Mar '11

18 Mar '11

Author: chatellier Date: 2011-03-18 11:26:06 +0000 (Fri, 18 Mar 2011) New Revision: 788 Log: Fix double with exponent and fixed decimal count check Modified: trunk/changelog.txt trunk/coser-business/src/main/java/fr/ifremer/coser/validators/CoserCheckDoubleValidator.java trunk/coser-business/src/main/java/fr/ifremer/coser/validators/CoserDoubleValidator.java trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-fatal-validation.xml trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-warning-validation.xml trunk/coser-business/src/test/java/fr/ifremer/coser/services/ControlServiceTest.java Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2011-03-18 11:25:37 UTC (rev 787) +++ trunk/changelog.txt 2011-03-18 11:26:06 UTC (rev 788) @@ -4,9 +4,9 @@ 1.0.3 ----- + * Fix double with exponent and fixed decimal count check * Fix selection comment reload * Remove replay selection menu - * Allow "e" in double check for lat, long and swept surface * Set english website help link to correct locale * Fix filter ui layout * Add control about surface attributes to be positive only Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/validators/CoserCheckDoubleValidator.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/validators/CoserCheckDoubleValidator.java 2011-03-18 11:25:37 UTC (rev 787) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/validators/CoserCheckDoubleValidator.java 2011-03-18 11:26:06 UTC (rev 788) @@ -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 Lesser General Public License as @@ -25,10 +25,15 @@ package fr.ifremer.coser.validators; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.apache.commons.lang.StringUtils; + import com.opensymphony.xwork2.validator.ValidationException; /** - * Validateur de double de coser. + * Validateur de double de coser en tant que string. * * @author chatellier * @version $Revision$ @@ -38,8 +43,20 @@ */ public class CoserCheckDoubleValidator extends AbstractFieldValidator { + /** + * Pattern pour un double + * - group0 => all double + * - group1 => .xxxx + * - group2 => xxxx (after .) + * - group3 => exposant with e + * - group4 => exposant without e + */ + protected static final Pattern DOUBLE_PATTERN = Pattern.compile("^[0-9]+(\\.([0-9]+))?(e(\\-?[0-9]+))?$"); + protected String notAvailable; + protected Integer minDecimals; + public String getNotAvailable() { return notAvailable; } @@ -48,6 +65,14 @@ this.notAvailable = notAvailable; } + public Integer getMinDecimals() { + return minDecimals; + } + + public void setMinDecimals(Integer minDecimals) { + this.minDecimals = minDecimals; + } + public void validate(Object object) throws ValidationException { Object obj = getFieldValue(getFieldName(), object); String value = (String) obj; @@ -62,7 +87,26 @@ if (notAvailable != null && notAvailable.equals(value)) { return; } + + if (minDecimals != null) { + Matcher matcher = DOUBLE_PATTERN.matcher(value); + if (matcher.find()) { + int decimaleSize = StringUtils.length(matcher.group(2)); + int exposant = 0; + if (matcher.group(4) != null) { + exposant = Integer.parseInt(matcher.group(4)); + } + // 5.44e-2 => 2 - (-2) => 4 < minDecimale + if (decimaleSize - exposant < minDecimals) { + addFieldError(getFieldName(), object); + } + } + else { + addFieldError(getFieldName(), object); + } + } + try { Double.parseDouble(value); } Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/validators/CoserDoubleValidator.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/validators/CoserDoubleValidator.java 2011-03-18 11:25:37 UTC (rev 787) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/validators/CoserDoubleValidator.java 2011-03-18 11:26:06 UTC (rev 788) @@ -28,7 +28,7 @@ import com.opensymphony.xwork2.validator.ValidationException; /** - * TODO add comment here. + * Coser double validator. * * @author chatellier * @version $Revision$ Modified: trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-fatal-validation.xml =================================================================== --- trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-fatal-validation.xml 2011-03-18 11:25:37 UTC (rev 787) +++ trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-fatal-validation.xml 2011-03-18 11:26:06 UTC (rev 788) @@ -27,8 +27,8 @@ "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> <validators> <field name="sweptSurface"> - <field-validator type="regex"> - <param name="expression">(\-?[0-9]+\.[0-9]{3,})|([0-9]+(\.[0-9]+)?e\-?[0-9]+?)</param> + <field-validator type="checkDouble"> + <param name="minDecimals">3</param> <message>sweptSurface must contain at least 3 decimals</message> </field-validator> </field> Modified: trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-warning-validation.xml =================================================================== --- trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-warning-validation.xml 2011-03-18 11:25:37 UTC (rev 787) +++ trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-warning-validation.xml 2011-03-18 11:26:06 UTC (rev 788) @@ -27,14 +27,14 @@ "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> <validators> <field name="lat"> - <field-validator type="regex"> - <param name="expression">(\-?[0-9]+\.[0-9]{4,})|([0-9]+(\.[0-9]+)?e\-?[0-9]+?)</param> + <field-validator type="checkDouble"> + <param name="minDecimals">4</param> <message>lat must contain at least 4 decimals</message> </field-validator> </field> <field name="long"> - <field-validator type="regex"> - <param name="expression">(\-?[0-9]+\.[0-9]{4,})|([0-9]+(\.[0-9]+)?e\-?[0-9]+?)</param> + <field-validator type="checkDouble"> + <param name="minDecimals">4</param> <message>long must contain at least 4 decimals</message> </field-validator> </field> Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/ControlServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/ControlServiceTest.java 2011-03-18 11:25:37 UTC (rev 787) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/ControlServiceTest.java 2011-03-18 11:26:06 UTC (rev 788) @@ -102,20 +102,31 @@ } /** - * Test que certains double ont 5 decimales de définie. + * Test que certains double ont 3 ou 5 decimales de définie. */ @Test public void test5DecimalValidation() { Haul haulBean = new Haul(); + + // "Survey","Year","Haul","Month","Stratum","SweptSurface","Lat","Long","Depth" + + // erreur , pas assez de décimale haulBean.setData(new String[]{"1", "COSER_TEST","2010","TRAIT3","10","STR3","0.06","43.89","1.73","115.00"}); List<ControlError> errors = controlService.validate(haulBean, Category.HAUL); Assert.assertEquals(3, errors.size()); + // pas d'erreur, assez de décimales haulBean.setData(new String[]{"1","COSER_TEST","2010","TRAIT3","10","STR3","0.06000","43.89000","1.73234","115.00"}); errors = controlService.validate(haulBean, Category.HAUL); Assert.assertTrue(errors.isEmpty()); + + // erreur, exposant incorrect + haulBean.setData(new String[]{"1","COSER_TEST","2010","TRAIT3","10","STR3","6e-2","4.3e1","1.14564e3","115.00"}); + errors = controlService.validate(haulBean, Category.HAUL); + Assert.assertEquals(3, errors.size()); - haulBean.setData(new String[]{"1","COSER_TEST","2010","TRAIT3","10","STR3","6e-4","4.3e1","1.14564e3","115.00"}); + // pas d'erreur, exposant correct + haulBean.setData(new String[]{"1","COSER_TEST","2010","TRAIT3","10","STR3","6e-4","4.3e-3","1.14564e0","115.00"}); errors = controlService.validate(haulBean, Category.HAUL); Assert.assertTrue(errors.isEmpty()); }

1 0

r787 - trunk/coser-web/src/main/webapp/js
by chatellier＠users.labs.libre-entreprise.org 18 Mar '11

18 Mar '11

Author: chatellier Date: 2011-03-18 11:25:37 +0000 (Fri, 18 Mar 2011) New Revision: 787 Log: Add license Modified: trunk/coser-web/src/main/webapp/js/coser.js Modified: trunk/coser-web/src/main/webapp/js/coser.js =================================================================== --- trunk/coser-web/src/main/webapp/js/coser.js 2011-03-15 15:07:37 UTC (rev 786) +++ trunk/coser-web/src/main/webapp/js/coser.js 2011-03-18 11:25:37 UTC (rev 787) @@ -1,3 +1,26 @@ +/* + * #%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% + */ // affiche la carte correspondant à la selection dans la liste function coserShowSelectedZoneMap(select, prefix) { // cache toutes les autres cartes

1 0

r786 - trunk
by chatellier＠users.labs.libre-entreprise.org 15 Mar '11

15 Mar '11

Author: chatellier Date: 2011-03-15 15:07:37 +0000 (Tue, 15 Mar 2011) New Revision: 786 Log: Update to rsyntaxtextarea 1.5.0 Modified: trunk/changelog.txt trunk/pom.xml Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2011-03-15 10:07:06 UTC (rev 785) +++ trunk/changelog.txt 2011-03-15 15:07:37 UTC (rev 786) @@ -12,6 +12,7 @@ * Add control about surface attributes to be positive only * Fix some translation * Update to jQuery 1.5.1 + * Update to rSyntaxTextArea 1.5.0 1.0.2 ----- Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-03-15 10:07:06 UTC (rev 785) +++ trunk/pom.xml 2011-03-15 15:07:37 UTC (rev 786) @@ -194,7 +194,7 @@ <dependency> <groupId>com.fifesoft</groupId> <artifactId>rsyntaxtextarea</artifactId> - <version>r239</version> + <version>1.5.0</version> <scope>runtime</scope> </dependency>

1 0

r785 - in trunk: . coser-ui/src/main/java/fr/ifremer/coser/ui/selection
by chatellier＠users.labs.libre-entreprise.org 15 Mar '11

15 Mar '11

Author: chatellier Date: 2011-03-15 10:07:06 +0000 (Tue, 15 Mar 2011) New Revision: 785 Log: Fix selection comment reload Modified: trunk/changelog.txt trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2011-03-15 10:01:50 UTC (rev 784) +++ trunk/changelog.txt 2011-03-15 10:07:06 UTC (rev 785) @@ -4,6 +4,7 @@ 1.0.3 ----- + * Fix selection comment reload * Remove replay selection menu * Allow "e" in double check for lat, long and swept surface * Set english website help link to correct locale Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 2011-03-15 10:01:50 UTC (rev 784) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 2011-03-15 10:07:06 UTC (rev 785) @@ -104,7 +104,7 @@ </cell> <cell anchor="north" fill="horizontal" weighty="1" columns="3"> <JScrollPane> - <JTextArea id="detailsComment" rows="3" /> + <JTextArea id="detailsComment" text="{getSelection().getComment()}" rows="3" /> <javax.swing.text.Document javaBean="detailsComment.getDocument()" onInsertUpdate='getSelection().setComment(detailsComment.getText())' onRemoveUpdate='getSelection().setComment(detailsComment.getText())' />

1 0

r784 - in trunk/src/site: en/rst/user rst/user
by chatellier＠users.labs.libre-entreprise.org 15 Mar '11

15 Mar '11

Author: chatellier Date: 2011-03-15 10:01:50 +0000 (Tue, 15 Mar 2011) New Revision: 784 Log: Update control surface "positive real" Modified: trunk/src/site/en/rst/user/guide_listcontrols.rst trunk/src/site/rst/user/guide_listcontrols.rst Modified: trunk/src/site/en/rst/user/guide_listcontrols.rst =================================================================== --- trunk/src/site/en/rst/user/guide_listcontrols.rst 2011-03-15 10:00:56 UTC (rev 783) +++ trunk/src/site/en/rst/user/guide_listcontrols.rst 2011-03-15 10:01:50 UTC (rev 784) @@ -71,7 +71,7 @@ +------------+----------------------------------------------------------------+----------+ | Stratum | Mandatory field | Error | +------------+----------------------------------------------------------------+----------+ -| Surface | Number, empty or NA | Error | +| Surface | Number, empty or NA, strictly positive | Error | +------------+----------------------------------------------------------------+----------+ +-----------------------------------------------------------------------------+----------+ @@ -120,6 +120,9 @@ | Check the minimal number of observations in the table LENGTH$Number by | Error | | species by stratum by year | | +-----------------------------------------------------------------------------+----------+ +| For the fishes, the Length field must have a full or half step | Warning | +| (for example: 4.0 or 4.5 but not 4.25) | | ++-----------------------------------------------------------------------------+----------+ Hauls ----- @@ -169,9 +172,6 @@ +-----------------------------------------------------------------------------+----------+ | The list of years must be the same in the Catchs, Length and Hauls files | Fatal | +-----------------------------------------------------------------------------+----------+ -| For the fishes, the Length field must have a full or half step | Warning | -| (for example: 4.0 or 4.5 but not 4.25) | | -+-----------------------------------------------------------------------------+----------+ | Check that for each species present in a haul of a year in the length file | Fatal | | (noted Year/Haul/Species) there is a data in the catch files (the opposite | | | is not true) | | Modified: trunk/src/site/rst/user/guide_listcontrols.rst =================================================================== --- trunk/src/site/rst/user/guide_listcontrols.rst 2011-03-15 10:00:56 UTC (rev 783) +++ trunk/src/site/rst/user/guide_listcontrols.rst 2011-03-15 10:01:50 UTC (rev 784) @@ -123,6 +123,9 @@ | Vérification du nombre minimal d'observation dans table TAILLES$Nombre par | Erreur | | espèce par trait par année | | +-----------------------------------------------------------------------------+----------+ +| Pour les poissons, le champs Longueur doit utiliser un pas entier ou un | Warning | +| demi pas (par exemple: 4.0 ou 4.5, mais pas 4.25) | | ++-----------------------------------------------------------------------------+----------+ Traits ------ @@ -175,9 +178,6 @@ | La liste des années doit être identique entre les fichiers Captures, | | | Tailles et Traits | Fatal | +-----------------------------------------------------------------------------+----------+ -| Pour les poissons, le champs Longueur doit utiliser un pas entier ou un | Warning | -| demi pas (par exemple: 4.0 ou 4.5, mais pas 4.25) | | -+-----------------------------------------------------------------------------+----------+ | Vérification que pour chaque espèce présent dans un trait d'une année | Fatal | | dans le fichier tailles (noté Annee/Trait/Espece) il y a une donnée | | | dans le fichier captures (le contraire n'est pas vrai) | |

1 0

r783 - trunk
by chatellier＠users.labs.libre-entreprise.org 15 Mar '11

15 Mar '11

Author: chatellier Date: 2011-03-15 10:00:56 +0000 (Tue, 15 Mar 2011) New Revision: 783 Log: Remove replay selection menu Modified: trunk/changelog.txt Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2011-03-15 10:00:54 UTC (rev 782) +++ trunk/changelog.txt 2011-03-15 10:00:56 UTC (rev 783) @@ -4,6 +4,7 @@ 1.0.3 ----- + * Remove replay selection menu * Allow "e" in double check for lat, long and swept surface * Set english website help link to correct locale * Fix filter ui layout

1 0

r782 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui
by chatellier＠users.labs.libre-entreprise.org 15 Mar '11

15 Mar '11

Author: chatellier Date: 2011-03-15 10:00:54 +0000 (Tue, 15 Mar 2011) New Revision: 782 Log: Remove replay selection menu Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/SelectionsListMenuItem.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/SelectionsListMenuItem.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/SelectionsListMenuItem.java 2011-03-14 17:05:05 UTC (rev 781) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/SelectionsListMenuItem.java 2011-03-15 10:00:54 UTC (rev 782) @@ -130,14 +130,14 @@ newMenuItem.addActionListener(this); add(newMenuItem); - // new selection + /* replay selection + chatellier disabled since 20110315 never implemented JMenuItem replayMenuItem = new JMenuItem(_("coser.ui.mainframe.menu.data.replaySelection")); // les chaines ne doivent pas poser pb, on ne peut pas // avoir de selection avec espace replayMenuItem.setActionCommand("replay selection"); replayMenuItem.addActionListener(this); - replayMenuItem.setEnabled(false); // FIXME chatellier 20101126 pas terminé - add(replayMenuItem); + add(replayMenuItem);*/ } } }

1 0

r781 - trunk/coser-ui/src/main/java/fr/ifremer/coser
by chatellier＠users.labs.libre-entreprise.org 14 Mar '11

14 Mar '11

Author: chatellier Date: 2011-03-14 17:05:05 +0000 (Mon, 14 Mar 2011) New Revision: 781 Log: Update link for en url Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java 2011-03-14 16:39:53 UTC (rev 780) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java 2011-03-14 17:05:05 UTC (rev 781) @@ -82,7 +82,7 @@ LOOKANDFEEL("coser.lookandfeel", _("coser.config.lookandfeel.description"), null, String.class, false, false), APPLICATION_VERSION("coser.application.version", _("coser.config.application.version.description"), null, String.class, false, false), SUPPORT_EMAIL("coser.support.email", _("coser.config.support.email.description"), "support at codelutin.com", String.class, false, false), - WEBSITE_URL("coser.website", _("coser.config.website.description"), "http://coser.labs.libre-entreprise.org/", String.class, false, false); + WEBSITE_URL("coser.website", _("coser.config.website.description"), "http://coser.labs.libre-entreprise.org/coser/", String.class, false, false); protected String key; protected String description;

1 0

r780 - trunk/src/site
by chatellier＠users.labs.libre-entreprise.org 14 Mar '11

14 Mar '11

Author: chatellier Date: 2011-03-14 16:39:53 +0000 (Mon, 14 Mar 2011) New Revision: 780 Log: Fix site Modified: trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2011-03-14 16:33:08 UTC (rev 779) +++ trunk/src/site/site_en.xml 2011-03-14 16:39:53 UTC (rev 780) @@ -27,7 +27,7 @@ <project name="${project.name}"> <bannerLeft> - <src>icons/logo100.png</src> + <src>http://coser.labs.libre-entreprise.org/coser/icons/logo100.png</src> <href>index.html</href> </bannerLeft> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2011-03-14 16:33:08 UTC (rev 779) +++ trunk/src/site/site_fr.xml 2011-03-14 16:39:53 UTC (rev 780) @@ -27,7 +27,7 @@ <project name="${project.name}"> <bannerLeft> - <src>icons/logo100.png</src> + <src>http://coser.labs.libre-entreprise.org/coser/icons/logo100.png</src> <href>index.html</href> </bannerLeft>

1 0

r779 - in trunk: coser-business/src/site coser-ui/src/site coser-web/src/site src/site
by chatellier＠users.labs.libre-entreprise.org 14 Mar '11

14 Mar '11

Author: chatellier Date: 2011-03-14 16:33:08 +0000 (Mon, 14 Mar 2011) New Revision: 779 Log: Fix site Modified: trunk/coser-business/src/site/site_en.xml trunk/coser-business/src/site/site_fr.xml trunk/coser-ui/src/site/site_en.xml trunk/coser-ui/src/site/site_fr.xml trunk/coser-web/src/site/site_en.xml trunk/coser-web/src/site/site_fr.xml trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/coser-business/src/site/site_en.xml =================================================================== --- trunk/coser-business/src/site/site_en.xml 2011-03-14 16:25:25 UTC (rev 778) +++ trunk/coser-business/src/site/site_en.xml 2011-03-14 16:33:08 UTC (rev 779) @@ -30,11 +30,6 @@ <menu ref="parent"/> - <links> - <item name="[fr" href="../index.html" /> - <item name="en]" href="index.html" /> - </links> - <menu ref="reports"/> </body> Modified: trunk/coser-business/src/site/site_fr.xml =================================================================== --- trunk/coser-business/src/site/site_fr.xml 2011-03-14 16:25:25 UTC (rev 778) +++ trunk/coser-business/src/site/site_fr.xml 2011-03-14 16:33:08 UTC (rev 779) @@ -30,11 +30,6 @@ <menu ref="parent"/> - <links> - <item name="[fr" href="index.html" /> - <item name="en]" href="en/index.html" /> - </links> - <menu ref="reports"/> </body> Modified: trunk/coser-ui/src/site/site_en.xml =================================================================== --- trunk/coser-ui/src/site/site_en.xml 2011-03-14 16:25:25 UTC (rev 778) +++ trunk/coser-ui/src/site/site_en.xml 2011-03-14 16:33:08 UTC (rev 779) @@ -30,11 +30,6 @@ <menu ref="parent"/> - <links> - <item name="[fr" href="../index.html" /> - <item name="en]" href="index.html" /> - </links> - <menu ref="reports"/> </body> Modified: trunk/coser-ui/src/site/site_fr.xml =================================================================== --- trunk/coser-ui/src/site/site_fr.xml 2011-03-14 16:25:25 UTC (rev 778) +++ trunk/coser-ui/src/site/site_fr.xml 2011-03-14 16:33:08 UTC (rev 779) @@ -30,11 +30,6 @@ <menu ref="parent"/> - <links> - <item name="[fr" href="index.html" /> - <item name="en]" href="en/index.html" /> - </links> - <menu ref="reports"/> </body> Modified: trunk/coser-web/src/site/site_en.xml =================================================================== --- trunk/coser-web/src/site/site_en.xml 2011-03-14 16:25:25 UTC (rev 778) +++ trunk/coser-web/src/site/site_en.xml 2011-03-14 16:33:08 UTC (rev 779) @@ -29,11 +29,6 @@ <menu ref="parent"/> - <links> - <item name="[fr" href="../index.html" /> - <item name="en]" href="index.html" /> - </links> - <menu ref="reports"/> </body> Modified: trunk/coser-web/src/site/site_fr.xml =================================================================== --- trunk/coser-web/src/site/site_fr.xml 2011-03-14 16:25:25 UTC (rev 778) +++ trunk/coser-web/src/site/site_fr.xml 2011-03-14 16:33:08 UTC (rev 779) @@ -29,11 +29,6 @@ <menu ref="parent"/> - <links> - <item name="[fr" href="index.html" /> - <item name="en]" href="en/index.html" /> - </links> - <menu ref="reports"/> </body> Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2011-03-14 16:25:25 UTC (rev 778) +++ trunk/src/site/site_en.xml 2011-03-14 16:33:08 UTC (rev 779) @@ -27,7 +27,7 @@ <project name="${project.name}"> <bannerLeft> - <src>http://coser.labs.libre-entreprise.org/coser/icons/logo100.png</src> + <src>icons/logo100.png</src> <href>index.html</href> </bannerLeft> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2011-03-14 16:25:25 UTC (rev 778) +++ trunk/src/site/site_fr.xml 2011-03-14 16:33:08 UTC (rev 779) @@ -27,7 +27,7 @@ <project name="${project.name}"> <bannerLeft> - <src>http://coser.labs.libre-entreprise.org/coser/icons/logo100.png</src> + <src>icons/logo100.png</src> <href>index.html</href> </bannerLeft>

1 0