From fdesbois@users.chorem.org Mon Apr 23 11:42:14 2012 From: fdesbois@users.chorem.org To: pollen-commits@list.chorem.org Subject: [Pollen-commits] r3299 - in trunk/pollen-ui-struts2/src/main/webapp/WEB-INF: decorators jsp/poll Date: Mon, 23 Apr 2012 11:42:14 +0200 Message-ID: <20120423094214.0F48A15888@nuiton.codelutin.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5771928032095978603==" --===============5771928032095978603== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Author: fdesbois Date: 2012-04-23 11:42:14 +0200 (Mon, 23 Apr 2012) New Revision: 3299 Url: http://chorem.org/repositories/revision/pollen/3299 Log: move sj locale in layout Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.= jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-d= efault.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/decorators/layout-default= .jsp 2012-04-23 09:42:04 UTC (rev 3298) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default= .jsp 2012-04-23 09:42:14 UTC (rev 3299) @@ -21,9 +21,9 @@ along with this program. If not, see . #L% --%> + <%@ page language=3D"java" contentType=3D"text/html; charset=3Dutf-8" pageEncoding=3D"utf-8" %> - <%@ taglib prefix=3D"s" uri=3D"/struts-tags" %> <%@ taglib prefix=3D"sj" uri=3D"/struts-jquery-tags" %> <%@ taglib prefix=3D"d" uri=3D"http://www.opensymphony.com/sitemesh/decorato= r" %> @@ -38,7 +38,7 @@ "/> "/> "/> - + =20 <%-- TODO AThimel 24/01/2012 Remove this when refactoring is over --%> 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-= 04-23 09:42:04 UTC (rev 3298) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp 2012-= 04-23 09:42:14 UTC (rev 3299) @@ -24,10 +24,7 @@ <%@ page language=3D"java" contentType=3D"text/html" pageEncoding=3D"utf-8" = %> <%@ taglib prefix=3D"s" uri=3D"/struts-tags" %> <%@ taglib prefix=3D"sj" uri=3D"/struts-jquery-tags" %> - - =20 - "/> "/> =20 @@ -65,9 +62,6 @@ =20 - - - =20 <s:text name=3D"pollen.title.createPoll"/> @@ -284,6 +278,3 @@ =20 - - - Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.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/vote.jsp 2012-04= -23 09:42:04 UTC (rev 3298) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-04= -23 09:42:14 UTC (rev 3299) @@ -26,10 +26,6 @@ <%@ taglib prefix=3D"sj" uri=3D"/struts-jquery-tags" %> <%@ taglib prefix=3D"sjg" uri=3D"/struts-jquery-grid-tags" %> =20 - - - - <s:property value=3D"%{poll.title}"/> =20 =20 - - -

=20 @@ -558,7 +550,4 @@ autoOpen=3D"false" modal=3D"true" width=3D"800"/> =20 - - - - \ No newline at end of file + \ No newline at end of file --===============5771928032095978603==--