- Wao-commits - mailman.cloud.codelutin.com

[Suiviobsmer-commits] r223 - trunk/suiviobsmer-ui/src/main/webapp/css
by fdesbois＠users.labs.libre-entreprise.org 17 Jan '10

17 Jan '10

Author: fdesbois Date: 2010-01-17 20:04:24 +0000 (Sun, 17 Jan 2010) New Revision: 223 Modified: trunk/suiviobsmer-ui/src/main/webapp/css/contacts.css trunk/suiviobsmer-ui/src/main/webapp/css/sampling.css Log: Minimize size of big tables for admin Modified: trunk/suiviobsmer-ui/src/main/webapp/css/contacts.css =================================================================== --- trunk/suiviobsmer-ui/src/main/webapp/css/contacts.css 2010-01-17 19:49:21 UTC (rev 222) +++ trunk/suiviobsmer-ui/src/main/webapp/css/contacts.css 2010-01-17 20:04:24 UTC (rev 223) @@ -83,7 +83,7 @@ } div#so-contacts table.admin { - width: 3000px; + width: 2000px; font-size: 0.8em; } Modified: trunk/suiviobsmer-ui/src/main/webapp/css/sampling.css =================================================================== --- trunk/suiviobsmer-ui/src/main/webapp/css/sampling.css 2010-01-17 19:49:21 UTC (rev 222) +++ trunk/suiviobsmer-ui/src/main/webapp/css/sampling.css 2010-01-17 20:04:24 UTC (rev 223) @@ -18,7 +18,7 @@ } div#so-sampling div.admin { - width: 2500px; + width: 2200px; margin-left: 10px; font-size: 0.8em; }

1 0

[Suiviobsmer-commits] r222 - in trunk: suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components suiviobsmer-ui/src/main/java/fr/ifremer/
by fdesbois＠users.labs.libre-entreprise.org 17 Jan '10

17 Jan '10

Author: fdesbois Date: 2010-01-17 19:49:21 +0000 (Sun, 17 Jan 2010) New Revision: 222 Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/MD5.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/ContactFilterImpl.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/ImportResultsImpl.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/SamplingFilterImpl.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceNewsImpl.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImpl.java trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/ImportHelperTest.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/AbstractFilteredPage.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/Chart.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/data/ChartUtils.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/mixins/PopupPageLink.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/ExceptionReport.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SampleRowHistoric.java Log: update license headers Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/MD5.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/MD5.java 2010-01-17 19:38:22 UTC (rev 221) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/MD5.java 2010-01-17 19:49:21 UTC (rev 222) @@ -1,18 +1,21 @@ -/* *##% Pollen - * Copyright (C) 2009 CodeLutin +/* *##% + * SuiviObsmer :: Business + * Copyright (C) 2009 - 2010 Ifremer * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * it under the terms of the GNU 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. + * GNU General Lesser Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. ##%*/ + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * ##%*/ package fr.ifremer.suiviobsmer; Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/ContactFilterImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/ContactFilterImpl.java 2010-01-17 19:38:22 UTC (rev 221) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/ContactFilterImpl.java 2010-01-17 19:49:21 UTC (rev 222) @@ -1,3 +1,23 @@ +/* + * *##% + * SuiviObsmer :: Business + * Copyright (C) 2009 - 2010 Ifremer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * ##%* + */ package fr.ifremer.suiviobsmer.bean; Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/ImportResultsImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/ImportResultsImpl.java 2010-01-17 19:38:22 UTC (rev 221) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/ImportResultsImpl.java 2010-01-17 19:49:21 UTC (rev 222) @@ -1,3 +1,23 @@ +/* + * *##% + * SuiviObsmer :: Business + * Copyright (C) 2009 - 2010 Ifremer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * ##%* + */ package fr.ifremer.suiviobsmer.bean; Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/SamplingFilterImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/SamplingFilterImpl.java 2010-01-17 19:38:22 UTC (rev 221) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/SamplingFilterImpl.java 2010-01-17 19:49:21 UTC (rev 222) @@ -1,3 +1,23 @@ +/* + * *##% + * SuiviObsmer :: Business + * Copyright (C) 2009 - 2010 Ifremer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * ##%* + */ package fr.ifremer.suiviobsmer.bean; Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.java 2010-01-17 19:38:22 UTC (rev 221) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.java 2010-01-17 19:49:21 UTC (rev 222) @@ -1,3 +1,23 @@ +/* + * *##% + * SuiviObsmer :: Business + * Copyright (C) 2009 - 2010 Ifremer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * ##%* + */ package fr.ifremer.suiviobsmer.entity; Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceNewsImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceNewsImpl.java 2010-01-17 19:38:22 UTC (rev 221) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceNewsImpl.java 2010-01-17 19:49:21 UTC (rev 222) @@ -1,3 +1,23 @@ +/* + * *##% + * SuiviObsmer :: Business + * Copyright (C) 2009 - 2010 Ifremer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * ##%* + */ package fr.ifremer.suiviobsmer.impl; Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImpl.java 2010-01-17 19:38:22 UTC (rev 221) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImpl.java 2010-01-17 19:49:21 UTC (rev 222) @@ -1,3 +1,23 @@ +/* + * *##% + * SuiviObsmer :: Business + * Copyright (C) 2009 - 2010 Ifremer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * ##%* + */ package fr.ifremer.suiviobsmer.impl; Modified: trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/ImportHelperTest.java =================================================================== --- trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/ImportHelperTest.java 2010-01-17 19:38:22 UTC (rev 221) +++ trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/ImportHelperTest.java 2010-01-17 19:49:21 UTC (rev 222) @@ -146,4 +146,4 @@ System.out.println("logTimeAndMemory"); } -} \ No newline at end of file +} Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/AbstractFilteredPage.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/AbstractFilteredPage.java 2010-01-17 19:38:22 UTC (rev 221) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/AbstractFilteredPage.java 2010-01-17 19:49:21 UTC (rev 222) @@ -1,3 +1,23 @@ +/* + * *##% + * SuiviObsmer :: Web Interface + * Copyright (C) 2009 - 2010 Ifremer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * ##%* + */ package fr.ifremer.suiviobsmer.ui.base; Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/Chart.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/Chart.java 2010-01-17 19:38:22 UTC (rev 221) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/Chart.java 2010-01-17 19:49:21 UTC (rev 222) @@ -1,18 +1,21 @@ -/* *##% Pollen - * Copyright (C) 2009 CodeLutin +/* *##% + * SuiviObsmer :: Web Interface + * Copyright (C) 2009 - 2010 Ifremer * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * it under the terms of the GNU 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. + * GNU General Lesser Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. ##%*/ + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * ##%*/ package fr.ifremer.suiviobsmer.ui.components; @@ -131,4 +134,4 @@ } }; } -} \ No newline at end of file +} Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/data/ChartUtils.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/data/ChartUtils.java 2010-01-17 19:38:22 UTC (rev 221) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/data/ChartUtils.java 2010-01-17 19:49:21 UTC (rev 222) @@ -1,3 +1,23 @@ +/* + * *##% + * SuiviObsmer :: Web Interface + * Copyright (C) 2009 - 2010 Ifremer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * ##%* + */ package fr.ifremer.suiviobsmer.ui.data; Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/mixins/PopupPageLink.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/mixins/PopupPageLink.java 2010-01-17 19:38:22 UTC (rev 221) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/mixins/PopupPageLink.java 2010-01-17 19:49:21 UTC (rev 222) @@ -1,3 +1,23 @@ +/* + * *##% + * SuiviObsmer :: Web Interface + * Copyright (C) 2009 - 2010 Ifremer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * ##%* + */ package fr.ifremer.suiviobsmer.ui.mixins; @@ -86,4 +106,4 @@ } -} \ No newline at end of file +} Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/ExceptionReport.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/ExceptionReport.java 2010-01-17 19:38:22 UTC (rev 221) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/ExceptionReport.java 2010-01-17 19:49:21 UTC (rev 222) @@ -18,67 +18,67 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * ##%* */ - -package fr.ifremer.suiviobsmer.ui.pages; - -import fr.ifremer.suiviobsmer.SuiviObsmerException; -import fr.ifremer.suiviobsmer.ui.base.SuiviObsmerPage; -import fr.ifremer.suiviobsmer.ui.components.Layout; -import org.apache.tapestry5.annotations.InjectComponent; -import org.apache.tapestry5.annotations.Property; -import org.apache.tapestry5.ioc.annotations.Inject; -import org.apache.tapestry5.runtime.ComponentEventException; -import org.apache.tapestry5.services.ExceptionReporter; -import org.slf4j.Logger; - -/** - * ExceptionReport - * - * Created: 5 janv. 2010 - * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ - */ -public class ExceptionReport implements ExceptionReporter, SuiviObsmerPage { - - @InjectComponent - private Layout layout; - - @Inject - private Logger log; - - @Property - private Throwable exception; - - @Override - public void reportException(Throwable eee) { - this.exception = getSuiviObsmerException(eee); - if (exception != null) { - layout.getFeedBack().addError(exception.getMessage()); - this.exception = exception.getCause(); - } else { - this.exception = eee; - log.error("Unexpected exception", eee); - } - layout.getFeedBack().addError("Erreur : " + this.exception.getClass().getSimpleName() + " : " + this.exception.getMessage()); - } - - protected Throwable getSuiviObsmerException(Throwable eee) { - if (eee == null) { - return eee; - } - if (eee instanceof SuiviObsmerException) { - return eee; - } - return getSuiviObsmerException(eee.getCause()); - } - - @Override - public boolean isOnlyForAdmin() { - return false; - } - -} + +package fr.ifremer.suiviobsmer.ui.pages; + +import fr.ifremer.suiviobsmer.SuiviObsmerException; +import fr.ifremer.suiviobsmer.ui.base.SuiviObsmerPage; +import fr.ifremer.suiviobsmer.ui.components.Layout; +import org.apache.tapestry5.annotations.InjectComponent; +import org.apache.tapestry5.annotations.Property; +import org.apache.tapestry5.ioc.annotations.Inject; +import org.apache.tapestry5.runtime.ComponentEventException; +import org.apache.tapestry5.services.ExceptionReporter; +import org.slf4j.Logger; + +/** + * ExceptionReport + * + * Created: 5 janv. 2010 + * + * @author fdesbois + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ +public class ExceptionReport implements ExceptionReporter, SuiviObsmerPage { + + @InjectComponent + private Layout layout; + + @Inject + private Logger log; + + @Property + private Throwable exception; + + @Override + public void reportException(Throwable eee) { + this.exception = getSuiviObsmerException(eee); + if (exception != null) { + layout.getFeedBack().addError(exception.getMessage()); + this.exception = exception.getCause(); + } else { + this.exception = eee; + log.error("Unexpected exception", eee); + } + layout.getFeedBack().addError("Erreur : " + this.exception.getClass().getSimpleName() + " : " + this.exception.getMessage()); + } + + protected Throwable getSuiviObsmerException(Throwable eee) { + if (eee == null) { + return eee; + } + if (eee instanceof SuiviObsmerException) { + return eee; + } + return getSuiviObsmerException(eee.getCause()); + } + + @Override + public boolean isOnlyForAdmin() { + return false; + } + +} Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SampleRowHistoric.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SampleRowHistoric.java 2010-01-17 19:38:22 UTC (rev 221) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SampleRowHistoric.java 2010-01-17 19:49:21 UTC (rev 222) @@ -1,88 +1,108 @@ - -package fr.ifremer.suiviobsmer.ui.pages; - -import fr.ifremer.suiviobsmer.SuiviObsmerException; -import fr.ifremer.suiviobsmer.entity.SampleRow; -import fr.ifremer.suiviobsmer.entity.SampleRowLog; -import fr.ifremer.suiviobsmer.services.ServiceSampling; -import fr.ifremer.suiviobsmer.ui.base.SuiviObsmerPage; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.Locale; -import org.apache.tapestry5.annotations.IncludeStylesheet; -import org.apache.tapestry5.annotations.Persist; -import org.apache.tapestry5.annotations.Property; -import org.apache.tapestry5.ioc.annotations.Inject; -import org.slf4j.Logger; - -/** - * SampleRowHistoric - * - * Created: 12 janv. 2010 - * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ - */ - at IncludeStylesheet("context:css/sampling.css") -public class SampleRowHistoric implements SuiviObsmerPage { - - @Override - public boolean isOnlyForAdmin() { - return true; - } - - @Inject - private Logger log; - - @Inject - private ServiceSampling serviceSampling; - - private String sampleRowId; - - @Persist - private SampleRow sampleRow; - - @Property - private SampleRowLog sampleRowLog; - - void onActivate(String id) { - sampleRowId = id; - } - - String onPassivate() { - return sampleRowId; - } - - void setupRender() throws SuiviObsmerException { - sampleRow = null; - getSampleRow(); - } - - public SampleRow getSampleRow() throws SuiviObsmerException { - if (sampleRow == null) { - if (log.isInfoEnabled()) { - log.info("BUSINESS REQUEST [getSampleRow]"); - } - sampleRow = serviceSampling.getSampleRow(sampleRowId); - } - return sampleRow; - } - - public DateFormat getDateFormat() { - return new SimpleDateFormat("dd/MM/yyyy HH:mm:ss", Locale.FRENCH); - } - - public String getContent() { - String content = sampleRowLog.getLogText(); - if (content == null) { - content = "Aucun changement enregistré."; - } else { - content = content.replaceAll("\\n", "<br />"); - } - return content; - } - -} +/* + * *##% + * SuiviObsmer :: Web Interface + * Copyright (C) 2009 - 2010 Ifremer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * ##%* + */ + +package fr.ifremer.suiviobsmer.ui.pages; + +import fr.ifremer.suiviobsmer.SuiviObsmerException; +import fr.ifremer.suiviobsmer.entity.SampleRow; +import fr.ifremer.suiviobsmer.entity.SampleRowLog; +import fr.ifremer.suiviobsmer.services.ServiceSampling; +import fr.ifremer.suiviobsmer.ui.base.SuiviObsmerPage; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Locale; +import org.apache.tapestry5.annotations.IncludeStylesheet; +import org.apache.tapestry5.annotations.Persist; +import org.apache.tapestry5.annotations.Property; +import org.apache.tapestry5.ioc.annotations.Inject; +import org.slf4j.Logger; + +/** + * SampleRowHistoric + * + * Created: 12 janv. 2010 + * + * @author fdesbois + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ + at IncludeStylesheet("context:css/sampling.css") +public class SampleRowHistoric implements SuiviObsmerPage { + + @Override + public boolean isOnlyForAdmin() { + return true; + } + + @Inject + private Logger log; + + @Inject + private ServiceSampling serviceSampling; + + private String sampleRowId; + + @Persist + private SampleRow sampleRow; + + @Property + private SampleRowLog sampleRowLog; + + void onActivate(String id) { + sampleRowId = id; + } + + String onPassivate() { + return sampleRowId; + } + + void setupRender() throws SuiviObsmerException { + sampleRow = null; + getSampleRow(); + } + + public SampleRow getSampleRow() throws SuiviObsmerException { + if (sampleRow == null) { + if (log.isInfoEnabled()) { + log.info("BUSINESS REQUEST [getSampleRow]"); + } + sampleRow = serviceSampling.getSampleRow(sampleRowId); + } + return sampleRow; + } + + public DateFormat getDateFormat() { + return new SimpleDateFormat("dd/MM/yyyy HH:mm:ss", Locale.FRENCH); + } + + public String getContent() { + String content = sampleRowLog.getLogText(); + if (content == null) { + content = "Aucun changement enregistré."; + } else { + content = content.replaceAll("\\n", "<br />"); + } + return content; + } + +}

1 0

[Suiviobsmer-commits] r221 - in trunk: . suiviobsmer-business suiviobsmer-ui
by fdesbois＠users.labs.libre-entreprise.org 17 Jan '10

17 Jan '10

Author: fdesbois Date: 2010-01-17 19:38:22 +0000 (Sun, 17 Jan 2010) New Revision: 221 Modified: trunk/changelog.txt trunk/pom.xml trunk/suiviobsmer-business/pom.xml trunk/suiviobsmer-ui/pom.xml Log: Change version to 0.1.0 : first beta version with fixed model Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2010-01-17 19:32:26 UTC (rev 220) +++ trunk/changelog.txt 2010-01-17 19:38:22 UTC (rev 221) @@ -4,6 +4,7 @@ 0.1.0 ----- +- [fdesbois] Evol #1939 : Gestion des News (Ajouter/Modifier/Supprimer) - [fdesbois] Evol #1975 : Synthèse : Graphique dynamique sur les données du plan d'échantillonnage (nb marées prévus/réels) - [fdesbois] Evol #2001 : Possibilité d'avoir un mois vide au milieu de la période d'une ligne d'échantillon - [fdesbois] Evol #2000 : Déplacement des dates de la période du programme vers les lignes d'échantillonnage Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-17 19:32:26 UTC (rev 220) +++ trunk/pom.xml 2010-01-17 19:38:22 UTC (rev 221) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>suiviobsmer</artifactId> - <version>0.0.4-SNAPSHOT</version> + <version>0.1.0-SNAPSHOT</version> <modules> <module>suiviobsmer-ui</module> Modified: trunk/suiviobsmer-business/pom.xml =================================================================== --- trunk/suiviobsmer-business/pom.xml 2010-01-17 19:32:26 UTC (rev 220) +++ trunk/suiviobsmer-business/pom.xml 2010-01-17 19:38:22 UTC (rev 221) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>suiviobsmer</artifactId> - <version>0.0.4-SNAPSHOT</version> + <version>0.1.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.suiviobsmer</groupId> Modified: trunk/suiviobsmer-ui/pom.xml =================================================================== --- trunk/suiviobsmer-ui/pom.xml 2010-01-17 19:32:26 UTC (rev 220) +++ trunk/suiviobsmer-ui/pom.xml 2010-01-17 19:38:22 UTC (rev 221) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>suiviobsmer</artifactId> - <version>0.0.4-SNAPSHOT</version> + <version>0.1.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.suiviobsmer</groupId>

1 0

[Suiviobsmer-commits] r220 - in trunk: . suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/mock suiviobsmer-business/src/main/xmi suiviobsmer-ui suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/services suiviobsmer-ui/src/main/resources/fr/ifremer/suiviobsmer/ui/pages suiviobsmer-ui/src/main/webapp suiviobsmer-ui/src/main/webapp/css suiviobsmer-ui/src/main/webapp/js
by fdesbois＠users.labs.libre-entreprise.org 17 Jan '10

17 Jan '10

Author: fdesbois Date: 2010-01-17 19:32:26 +0000 (Sun, 17 Jan 2010) New Revision: 220 Added: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceNewsImpl.java trunk/suiviobsmer-ui/src/main/resources/fr/ifremer/suiviobsmer/ui/pages/Index.properties trunk/suiviobsmer-ui/src/main/webapp/js/FCKConf.js Modified: trunk/pom.xml trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/mock/ServiceNewsMock.java trunk/suiviobsmer-business/src/main/xmi/suiviobsmer.zargo trunk/suiviobsmer-ui/pom.xml trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Index.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/services/AppModule.java trunk/suiviobsmer-ui/src/main/webapp/Index.tml trunk/suiviobsmer-ui/src/main/webapp/css/news.css Log: - Add news managment, use of EasyFCKEditor - Use last mavenpom and eugene releases Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-17 18:27:15 UTC (rev 219) +++ trunk/pom.xml 2010-01-17 19:32:26 UTC (rev 220) @@ -81,6 +81,11 @@ <version>${tapestry.version}</version> </dependency> <dependency> + <groupId>com.orientimport</groupId> + <artifactId>t5-easy-fckeditor</artifactId> + <version>1.0.4</version> + </dependency> + <dependency> <groupId>org.chenillekit</groupId> <artifactId>chenillekit-tapestry</artifactId> <version>1.2.0</version> @@ -207,7 +212,7 @@  <nuitonutils.version>1.1.3</nuitonutils.version> <topia.version>2.3.0-beta-4-SNAPSHOT</topia.version> - <eugene.version>2.0.0-beta-3-SNAPSHOT</eugene.version> + <eugene.version>2.0.0-beta-3</eugene.version> <tapestry.version>5.1.0.5</tapestry.version> </properties> @@ -310,6 +315,13 @@ </releases> </repository> + <repository> + <id>m2-release-repository.orientimport.kenai.com</id> + <name>Orient Import Oy Maven Release Repository</name> + <url>http://kenai.com/svn/t5-easy-fckeditor~maven-release-repository</url> + <layout>default</layout> + </repository> + </repositories> <pluginRepositories> Added: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceNewsImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceNewsImpl.java (rev 0) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceNewsImpl.java 2010-01-17 19:32:26 UTC (rev 220) @@ -0,0 +1,80 @@ + +package fr.ifremer.suiviobsmer.impl; + +import fr.ifremer.suiviobsmer.SuiviObsmerContext; +import fr.ifremer.suiviobsmer.SuiviObsmerException; +import fr.ifremer.suiviobsmer.SuiviObsmerModelDAOHelper; +import fr.ifremer.suiviobsmer.entity.News; +import fr.ifremer.suiviobsmer.entity.NewsDAO; +import fr.ifremer.suiviobsmer.services.ServiceNews; +import java.util.ArrayList; +import java.util.List; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.persistence.TopiaEntity; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * ServiceNews + * + * Created: 17 janv. 2010 + * + * @author fdesbois + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ +public class ServiceNewsImpl implements ServiceNews { + + private static final Logger log = LoggerFactory.getLogger(ServiceNewsImpl.class); + + protected TopiaContext rootContext; + + public ServiceNewsImpl() throws SuiviObsmerException { + rootContext = SuiviObsmerContext.getTopiaRootContext(); + } + + @Override + public List<News> getNews() throws SuiviObsmerException { + TopiaContext transaction = null; + List<News> results = new ArrayList<News>(); + try { + transaction = rootContext.beginTransaction(); + + NewsDAO dao = SuiviObsmerModelDAOHelper.getNewsDAO(transaction); + + results = dao.findAllWithOrder(TopiaEntity.TOPIA_CREATE_DATE + " DESC"); + + transaction.closeContext(); + } catch (Exception eee) { + SuiviObsmerContext.serviceException(transaction, + "Impossible de récupérer l'ensemble des news", eee); + } + return results; + } + + @Override + public void saveNews(News news, boolean delete) throws SuiviObsmerException { + TopiaContext transaction = null; + try { + transaction = rootContext.beginTransaction(); + + NewsDAO dao = SuiviObsmerModelDAOHelper.getNewsDAO(transaction); + + if (delete) { + dao.delete(news); + } else { + SuiviObsmerContext.prepareTopiaId(News.class, news); + dao.update(news); + } + + transaction.commitTransaction(); + transaction.closeContext(); + } catch (Exception eee) { + SuiviObsmerContext.serviceException(transaction, + "Impossible de récupérer l'ensemble des news", eee); + } + } + +} Property changes on: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceNewsImpl.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/mock/ServiceNewsMock.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/mock/ServiceNewsMock.java 2010-01-17 18:27:15 UTC (rev 219) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/mock/ServiceNewsMock.java 2010-01-17 19:32:26 UTC (rev 220) @@ -105,4 +105,9 @@ return results; } + @Override + public void saveNews(News news, boolean delete) throws SuiviObsmerException { + throw new UnsupportedOperationException("Not supported yet."); + } + } Modified: trunk/suiviobsmer-business/src/main/xmi/suiviobsmer.zargo =================================================================== (Binary files differ) Modified: trunk/suiviobsmer-ui/pom.xml =================================================================== --- trunk/suiviobsmer-ui/pom.xml 2010-01-17 18:27:15 UTC (rev 219) +++ trunk/suiviobsmer-ui/pom.xml 2010-01-17 19:32:26 UTC (rev 220) @@ -44,6 +44,10 @@ <artifactId>chenillekit-tapestry</artifactId> </dependency> <dependency> + <groupId>com.orientimport</groupId> + <artifactId>t5-easy-fckeditor</artifactId> + </dependency> + <dependency> <groupId>jfree</groupId> <artifactId>jfreechart</artifactId> </dependency> Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Index.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Index.java 2010-01-17 18:27:15 UTC (rev 219) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Index.java 2010-01-17 19:32:26 UTC (rev 220) @@ -23,16 +23,23 @@ import fr.ifremer.suiviobsmer.SuiviObsmerException; import fr.ifremer.suiviobsmer.entity.News; +import fr.ifremer.suiviobsmer.entity.NewsImpl; +import fr.ifremer.suiviobsmer.entity.User; import fr.ifremer.suiviobsmer.services.ServiceNews; import fr.ifremer.suiviobsmer.ui.base.SuiviObsmerPage; import java.text.DateFormat; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.List; +import org.apache.tapestry5.Asset2; import org.apache.tapestry5.annotations.IncludeStylesheet; import org.apache.tapestry5.annotations.Log; +import org.apache.tapestry5.annotations.Path; import org.apache.tapestry5.annotations.Persist; import org.apache.tapestry5.annotations.Property; +import org.apache.tapestry5.annotations.SessionState; import org.apache.tapestry5.ioc.annotations.Inject; +import org.slf4j.Logger; /** * Index @@ -56,6 +63,13 @@ @Inject private ServiceNews serviceNews; + @Inject + private Logger log; + + @SessionState + @Property + private User user; + @Persist private List<News> newsList; @@ -64,28 +78,92 @@ private DateFormat dateFormat; + @Persist("flash") + private String editedId; + + @Property + private int rowIndex; + + @Property + @Inject + @Path("context:js/FCKConf.js") + private Asset2 fckconf; + + @Log - void setupRender() { - newsList = null; - getNewsList(); + void setupRender() throws SuiviObsmerException { + if (editedId == null || !"NEW".equals(editedId)) { + newsList = null; + getNewsList(); + } } - public List<News> getNewsList() { +// void onActivate(EventContext ec) { +// if (ec.getCount() > 0) { +// this.editedId = ec.get(String.class, 0); +// } +// } +// +// String onPassivate() { +// return editedId; +// } + + public List<News> getNewsList() throws SuiviObsmerException { if (newsList == null) { - try { - newsList = serviceNews.getNews(); - } catch (SuiviObsmerException eee) { - // error db, ... - } + newsList = serviceNews.getNews(); } return newsList; } + public boolean isEditionMode() { + return isCreateMode() || news.getTopiaId().equals(editedId); + } + + public boolean isCreateMode() { + return news.getTopiaId() == null; + } + public DateFormat getDateFormat() { if (dateFormat == null) { dateFormat = new SimpleDateFormat("dd/MM/yyyy"); } return dateFormat; } + + void onActionFromAddNews() throws SuiviObsmerException { + news = new NewsImpl(); + // Create a new list with the new news in first position + List<News> list = new ArrayList<News>(); + list.add(news); + list.addAll(getNewsList()); + newsList = list; + editedId = "NEW"; + } + + void onActionFromEditNews(int rowIndex) throws SuiviObsmerException { + news = getNewsList().get(rowIndex); + this.editedId = news.getTopiaId(); + } + + void onActionFromDeleteNews(int rowIndex) throws SuiviObsmerException { + news = getNewsList().get(rowIndex); + serviceNews.saveNews(news, true); + //newsList = null; + } + + void onActionFromCancelEdit() { + } + + void onSelectedFromSaveNews(int rowIndex) throws SuiviObsmerException { + news = getNewsList().get(rowIndex); + } + + void onSuccessFromNewsForm() throws SuiviObsmerException { + serviceNews.saveNews(news, false); + //this.editedId = null; + if (log.isDebugEnabled()) { + log.debug(news.getContent()); + } + } } Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/services/AppModule.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/services/AppModule.java 2010-01-17 18:27:15 UTC (rev 219) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/services/AppModule.java 2010-01-17 19:32:26 UTC (rev 220) @@ -50,7 +50,7 @@ // Use service builder methods (example below) when the implementation // is provided inline, or requires more initialization than simply // invoking the constructor. - binder.bind(ServiceNews.class, ServiceNewsMock.class); + binder.bind(ServiceNews.class, ServiceNewsImpl.class); binder.bind(ServiceUser.class, ServiceUserImpl.class); binder.bind(ServiceSampling.class, ServiceSamplingImpl.class); binder.bind(ServiceReferential.class, ServiceReferentialImpl.class); Added: trunk/suiviobsmer-ui/src/main/resources/fr/ifremer/suiviobsmer/ui/pages/Index.properties =================================================================== --- trunk/suiviobsmer-ui/src/main/resources/fr/ifremer/suiviobsmer/ui/pages/Index.properties (rev 0) +++ trunk/suiviobsmer-ui/src/main/resources/fr/ifremer/suiviobsmer/ui/pages/Index.properties 2010-01-17 19:32:26 UTC (rev 220) @@ -0,0 +1,2 @@ +title-label: Titre +content-label: Texte : \ No newline at end of file Modified: trunk/suiviobsmer-ui/src/main/webapp/Index.tml =================================================================== --- trunk/suiviobsmer-ui/src/main/webapp/Index.tml 2010-01-17 18:27:15 UTC (rev 219) +++ trunk/suiviobsmer-ui/src/main/webapp/Index.tml 2010-01-17 19:32:26 UTC (rev 220) @@ -1,11 +1,63 @@ -<t:layout t:pageTitle="News" t:contentId="so-news" - xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd"> - <t:loop t:source="newsList" value="news"> - <div class="item"> - <p class="date">Publiée le <t:output value="news.topiaCreateDate" format="dateFormat" /></p> - <h2>${news.title}</h2> - <p class="content">${news.content}</p> - </div> - <div class="sep"><hr /></div> - </t:loop> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<t:layout t:pageTitle="News" t:contentId="so-news" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> + + <form t:type="form" t:id="newsForm"> + <p class="aright"> + <a t:type="actionlink" t:id="addNews"> + <img src="${asset:context:}/img/add-32px.png" alt="Ajouter" title="Ajouter un nouvel article"/> + </a> + </p> + <t:loop t:source="newsList" value="news" t:index="rowIndex" t:volatile="true"> + <div class="item" > + <p class="date"> + <t:unless t:test="createMode"> + Publiée le <t:output value="news.topiaCreateDate" format="dateFormat" /> + <p:else> + En cours de création... + </p:else> + </t:unless> + </p> + <h2> + <t:if t:test="editionMode"> + <t:label t:for="title" /> : <input t:type="textfield" t:id="title" value="news.title" class="width200" t:validate="required"/> + <p:else> + ${news.title} + </p:else> + </t:if> + </h2> + <t:if t:test="user.admin"> + <p class="aright"> + <t:if t:test="editionMode"> + <input t:type="submitContext" t:context="rowIndex" t:id="saveNews" class="ico22px save22px" value="Save" + title="Enregistrer les modifications" />  + <a t:type="actionlink" t:id="cancelEdit"> + <img src="${asset:context:}/img/undo-22px.png" title="Annuler les modifications"/> + </a> + <p:else> + <a t:type="actionlink" t:id="editNews" t:context="rowIndex" title="Modifier l'article"> + <img src="${asset:context:}/img/edit.png" alt="Edit" /> + </a>  + <a t:type="actionlink" t:id="deleteNews" t:context="rowIndex" title="Supprimer l'article" + t:mixins="confirm" t:message="Etes-vous sûr de vouloir supprimer définitivement cet article ?"> + <img src="${asset:context:}/img/delete2.png" alt="Delete" /> + </a> + </p:else> + </t:if> + </p> + </t:if> + <div class="content"> + <t:if t:test="editionMode"> + <t:label t:for="content" /><br /> +  + <textarea t:type="easyfck/fckeditor" t:id="content" width="800px" height="200px" value="news.content" t:configuration="fckconf" t:validate="required" /> + <p:else> + <t:outputraw t:value="news.content"/> + </p:else> + </t:if> + </div> + </div> + <div class="sep"><hr /></div> + </t:loop> + </form> + </t:layout> Modified: trunk/suiviobsmer-ui/src/main/webapp/css/news.css =================================================================== --- trunk/suiviobsmer-ui/src/main/webapp/css/news.css 2010-01-17 18:27:15 UTC (rev 219) +++ trunk/suiviobsmer-ui/src/main/webapp/css/news.css 2010-01-17 19:32:26 UTC (rev 220) @@ -26,7 +26,7 @@ padding: 5px; } -div#so-news div.item p.content { +div#so-news div.item div.content { margin: 5px; text-align: justify; border-left: 3px solid #133852; Added: trunk/suiviobsmer-ui/src/main/webapp/js/FCKConf.js =================================================================== --- trunk/suiviobsmer-ui/src/main/webapp/js/FCKConf.js (rev 0) +++ trunk/suiviobsmer-ui/src/main/webapp/js/FCKConf.js 2010-01-17 19:32:26 UTC (rev 220) @@ -0,0 +1,7 @@ +FCKConfig.ToolbarCanCollapse = false; +FCKConfig.ContextMenu = ["Link"]; +FCKConfig.ToolbarSets["Default"] = [ +['Bold','Italic','Underline'], +['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'], +['Link','Unlink','Anchor'] +]; \ No newline at end of file

1 0

[Suiviobsmer-commits] r219 - trunk
by tchemit＠users.labs.libre-entreprise.org 17 Jan '10

17 Jan '10

Author: tchemit Date: 2010-01-17 18:27:15 +0000 (Sun, 17 Jan 2010) New Revision: 219 Modified: trunk/pom.xml Log: use mavenpom4labs 2.0.1 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-17 18:12:34 UTC (rev 218) +++ trunk/pom.xml 2010-01-17 18:27:15 UTC (rev 219) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4labs</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.0.1</version> </parent> <groupId>fr.ifremer</groupId>

1 0

[Suiviobsmer-commits] r218 - in trunk: . src/site src/site/rst suiviobsmer-business suiviobsmer-business/src/site suiviobsmer-business/src/site/rst suiviobsmer-ui suiviobsmer-ui/src/site suiviobsmer-ui/src/site/rst
by tchemit＠users.labs.libre-entreprise.org 17 Jan '10

17 Jan '10

Author: tchemit Date: 2010-01-17 18:12:34 +0000 (Sun, 17 Jan 2010) New Revision: 218 Modified: trunk/pom.xml trunk/src/site/rst/ trunk/src/site/site_fr.xml trunk/suiviobsmer-business/pom.xml trunk/suiviobsmer-business/src/site/rst/ trunk/suiviobsmer-business/src/site/site_fr.xml trunk/suiviobsmer-ui/pom.xml trunk/suiviobsmer-ui/src/site/rst/ trunk/suiviobsmer-ui/src/site/site_fr.xml Log: optimized poms with mavenpom4labs Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-17 17:46:30 UTC (rev 217) +++ trunk/pom.xml 2010-01-17 18:12:34 UTC (rev 218) @@ -182,19 +182,11 @@ </developer> </developers> - <url>http://suiviobsmer.labs.libre-entreprise.org</url> + <url>http://suiviobsmer.labs.libre-entreprise.org/suiviobsmer</url> - <licenses> - <license> - <name>General Public License (GPL)</name> - <url>${maven.license.file}</url> - <distribution>local</distribution> - </license> - </licenses> - <issueManagement> <system>gforge</system> - <url>https://${platform}/activity?group_id=${labs.id}</url> + <url>https://${platform}/tracker?group_id=${labs.id}</url> </issueManagement>  @@ -218,9 +210,6 @@ <eugene.version>2.0.0-beta-3-SNAPSHOT</eugene.version> <tapestry.version>5.1.0.5</tapestry.version> -  - <license.licenseName>gpl_v3</license.licenseName> - </properties>  @@ -235,8 +224,6 @@ <build> - <defaultGoal>install</defaultGoal> - <pluginManagement> <plugins> @@ -291,32 +278,8 @@ </mailingLists> -  - <distributionManagement> -  - <site> - <id>codelutin</id> - <url>scpexe://labs.libre-entreprise.org/home/groups/${projectId}/htdocs/${projec…</url> - </site> - </distributionManagement> - <repositories> -  -  <repository> Property changes on: trunk/src/site/rst ___________________________________________________________________ Added: svn:ignore + release-note.rst Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2010-01-17 17:46:30 UTC (rev 217) +++ trunk/src/site/site_fr.xml 2010-01-17 18:12:34 UTC (rev 218) @@ -2,13 +2,13 @@ <project name="${project.name}"> <bannerLeft> - <src alt="Web Applicatif Obsmer">logo-wao.png</src> + <src alt="Web Applicatif Obsmer">http://suiviobsmer.labs.libre-entreprise.org/suiviobsmer/logo-wao.png</src> <name>${project.name}</name> - <href>index.html</href> + <href>http://suiviobsmer.labs.libre-entreprise.org/suiviobsmer/index.html</href> </bannerLeft> <bannerRight> - <src alt="Obsmer">logo-obsmer.jpg</src> + <src alt="Obsmer">http://suiviobsmer.labs.libre-entreprise.org/suiviobsmer/logo-obsmer.jpg</src> </bannerRight> <poweredBy> @@ -20,7 +20,7 @@ <body> <breadcrumbs> - <item name="${project.name}" href="index.html" /> + <item name="${project.name}" href="http://suiviobsmer.labs.libre-entreprise.org/suiviobsmer/index.html" /> </breadcrumbs>    @@ -108,7 +105,6 @@ <plugin> <groupId>org.nuiton.eugene</groupId> <artifactId>maven-eugene-plugin</artifactId> -  <executions> <execution> <phase>generate-sources</phase> @@ -136,8 +132,6 @@ <scm> <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/suiviobsmer-business/…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/suiviobsmer-business</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/suiviobsmer-business</developerConnection> </scm> </project> Property changes on: trunk/suiviobsmer-business/src/site/rst ___________________________________________________________________ Added: svn:ignore + release-note.rst Modified: trunk/suiviobsmer-business/src/site/site_fr.xml =================================================================== --- trunk/suiviobsmer-business/src/site/site_fr.xml 2010-01-17 17:46:30 UTC (rev 217) +++ trunk/suiviobsmer-business/src/site/site_fr.xml 2010-01-17 18:12:34 UTC (rev 218) @@ -2,8 +2,9 @@ <project name="${project.name}"> <bannerLeft> + <src alt="Web Applicatif Obsmer">http://suiviobsmer.labs.libre-entreprise.org/suiviobsmer/logo-wao.png</src> <name>${project.name}</name> - <href>index.html</href> + <href>http://suiviobsmer.labs.libre-entreprise.org/suiviobsmer/suiviobsmer-busine…</href> </bannerLeft> <body> Modified: trunk/suiviobsmer-ui/pom.xml =================================================================== --- trunk/suiviobsmer-ui/pom.xml 2010-01-17 17:46:30 UTC (rev 217) +++ trunk/suiviobsmer-ui/pom.xml 2010-01-17 18:12:34 UTC (rev 218) @@ -80,21 +80,17 @@ <packaging>war</packaging> - <properties> - </properties> -    <build> -  +  <finalName>wao-${project.version}</finalName> -  +  <plugins> <plugin> <artifactId>maven-war-plugin</artifactId> - <version>2.1-beta-1</version> <configuration> <archive> <manifest> @@ -123,8 +119,6 @@ <scm> <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/suiviobsmer-ui/?root=…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/suiviobsmer-ui</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/suiviobsmer-ui</developerConnection> </scm> </project> Property changes on: trunk/suiviobsmer-ui/src/site/rst ___________________________________________________________________ Added: svn:ignore + release-note.rst Modified: trunk/suiviobsmer-ui/src/site/site_fr.xml =================================================================== --- trunk/suiviobsmer-ui/src/site/site_fr.xml 2010-01-17 17:46:30 UTC (rev 217) +++ trunk/suiviobsmer-ui/src/site/site_fr.xml 2010-01-17 18:12:34 UTC (rev 218) @@ -2,8 +2,9 @@ <project name="${project.name}"> <bannerLeft> + <src alt="Web Applicatif Obsmer">http://suiviobsmer.labs.libre-entreprise.org/suiviobsmer/logo-wao.png</src> <name>${project.name}</name> - <href>index.html</href> + <href>http://suiviobsmer.labs.libre-entreprise.org/suiviobsmer/suiviobsmer-ui/ind…</href> </bannerLeft> <body>

1 0

[Suiviobsmer-commits] r217 - trunk/suiviobsmer-business
by tchemit＠users.labs.libre-entreprise.org 17 Jan '10

17 Jan '10

Author: tchemit Date: 2010-01-17 17:46:30 +0000 (Sun, 17 Jan 2010) New Revision: 217 Modified: trunk/suiviobsmer-business/pom.xml Log: add FIXME Modified: trunk/suiviobsmer-business/pom.xml =================================================================== --- trunk/suiviobsmer-business/pom.xml 2010-01-17 16:34:59 UTC (rev 216) +++ trunk/suiviobsmer-business/pom.xml 2010-01-17 17:46:30 UTC (rev 217) @@ -93,6 +93,7 @@  <build> +   <resources> <resource>

1 0

[Suiviobsmer-commits] r216 - trunk
by fdesbois＠users.labs.libre-entreprise.org 17 Jan '10

17 Jan '10

Author: fdesbois Date: 2010-01-17 16:34:59 +0000 (Sun, 17 Jan 2010) New Revision: 216 Modified: trunk/pom.xml Log: Use last mavenpom snapshot Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-17 16:16:05 UTC (rev 215) +++ trunk/pom.xml 2010-01-17 16:34:59 UTC (rev 216) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4labs</artifactId> - <version>2.0</version> + <version>2.0.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer</groupId>

1 0

[Suiviobsmer-commits] r215 - trunk/src/site
by fdesbois＠users.labs.libre-entreprise.org 17 Jan '10

17 Jan '10

Author: fdesbois Date: 2010-01-17 16:16:05 +0000 (Sun, 17 Jan 2010) New Revision: 215 Modified: trunk/src/site/site_fr.xml Log: Change changelog.html link by release-note.html Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2010-01-17 15:48:31 UTC (rev 214) +++ trunk/src/site/site_fr.xml 2010-01-17 16:16:05 UTC (rev 215) @@ -37,7 +37,7 @@  </item> <item name="Règles métier" href="business-rules.html" /> - <item name="Historique des versions" href="changelog.html" /> + <item name="Historique des versions" href="release-note.html" /> </menu> <menu name ="Mise en place">

1 0

[Suiviobsmer-commits] r214 - in trunk: . src/site
by fdesbois＠users.labs.libre-entreprise.org 17 Jan '10

17 Jan '10

Author: fdesbois Date: 2010-01-17 15:48:31 +0000 (Sun, 17 Jan 2010) New Revision: 214 Modified: trunk/changelog.txt trunk/src/site/site_fr.xml Log: Add changelog.html in site + maj changelog Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2010-01-17 15:37:09 UTC (rev 213) +++ trunk/changelog.txt 2010-01-17 15:48:31 UTC (rev 214) @@ -4,6 +4,7 @@ 0.1.0 ----- +- [fdesbois] Evol #1975 : Synthèse : Graphique dynamique sur les données du plan d'échantillonnage (nb marées prévus/réels) - [fdesbois] Evol #2001 : Possibilité d'avoir un mois vide au milieu de la période d'une ligne d'échantillon - [fdesbois] Evol #2000 : Déplacement des dates de la période du programme vers les lignes d'échantillonnage - [fdesbois] Evol #1934 : Historique d'une ligne du plan (excepté changement sur le métier) Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2010-01-17 15:37:09 UTC (rev 213) +++ trunk/src/site/site_fr.xml 2010-01-17 15:48:31 UTC (rev 214) @@ -37,6 +37,7 @@  </item> <item name="Règles métier" href="business-rules.html" /> + <item name="Historique des versions" href="changelog.html" /> </menu> <menu name ="Mise en place">

1 0