Author: tchemit Date: 2012-05-18 09:40:41 +0200 (Fri, 18 May 2012) New Revision: 3373 Url: http://chorem.org/repositories/revision/pollen/3373 Log: add thumb on uploaded image choices + fix add new choices Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 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/js/createPoll.js Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-05-18 06:52:21 UTC (rev 3372) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-05-18 07:40:41 UTC (rev 3373) @@ -21,7 +21,7 @@ pollen.action.deleteUser=Delete selected user pollen.action.deleteVote=Supprimer ce vote pollen.action.editFavoriteList=Edit a list -pollen.action.editPoll=Edit the poll +pollen.action.editPoll=Edit the pollLes deux mots de passe saisis non identiques pollen.action.editPollAccount=Edit selected member pollen.action.editUser=Edit selected user pollen.action.editVote=Modifier le vote @@ -163,7 +163,7 @@ pollen.error.no.poll.found=Poll not found with id %s pollen.error.password.required=Your must provide a password pollen.error.password2.required=You must repeat your password for confirmation -pollen.error.passwords.not.equals=Les deux mots de passe saisis non identiques +pollen.error.passwords.not.equals=The two password are not the same pollen.error.poll.detected.duplicate.choice.name=Choices must be unique. pollen.error.poll.endChoiceDate.after.endDate=The choice end date must be sooner than the poll end date. pollen.error.poll.endChoiceDate.before.beginChoiceDate=The choice end date must be later than the begin date. @@ -292,3 +292,4 @@ pollen.title.usersList=Users administration title=Create a poll vote.anonymous=Anonymous vote +pollen.image.not.loaded=Image not loaded Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-05-18 06:52:21 UTC (rev 3372) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-05-18 07:40:41 UTC (rev 3373) @@ -288,3 +288,4 @@ pollen.title.usersList=Gestion des utilisateurs title=Création d'un sondage vote.anonymous=Vote anonyme +pollen.image.not.loaded=Image non chargée 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-05-18 06:52:21 UTC (rev 3372) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp 2012-05-18 07:40:41 UTC (rev 3373) @@ -26,195 +26,220 @@ <%@ taglib prefix="sp" uri="/nuiton-tags" %> <%@ taglib prefix="sj" uri="/struts-jquery-tags" %> <fieldset> - <legend><s:text name="pollen.fieldset.poll.choices"/></legend> - <s:radio key='poll.choiceType' list="choiceTypes" label='' - theme="simple" disabled="%{voteStarted}"/> - <hr/> - <s:fielderror fieldName="poll.choices"/> +<legend><s:text name="pollen.fieldset.poll.choices"/></legend> +<s:radio key='poll.choiceType' list="choiceTypes" label='' + theme="simple" disabled="%{voteStarted}"/> +<hr/> +<s:fielderror fieldName="poll.choices"/> - <s:set id='deleteTitle'><s:text - name="pollen.action.pollChoiceDelete"/></s:set> - <s:set id='upTitle'><s:text name="pollen.action.pollChoiceUp"/></s:set> - <s:set id='downTitle'><s:text name="pollen.action.pollChoiceDown"/></s:set> +<s:set id='deleteTitle'><s:text + name="pollen.action.pollChoiceDelete"/></s:set> +<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" class="choices"> - <s:iterator value="textChoices" status="status" var="choice"> - <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"/>'> - <s:hidden key='%{#prefix}.topiaId' value='%{#choice.topiaId}' label=''/> - <sp:fielderror fieldName="%{#prefix}"/> - <div class="fleft choiceName"> - <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}" +<div id="choicesTEXT" class="choices"> + <s:iterator value="textChoices" status="status" var="choice"> + <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"/>'> + <s:hidden key='%{#prefix}.topiaId' value='%{#choice.topiaId}' label=''/> + <sp:fielderror fieldName="%{#prefix}"/> + <div class="fleft choiceName"> + <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}" + disabled="%{voteStarted}"/> + - + <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}" + disabled="%{voteStarted}"/> + </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: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> + <div class="cleanBoth"></div> + </div> + </s:iterator> +</div> +<div id="choicesDATE" class="choices"> + <s:iterator value="dateChoices" status="status" var="choice"> + <s:set name="choiceNumber"><s:property value="%{#status.index}"/></s:set> + <s:set name="prefix">dateChoice_<s:property + value="%{#choiceNumber}"/></s:set> + <div id='choicesDATE_<s:property value="choiceNumber"/>'> + <s:hidden key='%{#prefix}.topiaId' id='%{#prefix}.topiaId' + value='%{#choice.topiaId}' label='' theme="simple"/> + <sp:fielderror fieldName="%{#prefix}"/> + <div class="fleft choiceName"> + <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')}" disabled="%{voteStarted}"/> - - - <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}" - disabled="%{voteStarted}"/> - </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: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> - <div class="cleanBoth"></div> + - + <s:label for="%{#prefix}.description" key="pollen.common.description" + theme="simple"/> </div> - </s:iterator> - </div> - <div id="choicesDATE" class="choices"> - <s:iterator value="dateChoices" status="status" var="choice"> - <s:set name="choiceNumber"><s:property value="%{#status.index}"/></s:set> - <s:set name="prefix">dateChoice_<s:property - value="%{#choiceNumber}"/></s:set> - <div id='choicesDATE_<s:property value="choiceNumber"/>'> - <s:hidden key='%{#prefix}.topiaId' id='%{#prefix}.topiaId' - value='%{#choice.topiaId}' label='' theme="simple"/> - <sp:fielderror fieldName="%{#prefix}"/> - <div class="fleft choiceName"> - <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')}" - disabled="%{voteStarted}"/> - - - <s:label for="%{#prefix}.description" key="pollen.common.description" - theme="simple"/> + <div class="fleft"> + <s:textarea cols="30" id="%{#prefix}.description" + key="%{#prefix}.description" label='' theme="simple" + value="%{#choice.description}" + disabled="%{voteStarted}"/> + </div> + <s:if test="!voteStarted"> + <div class="fright"> + <s:a id='choicesDATE_down_%{choiceNumber}' + cssClass="hidden" href='#' + onclick="return downChoice('choicesDATE_%{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='choicesDATE_up_%{choiceNumber}' href='#' cssClass="hidden" + onclick="return upChoice('choicesDATE_%{choiceNumber}')"> + <image alt='<s:property value="upTitle"/>' + 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> </div> - <div class="fleft"> - <s:textarea cols="30" id="%{#prefix}.description" - key="%{#prefix}.description" label='' theme="simple" - value="%{#choice.description}" - disabled="%{voteStarted}"/> - </div> - <s:if test="!voteStarted"> - <div class="fright"> - <s:a id='choicesDATE_down_%{choiceNumber}' - cssClass="hidden" href='#' - onclick="return downChoice('choicesDATE_%{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='choicesDATE_up_%{choiceNumber}' href='#' cssClass="hidden" - onclick="return upChoice('choicesDATE_%{choiceNumber}')"> - <image alt='<s:property value="upTitle"/>' - 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> - </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: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"/>'> + <s:hidden key='%{#prefix}.topiaId' value='%{#choice.topiaId}' label=''/> + <sp:fielderror fieldName="%{#prefix}"/> + <div class="fleft choiceName"> + <s:label for="%{#prefix}.name" id="choicesIMAGE_label_%{choiceNumber}" + theme="simple" value=''/> + <s:if test="#choice.name != null"> + + <%--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="false"> + <s:param name="choiceId" value="%{#choice.name}"/> + <s:param name="pollId" value="poll.pollId"/> + <s:param name="thumb" value="true"/> + </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:label label='' theme="simple" cssClass="nameField" + value="%{#choice.name}" readonly="true"/--> </s:if> - <div class="cleanBoth"></div> - </div> - </s:iterator> - </div> - <div id="choicesIMAGE" class="choices"> - <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"/>'> - <s:hidden key='%{#prefix}.topiaId' value='%{#choice.topiaId}' label=''/> - <sp:fielderror fieldName="%{#prefix}"/> - <div class="fleft choiceName"> - <s:label for="%{#prefix}.name" id="choicesIMAGE_label_%{choiceNumber}" - theme="simple" value=''/> - <s:if test="#choice.name != null"> + <s:else> + <%--New image--%> + <s:url id="imageUrl" namespace="/io" action="getPollChoiceImage" + escapeAmp="false" value="/img/7ter.jpg"> + <s:param name="choiceId" value="%{#choice.name}"/> + <s:param name="pollId" value="poll.pollId"/> + <s:param name="thumb" value="true"/> + </s:url> + <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"> + <span style="float: left; margin-left:50px; "> + <s:file key='imageChoice[%{#choiceNumber}]' label='' + theme="simple" + cssClass="nameField" + disabled="%{voteStarted}" cssStyle="clear: both;"/> + </span> - <%--Uploaded image--%> - <s:hidden id="%{#prefix}.name" name="%{#prefix}.name" - value="%{#choice.name}" label='' theme="simple"/> + </s:else> - <s:hidden id="%{#prefix}.location" name="%{#prefix}.location" - value="%{#choice.location}" label='' theme="simple"/> - - <s:label label='' theme="simple" cssClass="nameField" - value="%{#choice.name}" readonly="true"/> - </s:if> - <s:else> - <%--New image--%> - <s:file key='imageChoice[%{#choiceNumber}]' label='' theme="simple" - cssClass="nameField" + </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}" disabled="%{voteStarted}"/> - </s:else> - - - <s:label for="%{#prefix}.description" key="pollen.common.description" - theme="simple"/> + </div> + <s:if test="!voteStarted"> + <div class="fright"> + <s:a id='choicesIMAGE_down_%{choiceNumber}' + cssClass="hidden" href='#' + onclick="return downChoice('choicesIMAGE_%{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='choicesIMAGE_up_%{choiceNumber}' href='#' cssClass="hidden" + onclick="return upChoice('choicesIMAGE_%{choiceNumber}')"> + <image alt='<s:property value="upTitle"/>' + 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> </div> - <div class="fleft"> - <s:textarea cols="30" id="%{#prefix}.description" label='' - theme="simple" - key="%{#prefix}.description" - value="%{#choice.description}" - disabled="%{voteStarted}"/> - </div> - <s:if test="!voteStarted"> - <div class="fright"> - <s:a id='choicesIMAGE_down_%{choiceNumber}' - cssClass="hidden" href='#' - onclick="return downChoice('choicesIMAGE_%{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='choicesIMAGE_up_%{choiceNumber}' href='#' cssClass="hidden" - onclick="return upChoice('choicesIMAGE_%{choiceNumber}')"> - <image alt='<s:property value="upTitle"/>' - 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> - </div> - </s:if> + </s:if> - <div class="cleanBoth"></div> - </div> - </s:iterator> - </div> - <hr/> - <s:submit key="pollen.action.addChoice" align="center" - onclick="return addNewChoice();" disabled="%{voteStarted}"/> + <div class="cleanBoth"></div> + </div> + </s:iterator> +</div> +<hr/> +<s:submit key="pollen.action.addChoice" align="center" + onclick="return addNewChoice();" disabled="%{voteStarted}"/> </fieldset> \ No newline at end of file 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-05-18 06:52:21 UTC (rev 3372) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayDateChoice.jsp 2012-05-18 07:40:41 UTC (rev 3373) @@ -48,12 +48,7 @@ value="%{choice.description}"/> </div> <div class="fright"> - <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:a id='choicesDATE_down_%{choiceNumber}' + <s:a id='choicesDATE_down_%{choiceNumber}' cssClass="hidden" href='#' onclick="return downChoice('choicesDATE_%{choiceNumber}')"> <image alt='<s:property value="downTitle"/>' @@ -65,7 +60,12 @@ <image alt='<s:property value="upTitle"/>' title='<s:property value="upTitle"/>' src="<s:url value='/img/1uparrow.png'/>"></image> - </s:a--%> + </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> </div> <div class="cleanBoth"></div> </div> \ No newline at end of file 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-05-18 06:52:21 UTC (rev 3372) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayImageChoice.jsp 2012-05-18 07:40:41 UTC (rev 3373) @@ -34,37 +34,49 @@ <div class="fleft choiceName"> <s:label for="%{#prefix}.name" id="choicesIMAGE_label_%{choiceNumber}" theme="simple" value=''/> - <s:if test="choice.name != ''"> + <%--<s:if test="choice.name != ''">--%> - <%--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:hidden id="%{#prefix}.location" name="%{#prefix}.location"--%> + <%--value="%{choice.location}" label='' theme="simple"/>--%> - <s:label label='' theme="simple" cssClass="nameField" - value="%{choice.name}" readonly="true"/> - </s:if> - <s:else> + <%--<s:label label='' theme="simple" cssClass="nameField"--%> + <%--value="%{choice.name}" readonly="true"/>--%> + <%--</s:if>--%> + <%--<s:else>--%> <%--New image--%> - <s:file key='%{#prefix2}' label='' theme="simple" cssClass="nameField"/> - </s:else> + <s:url id="imageUrl" namespace="/io" action="getPollChoiceImage" + escapeAmp="false" value="/img/7ter.jpg"> + <s:param name="choiceId" value="%{#choice.name}"/> + <s:param name="pollId" value="poll.pollId"/> + <s:param name="thumb" value="true"/> + </s:url> + <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> + + <%--<s:file key='%{#prefix2}' label='' theme="simple" cssClass="nameField"/>--%> + <%--</s:else>--%> + </div> + <div class="fleft"> - <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 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:a id='choicesIMAGE_down_%{choiceNumber}' + <s:a id='choicesIMAGE_down_%{choiceNumber}' cssClass="hidden" href='#' onclick="return downChoice('choicesIMAGE_%{choiceNumber}')"> <image alt='<s:property value="downTitle"/>' @@ -76,7 +88,12 @@ <image alt='<s:property value="upTitle"/>' title='<s:property value="upTitle"/>' src="<s:url value='/img/1uparrow.png'/>"></image> - </s:a--%> + </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> </div> <div class="cleanBoth"></div> 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-05-18 06:52:21 UTC (rev 3372) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayTextChoice.jsp 2012-05-18 07:40:41 UTC (rev 3373) @@ -44,12 +44,7 @@ key="%{#prefix}.description" value="%{choice.description}"/> </div> <div class="fright"> - <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> - <%--s:a id='choicesTEXT_down_%{choiceNumber}' + <s:a id='choicesTEXT_down_%{choiceNumber}' cssClass="hidden" href='#' onclick="return downChoice('choicesTEXT_%{choiceNumber}')"> <image alt='<s:property value="downTitle"/>' @@ -61,7 +56,12 @@ <image alt='<s:property value="upTitle"/>' title='<s:property value="upTitle"/>' src="<s:url value='/img/1uparrow.png'/>"></image> - </s:a--%> + </s:a> + <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> <div class="cleanBoth"></div> </div> \ No newline at end of file Modified: trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js 2012-05-18 06:52:21 UTC (rev 3372) +++ trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js 2012-05-18 07:40:41 UTC (rev 3373) @@ -506,6 +506,9 @@ // change location switchValue(choicePrefix, choiceNumber, newChoiceNumber, '.location'); + + // change thumb + switchThumb(choicePrefix, choiceNumber, newChoiceNumber); } return false; } @@ -520,6 +523,17 @@ newChoiceTI.val(choiceTIVal); } +function switchThumb(choicePrefix, choiceNumber, newChoiceNumber) { + var choiceTI = $('[name="' + choicePrefix + choiceNumber + '.thumb"]'); + var newChoiceTI = $('[name="' + choicePrefix + newChoiceNumber + '.thumb"]'); + + var choiceTIVal = choiceTI.val(); + var newChoiceTIVal = newChoiceTI.val(); + console.info("switch " + choiceTIVal + " to " + newChoiceTIVal); + choiceTI.val(newChoiceTIVal); + newChoiceTI.val(choiceTIVal); +} + function confirmClose() { $('.ui-dialog-title').html(datas['confirmCloseTitle']) var dialog = $("#confirmDialog");