Author: tchemit Date: 2013-04-22 22:49:16 +0200 (Mon, 22 Apr 2013) New Revision: 3775 Url: http://chorem.org/projects/pollen/repository/revisions/3775 Log: replace required attribute by requiredLabel attribute Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollComment.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollVote.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVote_TEXTFIELD.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/login.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/register.jsp Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2013-04-22 20:34:22 UTC (rev 3774) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2013-04-22 20:49:16 UTC (rev 3775) @@ -168,14 +168,14 @@ <label for="connection_login"> <s:text name="pollen.common.login"/> : </label> - <s:textfield key="login" size="10" required="true" theme="simple" + <s:textfield key="login" size="10" requiredLabel="true" theme="simple" label='' id='connection_login'/> </li> <li> <label for="connection_password"> <s:text name="pollen.common.password"/> : </label> - <s:password key="password" size="10" required="true" + <s:password key="password" size="10" requiredLabel="true" id='connection_password' label="" theme="simple"/> </li> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp 2013-04-22 20:34:22 UTC (rev 3774) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp 2013-04-22 20:49:16 UTC (rev 3775) @@ -89,10 +89,10 @@ <fieldset> <legend><s:text name="pollen.fieldset.userInformation.toCreate"/></legend> <s:textfield key="createUser.login" - label="%{getText('pollen.common.login')}" required="true" + label="%{getText('pollen.common.login')}" requiredLabel="true" size="40"/> <s:textfield key="createUser.email" - label="%{getText('pollen.common.email')}" required="true" + label="%{getText('pollen.common.email')}" requiredLabel="true" size="40"/> <s:textfield key="createUser.firstName" label="%{getText('pollen.common.firstName')}" size="40"/> @@ -114,9 +114,9 @@ <fieldset> <legend><s:text name="pollen.fieldset.userInformation.toUpdate"/></legend> <s:textfield key="editUser.login" label="%{getText('pollen.common.login')}" - required="true" readonly="true" size="40"/> + requiredLabel="true" readonly="true" size="40"/> <s:textfield key="editUser.email" label="%{getText('pollen.common.email')}" - required="true" size="40" disabled="true"/> + requiredLabel="true" size="40" disabled="true"/> <s:textfield key="editUser.firstName" label="%{getText('pollen.common.firstName')}" size="40"/> <s:textfield key="editUser.lastName" Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollComment.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollComment.jsp 2013-04-22 20:34:22 UTC (rev 3774) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollComment.jsp 2013-04-22 20:49:16 UTC (rev 3775) @@ -36,7 +36,7 @@ <s:textarea key='comment.text' readonly="true" rows="3" label="%{getText('pollen.common.commentText')}"/> - <s:textarea key='reason' rows="3" required="true" + <s:textarea key='reason' rows="3" requiredLabel="true" label="%{getText('pollen.common.deleteReason')}"/> <hr/> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollVote.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollVote.jsp 2013-04-22 20:34:22 UTC (rev 3774) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollVote.jsp 2013-04-22 20:49:16 UTC (rev 3775) @@ -33,7 +33,7 @@ </s:param> </s:text>. - <s:textarea key='reason' rows="3" required="true" + <s:textarea key='reason' rows="3" requiredLabel="true" label="%{getText('pollen.common.deleteReason')}"/> <hr/> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVote_TEXTFIELD.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVote_TEXTFIELD.jsp 2013-04-22 20:34:22 UTC (rev 3774) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVote_TEXTFIELD.jsp 2013-04-22 20:49:16 UTC (rev 3775) @@ -22,6 +22,6 @@ --%> <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<s:textfield required="true" size="3" theme="simple" +<s:textfield requiredLabel="true" size="3" theme="simple" name="vote.choiceVoteToChoice[%{#status.index}].voteValue" value="%{vote.choiceVoteToChoice[#status.index].voteValue}"/> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp 2013-04-22 20:34:22 UTC (rev 3774) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp 2013-04-22 20:49:16 UTC (rev 3775) @@ -119,7 +119,7 @@ <fieldset> <s:textfield key="poll.title" label="%{getText('pollen.common.title')}" - required="true" size="80"/> + requiredLabel="true" size="80"/> <s:url var="configUrl" value='/js/ckeditor.config.js'/> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2013-04-22 20:34:22 UTC (rev 3774) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2013-04-22 20:49:16 UTC (rev 3775) @@ -248,7 +248,7 @@ </s:if> <s:else> <th id="voterName"> - <s:textfield key='pollAccount.votingId' required="true" label='' + <s:textfield key='pollAccount.votingId' requiredLabel="true" label='' value="%{pollAccount.votingId}" theme="simple"/> </th> </s:else> @@ -355,17 +355,17 @@ enctype="multipart/form-data"> <h4><s:text name="pollen.action.addChoice"/></h4> <s:if test="textType"> - <s:textfield key="choice.name" required="true" + <s:textfield key="choice.name" requiredLabel="true" label="%{getText('pollen.common.choice')}" /> </s:if> <s:elseif test="dateType"> - <sj:datepicker key="choice.date" required="true" + <sj:datepicker key="choice.date" requiredLabel="true" label="%{getText('pollen.common.choice')}" changeMonth="true" changeYear="true" timepicker="true" displayFormat="%{getText('pollen.common.datePickerPattern')}" /> </s:elseif> <s:elseif test="imageType"> - <s:file key="imageChoice[0]" required="true" cssClass="nameField" + <s:file key="imageChoice[0]" requiredLabel="true" cssClass="nameField" label="%{getText('pollen.common.choice')}" /> </s:elseif> <br/> @@ -395,11 +395,11 @@ <s:form id='addCommentForm' method="POST" namespace="/poll" validate="true"> - <s:textfield key="commentAuthor" required="true" size="78" + <s:textfield key="commentAuthor" requiredLabel="true" size="78" label="%{getText('pollen.common.commentAuthor')}"/> <s:url var="configUrl" value='/js/ckeditor.config.js'/> - <sjr:ckeditor key="commentText" required="true" + <sjr:ckeditor key="commentText" requiredLabel="true" value="" rows="3" cols="54" width="500" label="%{getText('pollen.common.commentText')}" toolbar="PollenToolbar" customConfig="%{configUrl}" Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp 2013-04-22 20:34:22 UTC (rev 3774) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp 2013-04-22 20:49:16 UTC (rev 3775) @@ -92,7 +92,7 @@ <s:form namespace="/user" method="POST"> <s:textfield key="pollId" label='%{getText("pollen.common.pollId")}' - required="true" size="80" tooltipIconPath="/img/tooltip.png" + requiredLabel="true" size="80" tooltipIconPath="/img/tooltip.png" tooltip='%{getText("poll.help.pollId")}'/> <br/> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp 2013-04-22 20:34:22 UTC (rev 3774) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp 2013-04-22 20:49:16 UTC (rev 3775) @@ -32,7 +32,7 @@ <s:text name="pollen.information.lostPassword"/> <div style="padding: 1em; margin-bottom: 3em;"> - <s:textfield key="email" required="true" size="30"/> + <s:textfield key="email" requiredLabel="true" size="30"/> </div> <hr/> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp 2013-04-22 20:34:22 UTC (rev 3774) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp 2013-04-22 20:49:16 UTC (rev 3775) @@ -36,9 +36,9 @@ <s:hidden key="pollenUserAccount.topiaId" label=""/> <s:textfield name="pollenUserAccount.login" key="pollen.common.login" - required="true"/> + requiredLabel="true"/> <s:password name="pollenUserAccount.password" key="pollen.common.password" - required="true"/> + requiredLabel="true"/> <s:password name="newPassword" key="pollen.common.newPassword"/> <s:password name="newPassword2" key="pollen.common.newPassword2"/> </fieldset> @@ -47,7 +47,7 @@ <legend><s:text name="pollen.fieldset.userInformation"/></legend> <s:textfield name="pollenUserAccount.email" key="pollen.common.email" - required="true" disabled="%{exists}"/> + requiredLabel="true" disabled="%{exists}"/> <s:textfield name="pollenUserAccount.firstName" key="pollen.common.firstName"/> <s:textfield name="pollenUserAccount.lastName" Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp 2013-04-22 20:34:22 UTC (rev 3774) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp 2013-04-22 20:49:16 UTC (rev 3775) @@ -102,9 +102,9 @@ <legend> <s:text name="pollen.fieldset.pollAccount.toAddToFavoriteList"/> </legend> - <s:textfield key="createPollAccount.votingId" required="true" + <s:textfield key="createPollAccount.votingId" requiredLabel="true" label="%{getText('pollen.common.name')}" size="40"/> - <s:textfield key="createPollAccount.email" required="true" + <s:textfield key="createPollAccount.email" requiredLabel="true" label="%{getText('pollen.common.email')}" size="40"/> </fieldset> @@ -124,9 +124,9 @@ <legend> <s:text name="pollen.fieldset.pollAccount.toEditToFavoriteList"/> </legend> - <s:textfield key="editPollAccount.votingId" required="true" + <s:textfield key="editPollAccount.votingId" requiredLabel="true" label="%{getText('pollen.common.name')}" size="40"/> - <s:textfield key="editPollAccount.email" required="true" + <s:textfield key="editPollAccount.email" requiredLabel="true" label="%{getText('pollen.common.email')}" size="40"/> </fieldset> <br/> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp 2013-04-22 20:34:22 UTC (rev 3774) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp 2013-04-22 20:49:16 UTC (rev 3775) @@ -97,7 +97,7 @@ <legend> <s:text name="pollen.fieldset.userFavoriteList.toCreate"/> </legend> - <s:textfield key="createFavoriteList.name" required="true" size="40" + <s:textfield key="createFavoriteList.name" requiredLabel="true" size="40" label="%{getText('pollen.common.name')}"/> <s:file id='csvImport' key="csvImport[0]" label="%{getText('pollen.common.csvImport')}" Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/login.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/login.jsp 2013-04-22 20:34:22 UTC (rev 3774) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/login.jsp 2013-04-22 20:49:16 UTC (rev 3775) @@ -38,10 +38,10 @@ <legend><s:text name="pollen.fieldset.login"/></legend> <s:textfield key="login" size="10" label="%{getText('pollen.common.login')}" - required="true"/> + requiredLabel="true"/> <s:password key="password" label="%{getText('pollen.common.password')}" size="10" - required="true"/> + requiredLabel="true"/> </fieldset> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/register.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/register.jsp 2013-04-22 20:34:22 UTC (rev 3774) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/register.jsp 2013-04-22 20:49:16 UTC (rev 3775) @@ -36,17 +36,17 @@ <legend><s:text name="pollen.fieldset.connexionInformation"/></legend> <s:textfield name="pollenUserAccount.login" key="pollen.common.login" - required="true"/> + requiredLabel="true"/> <s:password name="pollenUserAccount.password" key="pollen.common.password" - required="true"/> - <s:password name="password2" key="pollen.common.password2" required="true"/> + requiredLabel="true"/> + <s:password name="password2" key="pollen.common.password2" requiredLabel="true"/> </fieldset> <fieldset> <legend><s:text name="pollen.fieldset.userInformation"/></legend> <s:textfield name="pollenUserAccount.email" key="pollen.common.email" - required="true"/> + requiredLabel="true"/> <s:textfield name="pollenUserAccount.firstName" key="pollen.common.firstName"/> <s:textfield name="pollenUserAccount.lastName"