Author: fdesbois Date: 2012-04-16 14:23:57 +0200 (Mon, 16 Apr 2012) New Revision: 3279 Url: http://chorem.org/repositories/revision/pollen/3279 Log: fixes #514 : change cancel submit to button. The send action need to be the default one for enter key. Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-04-16 11:57:48 UTC (rev 3278) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-04-16 12:23:57 UTC (rev 3279) @@ -195,6 +195,7 @@ pollen.information.favoriteList.created=Favorite list %s created. pollen.information.favoriteList.deleted=Favorite list %s deleted. pollen.information.irreversible.operation=Be ware, this operation is irreversible. +pollen.information.lostPassword=You will receive a new password to the given email pollen.information.lostPassword.success=An e-mail was sent with your new password. You can change it on your user account page. pollen.information.need.login=You must be logged to access this page. Please fill the form below. pollen.information.poll.created=Poll created 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 2012-04-16 11:57:48 UTC (rev 3278) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp 2012-04-16 12:23:57 UTC (rev 3279) @@ -41,8 +41,7 @@ <hr/> <div align="right"> - <s:submit onclick="return cancel();" theme="simple" - key="pollen.action.cancel"/> + <button><s:text name="pollen.action.cancel"/></button> <s:submit key="pollen.action.send" theme="simple" action="lostPassword"/> </div>