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

r3536 - in trunk: . pollen-ui-struts2
by maven-release＠users.chorem.org 19 Jun '12

19 Jun '12

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 19 Jun '12

19 Jun '12

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 19 Jun '12

19 Jun '12

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 19 Jun '12

19 Jun '12

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 19 Jun '12

19 Jun '12

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 19 Jun '12

19 Jun '12

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

r3530 - in trunk/pollen-ui-struts2/src/main/webapp: WEB-INF/jsp/poll img js
by sletellier＠users.chorem.org 19 Jun '12

19 Jun '12

Author: sletellier Date: 2012-06-19 16:09:37 +0200 (Tue, 19 Jun 2012) New Revision: 3530 Url: http://chorem.org/repositories/revision/pollen/3530 Log: - refs #562 : improve choice layout - add image to represent choosed images - put image path in tooltip - fix open image in hidden file chooser on chromium Added: trunk/pollen-ui-struts2/src/main/webapp/img/7terOk.jpg 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/js/createPoll.js 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 13:22:34 UTC (rev 3529) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp 2012-06-19 14:09:37 UTC (rev 3530) @@ -175,10 +175,11 @@ alt="<s:property value='name'/>" title="<s:property value='name'/>" src="<s:property value='imageUrl'/>" - class="fright choiceImage"> + class="fleft choiceImage"> <s:file key='imageChoice[%{#choiceNumber}]' label='' theme="simple" - cssClass="nameField fleft" cssStyle="margin-left:50px;"/> + class="fright" + cssStyle="opacity: 0;"/> </s:if> <s:else> <%--New image--%> @@ -188,9 +189,10 @@ alt="<s:text name='pollen.image.not.loaded'/>" title="<s:text name='pollen.image.not.loaded'/>" src="<s:property value='imageUrl'/>" width="100px" - height="75px" class="fright choiceImage"> + height="75px" class="fleft choiceImage"> <s:file key='imageChoice[%{#choiceNumber}]' label='' theme="simple" - cssClass="hidden"/> + class="fright" + cssStyle="opacity: 0;"/> </s:else> </div> 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 13:22:34 UTC (rev 3529) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayImageChoice.jsp 2012-06-19 14:09:37 UTC (rev 3530) @@ -45,10 +45,11 @@ alt="<s:text name='pollen.image.not.loaded'/>" title="<s:text name='pollen.image.not.loaded'/>" src="<s:property value='imageUrl'/>" width="100px" height="75" - class="fright choiceImage"> + class="fleft choiceImage"> <s:file key='%{#prefix2}' label='' theme="simple" - cssClass="hidden"/> + class="fright" + cssStyle="opacity: 0;"/> </div> </div> <div class="fright"> Added: trunk/pollen-ui-struts2/src/main/webapp/img/7terOk.jpg =================================================================== (Binary files differ) Property changes on: trunk/pollen-ui-struts2/src/main/webapp/img/7terOk.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js 2012-06-19 13:22:34 UTC (rev 3529) +++ trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js 2012-06-19 14:09:37 UTC (rev 3530) @@ -354,9 +354,21 @@ getAllChoices(containerId).each(function (index) { var imageChoice = $('[name="imageChoice_' + index + '.thumb"]'); - imageChoice.click(function(){ - $('#registerForm_imageChoice_' + index + '_').click(); + 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); + }); }); } updateUpdownActions(containerId);

1 0

r3529 - in trunk/pollen-ui-struts2/src/main/webapp: WEB-INF/jsp/poll css js
by sletellier＠users.chorem.org 19 Jun '12

19 Jun '12

Author: sletellier Date: 2012-06-19 15:22:34 +0200 (Tue, 19 Jun 2012) New Revision: 3529 Url: http://chorem.org/repositories/revision/pollen/3529 Log: - refs #562 : improve choice layout - fix html and css style - hide file chooser - image click open file chooser 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/displayDateChoice.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayImageChoice.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayTextChoice.jsp trunk/pollen-ui-struts2/src/main/webapp/css/pollCreation.css trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js 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 13:22:18 UTC (rev 3528) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp 2012-06-19 13:22:34 UTC (rev 3529) @@ -40,50 +40,47 @@ <s:set name="choiceNumber"><s:property value="%{#status.index}"/></s:set> <s:set name="prefix">textChoice_<s:property value="%{#choiceNumber}"/></s:set> - <div id='choicesTEXT_<s:property value="choiceNumber"/>' class="ui-state-default"> + <div id='choicesTEXT_<s:property value="choiceNumber"/>' class="ui-state-default choicesDiv"> <%--<div id='choicesTEXT_<s:property value="choiceNumber"/>'>--%> <s:hidden key='%{#prefix}.topiaId' value='%{#choice.topiaId}' label=''/> <s:hidden key='%{#prefix}.order' value='%{#choiceNumber}' label=''/> <sp:fielderror fieldName="%{#prefix}" id="%{#prefix}_error"/> <div class="fleft choiceName"> <sp:fielderror fieldName="%{#prefix}.name" id="%{#prefix}.name_error"/> - <span class="choicesImage ui-icon ui-icon-arrowthick-2-n-s"></span> + <span class="moveImage ui-icon ui-icon-arrowthick-2-n-s"></span> <s:label for="%{#prefix}.name" id="choicesTEXT_label_%{#choiceNumber}" theme="simple" value=''/> <s:textfield cssClass="nameField" id='%{#prefix}.name' theme="simple" key="%{#prefix}.name" label='' value="%{#choice.name}"/> - - + </div> + <div class="fright"> + <%--s:a id='choicesTEXT_down_%{choiceNumber}' + cssClass="hidden" href='#' + onclick="return downChoice('choicesTEXT_%{choiceNumber}')"> + <image alt='<s:property value="downTitle"/>' + title='<s:property value="downTitle"/>' + src="<s:url value='/img/1downarrow.png'/>"></image> + </s:a> + <s:a id='choicesTEXT_up_%{choiceNumber}' href='#' cssClass="hidden" + onclick="return upChoice('choicesTEXT_%{choiceNumber}')"> + <image alt='<s:property value="upTitle"/>' + title='<s:property value="upTitle"/>' + src="<s:url value='/img/1uparrow.png'/>"></image> + </s:a--%> <s:label for="%{#prefix}.description" key="pollen.common.description" theme="simple"/> - <%--/div> - <div class="fleft"--%> <s:textarea cols="30" id="%{#prefix}.description" label='' theme="simple" key="%{#prefix}.description" value="%{#choice.description}"/> - </div> - <s:if test="!voteStarted"> - <div class="fright"> - <%--s:a id='choicesTEXT_down_%{choiceNumber}' - cssClass="hidden" href='#' - onclick="return downChoice('choicesTEXT_%{choiceNumber}')"> - <image alt='<s:property value="downTitle"/>' - title='<s:property value="downTitle"/>' - src="<s:url value='/img/1downarrow.png'/>"></image> - </s:a> - <s:a id='choicesTEXT_up_%{choiceNumber}' href='#' cssClass="hidden" - onclick="return upChoice('choicesTEXT_%{choiceNumber}')"> - <image alt='<s:property value="upTitle"/>' - title='<s:property value="upTitle"/>' - src="<s:url value='/img/1uparrow.png'/>"></image> - </s:a--%> + <s:if test="!voteStarted"> <s:a href='#' onclick="return deleteChoice('choicesTEXT_%{choiceNumber}')"> <image alt='<s:property value="deleteTitle"/>' title='<s:property value="deleteTitle"/>' src="<s:url value='/img/delete.png'/>"></image> </s:a> - </div> - </s:if> + </s:if> + </div> <div class="cleanBoth"></div> </div> </s:iterator> @@ -94,14 +91,14 @@ <s:set name="prefix">dateChoice_<s:property value="%{#choiceNumber}"/></s:set> <div id='choicesDATE_<s:property value="choiceNumber"/>' - class="ui-state-default"> + class="ui-state-default choicesDiv"> <s:hidden key='%{#prefix}.topiaId' id='%{#prefix}.topiaId' theme="simple" value='%{#choice.topiaId}' label=''/> <s:hidden key='%{#prefix}.order' value='%{#choiceNumber}' label=''/> <sp:fielderror fieldName="%{#prefix}" id="%{#prefix}_error"/> <div class="fleft choiceName"> <sp:fielderror fieldName="%{#prefix}.name" id="%{#prefix}.name_error"/> - <span class="choicesImage ui-icon ui-icon-arrowthick-2-n-s"> </span> + <span class="moveImage ui-icon ui-icon-arrowthick-2-n-s"> </span> <s:label for="%{#prefix}.name" id="choicesDATE_label_%{choiceNumber}" theme="simple" value=''/> <sj:datepicker id='%{#prefix}.name' key="%{#prefix}.name" label="" @@ -109,16 +106,7 @@ theme="simple" timepicker="true" value="%{#choice.name}" displayFormat="%{getText('pollen.common.datePickerPattern')}"/> - - - <s:label for="%{#prefix}.description" key="pollen.common.description" - theme="simple"/> </div> - <div class="fleft"> - <s:textarea cols="30" id="%{#prefix}.description" theme="simple" - key="%{#prefix}.description" label='' - value="%{#choice.description}"/> - </div> - <s:if test="!voteStarted"> <div class="fright"> <%--s:a id='choicesDATE_down_%{choiceNumber}' cssClass="hidden" href='#' @@ -133,80 +121,81 @@ title='<s:property value="upTitle"/>' src="<s:url value='/img/1uparrow.png'/>"></image> </s:a--%> - <s:a href='#' - onclick="return deleteChoice('choicesDATE_%{choiceNumber}')"> - <image alt='<s:property value="deleteTitle"/>' - title='<s:property value="deleteTitle"/>' - src="<s:url value='/img/delete.png'/>"></image> - </s:a> + <s:label for="%{#prefix}.description" key="pollen.common.description" + theme="simple"/> + <s:textarea cols="30" id="%{#prefix}.description" theme="simple" + key="%{#prefix}.description" label='' + value="%{#choice.description}"/> + <s:if test="!voteStarted"> + <s:a href='#' + onclick="return deleteChoice('choicesDATE_%{choiceNumber}')"> + <image alt='<s:property value="deleteTitle"/>' + title='<s:property value="deleteTitle"/>' + src="<s:url value='/img/delete.png'/>"></image> + </s:a> + </s:if> </div> - </s:if> <div class="cleanBoth"></div> </div> </s:iterator> </div> <div id="choicesIMAGE" class="choices"> - <s:iterator value="imageChoices" status="status" var="choice"> + <s:iterator value="imageChoices" status="status" var="choiceDiv"> <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"> + class="ui-state-default choicesImageDiv"> <s:hidden key='%{#prefix}.order' value='%{#choiceNumber}' label=''/> <s:hidden key='%{#prefix}.topiaId' value='%{#choice.topiaId}' label=''/> <sp:fielderror fieldName="%{#prefix}" id="%{#prefix}_error"/> <div class="fleft choiceName"> - <sp:fielderror fieldName="%{#prefix}.name" id="%{#prefix}.name_error"/> - <span class="choicesImage ui-icon ui-icon-arrowthick-2-n-s"></span> - <s:label for="%{#prefix}.name" id="choicesIMAGE_label_%{choiceNumber}" - theme="simple" value=''/> - <s:if test="#choice.name != null"> + <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=''/> + </div> + <div class="fright"> + <s:if test="#choice.name != null"> - <%--Uploaded image--%> - <s:hidden id="%{#prefix}.name" name="%{#prefix}.name" - value="%{#choice.name}" label='' theme="simple"/> + <%--Uploaded image--%> + <s:hidden id="%{#prefix}.name" name="%{#prefix}.name" + value="%{#choice.name}" label='' theme="simple"/> - <s:hidden id="%{#prefix}.location" name="%{#prefix}.location" - value="%{#choice.location}" label='' theme="simple"/> - <s:url id="imageUrl" namespace="/io" action="getPollChoiceImage" - escapeAmp="true"> - <s:param name="choiceTokenId"> - imagechoicesThumb_<s:property value='name'/> - </s:param> - </s:url> - <img name="<s:property value="#prefix"/>.thumb" - alt="<s:property value='name'/>" - title="<s:property value='name'/>" - src="<s:property value='imageUrl'/>"> + <s:hidden id="%{#prefix}.location" name="%{#prefix}.location" + value="%{#choice.location}" label='' theme="simple"/> + <s:url id="imageUrl" namespace="/io" action="getPollChoiceImage" + escapeAmp="true"> + <s:param name="choiceTokenId"> + imagechoicesThumb_<s:property value='name'/> + </s:param> + </s:url> + <img name="<s:property value="#prefix"/>.thumb" + alt="<s:property value='name'/>" + title="<s:property value='name'/>" + src="<s:property value='imageUrl'/>" + class="fright choiceImage"> - <s:file key='imageChoice[%{#choiceNumber}]' label='' theme="simple" - cssClass="nameField fleft" cssStyle="margin-left:50px;"/> - </s:if> - <s:else> - <%--New image--%> - <s:url id="imageUrl" namespace="/io" action="getPollChoiceImage" - escapeAmp="false" value="/img/7ter.jpg"/> - <img name="<s:property value="#prefix"/>.thumb" - alt="<s:text name='pollen.image.not.loaded'/>" - title="<s:text name='pollen.image.not.loaded'/>" - src="<s:property value='imageUrl'/>" width="100px" - height="75px"> - <s:file key='imageChoice[%{#choiceNumber}]' label='' theme="simple" - cssClass="nameField fleft" - cssStyle="margin-left:50px;"/> + <s:file key='imageChoice[%{#choiceNumber}]' label='' theme="simple" + cssClass="nameField fleft" cssStyle="margin-left:50px;"/> + </s:if> + <s:else> + <%--New image--%> + <s:url id="imageUrl" namespace="/io" action="getPollChoiceImage" + escapeAmp="false" value="/img/7ter.jpg"/> + <img name="<s:property value="#prefix"/>.thumb" + alt="<s:text name='pollen.image.not.loaded'/>" + title="<s:text name='pollen.image.not.loaded'/>" + src="<s:property value='imageUrl'/>" width="100px" + height="75px" class="fright choiceImage"> + <s:file key='imageChoice[%{#choiceNumber}]' label='' theme="simple" + cssClass="hidden"/> - </s:else> + </s:else> + </div> </div> - <div class="fleft"> - - - <s:label for="%{#prefix}.description" key="pollen.common.description" - theme="simple"/> - <s:textarea cols="30" id="%{#prefix}.description" label='' - theme="simple" key="%{#prefix}.description" - value="%{#choice.description}"/> - </div> - <s:if test="!voteStarted"> <div class="fright"> <%--s:a id='choicesIMAGE_down_%{choiceNumber}' cssClass="hidden" href='#' @@ -221,14 +210,20 @@ title='<s:property value="upTitle"/>' src="<s:url value='/img/1uparrow.png'/>"></image> </s:a--%> - <s:a href='#' - onclick="return deleteChoice('choicesIMAGE_%{choiceNumber}')"> - <image alt='<s:property value="deleteTitle"/>' - title='<s:property value="deleteTitle"/>' - src="<s:url value='/img/delete.png'/>"></image> - </s:a> + <s:label for="%{#prefix}.description" key="pollen.common.description" + theme="simple"/> + <s:textarea cols="30" id="%{#prefix}.description" label='' + theme="simple" key="%{#prefix}.description" + value="%{#choice.description}"/> + <s:if test="!voteStarted"> + <s:a href='#' + onclick="return deleteChoice('choicesIMAGE_%{choiceNumber}')"> + <image alt='<s:property value="deleteTitle"/>' + title='<s:property value="deleteTitle"/>' + src="<s:url value='/img/delete.png'/>"></image> + </s:a> + </s:if> </div> - </s:if> <div class="cleanBoth"></div> </div> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayDateChoice.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayDateChoice.jsp 2012-06-19 13:22:18 UTC (rev 3528) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayDateChoice.jsp 2012-06-19 13:22:34 UTC (rev 3529) @@ -29,26 +29,18 @@ <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='choicesDATE_<s:property value="choiceNumber"/>' - class="ui-state-default"> + class="ui-state-default choicesDiv"> <s:hidden key='%{#prefix}.topiaId' value='%{choice.topiaId}' label=''/> <s:hidden key='%{#prefix}.order' value='%{#choiceNumber}' label=''/> <div class="fleft choiceName"> - <span class="choicesImage ui-icon ui-icon-arrowthick-2-n-s"></span> + <span class="moveImage ui-icon ui-icon-arrowthick-2-n-s"></span> <s:label for="%{#prefix}.name" id="choicesDATE_label_%{choiceNumber}" theme="simple" value=''/> <sj:datepicker id='%{#prefix}.name' key="%{#prefix}.name" changeMonth="true" changeYear="true" labelSeparator="" theme="simple" label="" timepicker="true" value="%{choice.date}" displayFormat="%{getText('pollen.common.datePickerPattern')}"/> - - - <s:label for="%{#prefix}.description" key="pollen.common.description" - theme="simple"/> </div> - <div class="fleft"> - <s:textarea cols="30" id="%{#prefix}.description" - key="%{#prefix}.description" label='' theme="simple" - value="%{choice.description}"/> - </div> <div class="fright"> <%--s:a id='choicesDATE_down_%{choiceNumber}' cssClass="hidden" href='#' @@ -63,6 +55,11 @@ title='<s:property value="upTitle"/>' src="<s:url value='/img/1uparrow.png'/>"></image> </s:a--%> + <s:label for="%{#prefix}.description" key="pollen.common.description" + theme="simple"/> + <s:textarea cols="30" id="%{#prefix}.description" + key="%{#prefix}.description" label='' theme="simple" + value="%{choice.description}"/> <s:a href='#' onclick="return deleteChoice('choicesDATE_%{choiceNumber}')"> <image alt='<s:property value="deleteTitle"/>' title='<s:property value="deleteTitle"/>' 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 13:22:18 UTC (rev 3528) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayImageChoice.jsp 2012-06-19 13:22:34 UTC (rev 3529) @@ -29,33 +29,28 @@ <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"> + class="ui-state-default choicesImageDiv"> <s:hidden key='%{#prefix}.topiaId' value='%{choice.topiaId}' label=''/> <s:hidden key='%{#prefix}.order' value='%{#choiceNumber}' label=''/> <div class="fleft choiceName"> - <span class="choicesImage ui-icon ui-icon-arrowthick-2-n-s"></span> - <s:label for="%{#prefix}.name" id="choicesIMAGE_label_%{choiceNumber}" - theme="simple" value=''/> - <s:url id="imageUrl" namespace="/io" action="getPollChoiceImage" - escapeAmp="false" value="/img/7ter.jpg"/> - <img name="<s:property value="#prefix"/>.thumb" - alt="<s:text name='pollen.image.not.loaded'/>" - title="<s:text name='pollen.image.not.loaded'/>" - src="<s:property value='imageUrl'/>" width="100px" height="75"> - <span style="float: left; margin-left:50px; "> - <s:file key='%{#prefix2}' label='' - theme="simple" - cssClass="nameField" - disabled="%{voteStarted}" cssStyle="clear: both;"/> - </span> + <div class="fleft"> + <span class="moveImage ui-icon ui-icon-arrowthick-2-n-s"></span> + <s:label for="%{#prefix}.name" id="choicesIMAGE_label_%{choiceNumber}" + theme="simple" value=''/> + </div> + <div class="fright"> + <s:url id="imageUrl" namespace="/io" action="getPollChoiceImage" + escapeAmp="false" value="/img/7ter.jpg"/> + <img name="<s:property value="#prefix"/>.thumb" + alt="<s:text name='pollen.image.not.loaded'/>" + title="<s:text name='pollen.image.not.loaded'/>" + src="<s:property value='imageUrl'/>" width="100px" height="75" + class="fright choiceImage"> + <s:file key='%{#prefix2}' label='' + theme="simple" + cssClass="hidden"/> + </div> </div> - <div class="fleft"> - - - <s:label for="%{#prefix}.description" key="pollen.common.description" - theme="simple"/> - <s:textarea cols="30" id="%{#prefix}.description" label='' theme="simple" - key="%{#prefix}.description" value="%{choice.description}"/> - </div> <div class="fright"> <%--s:a id='choicesIMAGE_down_%{choiceNumber}' cssClass="hidden" href='#' @@ -70,6 +65,10 @@ title='<s:property value="upTitle"/>' src="<s:url value='/img/1uparrow.png'/>"></image> </s:a--%> + <s:label for="%{#prefix}.description" key="pollen.common.description" + theme="simple"/> + <s:textarea cols="30" id="%{#prefix}.description" label='' theme="simple" + key="%{#prefix}.description" value="%{choice.description}"/> <s:a href='#' onclick="return deleteChoice('choicesIMAGE_%{choiceNumber}')"> <image alt='<s:property value="deleteTitle"/>' title='<s:property value="deleteTitle"/>' Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayTextChoice.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayTextChoice.jsp 2012-06-19 13:22:18 UTC (rev 3528) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayTextChoice.jsp 2012-06-19 13:22:34 UTC (rev 3529) @@ -28,22 +28,15 @@ <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='choicesTEXT_<s:property value="choiceNumber"/>' - class="ui-state-default"> + class="ui-state-default choicesDiv"> <s:hidden key='%{#prefix}.topiaId' value='%{choice.topiaId}' label=''/> <s:hidden key='%{#prefix}.order' value='%{#choiceNumber}' label=''/> <div class="fleft choiceName"> - <span class="choicesImage ui-icon ui-icon-arrowthick-2-n-s"></span> + <span class="moveImage ui-icon ui-icon-arrowthick-2-n-s"></span> <s:label for="%{#prefix}.name" id="choicesTEXT_label_%{choiceNumber}" theme="simple" value=''/> <s:textfield cssClass="nameField" id='%{#prefix}.name' key="%{#prefix}.name" label='' theme="simple" value="%{choice.name}"/> - - - <s:label for="%{#prefix}.description" key="pollen.common.description" - theme="simple"/> - <%--/div> - <div class="fleft"--%> - <s:textarea cols="30" id="%{#prefix}.description" label='' theme="simple" - key="%{#prefix}.description" value="%{choice.description}"/> </div> <div class="fright"> <%--s:a id='choicesTEXT_down_%{choiceNumber}' @@ -59,6 +52,10 @@ title='<s:property value="upTitle"/>' src="<s:url value='/img/1uparrow.png'/>"></image> </s:a--%> + <s:label for="%{#prefix}.description" key="pollen.common.description" + theme="simple"/> + <s:textarea cols="30" id="%{#prefix}.description" label='' theme="simple" + key="%{#prefix}.description" value="%{choice.description}"/> <s:a href='#' onclick="return deleteChoice('choicesTEXT_%{choiceNumber}')"> <image alt='<s:property value="deleteTitle"/>' title='<s:property value="deleteTitle"/>' Modified: trunk/pollen-ui-struts2/src/main/webapp/css/pollCreation.css =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/css/pollCreation.css 2012-06-19 13:22:18 UTC (rev 3528) +++ trunk/pollen-ui-struts2/src/main/webapp/css/pollCreation.css 2012-06-19 13:22:34 UTC (rev 3529) @@ -20,10 +20,40 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -.choicesImage { position: absolute; margin-left: 1.3em; } -.choices div { height: 4em; line-height: 1.2em; } -.ui-state-highlight { height: 4em; line-height: 1.2em; } +/* override jquery-ui.css */ +.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { + font-size: 0.9em; +} + +.choicesImageDiv { + height: 6em; +} + +.choiceImage { + margin-left: 30px; +} + +.moveImage { + /*position: absolute; */ + margin-left: 1.3em; + margin-bottom: 14px; +} + +.choiceName label { + margin-left: 5px; +} + +.choicesDiv { + height: 4em; + line-height: 1.2em; +} + +div.ui-state-highlight { + height: 4em; + line-height: 1.2em; +} + #pollCreationZone { width: 550px; margin: auto; Modified: trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js 2012-06-19 13:22:18 UTC (rev 3528) +++ trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js 2012-06-19 13:22:34 UTC (rev 3529) @@ -349,6 +349,16 @@ $('#choicesDATE .wwgrp').remove(); } + + if (containerId == 'choicesIMAGE') { + + getAllChoices(containerId).each(function (index) { + var imageChoice = $('[name="imageChoice_' + index + '.thumb"]'); + imageChoice.click(function(){ + $('#registerForm_imageChoice_' + index + '_').click(); + }); + }); + } updateUpdownActions(containerId); }

1 0

r3528 - in trunk: pollen-services/src/main/java/org/chorem/pollen/services/impl pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security
by tchemit＠users.chorem.org 19 Jun '12

19 Jun '12

Author: tchemit Date: 2012-06-19 15:22:18 +0200 (Tue, 19 Jun 2012) New Revision: 3528 Url: http://chorem.org/repositories/revision/pollen/3528 Log: still some security holes... Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollResultAccessRequired.java Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java 2012-06-19 13:21:32 UTC (rev 3527) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java 2012-06-19 13:22:18 UTC (rev 3528) @@ -160,6 +160,19 @@ return result; } + public boolean isCanAccessResult(Poll poll, + String accountId, + SecurityService.AccountIdRole accountIdRole, + UserAccount userAccount) { + + if (isPollCreator(poll, accountId, userAccount)) { + accountIdRole = AccountIdRole.CREATOR; + } + + String errorMessage = isCanAccessResult(poll, accountIdRole); + return errorMessage == null; + } + public String isCanAccessResult(Poll poll, SecurityService.AccountIdRole accountIdRole) { Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java 2012-06-19 13:21:32 UTC (rev 3527) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java 2012-06-19 13:22:18 UTC (rev 3528) @@ -239,7 +239,7 @@ public String getSummaryUrl() { PollUrl url = getPollUrlService().getPollSummaryUrl(poll); - getSecurityService().removeAccountIdWhenConnected(url, getPollenUserAccount()); + url.getPollUri().setAccountId(getAccountId()); return url.getUrl(); } @@ -250,12 +250,16 @@ return url.getUrl(); } + public String getVoteMessages() { + return _("pollen.common.voteNbVotes", poll.sizeVote()); + } + public boolean isFeedFileExisting() { return feedFileExisting; } - public boolean isCreatorUser() { - return creatorUser; + public boolean isCreatorOrAdmin() { + return creatorUser || isUserAdmin(); } public boolean isAccountFieldDisplayed() { @@ -430,14 +434,16 @@ accountId = null; } voteAllowed = getSecurityService().isCanVote(poll, - null, + accountId, accountIdRole); } // is can display result link ? resultAllowed = - getSecurityService().isCanAccessResult(poll, accountIdRole) - == null; + getSecurityService().isCanAccessResult(poll, + getAccountId(), + accountIdRole, + getPollenUserAccount()); if (voteAllowed) { Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollResultAccessRequired.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollResultAccessRequired.java 2012-06-19 13:21:32 UTC (rev 3527) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollResultAccessRequired.java 2012-06-19 13:22:18 UTC (rev 3528) @@ -24,6 +24,7 @@ import org.chorem.pollen.bean.PollUri; import org.chorem.pollen.business.persistence.Poll; +import org.chorem.pollen.business.persistence.UserAccount; import org.chorem.pollen.services.PollenServiceContext; import org.chorem.pollen.services.impl.SecurityService; import org.chorem.pollen.ui.PollenUIUtils; @@ -92,6 +93,19 @@ request, n_("pollen.security.error.bad.accountId")); } + } else { + + // check if current userAccount is creator + UserAccount userAccount = getPollenUserAccount(request); + + boolean isCreator = securityService.isPollCreator( + poll, + null, + userAccount); + + if (isCreator) { + accountIdRole = SecurityService.AccountIdRole.CREATOR; + } } if (isAdmin) {

1 0

r3527 - in trunk/pollen-ui-struts2/src/main/webapp: WEB-INF/jsp/poll js
by tchemit＠users.chorem.org 19 Jun '12

19 Jun '12

Author: tchemit Date: 2012-06-19 15:21:32 +0200 (Tue, 19 Jun 2012) New Revision: 3527 Url: http://chorem.org/repositories/revision/pollen/3527 Log: refs #562: improve choice layout (make sure sortable is done at the very end of page loading) Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js 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 13:20:24 UTC (rev 3526) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp 2012-06-19 13:21:32 UTC (rev 3527) @@ -346,6 +346,19 @@ if (<s:property value="%{voteStarted}"/>) { disableWhenVoteStarted(); } + + $.struts2_jquery.require('js/base/jquery.ui.sortable.js', function () { + + $(".choices").sortable({placeholder:"ui-state-highlight", + update:function (event, ui) { + var item = $(ui.item); + var container = item.data('choiceType'); + var choiceNumber = item.data('choiceNumber'); + console.info('Moved ' + container + ' -- ' + choiceNumber); + reorder(container); + } + }).disableSelection(); + }); }); </script> Modified: trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js 2012-06-19 13:20:24 UTC (rev 3526) +++ trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js 2012-06-19 13:21:32 UTC (rev 3527) @@ -688,19 +688,4 @@ $('img[src$="tooltip.png"]').addClass("tooltip"); $('.tooltip').tipTip({ defaultPosition:'top' }); - - $.struts2_jquery.require('js/base/jquery.ui.sortable.js', function () { - - $(".choices").sortable({placeholder:"ui-state-highlight", - update:function (event, ui) { - var item = $(ui.item); - var container = item.data('choiceType'); - var choiceNumber = item.data('choiceNumber'); - console.info('Moved ' + container + ' -- ' + choiceNumber); - reorder(container); - } - }).disableSelection(); - }); - - });

1 0