Author: tchemit Date: 2012-08-28 18:29:02 +0200 (Tue, 28 Aug 2012) New Revision: 3650 Url: http://chorem.org/repositories/revision/pollen/3650 Log: remove all logic code from jsp :( 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-08-28 16:28:18 UTC (rev 3649) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-08-28 16:29:02 UTC (rev 3650) @@ -177,20 +177,20 @@ <s:form id="voteForm" validate="true"> <s:hidden key="pollUri" label=''/> -<s:if test="poll.anonymous"> - <s:hidden key="vote.anonymous" label="" value='true'/> -</s:if> +<%--<s:if test="poll.anonymous">--%> + <%--<s:hidden key="vote.anonymous" label="" value='true'/>--%> +<%--</s:if>--%> <table id="poll"> <thead> <tr> - <s:if test="accountFieldDisplayed"> + <%--<s:if test="accountFieldDisplayed">--%> <th style="width:200px;"> <s:text name="pollen.common.voterName"/> </th> - </s:if> - <s:else> - <th></th> - </s:else> + <%--</s:if>--%> + <%--<s:else>--%> + <%--<th></th>--%> + <%--</s:else>--%> <s:if test="textType"> <s:iterator value="poll.choice" var="choice"> <s:if test="!isChoiceHidden(#choice)"> @@ -285,14 +285,14 @@ <s:if test="voteAllowed"> <tfoot> <tr> - <s:if test="accountFieldDisplayed"> + <s:if test="vote.anonymous"> + <th>?</th> + </s:if> + <s:else> <th id="voterName"> <s:textfield key='pollAccount.votingId' required="true" label='' value="%{pollAccount.votingId}" theme="simple"/> </th> - </s:if> - <s:else> - <th></th> </s:else> <s:set name="template" value="%{choiceFragment}"/> <s:iterator value="poll.choice" var="choice" status="status"> @@ -307,18 +307,18 @@ </tfoot> </s:if> <tbody> -<s:if test="!poll.anonymous"> +<%--s:if test="!poll.anonymous"--%> <s:iterator value="votes" var="vote"> <tr id='vote_<s:property value="%{#vote.pollAccount.accountId}"/>'> <td> - <s:if test="accountFieldDisplayed"> - <s:if test="!#vote.anonymous"> - <s:property value="pollAccount.votingId"/> + <%--<s:if test="accountFieldDisplayed">--%> + <s:if test="vote.anonymous"> + ? </s:if> <s:else> - ? + <s:property value="pollAccount.votingId"/> </s:else> - </s:if> + <%--</s:if>--%> <s:if test="isModifyVoteAllowed(#vote)"> <s:a action="votefor/%{poll.pollId}:%{#vote.pollAccount.accountId}" namespace="/poll" id='modifyVote_%{#vote.pollAccount.accountId}'> @@ -341,10 +341,10 @@ <s:if test="!isChoiceHidden(#choice)"> <s:set name="currentVoteChoice" value="%{#vote.getChoiceVoteToChoice(#choice)}"/> - <s:if test="poll.anonymous"> + <%--s:if test="poll.anonymous"> <td class="anonymous">?</td> </s:if> - <s:else> + <s:else--%> <s:if test="isChoiceInVote(#currentVoteChoice)"> <td class="voted"> <s:property value="%{getChoiceValue(#currentVoteChoice)}"/> @@ -353,12 +353,12 @@ <s:else> <td class="notVoted"></td> </s:else> - </s:else> + <%--</s:else>--%> </s:if> </s:iterator> </tr> </s:iterator> -</s:if> +<%--</s:if>--%> <s:if test="resultAllowed"> <tr> <td>