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

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

June 19, 2012

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 June 19, 2012

June 19, 2012

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 June 19, 2012

June 19, 2012

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 June 19, 2012

June 19, 2012

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

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

June 19, 2012

Author: tchemit Date: 2012-06-19 15:20:24 +0200 (Tue, 19 Jun 2012) New Revision: 3526 Url: http://chorem.org/repositories/revision/pollen/3526 Log: fixes #622: Traduction manquante i18n Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-06-19 13:19:34 UTC (rev 3525) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-06-19 13:20:24 UTC (rev 3526) @@ -123,7 +123,7 @@ <fieldset> <legend><s:text name="pollen.common.aboutPoll"/></legend> <div style="float: right"> - <s:if test="creatorUser or userAdmin"> + <s:if test="creatorOrAdmin"> <s:a href="%{summaryUrl}"> <img src="<s:url value='/img/editSmall.png'/>" title="<s:text name='pollen.action.summaryPoll'/>" @@ -161,9 +161,7 @@ <s:if test="poll.anonymous"> <p> - <s:text name="pollen.common.voteNbVotes"> - <s:param><s:property value="%{poll.sizeVote()}"/></s:param> - </s:text> + <s:property value="%{voteSizeMessage}"/> </p> <%--<t:feedback t:id="voteFeedback"/>--%> </s:if> @@ -204,7 +202,7 @@ <s:property value="name"/> </s:else> <s:if test="pollChoiceRunning"> - <s:if test="creatorUser"> + <s:if test="creatorOrAdmin"> <s:a action="deleteChoice" namespace="/poll" onclick="return openDeleteChoiceDialog('%{#choice.topiaId}');"> <s:param name="choiceId"><s:property value="id"/></s:param>

1 0

r3525 - trunk/pollen-ui-struts2/src/main/resources/config
by tchemit＠users.chorem.org June 19, 2012

June 19, 2012

Author: tchemit Date: 2012-06-19 15:19:34 +0200 (Tue, 19 Jun 2012) New Revision: 3525 Url: http://chorem.org/repositories/revision/pollen/3525 Log: after deleting a poll, must redirect ot home (not to summary of no more existing poll...) Modified: trunk/pollen-ui-struts2/src/main/resources/config/struts-poll.xml Modified: trunk/pollen-ui-struts2/src/main/resources/config/struts-poll.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/config/struts-poll.xml 2012-06-19 12:22:07 UTC (rev 3524) +++ trunk/pollen-ui-struts2/src/main/resources/config/struts-poll.xml 2012-06-19 13:19:34 UTC (rev 3525) @@ -114,7 +114,7 @@ <action name="delete/*" class="org.chorem.pollen.ui.actions.poll.DeletePoll"> <param name="uriId">{1}</param> - <result type="redirect2"/> + <result type="redirectToHome"/> </action>

1 0

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

June 19, 2012

Author: tchemit Date: 2012-06-19 14:22:07 +0200 (Tue, 19 Jun 2012) New Revision: 3524 Url: http://chorem.org/repositories/revision/pollen/3524 Log: - fixes #620: On ne peut pas d?\195?\169pouiller un sondage priv?\195?\169 m?\195?\170me quand on en est le cr?\195?\169ateur (remove all security stuff from Result action and jsp...) - remove obsolete resources directory Removed: trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/ Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/result.jsp Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java 2012-06-19 12:10:43 UTC (rev 3523) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java 2012-06-19 12:22:07 UTC (rev 3524) @@ -30,7 +30,6 @@ import com.google.common.collect.Multimap; import com.opensymphony.xwork2.inject.Inject; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts2.views.util.UrlHelper; @@ -41,7 +40,6 @@ import org.chorem.pollen.common.ChoiceType; import org.chorem.pollen.common.PollType; import org.chorem.pollen.common.VoteCountingType; -import org.chorem.pollen.services.exceptions.PollNotFoundException; import org.chorem.pollen.services.impl.PollResultsService; import org.chorem.pollen.ui.actions.PageSkin; import org.chorem.pollen.ui.converters.DateConverter; @@ -74,15 +72,6 @@ private Boolean byGroup; /** - * Can user be on this page ? - * <p/> - * TODO-tchemit-2012-06-03 Security is managed by shiro, why doing it here again ? - * - * @since 1.3 - */ - private boolean userAllowed; - - /** * Is user is poll's creator ? * * @since 1.4 @@ -150,14 +139,10 @@ return poll; } - public boolean isUserAllowed() { - return userAllowed; + public boolean isCreatorOrAdmin() { + return creatorUser || isUserAdmin(); } - public boolean isCreatorUser() { - return creatorUser; - } - public boolean isFeedFileExisting() { return feedFileExisting; } @@ -165,7 +150,6 @@ public String getSummaryUrl() { PollUrl url = getPollUrlService().getPollSummaryUrl(poll); url.getPollUri().setAccountId(getAccountId()); - getSecurityService().removeAccountIdWhenConnected(url, getPollenUserAccount()); return url.getUrl(); } @@ -245,34 +229,50 @@ byGroup = isGroupPoll(); } - String accountId = getAccountId(); + creatorUser = getSecurityService().isPollCreator( + poll, + getAccountId(), getPollenUserAccount()); - creatorUser = poll.getCreator().getAccountId().equals(accountId); + if (poll.isRunning(serviceContext.getCurrentTime())) { + addFlashWarning(_("pollen.information.pollRunning")); + } - if (poll.isPublicResults()) { - userAllowed = true; - } else if (StringUtils.isNotEmpty(accountId)) { + // load results - // create is allowed to be ther - userAllowed = creatorUser; + PollResultsService service = getPollResultsService(); -// PollAccount creator = poll.getCreator(); -// if (accountId.equals(creator.getAccountId())) { -// userAllowed = true; -// } + PollResultList resultListDTO = service.getResults(poll); + + results = resultListDTO.getPollResults(); + + if (log.isDebugEnabled()) { + for (PollResult res : results) { + log.debug(res + + ", (voteCounting=" + res.getVoteCountingType() + + ", byGroup=" + res.isByGroup() + ")"); + } } - if (!userAllowed) { - addFlashError(_("pollen.error.userNotAllowed")); + if (isNumberVoteCounting()) { - } else if (poll.isRunning(serviceContext.getCurrentTime())) { - addFlashWarning(_("pollen.information.pollRunning")); - loadResults(); + // resultats des choix cachés + choicesResults = LinkedHashMultimap.create(); - } else { - loadResults(); + // sous-titres des vrais choix (les choix pas cachés) + subtitles = ArrayListMultimap.create(); + + results = service.createNumberVoteCountingResult( + resultListDTO, + choicesResults, + subtitles); } + topRanking = service.getTopRanking(results); + + if (log.isDebugEnabled()) { + log.debug("topRanking = " + topRanking); + } + return SUCCESS; } @@ -328,43 +328,6 @@ this.byGroup = byGroup; } - protected void loadResults() throws PollNotFoundException { - - PollResultsService service = getPollResultsService(); - - PollResultList resultListDTO = service.getResults(poll); - - results = resultListDTO.getPollResults(); - - if (log.isDebugEnabled()) { - for (PollResult res : results) { - log.debug(res - + ", (voteCounting=" + res.getVoteCountingType() - + ", byGroup=" + res.isByGroup() + ")"); - } - } - - if (isNumberVoteCounting()) { - - // resultats des choix cachés - choicesResults = LinkedHashMultimap.create(); - - // sous-titres des vrais choix (les choix pas cachés) - subtitles = ArrayListMultimap.create(); - - results = service.createNumberVoteCountingResult( - resultListDTO, - choicesResults, - subtitles); - } - - topRanking = service.getTopRanking(results); - - if (log.isInfoEnabled()) { - log.info("topRanking = " + topRanking); - } - } - /** @return Récupération de la liste des résultats pour le diagramme. */ public List<String> getChoices() { @@ -398,7 +361,6 @@ params.put("title", ""); params.put("values", getChoices()); - urlHelper.buildParametersString(params, url, "&"); String chartUrl = url.toString(); Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/result.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/result.jsp 2012-06-19 12:10:43 UTC (rev 3523) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/result.jsp 2012-06-19 12:22:07 UTC (rev 3524) @@ -67,158 +67,155 @@ }); </script> -<s:if test="userAllowed"> +<h1 class="titleVoteCounting"><s:property value="poll.title"/></h1> - <h1 class="titleVoteCounting"><s:property value="poll.title"/></h1> - -  - <div id="resultTop"> - <div style="white-space:pre-wrap; text-align: start;"> - <s:property value="poll.description"/> - </div> - <fieldset> - <legend><s:text name="pollen.common.aboutPoll"/></legend> - <div style="float: right"> - <s:if test="creatorUser or userAdmin"> - <s:a href="%{summaryUrl}"> - <img src="<s:url value='/img/editSmall.png'/>" - title="<s:text name='pollen.action.summaryPoll'/>" - alt="<s:text name='pollen.action.summaryPoll'/>"/> - </s:a> - </s:if> - <s:a href='%{voteUrl}'> - <img src="<s:url value='/img/vote.png'/>" - title="<s:text name="pollen.common.vote.return-help"/>" - alt="<s:text name="pollen.common.vote.return"/>"/> - </s:a> - <s:if test="feedFileExisting"> - <s:a namespace="/poll" action="getFeed"> - <s:param name="pollId" value="poll.pollId"/> - <img src="<s:url value='/img/feed.png'/>" title="Atom" alt="Atom"/> - </s:a> - </s:if> - </div> - <s:label value="%{poll.creator.votingId}" - key='pollen.common.pollCreator'/> - <s:label value="%{poll.beginDate}" key='pollen.common.beginDate'/> - <s:label value="%{poll.endDate}" - label='%{getText("pollen.common.endDate")}'/> - <s:label value="%{poll.voteCountingType}" - label='%{getText("pollen.common.voteCountingType")}' - tooltip="%{getVoteCountingTypeHelp(poll.voteCountingType)}" - tooltipIconPath="/img/tooltip.png"/> - </fieldset> + +<div id="resultTop"> + <div style="white-space:pre-wrap; text-align: start;"> + <s:property value="poll.description"/> </div> + <fieldset> + <legend><s:text name="pollen.common.aboutPoll"/></legend> + <div style="float: right"> + <s:if test="creatorOrAdmin"> + <s:a href="%{summaryUrl}"> + <img src="<s:url value='/img/editSmall.png'/>" + title="<s:text name='pollen.action.summaryPoll'/>" + alt="<s:text name='pollen.action.summaryPoll'/>"/> + </s:a> + </s:if> + <s:a href='%{voteUrl}'> + <img src="<s:url value='/img/vote.png'/>" + title="<s:text name="pollen.common.vote.return-help"/>" + alt="<s:text name="pollen.common.vote.return"/>"/> + </s:a> + <s:if test="feedFileExisting"> + <s:a namespace="/poll" action="getFeed"> + <s:param name="pollId" value="poll.pollId"/> + <img src="<s:url value='/img/feed.png'/>" title="Atom" alt="Atom"/> + </s:a> + </s:if> + </div> + <s:label value="%{poll.creator.votingId}" + key='pollen.common.pollCreator'/> + <s:label value="%{poll.beginDate}" key='pollen.common.beginDate'/> + <s:label value="%{poll.endDate}" + label='%{getText("pollen.common.endDate")}'/> + <s:label value="%{poll.voteCountingType}" + label='%{getText("pollen.common.voteCountingType")}' + tooltip="%{getVoteCountingTypeHelp(poll.voteCountingType)}" + tooltipIconPath="/img/tooltip.png"/> + </fieldset> +</div> -  - <s:if test="victoryMessage != ''"> - <h4><s:property value="victoryMessage"/> + +<s:if test="victoryMessage != ''"> + <h4><s:property value="victoryMessage"/> + <br/> + <s:iterator value="topRanking" var="result"> + <s:if test="textType"> + <s:property value="name"/> + </s:if> + <s:elseif test="dateType"> + <s:property value="%{getResultAsDate(#result)}"/> + </s:elseif> + <s:elseif test="imageType"> + <s:url id="imageUrl" namespace="/io" action="getPollChoiceImage" + escapeAmp="false"> + <s:param name="choiceId" value="name"/> + <s:param name="pollId" value="poll.pollId"/> + <s:param name="thumb" value="false"/> + </s:url> + <s:url id="imageUrlThumb" namespace="/io" action="getPollChoiceImage" + escapeAmp="false"> + <s:param name="choiceId" value="name"/> + <s:param name="pollId" value="poll.pollId"/> + <s:param name="thumb" value="true"/> + </s:url> + <a href="<s:property value='imageUrl'/>" rel="lightbox"> + <img alt="<s:property value='name'/>" + title="<s:property value='name'/>" + src="<s:property value='imageUrlThumb'/>"> + </a> + + </s:elseif> <br/> - <s:iterator value="topRanking" var="result"> - <s:if test="textType"> - <s:property value="name"/> - </s:if> - <s:elseif test="dateType"> - <s:property value="%{getResultAsDate(#result)}"/> - </s:elseif> - <s:elseif test="imageType"> - <s:url id="imageUrl" namespace="/io" action="getPollChoiceImage" - escapeAmp="false"> - <s:param name="choiceId" value="name"/> - <s:param name="pollId" value="poll.pollId"/> - <s:param name="thumb" value="false"/> - </s:url> - <s:url id="imageUrlThumb" namespace="/io" action="getPollChoiceImage" - escapeAmp="false"> - <s:param name="choiceId" value="name"/> - <s:param name="pollId" value="poll.pollId"/> - <s:param name="thumb" value="true"/> - </s:url> - <a href="<s:property value='imageUrl'/>" rel="lightbox"> - <img alt="<s:property value='name'/>" - title="<s:property value='name'/>" - src="<s:property value='imageUrlThumb'/>"> - </a> + </s:iterator> + </h4> +</s:if> - </s:elseif> - <br/> - </s:iterator> - </h4> - </s:if> + +<div id="resultChart"> + <div class="chartTypeDiv"> + <sj:a id='displayChart1' href="#" onclick="return displayCharts(1);"> + <img src="<s:url value='/img/rep1.png'/>" + title='<s:text name="pollen.common.chartType-pie"/>' alt="1"/> + </sj:a> + <sj:a id='displayChart2' href="#" onclick="return displayCharts(2);"> + <img src="<s:url value='/img/rep2.png'/>" + title='<s:text name="pollen.common.chartType-pie3d"/>' alt="2"/> + </sj:a> + <sj:a id='displayChart3' href="#" onclick="return displayCharts(3);"> + <img src="<s:url value='/img/rep3.png'/>" + title='<s:text name="pollen.common.chartType-ring"/>' alt="3"/> + </sj:a> + </div> -  - <div id="resultChart"> - <div class="chartTypeDiv"> - <sj:a id='displayChart1' href="#" onclick="return displayCharts(1);"> - <img src="<s:url value='/img/rep1.png'/>" - title='<s:text name="pollen.common.chartType-pie"/>' alt="1"/> - </sj:a> - <sj:a id='displayChart2' href="#" onclick="return displayCharts(2);"> - <img src="<s:url value='/img/rep2.png'/>" - title='<s:text name="pollen.common.chartType-pie3d"/>' alt="2"/> - </sj:a> - <sj:a id='displayChart3' href="#" onclick="return displayCharts(3);"> - <img src="<s:url value='/img/rep3.png'/>" - title='<s:text name="pollen.common.chartType-ring"/>' alt="3"/> - </sj:a> - </div> - - <div class="displayTypeDiv"> - <s:if test="groupPoll"> - <s:text name="pollen.common.results"/> - <s:if test="byGroup"> - <s:a namespace="/poll" action="results/%{poll.pollId}"> - <s:param name="byGroup" value="false"/> - <s:text name="pollen.common.normal"/> - </s:a> - - <s:text name="pollen.common.group"/> - </s:if> - <s:else> - <s:text name="pollen.common.normal"/> - - <s:a namespace="/poll" action="results/%{poll.pollId}"> - <s:text name="pollen.common.group"/> - </s:a> - </s:else> + <div class="displayTypeDiv"> + <s:if test="groupPoll"> + <s:text name="pollen.common.results"/> + <s:if test="byGroup"> + <s:a namespace="/poll" action="results/%{poll.pollId}"> + <s:param name="byGroup" value="false"/> + <s:text name="pollen.common.normal"/> + </s:a> + - <s:text name="pollen.common.group"/> </s:if> - </div> + <s:else> + <s:text name="pollen.common.normal"/> - + <s:a namespace="/poll" action="results/%{poll.pollId}"> + <s:text name="pollen.common.group"/> + </s:a> + </s:else> + </s:if> + </div> - <sj:div id='chartContainer'> - <img id='chart_normal'/> - </sj:div> + <sj:div id='chartContainer'> + <img id='chart_normal'/> + </sj:div> -  - <s:if test="choicesResults != null"> - <div id="resultChart"> - <div> - <s:iterator value="choicesResultNames" var="choicesResultName" - status="status"> - <img id='chart_<s:property value="#status.index"/>' - alt="<s:property/>" - title="<s:property/>" - src="<s:property value='%{getChoicesResultCharUrl(400,300, #choicesResultName)}'/>"> - </s:iterator> - </div> +  + <s:if test="choicesResults != null"> + <div id="resultChart"> + <div> + <s:iterator value="choicesResultNames" var="choicesResultName" + status="status"> + <img id='chart_<s:property value="#status.index"/>' + alt="<s:property/>" + title="<s:property/>" + src="<s:property value='%{getChoicesResultCharUrl(400,300, #choicesResultName)}'/>"> + </s:iterator> </div> - </s:if> - </div> -  - <%--<t:remove>--%> - <%--<div id="resultList">--%> - <%--<ol>--%> - <%--<s:iterator value="ranking" var="result">--%> - <%--<li>--%> - <%--<s:if test="dateType">--%> - <%--<s:property value="%{getResultNameAsDate(#result.name)}"/>--%> - <%--<%–<t:output value="resultNameAsDate" format="dateFormat"/>–%>--%> - <%--</s:if>--%> - <%--<s:else>--%> - <%--<s:property value="name"/>--%> - <%--</s:else>--%> - <%--(<s:property value="%{getTrimValue(#result)}"/>)--%> - <%--</li>--%> - <%--</s:iterator>--%> - <%--</ol>--%> - <%--</div>--%> - <%--</t:remove>--%> + </div> + </s:if> +</div> + +<%--<t:remove>--%> +<%--<div id="resultList">--%> +<%--<ol>--%> +<%--<s:iterator value="ranking" var="result">--%> +<%--<li>--%> +<%--<s:if test="dateType">--%> +<%--<s:property value="%{getResultNameAsDate(#result.name)}"/>--%> +<%--<%–<t:output value="resultNameAsDate" format="dateFormat"/>–%>--%> +<%--</s:if>--%> +<%--<s:else>--%> +<%--<s:property value="name"/>--%> +<%--</s:else>--%> +<%--(<s:property value="%{getTrimValue(#result)}"/>)--%> +<%--</li>--%> +<%--</s:iterator>--%> +<%--</ol>--%> +<%--</div>--%> +<%--</t:remove>--%> -</s:if>

1 0

r3523 - trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user
by tchemit＠users.chorem.org June 19, 2012

June 19, 2012

Author: tchemit Date: 2012-06-19 14:10:43 +0200 (Tue, 19 Jun 2012) New Revision: 3523 Url: http://chorem.org/repositories/revision/pollen/3523 Log: improve validation Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java 2012-06-19 10:18:41 UTC (rev 3522) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java 2012-06-19 12:10:43 UTC (rev 3523) @@ -102,9 +102,7 @@ if (StringUtils.isBlank(user.getEmail())) { addFieldError("user.email", _("pollen.error.email.required")); - } - - if (!StringUtil.isEmail(user.getEmail())) { + } else if (!StringUtil.isEmail(user.getEmail())) { addFieldError("user.email", _("pollen.error.email.invalid")); } } Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java 2012-06-19 10:18:41 UTC (rev 3522) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java 2012-06-19 12:10:43 UTC (rev 3523) @@ -86,9 +86,7 @@ if (StringUtils.isBlank(user.getEmail())) { addFieldError("user.email", _("pollen.error.email.required")); - } - - if (!StringUtil.isEmail(user.getEmail())) { + } else if (!StringUtil.isEmail(user.getEmail())) { addFieldError("user.email", _("pollen.error.email.invalid")); } }

1 0

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

June 19, 2012

Author: tchemit Date: 2012-06-19 12:18:41 +0200 (Tue, 19 Jun 2012) New Revision: 3522 Url: http://chorem.org/repositories/revision/pollen/3522 Log: remove old xml validation files + fix some jps bugs Removed: trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteList.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteUser.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/summary.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java 2012-06-19 08:53:57 UTC (rev 3521) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java 2012-06-19 10:18:41 UTC (rev 3522) @@ -23,11 +23,14 @@ package org.chorem.pollen.ui.actions.admin; import com.google.common.base.Preconditions; +import org.apache.commons.lang3.StringUtils; +import org.chorem.pollen.business.persistence.PollAccount; import org.chorem.pollen.business.persistence.UserAccount; import org.chorem.pollen.services.exceptions.UserEmailAlreadyUsedException; import org.chorem.pollen.services.exceptions.UserInvalidPasswordException; import org.chorem.pollen.services.exceptions.UserLoginAlreadyUsedException; import org.chorem.pollen.ui.actions.PollenActionSupport; +import org.nuiton.util.StringUtil; /** * @author tchemit <chemit(a)codelutin.com> @@ -68,6 +71,44 @@ this.action = action; } + @Override + public void validate() { + + if ("create".equals(action)) { + + UserAccount account = getCreateUser(); + + if (StringUtils.isBlank(account.getLogin())) { + addFieldError("createUser.login", + _("pollen.error.login.required")); + } + + if (StringUtils.isBlank(account.getEmail())) { + addFieldError("createUser.email", + _("pollen.error.email.required")); + } else if (!StringUtil.isEmail(account.getEmail())) { + addFieldError("createUser.email", + _("pollen.error.email.invalid")); + } + } else if ("edit".equals(action)) { + + UserAccount account = getEditUser(); + + if (StringUtils.isBlank(account.getLogin())) { + addFieldError("editUser.login", + _("pollen.error.pollAccount.votingId.required")); + } + + if (StringUtils.isBlank(account.getEmail())) { + addFieldError("editUser.email", + _("pollen.error.email.required")); + } else if (!StringUtil.isEmail(account.getEmail())) { + addFieldError("editUser.email", + _("pollen.error.email.invalid")); + } + } + } + public String create() throws Exception { Preconditions.checkNotNull(user); Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java 2012-06-19 08:53:57 UTC (rev 3521) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java 2012-06-19 10:18:41 UTC (rev 3522) @@ -22,11 +22,14 @@ */ package org.chorem.pollen.ui.actions.user; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; import org.chorem.pollen.business.persistence.UserAccount; import org.chorem.pollen.services.exceptions.UserEmailAlreadyUsedException; import org.chorem.pollen.services.exceptions.UserInvalidPasswordException; import org.chorem.pollen.ui.actions.PageSkin; import org.chorem.pollen.ui.actions.PollenActionSupport; +import org.nuiton.util.StringUtil; /** * Update a user. @@ -79,7 +82,34 @@ return INPUT; } + @Override + public void validate() { + + if (StringUtils.isBlank(user.getLogin())) { + addFieldError("user.login", _("pollen.error.login.required")); + } + + if (StringUtils.isBlank(user.getPassword())) { + addFieldError("user.password", _("pollen.error.password.required")); + } + + if (StringUtils.isNotBlank(getNewPassword())) { + if (ObjectUtils.notEqual(getNewPassword(), getNewPassword2())) { + addFieldError("newPassword", _("pollen.error.passwords.not.equals")); + } + } + + if (StringUtils.isBlank(user.getEmail())) { + addFieldError("user.email", _("pollen.error.email.required")); + } + + if (!StringUtil.isEmail(user.getEmail())) { + addFieldError("user.email", _("pollen.error.email.invalid")); + } + } + + @Override public String execute() throws Exception { // let's push back admin property to user to save Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteList.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteList.java 2012-06-19 08:53:57 UTC (rev 3521) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteList.java 2012-06-19 10:18:41 UTC (rev 3522) @@ -24,15 +24,16 @@ import com.google.common.base.Preconditions; import com.opensymphony.xwork2.Preparable; +import org.apache.commons.lang3.StringUtils; import org.apache.struts2.interceptor.ParameterAware; import org.chorem.pollen.business.persistence.PersonList; import org.chorem.pollen.business.persistence.PollAccount; import org.chorem.pollen.services.exceptions.FavoriteListNotFoundException; import org.chorem.pollen.services.exceptions.FavoriteListNotOwnedByUserException; import org.chorem.pollen.services.exceptions.ParticipantAlreadyFoundInListException; -import org.chorem.pollen.services.impl.FavoriteService; import org.chorem.pollen.ui.actions.PageSkin; import org.chorem.pollen.ui.actions.PollenActionSupport; +import org.nuiton.util.StringUtil; import java.util.Map; @@ -108,6 +109,44 @@ } } + @Override + public void validate() { + + if ("create".equals(action)) { + + PollAccount account = getCreatePollAccount(); + + if (StringUtils.isBlank(account.getVotingId())) { + addFieldError("createPollAccount.votingId", + _("pollen.error.pollAccount.votingId.required")); + } + + if (StringUtils.isBlank(account.getEmail())) { + addFieldError("createPollAccount.email", + _("pollen.error.email.required")); + } else if (!StringUtil.isEmail(account.getEmail())) { + addFieldError("createPollAccount.email", + _("pollen.error.email.invalid")); + } + } else if ("edit".equals(action)) { + + PollAccount account = getEditPollAccount(); + + if (StringUtils.isBlank(account.getVotingId())) { + addFieldError("editPollAccount.votingId", + _("pollen.error.pollAccount.votingId.required")); + } + + if (StringUtils.isBlank(account.getEmail())) { + addFieldError("editPollAccount.email", + _("pollen.error.email.required")); + } else if (!StringUtil.isEmail(account.getEmail())) { + addFieldError("editPollAccount.email", + _("pollen.error.email.invalid")); + } + } + } + public String create() throws Exception { Preconditions.checkNotNull(favoriteList); Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java 2012-06-19 08:53:57 UTC (rev 3521) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java 2012-06-19 10:18:41 UTC (rev 3522) @@ -102,6 +102,18 @@ return PageSkin.EDITION; } + @Override + public void validate() { + + if ("create".equals(action)) { + + if( StringUtils.isBlank(getCreateFavoriteList().getName())) { + addFieldError("createFavoriteList.name", + _("pollen.error.favoriteListName.required")); + } + } + } + public String create() throws Exception { Preconditions.checkNotNull(favoriteList); Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java 2012-06-19 08:53:57 UTC (rev 3521) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java 2012-06-19 10:18:41 UTC (rev 3522) @@ -22,11 +22,14 @@ */ package org.chorem.pollen.ui.actions.user; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; import org.chorem.pollen.business.persistence.UserAccount; import org.chorem.pollen.services.exceptions.UserEmailAlreadyUsedException; import org.chorem.pollen.services.exceptions.UserLoginAlreadyUsedException; import org.chorem.pollen.ui.actions.PageSkin; import org.chorem.pollen.ui.actions.PollenActionSupport; +import org.nuiton.util.StringUtil; /** * Register a new user. @@ -63,6 +66,34 @@ } @Override + public void validate() { + + if (StringUtils.isBlank(user.getLogin())) { + addFieldError("user.login", _("pollen.error.login.required")); + } + + if (StringUtils.isBlank(user.getPassword())) { + addFieldError("user.password", _("pollen.error.password.required")); + } + + if (StringUtils.isBlank(getPassword2())) { + addFieldError("password2", _("pollen.error.password2.required")); + } + + if (ObjectUtils.notEqual(getPassword2(), user.getPassword())) { + addFieldError("password2", _("pollen.error.passwords.not.equals")); + } + + if (StringUtils.isBlank(user.getEmail())) { + addFieldError("user.email", _("pollen.error.email.required")); + } + + if (!StringUtil.isEmail(user.getEmail())) { + addFieldError("user.email", _("pollen.error.email.invalid")); + } + } + + @Override public String execute() throws Exception { String result = INPUT; Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteUser.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteUser.jsp 2012-06-19 08:53:57 UTC (rev 3521) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteUser.jsp 2012-06-19 10:18:41 UTC (rev 3522) @@ -30,7 +30,7 @@ <fieldset class="ui-widget-content ui-corner-all"> <s:hidden key="redirectUrl" label=''/> - <s:hidden key="userId" value='%{user.topiaId}' label=''/> + <s:hidden key="userId" value='%{#user.topiaId}' label=''/> <s:text name="pollen.information.confirmDeleteUser"/> <div align="center" style="padding-top: 1em;"> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp 2012-06-19 08:53:57 UTC (rev 3521) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp 2012-06-19 10:18:41 UTC (rev 3522) @@ -51,8 +51,8 @@ var deleteImg = '<s:url value='/img/delete.png'/>'; jQuery(document).ready(function () { - initUsersPage("<s:property value='%{action}'/>", - "<s:property value='%{user.topiaId}'/>"); + initUsersPage("<s:property value='%{#action.action}'/>", + "<s:property value='%{#user.topiaId}'/>"); }); </script> 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 08:53:57 UTC (rev 3521) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/summary.jsp 2012-06-19 10:18:41 UTC (rev 3522) @@ -56,31 +56,6 @@ return false; } - 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> <h1 class="titleCreation"><s:property value="poll.title"/></h1> @@ -194,3 +169,34 @@ </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/WEB-INF/jsp/user/favoriteList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp 2012-06-19 08:53:57 UTC (rev 3521) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp 2012-06-19 10:18:41 UTC (rev 3522) @@ -52,7 +52,7 @@ jQuery(document).ready(function () { - initFavoritePage("<s:property value='%{action}'/>"); + initFavoritePage("<s:property value='%{#action.action}'/>"); }); </script> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp 2012-06-19 08:53:57 UTC (rev 3521) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp 2012-06-19 10:18:41 UTC (rev 3522) @@ -57,7 +57,7 @@ jQuery(document).ready(function () { - initFavoritesPage("<s:property value='%{action}'/>"); + initFavoritesPage("<s:property value='%{#action.action}'/>"); }); </script>

1 0

r3521 - trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators
by tchemit＠users.chorem.org June 19, 2012

June 19, 2012

Author: tchemit Date: 2012-06-19 10:53:57 +0200 (Tue, 19 Jun 2012) New Revision: 3521 Url: http://chorem.org/repositories/revision/pollen/3521 Log: connected user is hidden Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2012-06-19 08:52:49 UTC (rev 3520) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2012-06-19 08:53:57 UTC (rev 3521) @@ -109,7 +109,7 @@ <s:if test="userExists"> <span class="menu_elt" onmouseover="$('#compte_menu').show()" onmouseout="$('#compte_menu').hide()"> - <s:property value='%{user.displayName}'/> + <s:property value='%{#user.displayName}'/> <div class="dropdown_menu" id="compte_menu" style="display: none;"> <div class="top_right<s:property value='%{pageLogo}'/>"></div> <div class="top_left<s:property value='%{pageLogo}'/>"></div>

1 0