r3083 - trunk/pollen-ui/src/main/webapp/poll - Pollen-commits

29 Oct 2011

Author: kmorin
Date: 2011-10-29 10:54:13 +0200 (Sat, 29 Oct 2011)
New Revision: 3083

Url: http://chorem.org/repositories/revision/pollen/3083

Log:
set the right attribute name

Modified:
   trunk/pollen-ui/src/main/webapp/poll/PollCreation.tml
   trunk/pollen-ui/src/main/webapp/poll/PollForm.tml
   trunk/pollen-ui/src/main/webapp/poll/PollLinks.tml
   trunk/pollen-ui/src/main/webapp/poll/VoteForPoll.tml

Modified: trunk/pollen-ui/src/main/webapp/poll/PollCreation.tml
===================================================================

--- trunk/pollen-ui/src/main/webapp/poll/PollCreation.tml	2011-10-28 21:26:57 UTC (rev 3082)
+++ trunk/pollen-ui/src/main/webapp/poll/PollCreation.tml	2011-10-29 08:54:13 UTC (rev 3083)
@@ -65,7 +65,7 @@
                         </div>
                         <div>
                             <t:label for="pollType" />
-                            <t:select t:id="pollType" t:value="poll.pollType" t:validate="required"></t:select>
+                            <t:select t:id="pollType" t:value="poll.type" t:validate="required"></t:select>
                             <span t:type="ck/Tooltip" title="${message:help}" value="${message:pollType-help}" effect="appear">
                                 <img src="${asset:context:img/help.png}" alt="${message:help}"/>
                             </span>

Modified: trunk/pollen-ui/src/main/webapp/poll/PollForm.tml
===================================================================
--- trunk/pollen-ui/src/main/webapp/poll/PollForm.tml	2011-10-28 21:26:57 UTC (rev 3082)
+++ trunk/pollen-ui/src/main/webapp/poll/PollForm.tml	2011-10-29 08:54:13 UTC (rev 3083)
@@ -91,7 +91,7 @@
                        t:timePickerAdjacent="true" />
                 <label t:type="label" t:for="voteCountingType" />: 
                 <select t:type="select" t:id="voteCountingType"
-                        t:value="poll.voteCountingType" t:validate="required">
+                        t:value="poll.voteCounting" t:validate="required">
                   <option></option>
                 </select>
                 <span t:type="ck/Tooltip" title="${message:help}"
@@ -284,9 +284,9 @@
           <fieldset>
             <legend>
               <label t:type="label" t:for="pollType" />: 
-              <!--<select t:type="select" t:id="pollType" class="list-select" t:value="poll.pollType" t:validate="required"-->
+              <!--<select t:type="select" t:id="pollType" class="list-select" t:value="poll.type" t:validate="required"-->
               <!--t:mixins="nuiton/zoneUpdater" t:event="change" t:zone="p-pollForm-lists-zone" />-->
-              <select t:type="select" t:id="pollType" t:value="poll.pollType"
+              <select t:type="select" t:id="pollType" t:value="poll.type"
                       t:validate="required"
                       t:mixins="ck/onEvent" t:event="change"
                       t:onCompleteCallback="onConfirmRefreshZone" />
@@ -301,7 +301,7 @@
                 <t:nuiton.feedback t:id="listsFeedback" />
                 <br />
                 <t:subForm t:visible="refreshListsZone">
-                  <t:if t:test="poll.pollType.group">
+                  <t:if t:test="poll.type.group">
                     <p>
                       <label t:type="label" t:for="groupName" />: 
                       <input t:type="textfield" t:id="groupName"

Modified: trunk/pollen-ui/src/main/webapp/poll/PollLinks.tml
===================================================================
--- trunk/pollen-ui/src/main/webapp/poll/PollLinks.tml	2011-10-28 21:26:57 UTC (rev 3082)
+++ trunk/pollen-ui/src/main/webapp/poll/PollLinks.tml	2011-10-29 08:54:13 UTC (rev 3083)
@@ -29,7 +29,7 @@
       <h1 class="titleCreation">${title}</h1>
 
       <h3>${format:pollen.ui.poll.links.pollName=poll.title,poll.creator.name}</h3>
-      <t:unless t:test="poll.pollType.restrictedOrGroup">
+      <t:unless t:test="poll.type.restrictedOrGroup">
         <div style="margin-top: 10px;">
             <img src="${asset:context:img/vote.png}" alt="${message:vote}" style="margin-right: 20px;"/>
             ${message:pollen.ui.poll.links.votePage}

Modified: trunk/pollen-ui/src/main/webapp/poll/VoteForPoll.tml
===================================================================
--- trunk/pollen-ui/src/main/webapp/poll/VoteForPoll.tml	2011-10-28 21:26:57 UTC (rev 3082)
+++ trunk/pollen-ui/src/main/webapp/poll/VoteForPoll.tml	2011-10-29 08:54:13 UTC (rev 3083)
@@ -55,7 +55,7 @@
                 <label>${message:endDate-label}</label>
                 <t:output value="poll.endDate" format="dateFormat"/>
                 <br/>
-                <label>${message:pollType-label}</label> ${poll.voteCountingType}
+                <label>${message:pollType-label}</label> ${poll.voteCounting}
                 <span t:type="ck/Tooltip" title="${message:help}" value="${helpMessage}" effect="appear">
                     <img src="${asset:context:img/help.png}" alt="${message:help}"/>
                 </span>
@@ -247,7 +247,7 @@
                     </div>
                     <t:if test="canVote()">
                         <div id="buttons">
-                            <t:if t:test="poll.pollType.free">
+                            <t:if t:test="poll.type.free">
                                 <label t:type="label" t:for="pollAccountEmail" />
                                 <input t:type="textfield" t:id="pollAccountEmail" value="pollAccount.email" />
                             </t:if>

    

r3083 - trunk/pollen-ui/src/main/webapp/poll

kmorin＠users.chorem.org

tags

participants (1)