From tchemit@users.chorem.org Tue Aug 28 18:29:02 2012
From: tchemit@users.chorem.org
To: pollen-commits@list.chorem.org
Subject: [Pollen-commits] r3650 -
	trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll
Date: Tue, 28 Aug 2012 18:29:02 +0200
Message-ID: <20120828162902.40274163B2@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5612523910984572881=="

--===============5612523910984572881==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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 @@
=20
 <s:form id=3D"voteForm" validate=3D"true">
 <s:hidden key=3D"pollUri" label=3D''/>
-<s:if test=3D"poll.anonymous">
-  <s:hidden key=3D"vote.anonymous" label=3D"" value=3D'true'/>
-</s:if>
+<%--<s:if test=3D"poll.anonymous">--%>
+  <%--<s:hidden key=3D"vote.anonymous" label=3D"" value=3D'true'/>--%>
+<%--</s:if>--%>
 <table id=3D"poll">
 <thead>
 <tr>
-  <s:if test=3D"accountFieldDisplayed">
+  <%--<s:if test=3D"accountFieldDisplayed">--%>
     <th style=3D"width:200px;">
       <s:text name=3D"pollen.common.voterName"/>
     </th>
-  </s:if>
-  <s:else>
-    <th></th>
-  </s:else>
+  <%--</s:if>--%>
+  <%--<s:else>--%>
+    <%--<th></th>--%>
+  <%--</s:else>--%>
   <s:if test=3D"textType">
     <s:iterator value=3D"poll.choice" var=3D"choice">
       <s:if test=3D"!isChoiceHidden(#choice)">
@@ -285,14 +285,14 @@
 <s:if test=3D"voteAllowed">
   <tfoot>
   <tr>
-    <s:if test=3D"accountFieldDisplayed">
+    <s:if test=3D"vote.anonymous">
+      <th>?</th>
+    </s:if>
+    <s:else>
       <th id=3D"voterName">
         <s:textfield key=3D'pollAccount.votingId' required=3D"true" label=3D=
''
                      value=3D"%{pollAccount.votingId}" theme=3D"simple"/>
       </th>
-    </s:if>
-    <s:else>
-      <th></th>
     </s:else>
     <s:set name=3D"template" value=3D"%{choiceFragment}"/>
     <s:iterator value=3D"poll.choice" var=3D"choice" status=3D"status">
@@ -307,18 +307,18 @@
   </tfoot>
 </s:if>
 <tbody>
-<s:if test=3D"!poll.anonymous">
+<%--s:if test=3D"!poll.anonymous"--%>
   <s:iterator value=3D"votes" var=3D"vote">
     <tr id=3D'vote_<s:property value=3D"%{#vote.pollAccount.accountId}"/>'>
       <td>
-        <s:if test=3D"accountFieldDisplayed">
-          <s:if test=3D"!#vote.anonymous">
-            <s:property value=3D"pollAccount.votingId"/>
+        <%--<s:if test=3D"accountFieldDisplayed">--%>
+          <s:if test=3D"vote.anonymous">
+            ?
           </s:if>
           <s:else>
-            ?
+            <s:property value=3D"pollAccount.votingId"/>
           </s:else>
-        </s:if>
+        <%--</s:if>--%>
         <s:if test=3D"isModifyVoteAllowed(#vote)">
           <s:a action=3D"votefor/%{poll.pollId}:%{#vote.pollAccount.accountI=
d}"
                namespace=3D"/poll" id=3D'modifyVote_%{#vote.pollAccount.acco=
untId}'>
@@ -341,10 +341,10 @@
         <s:if test=3D"!isChoiceHidden(#choice)">
           <s:set name=3D"currentVoteChoice"
                  value=3D"%{#vote.getChoiceVoteToChoice(#choice)}"/>
-          <s:if test=3D"poll.anonymous">
+          <%--s:if test=3D"poll.anonymous">
             <td class=3D"anonymous">?</td>
           </s:if>
-          <s:else>
+          <s:else--%>
             <s:if test=3D"isChoiceInVote(#currentVoteChoice)">
               <td class=3D"voted">
                 <s:property value=3D"%{getChoiceValue(#currentVoteChoice)}"/>
@@ -353,12 +353,12 @@
             <s:else>
               <td class=3D"notVoted"></td>
             </s:else>
-          </s:else>
+          <%--</s:else>--%>
         </s:if>
       </s:iterator>
     </tr>
   </s:iterator>
-</s:if>
+<%--</s:if>--%>
 <s:if test=3D"resultAllowed">
   <tr>
     <td>


--===============5612523910984572881==--