r3299 - in trunk/pollen-ui-struts2/src/main/webapp/WEB-INF: decorators jsp/poll
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-default.jsp =================================================================== --- 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 <http://www.gnu.org/licenses/>. #L% --%> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <%@ taglib prefix="s" uri="/struts-tags" %> <%@ taglib prefix="sj" uri="/struts-jquery-tags" %> <%@ taglib prefix="d" uri="http://www.opensymphony.com/sitemesh/decorator" %> @@ -38,7 +38,7 @@ <link rel="stylesheet" type="text/css" href="<s:url value='/css/main.css' />"/> <link rel="stylesheet" type="text/css" href="<s:url value='/css/common.css' />"/> <link rel="icon" type="image/png" href="<s:url value='/favicon.png' />"/> - <sj:head jqueryui="true" jquerytheme="%{jqueryTheme}"/> + <sj:head locale="%{locale}" jqueryui="true" jquerytheme="%{jqueryTheme}"/> </head> <%-- 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 =================================================================== --- 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="java" contentType="text/html" pageEncoding="utf-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> <%@ taglib prefix="sj" uri="/struts-jquery-tags" %> -<html> -<head> -<sj:head locale="%{locale}"/> <link rel="stylesheet" type="text/css" href="<s:url value='/css/pollCreation.css'/>"/> <link rel="stylesheet" type="text/css" href="<s:url value='/css/tipTip.css'/>"/> @@ -65,9 +62,6 @@ <script type="text/javascript" src='<s:url value="/js/createPoll.js"/>'></script> <script type="text/javascript" src='<s:url value="/js/jquery.tipTip.minified.js"/>'></script> -</head> -<body> - <s:url id='errorImg' value='/img/exclamation.png'/> <title><s:text name="pollen.title.createPoll"/></title> @@ -284,6 +278,3 @@ <sj:dialog id="selectPersonListDialog" resizable="true" autoOpen="false" modal="true" width="500"/> - -</body> -</html> 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 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="sj" uri="/struts-jquery-tags" %> <%@ taglib prefix="sjg" uri="/struts-jquery-grid-tags" %> -<html> -<head> -<sj:head locale="%{locale}"/> - <title><s:property value="%{poll.title}"/></title> <link rel="stylesheet" type="text/css" @@ -106,12 +102,8 @@ }); - </script> -</head> -<body> - <h1 class="titleVote"><s:property value="poll.title"/></h1> <!-- Informations sur le sondage --> @@ -558,7 +550,4 @@ autoOpen="false" modal="true" width="800"/> </div> -</s:if> - -</body> -</html> \ No newline at end of file +</s:if> \ No newline at end of file
participants (1)
-
fdesbois＠users.chorem.org