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

r1075 - trunk/coser-web/src/main/webapp/WEB-INF/content
by echatellier＠users.forge.codelutin.com Oct. 24, 2012

Oct. 24, 2012

Author: echatellier Date: 2012-10-24 18:03:21 +0200 (Wed, 24 Oct 2012) New Revision: 1075 Url: http://forge.codelutin.com/repositories/revision/coser/1075 Log: Update sih website link Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/index.jsp Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/index.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/index.jsp 2012-10-24 15:46:58 UTC (rev 1074) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/index.jsp 2012-10-24 16:03:21 UTC (rev 1075) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2010 - 2012 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 @@ -46,7 +46,7 @@ <p> <s:text name="message.index.paragraph4"> - <s:param><a href="http://www.ifremer.fr/sih/">www.ifremer.fr/sih/</a></s:param> + <s:param><a href="http://sih.ifremer.fr/">sih.ifremer.fr</a></s:param> </s:text> </p>

1 0

r1074 - in trunk: . coser-business coser-business/src/main/java/fr/ifremer/coser/services coser-ui coser-web
by echatellier＠users.forge.codelutin.com Oct. 24, 2012

Oct. 24, 2012

Author: echatellier Date: 2012-10-24 17:46:58 +0200 (Wed, 24 Oct 2012) New Revision: 1074 Url: http://forge.codelutin.com/repositories/revision/coser/1074 Log: fixes #808: Update to HttpComponents 4.2.2 fixes #1616: Update to flying-saucer-pdf 9.0.1 fixes #1617: Update to nuiton-utils 2.6.3 fixes #1618: Update to jaxx 2.5.6 fixes #1619: Update to nuiton-matrix 2.3.2 fixes #1620: Update to nuiton-i18n 2.5 Modified: trunk/coser-business/pom.xml trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java trunk/coser-ui/pom.xml trunk/coser-web/pom.xml trunk/pom.xml Modified: trunk/coser-business/pom.xml =================================================================== --- trunk/coser-business/pom.xml 2012-10-24 15:31:44 UTC (rev 1073) +++ trunk/coser-business/pom.xml 2012-10-24 15:46:58 UTC (rev 1074) @@ -94,12 +94,12 @@ <artifactId>jcommon</artifactId> </dependency> <dependency> - <groupId>com.lowagie</groupId> - <artifactId>itext</artifactId> + <groupId>com.itextpdf</groupId> + <artifactId>itextpdf</artifactId> </dependency> <dependency> <groupId>org.xhtmlrenderer</groupId> - <artifactId>core-renderer</artifactId> + <artifactId>flying-saucer-pdf-itext5</artifactId> </dependency> <dependency> <groupId>org.freemarker</groupId> @@ -120,7 +120,7 @@ <plugins> <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> <goals> Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java 2012-10-24 15:31:44 UTC (rev 1073) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java 2012-10-24 15:46:58 UTC (rev 1074) @@ -76,7 +76,7 @@ import org.w3c.dom.Document; import org.xhtmlrenderer.pdf.ITextRenderer; -import com.lowagie.text.DocumentException; +import com.itextpdf.text.DocumentException; import fr.ifremer.coser.CoserBusinessConfig; import fr.ifremer.coser.CoserBusinessException; Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2012-10-24 15:31:44 UTC (rev 1073) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2012-10-24 15:46:58 UTC (rev 1074) @@ -78,7 +78,7 @@ import org.w3c.dom.Document; import org.xhtmlrenderer.pdf.ITextRenderer; -import com.lowagie.text.DocumentException; +import com.itextpdf.text.DocumentException; import fr.ifremer.coser.CoserBusinessConfig; import fr.ifremer.coser.CoserBusinessException; Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2012-10-24 15:31:44 UTC (rev 1073) +++ trunk/coser-ui/pom.xml 2012-10-24 15:46:58 UTC (rev 1074) @@ -196,7 +196,7 @@ </plugin> <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> <configuration> Modified: trunk/coser-web/pom.xml =================================================================== --- trunk/coser-web/pom.xml 2012-10-24 15:31:44 UTC (rev 1073) +++ trunk/coser-web/pom.xml 2012-10-24 15:46:58 UTC (rev 1074) @@ -103,7 +103,7 @@ <plugins> <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> <goals> @@ -113,37 +113,6 @@ </execution> </executions> </plugin> -  </plugins> </build> </project> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-24 15:31:44 UTC (rev 1073) +++ trunk/pom.xml 2012-10-24 15:46:58 UTC (rev 1074) @@ -96,42 +96,42 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> - <version>4.2.1</version> + <version>4.2.2</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>4.2.1</version> + <version>4.2.2</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpmime</artifactId> - <version>4.2.1</version> + <version>4.2.2</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>2.5.3</version> + <version>2.6.3</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix</artifactId> - <version>2.3</version> + <version>2.3.2</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix-gui</artifactId> - <version>2.3</version> + <version>2.3.2</version> <scope>compile</scope> </dependency> @@ -268,16 +268,16 @@ </dependency> <dependency> - <groupId>com.lowagie</groupId> - <artifactId>itext</artifactId> - <version>2.0.8</version> + <groupId>com.itextpdf</groupId> + <artifactId>itextpdf</artifactId> + <version>5.3.2</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.xhtmlrenderer</groupId> - <artifactId>core-renderer</artifactId> - <version>R8</version> + <artifactId>flying-saucer-pdf-itext5</artifactId> + <version>9.0.1</version> <scope>compile</scope> </dependency> @@ -340,9 +340,8 @@ <license.organizationName>Ifremer, Codelutin</license.organizationName>  - <jaxx.version>2.5.4</jaxx.version> - <i18n.version>2.4.1</i18n.version> -  + <jaxx.version>2.5.6</jaxx.version> + <i18n.version>2.5</i18n.version> <struts.version>2.3.4.1</struts.version> </properties> @@ -362,7 +361,7 @@ </plugin> <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <version>${i18n.version}</version> <configuration> <strictMode>true</strictMode> @@ -371,14 +370,9 @@ <plugin> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <version>8.1.5.v20120716</version> + <version>8.1.7.v20120910</version> </plugin> <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-jspc-maven-plugin</artifactId> - <version>8.1.5.v20120716</version> - </plugin> - <plugin> <artifactId>maven-site-plugin</artifactId> <configuration> <locales>fr,en</locales>

1 0

r1073 - trunk/coser-business/src/main/java/fr/ifremer/coser/services
by echatellier＠users.forge.codelutin.com Oct. 24, 2012

Oct. 24, 2012

Author: echatellier Date: 2012-10-24 17:31:44 +0200 (Wed, 24 Oct 2012) New Revision: 1073 Url: http://forge.codelutin.com/repositories/revision/coser/1073 Log: Unused imports Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java 2012-10-11 02:54:29 UTC (rev 1072) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java 2012-10-24 15:31:44 UTC (rev 1073) @@ -34,7 +34,6 @@ import java.io.IOException; import java.io.OutputStream; import java.io.OutputStreamWriter; -import java.io.PrintStream; import java.io.StringWriter; import java.io.Writer; import java.text.DateFormat; @@ -52,7 +51,6 @@ import java.util.TreeMap; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log;

1 0

r1072 - trunk
by tchemit＠users.forge.codelutin.com Oct. 11, 2012

Oct. 11, 2012

Author: tchemit Date: 2012-10-11 04:54:29 +0200 (Thu, 11 Oct 2012) New Revision: 1072 Url: http://forge.codelutin.com/repositories/revision/coser/1072 Log: Update mavenpom4redmine to 3.4. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-30 14:45:59 UTC (rev 1071) +++ trunk/pom.xml 2012-10-11 02:54:29 UTC (rev 1072) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.3.7</version> + <version>3.4</version> </parent> <groupId>fr.ifremer</groupId>

1 0

r1071 - trunk
by tchemit＠users.forge.codelutin.com Aug. 30, 2012

Aug. 30, 2012

Author: tchemit Date: 2012-08-30 16:45:59 +0200 (Thu, 30 Aug 2012) New Revision: 1071 Url: http://forge.codelutin.com/repositories/revision/coser/1071 Log: Update mavenpom4redmine to 3.3.7. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-24 14:59:04 UTC (rev 1070) +++ trunk/pom.xml 2012-08-30 14:45:59 UTC (rev 1071) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.3.6</version> + <version>3.3.7</version> </parent> <groupId>fr.ifremer</groupId>

1 0

r1070 - in trunk: coser-business/src/site/en/rst coser-business/src/site/rst coser-ui/src/site/en/rst coser-ui/src/site/rst coser-web/src/site/en/rst coser-web/src/site/rst
by echatellier＠users.forge.codelutin.com Aug. 24, 2012

Aug. 24, 2012

Author: echatellier Date: 2012-08-24 16:59:04 +0200 (Fri, 24 Aug 2012) New Revision: 1070 Url: http://forge.codelutin.com/repositories/revision/coser/1070 Log: Fix module index page parsing Modified: trunk/coser-business/src/site/en/rst/index.rst trunk/coser-business/src/site/rst/index.rst trunk/coser-ui/src/site/en/rst/index.rst trunk/coser-ui/src/site/rst/index.rst trunk/coser-web/src/site/en/rst/index.rst trunk/coser-web/src/site/rst/index.rst Modified: trunk/coser-business/src/site/en/rst/index.rst =================================================================== --- trunk/coser-business/src/site/en/rst/index.rst 2012-08-24 14:32:41 UTC (rev 1069) +++ trunk/coser-business/src/site/en/rst/index.rst 2012-08-24 14:59:04 UTC (rev 1070) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2010 Ifremer, Codelutin +.. * Copyright (C) 2010 - 2012 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 @@ -22,5 +22,6 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + Coser :: Business ================= \ No newline at end of file Modified: trunk/coser-business/src/site/rst/index.rst =================================================================== --- trunk/coser-business/src/site/rst/index.rst 2012-08-24 14:32:41 UTC (rev 1069) +++ trunk/coser-business/src/site/rst/index.rst 2012-08-24 14:59:04 UTC (rev 1070) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2010 Ifremer, Codelutin +.. * Copyright (C) 2010 - 2012 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 @@ -22,5 +22,6 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + Coser :: Business ================= \ No newline at end of file Modified: trunk/coser-ui/src/site/en/rst/index.rst =================================================================== --- trunk/coser-ui/src/site/en/rst/index.rst 2012-08-24 14:32:41 UTC (rev 1069) +++ trunk/coser-ui/src/site/en/rst/index.rst 2012-08-24 14:59:04 UTC (rev 1070) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2010 Ifremer, Codelutin +.. * Copyright (C) 2010 - 2012 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 @@ -22,5 +22,6 @@ .. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - + Coser :: UI =========== \ No newline at end of file Modified: trunk/coser-ui/src/site/rst/index.rst =================================================================== --- trunk/coser-ui/src/site/rst/index.rst 2012-08-24 14:32:41 UTC (rev 1069) +++ trunk/coser-ui/src/site/rst/index.rst 2012-08-24 14:59:04 UTC (rev 1070) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2010 Ifremer, Codelutin +.. * Copyright (C) 2010 - 2012 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 @@ -22,5 +22,6 @@ .. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - + Coser :: UI =========== \ No newline at end of file Modified: trunk/coser-web/src/site/en/rst/index.rst =================================================================== --- trunk/coser-web/src/site/en/rst/index.rst 2012-08-24 14:32:41 UTC (rev 1069) +++ trunk/coser-web/src/site/en/rst/index.rst 2012-08-24 14:59:04 UTC (rev 1070) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2010 Ifremer, Codelutin +.. * Copyright (C) 2010 - 2012 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 @@ -21,5 +21,6 @@ .. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - + Coser :: Web ============ \ No newline at end of file Modified: trunk/coser-web/src/site/rst/index.rst =================================================================== --- trunk/coser-web/src/site/rst/index.rst 2012-08-24 14:32:41 UTC (rev 1069) +++ trunk/coser-web/src/site/rst/index.rst 2012-08-24 14:59:04 UTC (rev 1070) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2010 Ifremer, Codelutin +.. * Copyright (C) 2010 - 2012 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 @@ -21,5 +21,6 @@ .. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - + Coser :: Web ============ \ No newline at end of file

1 0

r1069 - in trunk: . coser-business coser-ui coser-web
by maven-release＠users.forge.codelutin.com Aug. 24, 2012

Aug. 24, 2012

Author: maven-release Date: 2012-08-24 16:32:41 +0200 (Fri, 24 Aug 2012) New Revision: 1069 Url: http://forge.codelutin.com/repositories/revision/coser/1069 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/coser-business/pom.xml trunk/coser-ui/pom.xml trunk/coser-web/pom.xml trunk/pom.xml Modified: trunk/coser-business/pom.xml =================================================================== --- trunk/coser-business/pom.xml 2012-08-24 14:32:33 UTC (rev 1068) +++ trunk/coser-business/pom.xml 2012-08-24 14:32:41 UTC (rev 1069) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.3</version> + <version>1.3.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2012-08-24 14:32:33 UTC (rev 1068) +++ trunk/coser-ui/pom.xml 2012-08-24 14:32:41 UTC (rev 1069) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.3</version> + <version>1.3.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-web/pom.xml =================================================================== --- trunk/coser-web/pom.xml 2012-08-24 14:32:33 UTC (rev 1068) +++ trunk/coser-web/pom.xml 2012-08-24 14:32:41 UTC (rev 1069) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.3</version> + <version>1.3.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-24 14:32:33 UTC (rev 1068) +++ trunk/pom.xml 2012-08-24 14:32:41 UTC (rev 1069) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.3</version> + <version>1.3.1-SNAPSHOT</version> <packaging>pom</packaging> <modules> @@ -347,9 +347,9 @@ </properties> <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/coser/tags/coser-1.3</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/coser/tags/coser-1.3</developerConnection> - <url>http://forge.codelutin.com/repositories/browse/coser/tags/coser-1.3</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/coser/trunk</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/coser/trunk</developerConnection> + <url>http://forge.codelutin.com/repositories/browse/coser/trunk</url> </scm> <build>

1 0

r1068 - tags
by maven-release＠users.forge.codelutin.com Aug. 24, 2012

Aug. 24, 2012

Author: maven-release Date: 2012-08-24 16:32:33 +0200 (Fri, 24 Aug 2012) New Revision: 1068 Url: http://forge.codelutin.com/repositories/revision/coser/1068 Log: [maven-release-plugin] copy for tag coser-1.3 Added: tags/coser-1.3/

1 0

r1067 - in trunk: . coser-business coser-ui coser-web
by maven-release＠users.forge.codelutin.com Aug. 24, 2012

Aug. 24, 2012

Author: maven-release Date: 2012-08-24 16:26:36 +0200 (Fri, 24 Aug 2012) New Revision: 1067 Url: http://forge.codelutin.com/repositories/revision/coser/1067 Log: [maven-release-plugin] prepare release coser-1.3 Modified: trunk/coser-business/pom.xml trunk/coser-ui/pom.xml trunk/coser-web/pom.xml trunk/pom.xml Modified: trunk/coser-business/pom.xml =================================================================== --- trunk/coser-business/pom.xml 2012-08-24 14:17:14 UTC (rev 1066) +++ trunk/coser-business/pom.xml 2012-08-24 14:26:36 UTC (rev 1067) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2012-08-24 14:17:14 UTC (rev 1066) +++ trunk/coser-ui/pom.xml 2012-08-24 14:26:36 UTC (rev 1067) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-web/pom.xml =================================================================== --- trunk/coser-web/pom.xml 2012-08-24 14:17:14 UTC (rev 1066) +++ trunk/coser-web/pom.xml 2012-08-24 14:26:36 UTC (rev 1067) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-24 14:17:14 UTC (rev 1066) +++ trunk/pom.xml 2012-08-24 14:26:36 UTC (rev 1067) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3</version> <packaging>pom</packaging> <modules> @@ -347,9 +347,9 @@ </properties> <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/coser/trunk</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/coser/trunk</developerConnection> - <url>http://forge.codelutin.com/repositories/browse/coser/trunk</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/coser/tags/coser-1.3</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/coser/tags/coser-1.3</developerConnection> + <url>http://forge.codelutin.com/repositories/browse/coser/tags/coser-1.3</url> </scm> <build>

1 0

r1066 - in trunk/coser-web/src/main/webapp: WEB-INF/decorators styles
by echatellier＠users.forge.codelutin.com Aug. 24, 2012

Aug. 24, 2012

Author: echatellier Date: 2012-08-24 16:17:14 +0200 (Fri, 24 Aug 2012) New Revision: 1066 Url: http://forge.codelutin.com/repositories/revision/coser/1066 Log: Comment in spanich locale Modified: trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp trunk/coser-web/src/main/webapp/styles/coser.css Modified: trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2012-08-24 11:52:37 UTC (rev 1065) +++ trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2012-08-24 14:17:14 UTC (rev 1066) @@ -75,9 +75,9 @@ <a href="<s:url namespace="/" action="locale"> <s:param name="request_locale">fr</s:param> </s:url>" class="francais">Francais</a> - <a href="<s:url namespace="/" action="locale"> +  </div> <decorator:body/> Modified: trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp 2012-08-24 11:52:37 UTC (rev 1065) +++ trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp 2012-08-24 14:17:14 UTC (rev 1066) @@ -71,9 +71,9 @@ <a href="<s:url namespace="/" action="locale"> <s:param name="request_locale">fr</s:param> </s:url>" class="francais">Francais</a> - <a href="<s:url namespace="/" action="locale"> +  </div> <div class="page"> Modified: trunk/coser-web/src/main/webapp/styles/coser.css =================================================================== --- trunk/coser-web/src/main/webapp/styles/coser.css 2012-08-24 11:52:37 UTC (rev 1065) +++ trunk/coser-web/src/main/webapp/styles/coser.css 2012-08-24 14:17:14 UTC (rev 1066) @@ -482,7 +482,7 @@ text-indent: -999999px; background: url(../images/gb.png) no-repeat; position: absolute; - right: 20px; + right: 0px; top: 10px; width: 16px; height: 11px; @@ -498,7 +498,7 @@ text-indent: -999999px; background: url(../images/fr.png) no-repeat; position: absolute; - right: 40px; + right: 20px; top: 10px; width: 16px; height: 11px; @@ -509,7 +509,7 @@ border: 2px solid #ffe600; } -#middle .top_content .espagnol { +/*#middle .top_content .espagnol { display: block; text-indent: -999999px; background: url(../images/es.png) no-repeat; @@ -523,7 +523,7 @@ #middle .top_content .espagnol:hover { border: 2px solid #ffe600; -} +}*/ #middle .page .degrade ul li { /*list-style: none;*/ @@ -613,20 +613,20 @@ #conteneur_int .top_content .anglais { position: absolute; top: 22px; - right: 40px; + right: 20px; } #conteneur_int .top_content .francais { position: absolute; top: 22px; - right: 60px; + right: 40px; } -#conteneur_int .top_content .espagnol { +/*#conteneur_int .top_content .espagnol { position: absolute; top: 22px; right: 20px; -} +}*/ #conteneur_int #middle .col_droite { margin: 0;

1 0