Author: fdesbois Date: 2009-11-13 18:41:42 +0100 (Fri, 13 Nov 2009) New Revision: 2798 Modified: trunk/pollen-ui/ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/PollCreation.java trunk/pollen-ui/src/main/webapp/poll/PollCreation.tml Log: Add dateTimeField declaration in .tml instead of .java Property changes on: trunk/pollen-ui ___________________________________________________________________ Modified: svn:ignore - target .classpath .project .settings *.ipr *.iws *.iml + target .classpath .project .settings *.ipr *.iws *.iml .pollen Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/PollCreation.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/PollCreation.java 2009-11-12 09:13:57 UTC (rev 2797) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/PollCreation.java 2009-11-13 17:41:42 UTC (rev 2798) @@ -111,27 +111,6 @@ @Property private String siteURL; - /** Composants DateTimeField pour le début des ajouts de choix */ - @SuppressWarnings("unused") - @Component(parameters = { "timePicker=true", "timePickerAdjacent=true" }) - private DateTimeField beginChoiceDate; - @SuppressWarnings("unused") - @Component(parameters = { "timePicker=true", "timePickerAdjacent=true" }) - private DateTimeField endChoiceDate; - - /** Composants DateTimeField pour le début et la fin du sondage */ - @SuppressWarnings("unused") - @Component(parameters = { "timePicker=true", "timePickerAdjacent=true" }) - private DateTimeField beginDate; - @SuppressWarnings("unused") - @Component(parameters = { "timePicker=true", "timePickerAdjacent=true" }) - private DateTimeField endDate; - - /** Composant DateTimeField pour les choix du sondage */ - @SuppressWarnings("unused") - @Component(parameters = { "timePicker=true", "timePickerAdjacent=true" }) - private DateTimeField dateDTF; - /** Date de début du sondage (utilisée pour la validation). */ private Date beginDateValidation; Modified: trunk/pollen-ui/src/main/webapp/poll/PollCreation.tml =================================================================== --- trunk/pollen-ui/src/main/webapp/poll/PollCreation.tml 2009-11-12 09:13:57 UTC (rev 2797) +++ trunk/pollen-ui/src/main/webapp/poll/PollCreation.tml 2009-11-13 17:41:42 UTC (rev 2798) @@ -32,11 +32,13 @@ </div> <div> <t:label for="beginDate" /> - <input t:id="beginDate" t:value="poll.beginDate" datePattern="${message:DTF-pattern}" t:validate="regexp"/> + <input t:type="ck/dateTimeField" t:id="beginDate" value="poll.beginDate" t:validate="regexp" + t:datePattern="${message:DTF-pattern}" t:timePicker="true" t:timePickerAdjacent="true"/> </div> <div> <t:label for="endDate" /> - <input t:id="endDate" t:value="poll.endDate" datePattern="${message:DTF-pattern}" t:validate="regexp"/> + <input t:type="ck/dateTimeField" t:id="endDate" value="poll.endDate" t:validate="regexp" + t:datePattern="${message:DTF-pattern}" t:timePicker="true" t:timePickerAdjacent="true"/> </div> <div> <t:label for="pollType" /> @@ -102,10 +104,12 @@ <br/> <span id="choiceDateDiv" style="${choiceDateDisplay}"> <t:label for="beginChoiceDate" /> - <input t:id="beginChoiceDate" t:value="poll.beginChoiceDate" datePattern="${message:DTF-pattern}" t:validate="regexp"/> + <input t:type="ck/dateTimeField" t:id="beginChoiceDate" value="poll.beginChoiceDate" t:validate="regexp" + t:datePattern="${message:DTF-pattern}" t:timePicker="true" t:timePickerAdjacent="true"/> <br /> <t:label for="endChoiceDate" /> - <input t:id="endChoiceDate" t:value="poll.endChoiceDate" datePattern="${message:DTF-pattern}" t:validate="regexp"/> + <input t:type="ck/dateTimeField" t:id="endChoiceDate" value="poll.endChoiceDate" t:validate="regexp" + t:datePattern="${message:DTF-pattern}" t:timePicker="true" t:timePickerAdjacent="true"/> </span> </div> <t:if test="normalVoteCounting"> @@ -249,7 +253,8 @@ <div t:type="loop" t:source="dateTypeChoices" t:value="dateTypeChoice" t:volatile="true"> <div class="fleft choiceName"> <t:label for="dateDTF" /> - <input t:id="dateDTF" t:value="dateTypeChoice.date" t:validate="regexp" t:datePattern="${message:DTF-pattern}"/> + <input t:type="ck/dateTimeField" t:id="dateDTF" value="dateTypeChoice.date" t:validate="regexp" + t:datePattern="${message:DTF-pattern}" t:timePicker="true" t:timePickerAdjacent="true"/> - <t:label for="dateDesc" /> </div>