Author: sletellier Date: 2012-06-19 16:57:01 +0200 (Tue, 19 Jun 2012) New Revision: 3532 Url: http://chorem.org/repositories/revision/pollen/3532 Log: - refs #562: improve choice layout - Fix error position - Fix display existing image - Remove fixed size Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayImageChoice.jsp trunk/pollen-ui-struts2/src/main/webapp/css/pollCreation.css Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp 2012-06-19 14:53:41 UTC (rev 3531) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp 2012-06-19 14:57:01 UTC (rev 3532) @@ -45,8 +45,8 @@ <s:hidden key='%{#prefix}.topiaId' value='%{#choice.topiaId}' label=''/> <s:hidden key='%{#prefix}.order' value='%{#choiceNumber}' label=''/> <sp:fielderror fieldName="%{#prefix}" id="%{#prefix}_error"/> + <sp:fielderror fieldName="%{#prefix}.name" id="%{#prefix}.name_error"/> <div class="fleft choiceName"> - <sp:fielderror fieldName="%{#prefix}.name" id="%{#prefix}.name_error"/> <span class="moveImage ui-icon ui-icon-arrowthick-2-n-s"></span> <s:label for="%{#prefix}.name" id="choicesTEXT_label_%{#choiceNumber}" theme="simple" value=''/> @@ -96,8 +96,8 @@ theme="simple" value='%{#choice.topiaId}' label=''/> <s:hidden key='%{#prefix}.order' value='%{#choiceNumber}' label=''/> <sp:fielderror fieldName="%{#prefix}" id="%{#prefix}_error"/> + <sp:fielderror fieldName="%{#prefix}.name" id="%{#prefix}.name_error"/> <div class="fleft choiceName"> - <sp:fielderror fieldName="%{#prefix}.name" id="%{#prefix}.name_error"/> <span class="moveImage ui-icon ui-icon-arrowthick-2-n-s"> </span> <s:label for="%{#prefix}.name" id="choicesDATE_label_%{choiceNumber}" theme="simple" value=''/> @@ -140,18 +140,18 @@ </s:iterator> </div> <div id="choicesIMAGE" class="choices"> - <s:iterator value="imageChoices" status="status" var="choiceDiv"> + <s:iterator value="imageChoices" status="status" var="choice"> <s:set name="choiceNumber"><s:property value="%{#status.index}"/></s:set> <s:set name="prefix">imageChoice_<s:property value="%{#choiceNumber}"/></s:set> <div id='choicesIMAGE_<s:property value="choiceNumber"/>' - class="ui-state-default choicesImageDiv"> + class="ui-state-default"> <s:hidden key='%{#prefix}.order' value='%{#choiceNumber}' label=''/> <s:hidden key='%{#prefix}.topiaId' value='%{#choice.topiaId}' label=''/> <sp:fielderror fieldName="%{#prefix}" id="%{#prefix}_error"/> + <sp:fielderror fieldName="%{#prefix}.name" id="%{#prefix}.name_error"/> <div class="fleft choiceName"> <div class="fleft"> - <sp:fielderror fieldName="%{#prefix}.name" id="%{#prefix}.name_error"/> <span class="moveImage ui-icon ui-icon-arrowthick-2-n-s"></span> <s:label for="%{#prefix}.name" id="choicesIMAGE_label_%{choiceNumber}" theme="simple" value=''/> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayImageChoice.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayImageChoice.jsp 2012-06-19 14:53:41 UTC (rev 3531) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayImageChoice.jsp 2012-06-19 14:57:01 UTC (rev 3532) @@ -29,7 +29,7 @@ <s:set id='upTitle'><s:text name="pollen.action.pollChoiceUp"/></s:set> <s:set id='downTitle'><s:text name="pollen.action.pollChoiceDown"/></s:set> <div id='choicesIMAGE_<s:property value="choiceNumber"/>' - class="ui-state-default choicesImageDiv"> + class="ui-state-default"> <s:hidden key='%{#prefix}.topiaId' value='%{choice.topiaId}' label=''/> <s:hidden key='%{#prefix}.order' value='%{#choiceNumber}' label=''/> <div class="fleft choiceName"> Modified: trunk/pollen-ui-struts2/src/main/webapp/css/pollCreation.css =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/css/pollCreation.css 2012-06-19 14:53:41 UTC (rev 3531) +++ trunk/pollen-ui-struts2/src/main/webapp/css/pollCreation.css 2012-06-19 14:57:01 UTC (rev 3532) @@ -26,10 +26,6 @@ font-size: 0.9em; } -.choicesImageDiv { - height: 6em; -} - .choiceImage { margin-left: 30px; } @@ -45,7 +41,6 @@ } .choicesDiv { - height: 4em; line-height: 1.2em; }