June 2012 - Pollen-commits - mailman.cloud.codelutin.com

r3540 - trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user
by tchemit＠users.chorem.org June 20, 2012

June 20, 2012

Author: tchemit Date: 2012-06-20 10:48:50 +0200 (Wed, 20 Jun 2012) New Revision: 3540 Url: http://chorem.org/repositories/revision/pollen/3540 Log: fixes #626: Error when deleting a participant of a favorite list Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp 2012-06-19 16:33:54 UTC (rev 3539) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp 2012-06-20 08:48:50 UTC (rev 3540) @@ -35,14 +35,18 @@ <s:param name="favoriteListId" value="%{favoriteList.topiaId}"/> </s:url> -<s:url id="editPollAccounts" action="editPollAccount" namespace="/user"> +<%--<s:url id="editPollAccounts" action="editPollAccount" namespace="/user">--%> + <%--<s:param name="favoriteListId" value="%{favoriteList.topiaId}"/>--%> +<%--</s:url>--%> + +<s:url id="editFavoriteList" action="editFavoriteList" namespace="/user"> <s:param name="favoriteListId" value="%{favoriteList.topiaId}"/> </s:url> <script type="text/javascript"> var favoriteListId = '<s:property value="favoriteList.topiaId"/>'; - var redirectUrl = "<s:property value='%{editPollAccounts}'/>"; + var redirectUrl = "<s:property value='%{editFavoriteList}'/>"; var deleteTitle = '<s:text name="pollen.action.deletePollAccount"/>'; var deleteUrl = '<s:url action="confirmDeletePollAccount" namespace="/user" />'; var loadPollActionUrl = '<s:url action="getFavoriteListPollAccount" namespace="/json"/>';

1 0

r3539 - in trunk: . pollen-persistence pollen-services pollen-ui-struts2 pollen-votecounting
by maven-release＠users.chorem.org June 19, 2012

June 19, 2012

Author: maven-release Date: 2012-06-19 18:33:54 +0200 (Tue, 19 Jun 2012) New Revision: 3539 Url: http://chorem.org/repositories/revision/pollen/3539 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pollen-persistence/pom.xml trunk/pollen-services/pom.xml trunk/pollen-ui-struts2/pom.xml trunk/pollen-votecounting/pom.xml trunk/pom.xml Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2012-06-19 16:33:52 UTC (rev 3538) +++ trunk/pollen-persistence/pom.xml 2012-06-19 16:33:54 UTC (rev 3539) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2012-06-19 16:33:52 UTC (rev 3538) +++ trunk/pollen-services/pom.xml 2012-06-19 16:33:54 UTC (rev 3539) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-06-19 16:33:52 UTC (rev 3538) +++ trunk/pollen-ui-struts2/pom.xml 2012-06-19 16:33:54 UTC (rev 3539) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting/pom.xml =================================================================== --- trunk/pollen-votecounting/pom.xml 2012-06-19 16:33:52 UTC (rev 3538) +++ trunk/pollen-votecounting/pom.xml 2012-06-19 16:33:54 UTC (rev 3539) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-06-19 16:33:52 UTC (rev 3538) +++ trunk/pom.xml 2012-06-19 16:33:54 UTC (rev 3539) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> <modules> <module>pollen-votecounting</module> @@ -562,11 +562,11 @@  <scm> - <connection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.4</connection> + <connection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.4 + scm:svn:http://svn.chorem.org/svn/pollen/trunk </developerConnection> - <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.4</url> + <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> </scm> <distributionManagement>

1 0

r3538 - in tags: . pollen-1.4
by maven-release＠users.chorem.org June 19, 2012

June 19, 2012

Author: maven-release Date: 2012-06-19 18:33:52 +0200 (Tue, 19 Jun 2012) New Revision: 3538 Url: http://chorem.org/repositories/revision/pollen/3538 Log: [maven-release-plugin] copy for tag pollen-1.4 Added: tags/pollen-1.4/ Property changes on: tags/pollen-1.4 ___________________________________________________________________ Added: svn:ignore + target nbactions.xml .settings .classpath .project *.ipr *.iws *.iml .idea Added: svn:mergeinfo +

1 0

r3537 - in trunk: . pollen-persistence pollen-services pollen-ui-struts2 pollen-votecounting
by maven-release＠users.chorem.org June 19, 2012

June 19, 2012

Author: maven-release Date: 2012-06-19 18:33:50 +0200 (Tue, 19 Jun 2012) New Revision: 3537 Url: http://chorem.org/repositories/revision/pollen/3537 Log: [maven-release-plugin] prepare release pollen-1.4 Modified: trunk/pollen-persistence/pom.xml trunk/pollen-services/pom.xml trunk/pollen-ui-struts2/pom.xml trunk/pollen-votecounting/pom.xml trunk/pom.xml Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2012-06-19 16:32:01 UTC (rev 3536) +++ trunk/pollen-persistence/pom.xml 2012-06-19 16:33:50 UTC (rev 3537) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.4</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2012-06-19 16:32:01 UTC (rev 3536) +++ trunk/pollen-services/pom.xml 2012-06-19 16:33:50 UTC (rev 3537) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.4</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-06-19 16:32:01 UTC (rev 3536) +++ trunk/pollen-ui-struts2/pom.xml 2012-06-19 16:33:50 UTC (rev 3537) @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -12,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.4</version> </parent> <groupId>org.chorem.pollen</groupId> @@ -370,8 +368,7 @@ <phase>generate-resources</phase> <configuration> <target> - <mkdir - dir="${basedir}/target/pollen-embedded-temp-${project.version}/WEB-INF/classes"/> + <mkdir dir="${basedir}/target/pollen-embedded-temp-${project.version}/WEB-INF/classes" /> </target> </configuration> <goals> Modified: trunk/pollen-votecounting/pom.xml =================================================================== --- trunk/pollen-votecounting/pom.xml 2012-06-19 16:32:01 UTC (rev 3536) +++ trunk/pollen-votecounting/pom.xml 2012-06-19 16:33:50 UTC (rev 3537) @@ -1,14 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.4</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-06-19 16:32:01 UTC (rev 3536) +++ trunk/pom.xml 2012-06-19 16:33:50 UTC (rev 3537) @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -17,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.4</version> <modules> <module>pollen-votecounting</module> @@ -564,11 +562,11 @@  <scm> - <connection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</connection> + <connection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.4</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/pollen/trunk + scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.4 </developerConnection> - <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> + <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.4</url> </scm> <distributionManagement>

1 0

r3536 - in trunk: . pollen-ui-struts2
by maven-release＠users.chorem.org June 19, 2012

June 19, 2012

Author: maven-release Date: 2012-06-19 18:32:01 +0200 (Tue, 19 Jun 2012) New Revision: 3536 Url: http://chorem.org/repositories/revision/pollen/3536 Log: optimize dependencies = skip selenium tests (release does not like it Perm Gem... :() Modified: trunk/pollen-ui-struts2/pom.xml trunk/pom.xml Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-06-19 16:16:20 UTC (rev 3535) +++ trunk/pollen-ui-struts2/pom.xml 2012-06-19 16:32:01 UTC (rev 3536) @@ -218,6 +218,10 @@ <groupId>org.seleniumhq.selenium</groupId> <artifactId>selenium-safari-driver</artifactId> </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-remote-driver</artifactId> + </dependency> </dependencies> @@ -542,12 +546,12 @@ <profile> <id>selenium</id> - <activation> +  <properties> <pollenTestServerPort>8765</pollenTestServerPort> <pollenTestUrl>http://localhost:${pollenTestServerPort}/${defaultWebContextPath}</pollenTestUrl> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-06-19 16:16:20 UTC (rev 3535) +++ trunk/pom.xml 2012-06-19 16:32:01 UTC (rev 3536) @@ -476,6 +476,12 @@ <version>${seleniumVersion}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-remote-driver</artifactId> + <version>${seleniumVersion}</version> + <scope>test</scope> + </dependency> </dependencies> </dependencyManagement>

1 0

r3535 - trunk/pollen-ui-struts2/src/license
by maven-release＠users.chorem.org June 19, 2012

June 19, 2012

Author: maven-release Date: 2012-06-19 18:16:20 +0200 (Tue, 19 Jun 2012) New Revision: 3535 Url: http://chorem.org/repositories/revision/pollen/3535 Log: fix thrid parties Modified: trunk/pollen-ui-struts2/src/license/THIRD-PARTY.properties Modified: trunk/pollen-ui-struts2/src/license/THIRD-PARTY.properties =================================================================== --- trunk/pollen-ui-struts2/src/license/THIRD-PARTY.properties 2012-06-19 15:50:53 UTC (rev 3534) +++ trunk/pollen-ui-struts2/src/license/THIRD-PARTY.properties 2012-06-19 16:16:20 UTC (rev 3535) @@ -1,34 +1,43 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - Apache License # - Apache Software License - Version 2.0 # - BSD License +# - BSD style # - BSD-style license # - Bouncy Castle License # - CDDL # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Public License Version 1.0 # - Eclipse Public License - Version 1.0 # - GNU Affero General Public License version 3 # - GNU Lesser General Public Licence +# - GNU Library or Lesser General Public License # - GPLv2+CE # - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - LGPL, version 2.1 # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - MIT License # - MPL 1.1 # - Mozilla Public License +# - Mozilla Public License version 1.1 # - Similar to Apache License but with the acknowledgment clause removed # - The Apache Software License, Version 1.1 # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 +# - The W3C Software License # - license.txt +# - provided without support or warranty #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Fri Apr 13 19:37:43 CEST 2012 +#Tue Jun 19 18:14:05 CEST 2012 antlr--antlr--2.7.6=BSD License +cglib--cglib-nodep--2.1_3=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0

1 0

r3534 - in trunk/pollen-ui-struts2/src/main: java/org/chorem/pollen/ui/actions/poll webapp/WEB-INF/jsp/poll webapp/css
by tchemit＠users.chorem.org June 19, 2012

June 19, 2012

Author: tchemit Date: 2012-06-19 17:50:53 +0200 (Tue, 19 Jun 2012) New Revision: 3534 Url: http://chorem.org/repositories/revision/pollen/3534 Log: validate images (at last) + fix summry javascript Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/summary.jsp trunk/pollen-ui-struts2/src/main/webapp/css/summary.css Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java 2012-06-19 15:38:21 UTC (rev 3533) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java 2012-06-19 15:50:53 UTC (rev 3534) @@ -33,6 +33,7 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -404,9 +405,26 @@ String choiceId = choice.getTopiaId(); String location = imageChoice.getLocation(); - if (StringUtils.isBlank(choiceId) && - !isImageUploadEmpty(imageChoice)) { + boolean needCopy = false; + if (!isImageUploadEmpty(imageChoice)) { + // there is an image in the choice + + if (StringUtils.isBlank(choiceId)) { + + // this is a new choice + needCopy = true; + } else { + + // check that name has not changed + Choice oldChoice = poll.getChoiceByTopiaId(choiceId); + + needCopy = ObjectUtils.notEqual(oldChoice.getName(), imageChoice.getName()); + } + } + + if (needCopy) { + // not persisted choice with an upload // let's copy it somewhere safe @@ -421,6 +439,9 @@ FileUtils.copyFile(uploadedImage, copyImage); imageChoice.setLocation(copyImage.getAbsolutePath()); + + // generate also the thumb file + getPollService().generateThumbIfNeeded(copyImage); } } } @@ -1235,6 +1256,8 @@ case IMAGE: getImageChoices().addAll(pollChoices); + PollService service = getPollService(); + // if images are not still saved in a poll, then thumb // does not exists, must create a temporary one for (Choice choice : pollChoices) { @@ -1242,25 +1265,38 @@ String choiceId = imageChoice.getTopiaId(); File imageChoiceFile = null; - PollService service = getPollService(); if (StringUtils.isBlank(choiceId)) { + // new choice, + if (!isImageUploadEmpty(imageChoice)) { - // new choice, must create the thumb + + // ok there is an upload imageChoiceFile = new File(imageChoice.getLocation()); + } - if (imageChoiceFile.exists()) { + } else { - service.generateThumbIfNeeded(imageChoiceFile); - } + // already persisted choice, check choice has not changed + + Choice oldChoice = + poll.getChoiceByTopiaId(choiceId); + + if (ObjectUtils.equals( + imageChoice.getName(), + oldChoice.getName())) { + + // name has not changed, keep persisted choice + imageChoiceFile = service.getPollChoiceImageFile( + poll.getPollId(), choice.getName()); + } else { + + // use new choice image location + imageChoiceFile = + new File(imageChoice.getLocation()); } - } else { - - // already persisted choice, nothing to do - imageChoiceFile = service.getPollChoiceImageFile( - poll.getPollId(), choice.getName()); } if (imageChoiceFile != null) { Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/summary.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/summary.jsp 2012-06-19 15:38:21 UTC (rev 3533) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/summary.jsp 2012-06-19 15:50:53 UTC (rev 3534) @@ -56,6 +56,29 @@ return false; } + + $(document).ready(function() { + + $('.url').click(function () { + var el = $(this)[0]; + if (/textarea/i.test(el.tagName) || (/input/i.test(el.tagName) && /text/i.test(el.type))) { + el.select(); + } else if (!!window.getSelection) { // FF, Safari, Chrome, Opera + var sel = window.getSelection(); + var range = document.createRange(); + range.selectNodeContents(el); + sel.removeAllRanges(); + sel.addRange(range); + } else if (!!document.selection) { // IE + document.selection.empty(); + var range = document.body.createTextRange(); + range.moveToElementText(el); + range.select(); + } + }); + + }); + </script> <h1 class="titleCreation"><s:property value="poll.title"/></h1> @@ -169,34 +192,3 @@ </div> <sj:dialog id="confirmDialog" autoOpen="false" modal="true" width="500"/> - - - -<script type="text/javascript"> - - var autoSelect = function () { - var el = $(this)[0]; - if (/textarea/i.test(el.tagName) || (/input/i.test(el.tagName) && /text/i.test(el.type))) { - el.select(); - } else if (!!window.getSelection) { // FF, Safari, Chrome, Opera - var sel = window.getSelection(); - var range = document.createRange(); - range.selectNodeContents(el); - sel.removeAllRanges(); - sel.addRange(range); - } else if (!!document.selection) { // IE - document.selection.empty(); - var range = document.body.createTextRange(); - range.moveToElementText(el); - range.select(); - } - }; - - $(document).load(function() { - - - $('.url').click(autoSelect); - - }) - -</script> \ No newline at end of file Modified: trunk/pollen-ui-struts2/src/main/webapp/css/summary.css =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/css/summary.css 2012-06-19 15:38:21 UTC (rev 3533) +++ trunk/pollen-ui-struts2/src/main/webapp/css/summary.css 2012-06-19 15:50:53 UTC (rev 3534) @@ -22,7 +22,8 @@ */ .ui-widget-content-green { border: 1px solid #aaaaaa; - background: #b0f580 url(images/ui-bg_flat_75_b0f580_40x100.png) 50% 50% repeat-x; + /*background: #b0f580 url(images/ui-bg_flat_75_b0f580_40x100.png) 50% 50% repeat-x;*/ + background-color: #b0f580; color: #222222; } @@ -32,7 +33,8 @@ .ui-widget-content-yellow { border: 1px solid #aaaaaa; - background: #ffffaa url(images/ui-bg_flat_75_ffffaa_40x100.png) 50% 50% repeat-x; + /*background: #ffffaa url(images/ui-bg_flat_75_ffffaa_40x100.png) 50% 50% repeat-x;*/ + background-color: #ffffaa; color: #222222; } @@ -42,7 +44,8 @@ .ui-widget-content-red { border: 1px solid #aaaaaa; - background: #FFAAAA url(images/ui-bg_flat_75_ffffaa_40x100.png) 50% 50% repeat-x; + /*background: #FFAAAA url(images/ui-bg_flat_75_ffffaa_40x100.png) 50% 50% repeat-x;*/ + background-color: #FFAAAA; color: #222222; } @@ -52,7 +55,8 @@ .ui-widget-content-blue { border: 1px solid #dddddd; - background: #A9D4E3 url(images/ui-bg_highlight-hard_100_f2f5f7_1x100.png) 50% top repeat-x; + /*background: #A9D4E3 url(images/ui-bg_highlight-hard_100_f2f5f7_1x100.png) 50% top repeat-x;*/ + background-color: #A9D4E3; color: #362b36; }

1 0

r3533 - trunk/pollen-ui-struts2/src/main/webapp/js
by sletellier＠users.chorem.org June 19, 2012

June 19, 2012

Author: sletellier Date: 2012-06-19 17:38:21 +0200 (Tue, 19 Jun 2012) New Revision: 3533 Url: http://chorem.org/repositories/revision/pollen/3533 Log: Prepare image on adding choice Modified: trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js Modified: trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js 2012-06-19 14:57:01 UTC (rev 3532) +++ trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js 2012-06-19 15:38:21 UTC (rev 3533) @@ -353,27 +353,36 @@ if (containerId == 'choicesIMAGE') { getAllChoices(containerId).each(function (index) { - var imageChoice = $('[name="imageChoice_' + index + '.thumb"]'); - var data = {imageIndex:index}; - imageChoice.click(data, function(evt){ - var index = evt.data['imageIndex']; - var inputImageChoice = $('[name="imageChoice[' + index + ']"]'); - inputImageChoice.trigger('click'); - }); - var inputImageChoice = $('[name="imageChoice[' + index + ']"]'); - inputImageChoice.change(data, function(evt) { - var index = evt.data['imageIndex']; - var imageChoice = $('[name="imageChoice_' + index + '.thumb"]'); - imageChoice.attr("src", "/pollen/img/7terOk.jpg"); - imageChoice.attr("title", this.value); - imageChoice.attr("alt", this.value); - }); + // prepare image to enable click on image to select file + prepareImageChoice(index); }); } updateUpdownActions(containerId); } +function prepareImageChoice(index) { + + // click on hidden input file on click on image + var imageChoice = $('[name="imageChoice_' + index + '.thumb"]'); + var data = {imageIndex:index}; + imageChoice.click(data, function(evt){ + var index = evt.data['imageIndex']; + var inputImageChoice = $('[name="imageChoice[' + index + ']"]'); + inputImageChoice.trigger('click'); + }); + + // update image as selected + var inputImageChoice = $('[name="imageChoice[' + index + ']"]'); + inputImageChoice.change(data, function(evt) { + var index = evt.data['imageIndex']; + var imageChoice = $('[name="imageChoice_' + index + '.thumb"]'); + imageChoice.attr("src", "/pollen/img/7terOk.jpg"); + imageChoice.attr("title", this.value); + imageChoice.attr("alt", this.value); + }); +} + function updateUpdownActions(containerId) { reorder(containerId); @@ -445,6 +454,8 @@ } } }); + + return choiceNumber; } function addTextChoice(choiceNumber, nbChoices, tokenId) { @@ -464,10 +475,13 @@ } function addImageChoice(choiceNumber, nbChoices, tokenId) { - loadChoice('choicesIMAGE', 'imageChoice_', + choiceNumber = loadChoice('choicesIMAGE', 'imageChoice_', datas['displayImageChoiceUrl'], choiceNumber, nbChoices, tokenId ); + + // prepare image to enable click on image to select file + prepareImageChoice(choiceNumber); } function addNewChoice() {

1 0

r3532 - in trunk/pollen-ui-struts2/src/main/webapp: WEB-INF/jsp/poll css
by sletellier＠users.chorem.org June 19, 2012

June 19, 2012

Author: sletellier Date: 2012-06-19 16:57:01 +0200 (Tue, 19 Jun 2012) New Revision: 3532 Url: http://chorem.org/repositories/revision/pollen/3532 Log: - refs #562: improve choice layout - Fix error position - Fix display existing image - Remove fixed size Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayImageChoice.jsp trunk/pollen-ui-struts2/src/main/webapp/css/pollCreation.css Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp 2012-06-19 14:53:41 UTC (rev 3531) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp 2012-06-19 14:57:01 UTC (rev 3532) @@ -45,8 +45,8 @@ <s:hidden key='%{#prefix}.topiaId' value='%{#choice.topiaId}' label=''/> <s:hidden key='%{#prefix}.order' value='%{#choiceNumber}' label=''/> <sp:fielderror fieldName="%{#prefix}" id="%{#prefix}_error"/> + <sp:fielderror fieldName="%{#prefix}.name" id="%{#prefix}.name_error"/> <div class="fleft choiceName"> - <sp:fielderror fieldName="%{#prefix}.name" id="%{#prefix}.name_error"/> <span class="moveImage ui-icon ui-icon-arrowthick-2-n-s"></span> <s:label for="%{#prefix}.name" id="choicesTEXT_label_%{#choiceNumber}" theme="simple" value=''/> @@ -96,8 +96,8 @@ theme="simple" value='%{#choice.topiaId}' label=''/> <s:hidden key='%{#prefix}.order' value='%{#choiceNumber}' label=''/> <sp:fielderror fieldName="%{#prefix}" id="%{#prefix}_error"/> + <sp:fielderror fieldName="%{#prefix}.name" id="%{#prefix}.name_error"/> <div class="fleft choiceName"> - <sp:fielderror fieldName="%{#prefix}.name" id="%{#prefix}.name_error"/> <span class="moveImage ui-icon ui-icon-arrowthick-2-n-s"> </span> <s:label for="%{#prefix}.name" id="choicesDATE_label_%{choiceNumber}" theme="simple" value=''/> @@ -140,18 +140,18 @@ </s:iterator> </div> <div id="choicesIMAGE" class="choices"> - <s:iterator value="imageChoices" status="status" var="choiceDiv"> + <s:iterator value="imageChoices" status="status" var="choice"> <s:set name="choiceNumber"><s:property value="%{#status.index}"/></s:set> <s:set name="prefix">imageChoice_<s:property value="%{#choiceNumber}"/></s:set> <div id='choicesIMAGE_<s:property value="choiceNumber"/>' - class="ui-state-default choicesImageDiv"> + class="ui-state-default"> <s:hidden key='%{#prefix}.order' value='%{#choiceNumber}' label=''/> <s:hidden key='%{#prefix}.topiaId' value='%{#choice.topiaId}' label=''/> <sp:fielderror fieldName="%{#prefix}" id="%{#prefix}_error"/> + <sp:fielderror fieldName="%{#prefix}.name" id="%{#prefix}.name_error"/> <div class="fleft choiceName"> <div class="fleft"> - <sp:fielderror fieldName="%{#prefix}.name" id="%{#prefix}.name_error"/> <span class="moveImage ui-icon ui-icon-arrowthick-2-n-s"></span> <s:label for="%{#prefix}.name" id="choicesIMAGE_label_%{choiceNumber}" theme="simple" value=''/> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayImageChoice.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayImageChoice.jsp 2012-06-19 14:53:41 UTC (rev 3531) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayImageChoice.jsp 2012-06-19 14:57:01 UTC (rev 3532) @@ -29,7 +29,7 @@ <s:set id='upTitle'><s:text name="pollen.action.pollChoiceUp"/></s:set> <s:set id='downTitle'><s:text name="pollen.action.pollChoiceDown"/></s:set> <div id='choicesIMAGE_<s:property value="choiceNumber"/>' - class="ui-state-default choicesImageDiv"> + class="ui-state-default"> <s:hidden key='%{#prefix}.topiaId' value='%{choice.topiaId}' label=''/> <s:hidden key='%{#prefix}.order' value='%{#choiceNumber}' label=''/> <div class="fleft choiceName"> Modified: trunk/pollen-ui-struts2/src/main/webapp/css/pollCreation.css =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/css/pollCreation.css 2012-06-19 14:53:41 UTC (rev 3531) +++ trunk/pollen-ui-struts2/src/main/webapp/css/pollCreation.css 2012-06-19 14:57:01 UTC (rev 3532) @@ -26,10 +26,6 @@ font-size: 0.9em; } -.choicesImageDiv { - height: 6em; -} - .choiceImage { margin-left: 30px; } @@ -45,7 +41,6 @@ } .choicesDiv { - height: 4em; line-height: 1.2em; }

1 0

r3531 - in trunk/pollen-ui-struts2/src/main: java/org/chorem/pollen/ui/actions/poll webapp/WEB-INF/jsp/poll
by tchemit＠users.chorem.org June 19, 2012

June 19, 2012

Author: tchemit Date: 2012-06-19 16:53:41 +0200 (Tue, 19 Jun 2012) New Revision: 3531 Url: http://chorem.org/repositories/revision/pollen/3531 Log: fix poll choices validation Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java 2012-06-19 14:09:37 UTC (rev 3530) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java 2012-06-19 14:53:41 UTC (rev 3531) @@ -822,7 +822,6 @@ protected void validateDateChoices() { - String choicePrefix = getChoiceFieldPrefix(ChoiceType.DATE); Set<String> choiceNames = Sets.newHashSet(); @@ -831,30 +830,34 @@ Integer choiceIndex = entry.getKey(); PollDateChoice choice = (PollDateChoice) entry.getValue(); String choiceErrorField = choicePrefix + choiceIndex + ".name"; - String choiceName = choice.getName(); - if (StringUtils.isBlank(choiceName)) { + if (StringUtils.isBlank(choice.getName())) { // no name addInformationsError( choiceErrorField, _("pollen.error.poll.dateChoice.required")); continue; } - if (choiceNames.contains(choiceName)) { - // duplicated names + if (choice.getDate() == null) { + + // format error addInformationsError( choiceErrorField, - _("pollen.error.poll.dateChoice.already.used")); + _("pollen.error.poll.dateChoice.badDateFormat")); continue; } - if (choice.getDate() == null) { - // format error + // date is valid + // use now the date.toString() as value to ensure unicity + String choiceValue = choice.getDate().toString(); + + if (choiceNames.contains(choiceValue)) { + // duplicated names addInformationsError( choiceErrorField, - _("pollen.error.poll.dateChoice.badDateFormat")); - + _("pollen.error.poll.dateChoice.already.used")); + continue; } - choiceNames.add(choiceName); + choiceNames.add(choiceValue); } } @@ -912,7 +915,6 @@ continue; } } - } protected void validateOptions() { @@ -1172,7 +1174,6 @@ fieldNamePrefix, _("pollen.error.poll.personToList.weight.not.valid")); } - } protected boolean validateEndDate(Date begin, Date end) { @@ -1181,6 +1182,17 @@ && end.before(begin); } + public Object getDateChoiceValue(PollDateChoice choice) { + Date date = choice.getDate(); + Object result; + if (date == null) { + result = choice.getName(); + } else { + result = date; + } + return result; + } + @Override public void addFieldError(String fieldName, String errorMessage) { super.addFieldError(fieldName, errorMessage); @@ -1799,8 +1811,8 @@ Map<Integer, T> result2 = Maps.newTreeMap(); for (Integer choiceOrder : choicesOrder.keySet()) { - Integer choiceNumber = choicesOrder.get(choiceOrder); - T choice = result.get(choiceNumber ); + Integer choiceNumber = choicesOrder.get(choiceOrder); + T choice = result.get(choiceNumber); if (choice != null) { result2.put(choiceOrder, choice); } Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp 2012-06-19 14:09:37 UTC (rev 3530) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp 2012-06-19 14:53:41 UTC (rev 3531) @@ -104,7 +104,7 @@ <sj:datepicker id='%{#prefix}.name' key="%{#prefix}.name" label="" changeMonth="true" changeYear="true" labelSeparator="" theme="simple" timepicker="true" - value="%{#choice.name}" + value="%{getDateChoiceValue(#choice)}" displayFormat="%{getText('pollen.common.datePickerPattern')}"/> </div> <div class="fright"> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp 2012-06-19 14:09:37 UTC (rev 3530) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp 2012-06-19 14:53:41 UTC (rev 3531) @@ -357,7 +357,7 @@ console.info('Moved ' + container + ' -- ' + choiceNumber); reorder(container); } - }).disableSelection(); + }); }); }); </script>

1 0