This is an automated email from the git hooks/post-receive script. New commit to branch pollen-udpate-1.6 in repository pollen_1.x. See http://git.chorem.org/pollen_1.x.git commit 7f3e6ca1f551e3e3ec288bab067e51e1c2b1774c Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Wed Nov 18 21:22:55 2015 +0100 Fix invalid location of html element --- .../webapp/WEB-INF/decorators/layout-default.jsp | 28 +++++++++------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp index dc89af2..8a92876 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit + Copyright (C) 2009 - 2015 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -21,18 +21,15 @@ 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"> +<!DOCTYPE html> <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> <%@ taglib prefix="sj" uri="/struts-jquery-tags" %> <%@ taglib prefix="d" uri="http://www.opensymphony.com/sitemesh/decorator" %> -<html xmlns="http://www.w3.org/1999/xhtml"> -<script type="text/javascript"> - var StrutsUtils = new Object(); - StrutsUtils.showValidationErrors = function(){}; -</script> +<html> <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <title>Pollen - <d:title default="Pollen"/></title> <d:head/> @@ -40,15 +37,10 @@ <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 locale="%{locale}" jqueryui="true" jquerytheme="%{jqueryTheme}"/> -</head> - -<%--div id="in-progress"> - <a href="http://chorem.org/projects/pollen"> - <s:text name="pollen.banner.newVersion"/> - </a> -</div--%> -<script type="text/javascript"> + <script type="text/javascript"> + var StrutsUtils = new Object(); + StrutsUtils.showValidationErrors = function(){}; $(document).ready(function () { @@ -85,7 +77,9 @@ }); }); }); -</script> + </script> +</head> + <s:set var="user" value="%{#session.pollenSession.userAccount}"/> <s:set var="userExists" value="%{#user != null}"/> <s:set var="userIsAdmin" value="%{#userExists && #user.administrator}"/> @@ -148,7 +142,7 @@ </span> </s:if> <s:else> - <span id='tologin' onClick="$('#login_menu').toggle()"> + <span id='tologin' onclick="$('#login_menu').toggle()"> <s:text name="pollen.menu.login"/> </span> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.