r3267 - in trunk: . pollen-business pollen-domain pollen-persistence pollen-persistence/src/main/java/org/chorem/pollen/business/persistence pollen-services pollen-services/src/main/java/org/chorem/pollen/bean pollen-services/src/main/java/org/chorem/pollen/services/exceptions pollen-ui pollen-ui-struts2 pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user pollen-ui-struts2/src/main/resources/template/themes pollen-ui
Author: tchemit Date: 2012-04-13 19:27:48 +0200 (Fri, 13 Apr 2012) New Revision: 3267 Url: http://chorem.org/repositories/revision/pollen/3267 Log: - change versions - add svn properties - add headers - use fluido maven skin Added: trunk/src/site/resources/maven-site-chorem.org.js Modified: trunk/pollen-business/pom.xml trunk/pollen-domain/pom.xml trunk/pollen-persistence/pom.xml trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VotingListImpl.java trunk/pollen-services/pom.xml trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollUrl.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/InvalidEmailException.java trunk/pollen-ui-struts2/pom.xml trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PageSkin.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/LostPassword.java trunk/pollen-ui-struts2/src/main/resources/template/themes/README.txt trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_flat_0_aaaaaa_40x100.png trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_flat_75_b0f580_40x100.png trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_55_fbf9ee_1x400.png trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_65_368000_1x400.png trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_65_55cb00_1x400.png trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_75_4bb300_1x400.png trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_75_55cb00_1x400.png trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_75_b0f580_1x400.png trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_highlight-soft_75_55cb00_1x100.png trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_inset-soft_95_fef1ec_1x100.png trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_17990a_256x240.png trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_222222_256x240.png trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_227c24_256x240.png trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_454545_256x240.png trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_888888_256x240.png trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_cd0a0a_256x240.png trunk/pollen-ui-struts2/src/main/resources/template/themes/green/jquery-ui.css trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_flat_0_aaaaaa_40x100.png trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_flat_75_ffffaa_40x100.png trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_glass_55_fbf9ee_1x400.png trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_glass_65_ffcc00_1x400.png trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_glass_75_fff71f_1x400.png trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_glass_75_ffff0f_1x400.png trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_highlight-soft_75_ffff0f_1x100.png trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_inset-soft_95_fef1ec_1x100.png trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_222222_256x240.png trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_454545_256x240.png trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_cd0a0a_256x240.png trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_dcb104_256x240.png trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_ffcc00_256x240.png trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/jquery-ui.css trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingListPersons.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp trunk/pollen-ui/pom.xml trunk/pollen-votecounting/pom.xml trunk/pom.xml trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/pollen-business/pom.xml =================================================================== --- trunk/pollen-business/pom.xml 2012-04-13 16:52:34 UTC (rev 3266) +++ trunk/pollen-business/pom.xml 2012-04-13 17:27:48 UTC (rev 3267) @@ -12,7 +12,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.2.6-SNAPSHOT</version> + <version>1.3-rc1-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-domain/pom.xml =================================================================== --- trunk/pollen-domain/pom.xml 2012-04-13 16:52:34 UTC (rev 3266) +++ trunk/pollen-domain/pom.xml 2012-04-13 17:27:48 UTC (rev 3267) @@ -8,7 +8,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.2.6-SNAPSHOT</version> + <version>1.3-rc1-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2012-04-13 16:52:34 UTC (rev 3266) +++ trunk/pollen-persistence/pom.xml 2012-04-13 17:27:48 UTC (rev 3267) @@ -12,7 +12,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3-rc1-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Property changes on: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VotingListImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2012-04-13 16:52:34 UTC (rev 3266) +++ trunk/pollen-services/pom.xml 2012-04-13 17:27:48 UTC (rev 3267) @@ -12,7 +12,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3-rc1-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Property changes on: trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollUrl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/InvalidEmailException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-ui/pom.xml =================================================================== --- trunk/pollen-ui/pom.xml 2012-04-13 16:52:34 UTC (rev 3266) +++ trunk/pollen-ui/pom.xml 2012-04-13 17:27:48 UTC (rev 3267) @@ -12,7 +12,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.2.6-SNAPSHOT</version> + <version>1.3-rc1-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-04-13 16:52:34 UTC (rev 3266) +++ trunk/pollen-ui-struts2/pom.xml 2012-04-13 17:27:48 UTC (rev 3267) @@ -12,7 +12,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3-rc1-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Property changes on: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PageSkin.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/LostPassword.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_flat_0_aaaaaa_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_flat_75_b0f580_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_55_fbf9ee_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_65_368000_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_65_55cb00_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_75_4bb300_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_75_55cb00_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_75_b0f580_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_highlight-soft_75_55cb00_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_inset-soft_95_fef1ec_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_17990a_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_222222_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_227c24_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_454545_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_888888_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_cd0a0a_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/jquery-ui.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_flat_0_aaaaaa_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_flat_75_ffffaa_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_glass_55_fbf9ee_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_glass_65_ffcc00_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_glass_75_fff71f_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_glass_75_ffff0f_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_highlight-soft_75_ffff0f_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_inset-soft_95_fef1ec_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_222222_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_454545_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_cd0a0a_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_dcb104_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_ffcc00_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/jquery-ui.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingListPersons.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingListPersons.jsp 2012-04-13 16:52:34 UTC (rev 3266) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingListPersons.jsp 2012-04-13 17:27:48 UTC (rev 3267) @@ -2,8 +2,8 @@ #%L Pollen :: UI (strust2) - $Id: VotingList.jsp 3247 2012-04-11 14:23:26Z fdesbois $ - $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-1.2.6-struts2/pollen-ui-str... $ + $Id$ + $HeadURL$ %% Copyright (C) 2009 - 2012 CodeLutin %% Property changes on: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingListPersons.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-votecounting/pom.xml =================================================================== --- trunk/pollen-votecounting/pom.xml 2012-04-13 16:52:34 UTC (rev 3266) +++ trunk/pollen-votecounting/pom.xml 2012-04-13 17:27:48 UTC (rev 3267) @@ -8,7 +8,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3-rc1-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-13 16:52:34 UTC (rev 3266) +++ trunk/pom.xml 2012-04-13 17:27:48 UTC (rev 3267) @@ -17,7 +17,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3-rc1-SNAPSHOT</version> <modules> <module>pollen-votecounting</module> @@ -147,14 +147,14 @@ </dependency> <dependency> - <groupId>org.apache.shiro</groupId> - <artifactId>shiro-core</artifactId> - <version>${shiroVersion}</version> + <groupId>org.apache.shiro</groupId> + <artifactId>shiro-core</artifactId> + <version>${shiroVersion}</version> </dependency> <dependency> - <groupId>org.apache.shiro</groupId> - <artifactId>shiro-web</artifactId> - <version>${shiroVersion}</version> + <groupId>org.apache.shiro</groupId> + <artifactId>shiro-web</artifactId> + <version>${shiroVersion}</version> </dependency> @@ -460,13 +460,15 @@ <shiroVersion>1.2.0</shiroVersion> <slf4jVersion>1.6.4</slf4jVersion> <jettyVersion>${jettyPluginVersion}</jettyVersion> - + <!--Multilanguage maven-site --> <siteLocales>en,fr</siteLocales> <!-- license to use --> <license.licenseName>agpl_v3</license.licenseName> + <scmwebeditorEnabled>true</scmwebeditorEnabled> + </properties> <build> @@ -524,15 +526,9 @@ <!-- ************************************************************* --> <scm> - <connection> - scm:svn:http://svn.chorem.org/svn/pollen/branches/pollen-1.2.6-struts2 - </connection> - <developerConnection> - scm:svn:http://svn.chorem.org/svn/pollen/branches/pollen-1.2.6-struts2 - </developerConnection> - <url> - http://www.chorem.org/repositories/browse/pollen/branches/pollen-1.2.6-strut... - </url> + <connection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</connection> + <developerConnection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</developerConnection> + <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> </scm> <distributionManagement> @@ -544,29 +540,12 @@ <repositories> - <!-- chenillekit Repository --> - <!--repository> - <id>chenillekit</id> - <url>http://www.chenillekit.org/mvnrepo/release</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository--> - - <!-- Maven Java.net Repository --> - <!--repository> - <id>maven2-repository.dev.java.net</id> - <name>Java.net Repository for Maven</name> - <url>http://download.java.net/maven/2/</url> - <layout>default</layout> - </repository--> - <!-- depot des releases nuiton --> <repository> <id>nuiton.release</id> <name>NuitonReleaseRepository</name> - <url>http://maven.nuiton.org/release</url> + <url>http://nexus.nuiton.org/nexus/content/groups/public/</url> <snapshots> <enabled>false</enabled> </snapshots> @@ -581,7 +560,7 @@ <repository> <id>nuiton.snapshot</id> <name>NuitonSnapshotRepository</name> - <url>http://maven.nuiton.org/snapshot</url> + <url>http://nexus.nuiton.org/nexus/content/repositories/snapshots/</url> <snapshots> <enabled>true</enabled> <checksumPolicy>fail</checksumPolicy> @@ -601,7 +580,7 @@ <id>nuiton.release</id> <name>NuitonReleaseRepository</name> - <url>http://maven.nuiton.org/release</url> + <url>http://nexus.nuiton.org/nexus/content/groups/public/</url> <snapshots> <enabled>false</enabled> </snapshots> @@ -616,7 +595,7 @@ <pluginRepository> <id>nuiton.snapshot</id> <name>NuitonSnapshotRepository</name> - <url>http://maven.nuiton.org/snapshot</url> + <url>http://nexus.nuiton.org/nexus/content/repositories/snapshots/</url> <snapshots> <enabled>true</enabled> <checksumPolicy>fail</checksumPolicy> @@ -635,4 +614,17 @@ </reporting> + <profiles> + + <profile> + <id>extra-modules</id> + + <modules> + <module>pollen-domain</module> + <module>pollen-business</module> + <module>pollen-ui</module> + </modules> + </profile> + </profiles> + </project> Added: trunk/src/site/resources/maven-site-chorem.org.js =================================================================== --- trunk/src/site/resources/maven-site-chorem.org.js (rev 0) +++ trunk/src/site/resources/maven-site-chorem.org.js 2012-04-13 17:27:48 UTC (rev 3267) @@ -0,0 +1,82 @@ +/* + * #%L + * EchoBase + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 Ifremer, Codelutin + * %% + * 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% + */ +$(document).ready(function () { + + var metas = $('#projectMetas'); + var piwikEnabled = metas.attr('piwikEnabled'); + if (piwikEnabled) { + //Piwik Tracking Code + var piwikId = metas.attr('piwikId'); + if (!piwikId) { + + // default piwikId for chorem.org + piwikId = 3; + } + + console.log("use Piwik with id = " + piwikId); + var pkBaseURL = "https:" == document.location.protocol ? + "https://piwik.codelutin.com/" : + "http://piwik.codelutin.com/"; + $.getScript(pkBaseURL + "piwik.js", function (data, textStatus, jqxhr) { + var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", piwikId); + piwikTracker.trackPageView(); + piwikTracker.enableLinkTracking(); + console.log("piwikTracker loaded = " + piwikTracker); + }); + //Piwik Tracking Code + } + var scmwebeditorenabled = metas.attr('scmwebeditorenabled'); + var scm = metas.attr('scm'); + if (scmwebeditorenabled && scm.indexOf("/trunk") > -1) { + + // allow scmwebeditor is enabled and on trunk + + var scmurl = metas.attr('scmwebeditorurl'); + var projectId = metas.attr('projectId'); + var siteSourcesType = metas.attr('siteSourcesType'); + var path; + var pathname = document.location.pathname; + if (pathname.indexOf('target/site') > 0) { + path = pathname.substr(pathname.indexOf('/site')). + replace('/site/', ''); + } else { + if (pathname == '/' + projectId + '/') { + // on / page + path = 'index.html'; + } else { + path = pathname.substr(pathname.indexOf('/' + projectId)). + replace('/' + projectId + '/', ''); + } + } + path = path.replace('.html', '.' + siteSourcesType); + var url = scmurl + "?address=" + scm + "/src/site/" + siteSourcesType + "/" + path; + console.log("Add scmwebeditor with url = " + url); + var html = "<li class='pull-right'><a href='" + url + + "'>Éditer la page</a></li>" + + "<li class='divider pull-right'>|</li>"; + var ul = $('#publishDate'); + ul.prepend(html); + + } +}); \ No newline at end of file Property changes on: trunk/src/site/resources/maven-site-chorem.org.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2012-04-13 16:52:34 UTC (rev 3266) +++ trunk/src/site/site_en.xml 2012-04-13 17:27:48 UTC (rev 3267) @@ -25,8 +25,6 @@ <project name="${project.name}"> - <publishDate format="dd/MM/yyyy"/> - <bannerLeft> <name>${project.name}</name> <href>index.html</href> @@ -37,6 +35,35 @@ <href>http://www.codelutin.com</href> </bannerRight> + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> + + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>http://www.codelutin.com</href> + </bannerRight> + + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.2.1</version> + </skin> + + <custom> + <fluidoSkin> + <topBarEnabled>true</topBarEnabled> + <googleSearch/> + <sideBarEnabled>false</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> + </fluidoSkin> + </custom> + + <publishDate position="right" format="dd/MM/yyyy"/> + <version position="right" /> + <poweredBy> <logo href="http://maven.apache.org" name="Maven" img="http://maven-site.nuiton.org/jrst/images/logos/maven-feather.png"/> <logo href="http://maven-site.nuiton.org/jrst" name="JRst" img="http://maven-site.nuiton.org/jrst/images/jrst-logo.png"/> @@ -94,7 +121,24 @@ <!-- <menu ref="modules"/> --> <menu ref="reports"/> + <footer> + <script type="text/javascript" src="./maven-site-chorem.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.url}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + </body> - -</project> + </project> + Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-04-13 16:52:34 UTC (rev 3266) +++ trunk/src/site/site_fr.xml 2012-04-13 17:27:48 UTC (rev 3267) @@ -25,8 +25,6 @@ <project name="${project.name}"> - <publishDate format="dd/MM/yyyy"/> - <bannerLeft> <name>${project.name}</name> <href>index.html</href> @@ -37,6 +35,25 @@ <href>http://www.codelutin.com</href> </bannerRight> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.2.1</version> + </skin> + + <custom> + <fluidoSkin> + <topBarEnabled>true</topBarEnabled> + <googleSearch/> + <sideBarEnabled>false</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> + </fluidoSkin> + </custom> + + <publishDate position="right" format="dd/MM/yyyy"/> + <version position="right" /> + <poweredBy> <logo href="http://maven.apache.org" name="Maven" img="http://maven-site.nuiton.org/jrst/images/logos/maven-feather.png"/> <logo href="http://maven-site.nuiton.org/jrst" name="JRst" img="http://maven-site.nuiton.org/jrst/images/jrst-logo.png"/> @@ -92,6 +109,24 @@ <!-- <menu ref="modules"/> --> <menu ref="reports"/> + <footer> + + <script type="text/javascript" src="./maven-site-chorem.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.url}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + </body> </project>
participants (1)
-
tchemit@users.chorem.org