Author: fdesbois Date: 2009-10-19 18:12:41 +0200 (Mon, 19 Oct 2009) New Revision: 2786 Modified: trunk/pollen-ui/src/main/webapp/css/main.css trunk/pollen-ui/src/main/webapp/css/pollCreation.css trunk/pollen-ui/src/main/webapp/poll/PollCreation.tml trunk/pollen-ui/src/main/webapp/poll/PollModification.tml Log: Evol #55 : the description field of choices becomes a textarea (more place to explain the choice) Modified: trunk/pollen-ui/src/main/webapp/css/main.css =================================================================== --- trunk/pollen-ui/src/main/webapp/css/main.css 2009-10-19 15:10:05 UTC (rev 2785) +++ trunk/pollen-ui/src/main/webapp/css/main.css 2009-10-19 16:12:41 UTC (rev 2786) @@ -10,6 +10,18 @@ margin: auto; } +.fleft { + float: left; +} + +.fright { + float: right; +} + +.clr { + clear: both; +} + #CreationBody { background-image: url("../img/bigCreation.png"); } Modified: trunk/pollen-ui/src/main/webapp/css/pollCreation.css =================================================================== --- trunk/pollen-ui/src/main/webapp/css/pollCreation.css 2009-10-19 15:10:05 UTC (rev 2785) +++ trunk/pollen-ui/src/main/webapp/css/pollCreation.css 2009-10-19 16:12:41 UTC (rev 2786) @@ -36,15 +36,27 @@ text-align: left; } +#choicesCreationFormDiv div { + margin-bottom: 5px; +} + #choicesCreationFormDiv fieldset { border: 1px solid #aab; padding: 15px; - width: 600px; + width: 670px; margin: auto; vertical-align: top; text-align: left; } +#choicesCreationFormDiv div.choiceName { + padding-top: 12px; +} + +#choicesCreationFormDiv div.choiceName input.nameField { + width: 280px; +} + #pollCreationFormDiv label { display: block; width: 150px; @@ -89,8 +101,7 @@ #pollCreationFormDiv div, #optionsCreationFormDiv div, -#listsCreationFormDiv div, -#choicesCreationFormDiv div { +#listsCreationFormDiv div { margin-bottom: 10px; } Modified: trunk/pollen-ui/src/main/webapp/poll/PollCreation.tml =================================================================== --- trunk/pollen-ui/src/main/webapp/poll/PollCreation.tml 2009-10-19 15:10:05 UTC (rev 2785) +++ trunk/pollen-ui/src/main/webapp/poll/PollCreation.tml 2009-10-19 16:12:41 UTC (rev 2786) @@ -232,29 +232,44 @@ <legend>${stepLegend}</legend> <t:formfragment t:id="textChoiceFragment" visible="isTextChoices()"> <div t:type="loop" t:source="choices" t:value="choice" t:volatile="true"> - <t:label for="textName" /> - <t:textfield t:id="textName" t:value="choice.name" /> - - - <t:label for="textDesc" /> - <t:textfield t:id="textDesc" t:value="choice.description" /> + <div class="fleft choiceName"> + <t:label for="textName" /> + <t:textfield class="nameField" t:id="textName" t:value="choice.name" /> + - + <t:label for="textDesc" /> + </div> + <div class="fleft"> + <t:textarea cols="30" t:id="textDesc" t:value="choice.description" /> + </div> + <div class="clr" /> </div> </t:formfragment> <t:formfragment t:id="dateChoiceFragment" visible="isDateChoices()"> <div t:type="loop" t:source="dateTypeChoices" t:value="dateTypeChoice" t:volatile="true"> - <t:label for="dateDTF" /> - <input t:id="dateDTF" t:value="dateTypeChoice.date" t:validate="regexp" t:datePattern="${message:DTF-pattern}"/> - - - <t:label for="dateDesc" /> - <t:textfield t:id="dateDesc" t:value="dateTypeChoice.description" /> + <div class="fleft choiceName"> + <t:label for="dateDTF" /> + <input t:id="dateDTF" t:value="dateTypeChoice.date" t:validate="regexp" t:datePattern="${message:DTF-pattern}"/> + - + <t:label for="dateDesc" /> + </div> + <div class="fleft"> + <t:textarea cols="35" t:id="dateDesc" t:value="dateTypeChoice.description" /> + </div> + <div class="clr" /> </div> </t:formfragment> <t:formfragment t:id="imgChoiceFragment" visible="isImgChoices()"> <div t:type="loop" t:source="imgTypeChoices" t:value="imgTypeChoice" t:volatile="true"> - <t:label for="imgFile" /> - <input t:type="upload" t:id="imgFile" t:value="imgTypeChoice.img" t:validate="regexp" /> - - - <t:label for="imgDesc" /> - <t:textfield t:id="imgDesc" t:value="imgTypeChoice.description" /> + <div class="fleft choiceName"> + <t:label for="imgFile" /> + <input class="nameField" t:type="upload" t:id="imgFile" t:value="imgTypeChoice.img" t:validate="regexp" /> + - + <t:label for="imgDesc" /> + </div> + <div class="fleft"> + <t:textarea cols="30" t:id="imgDesc" t:value="imgTypeChoice.description" /> + </div> + <div class="clr" /> </div> </t:formfragment> </fieldset> Modified: trunk/pollen-ui/src/main/webapp/poll/PollModification.tml =================================================================== --- trunk/pollen-ui/src/main/webapp/poll/PollModification.tml 2009-10-19 15:10:05 UTC (rev 2785) +++ trunk/pollen-ui/src/main/webapp/poll/PollModification.tml 2009-10-19 16:12:41 UTC (rev 2786) @@ -156,18 +156,23 @@ <fieldset> <legend>${stepLegend}</legend> <div t:type="loop" t:source="poll.choiceDTOs" t:value="choice" t:volatile="true"> - <t:if test="isTextChoices()"> - ${choice.name} - </t:if> - <t:if test="isDateChoices()"> - <t:output value="choiceNameAsDate" format="dateFormat"/> - </t:if> - <t:if test="isImgChoices()"> - ${choice.name} - </t:if> - - - <t:label for="desc" /> - <t:textfield t:id="desc" t:value="choice.description" /> + <div class="fleft choiceName"> + <t:if test="isTextChoices()"> + ${choice.name} + </t:if> + <t:if test="isDateChoices()"> + <t:output value="choiceNameAsDate" format="dateFormat"/> + </t:if> + <t:if test="isImgChoices()"> + ${choice.name} + </t:if> + - + <t:label for="desc" /> + </div> + <div class="fleft"> + <t:textarea cols="35" t:id="desc" t:value="choice.description" /> + </div> + <div class="clr" /> </div> </fieldset> <div class="buttons">