From tchemit@users.chorem.org Mon Jun 18 12:42:01 2012
From: tchemit@users.chorem.org
To: pollen-commits@list.chorem.org
Subject: [Pollen-commits] r3512 - in trunk/pollen-ui-struts2/src/main:
	resources/i18n webapp/WEB-INF/jsp/poll
Date: Mon, 18 Jun 2012 12:42:01 +0200
Message-ID: <20120618104201.A944716647@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0276751993178384826=="

--===============0276751993178384826==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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.pr=
operties
   trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.pr=
operties
   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_e=
n_GB.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.p=
roperties	2012-06-18 10:35:27 UTC (rev 3511)
+++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.p=
roperties	2012-06-18 10:42:01 UTC (rev 3512)
@@ -327,6 +327,7 @@
 pollen.tab.poll.options=3DOptions
 pollen.title.clone.poll=3DClone a poll
 pollen.title.close.poll=3DClose a poll
+pollen.title.editPoll=3DEdit a poll
 pollen.title.createPoll=3DNew poll
 pollen.title.delete.poll=3DDelete a poll
 pollen.title.delete.pollChoice=3DDelete a poll choice

Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_f=
r_FR.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.p=
roperties	2012-06-18 10:35:27 UTC (rev 3511)
+++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.p=
roperties	2012-06-18 10:42:01 UTC (rev 3512)
@@ -327,6 +327,7 @@
 pollen.tab.poll.options=3DOptions
 pollen.title.clone.poll=3DClonage d'un sondage
 pollen.title.close.poll=3DFermeture d'un sondage
+pollen.title.editPoll=3DModifier un sondage
 pollen.title.createPoll=3DNouveau sondage
 pollen.title.delete.poll=3DSuppression d'un sondage
 pollen.title.delete.pollChoice=3DSuppression d'un choix

Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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=3D"%{poll.choiceType.name()}"/>',
       pollType:'<s:property value=3D"%{poll.pollType.name()}"/>',
       confirmCloseTitle:"<s:text name=3D'pollen.title.close.poll'/>",
-      confirmCloseUrl:'<s:url action=3D"confirmClosePoll/" namespace=3D"/pol=
l"/>'
-        + '<s:property value=3D"%{poll.adminId}"/>',
-      confirmCloseRedirectUrl:'<s:url action=3D"summary/" namespace=3D"/poll=
"/>'
-        + '<s:property value=3D"%{poll.adminId}"/>'
+      confirmCloseUrl:'<s:url action=3D"confirmClosePoll/%{poll.adminId}" na=
mespace=3D"/poll"/>',
+      confirmCloseRedirectUrl:'<s:url action=3D"summary/%{poll.adminId}" nam=
espace=3D"/poll"/>'
     }
   );
 </script>
@@ -73,7 +71,14 @@
=20
 <s:url id=3D'errorImg' value=3D'/img/exclamation.png'/>
=20
-<title><s:text name=3D"pollen.title.createPoll"/></title>
+<title>
+  <s:if test=3D"edit">
+    <s:text name=3D"pollen.title.editPoll"/>
+  </s:if>
+  <s:else>
+    <s:text name=3D"pollen.title.createPoll"/>
+  </s:else>
+</title>
=20
 <h1 class=3D"title${pageLogo}"><s:property value=3D"%{pageTitle}"/></h1>
=20


--===============0276751993178384826==--