Author: tchemit Date: 2012-06-18 12:42:01 +0200 (Mon, 18 Jun 2012) New Revision: 3512 Url: http://chorem.org/repositories/revision/pollen/3512 Log: change page name when edit a poll + improve a javascript 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_fr_FR.properties trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.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-06-18 10:35:27 UTC (rev 3511) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-06-18 10:42:01 UTC (rev 3512) @@ -327,6 +327,7 @@ pollen.tab.poll.options=Options pollen.title.clone.poll=Clone a poll pollen.title.close.poll=Close a poll +pollen.title.editPoll=Edit a poll pollen.title.createPoll=New poll pollen.title.delete.poll=Delete a poll pollen.title.delete.pollChoice=Delete a poll choice Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-06-18 10:35:27 UTC (rev 3511) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-06-18 10:42:01 UTC (rev 3512) @@ -327,6 +327,7 @@ pollen.tab.poll.options=Options pollen.title.clone.poll=Clonage d'un sondage pollen.title.close.poll=Fermeture d'un sondage +pollen.title.editPoll=Modifier un sondage pollen.title.createPoll=Nouveau sondage pollen.title.delete.poll=Suppression d'un sondage pollen.title.delete.pollChoice=Suppression d'un choix Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp 2012-06-18 10:35:27 UTC (rev 3511) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp 2012-06-18 10:42:01 UTC (rev 3512) @@ -58,10 +58,8 @@ choiceType:'<s:property value="%{poll.choiceType.name()}"/>', pollType:'<s:property value="%{poll.pollType.name()}"/>', confirmCloseTitle:"<s:text name='pollen.title.close.poll'/>", - confirmCloseUrl:'<s:url action="confirmClosePoll/" namespace="/poll"/>' - + '<s:property value="%{poll.adminId}"/>', - confirmCloseRedirectUrl:'<s:url action="summary/" namespace="/poll"/>' - + '<s:property value="%{poll.adminId}"/>' + confirmCloseUrl:'<s:url action="confirmClosePoll/%{poll.adminId}" namespace="/poll"/>', + confirmCloseRedirectUrl:'<s:url action="summary/%{poll.adminId}" namespace="/poll"/>' } ); </script> @@ -73,7 +71,14 @@ <s:url id='errorImg' value='/img/exclamation.png'/> -<title><s:text name="pollen.title.createPoll"/></title> +<title> + <s:if test="edit"> + <s:text name="pollen.title.editPoll"/> + </s:if> + <s:else> + <s:text name="pollen.title.createPoll"/> + </s:else> +</title> <h1 class="title${pageLogo}"><s:property value="%{pageTitle}"/></h1>