branch develop updated (a14aa2a -> 28b0936)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git from a14aa2a Update parent pom new 728f3b1 fixes #1386: Update struts to 2.3.32 new 84e7d5c Add <strong> on link new 3c93a07 Replace invalid "image" tag new 28b0936 Fix invalid location of html element The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 28b0936a9fe510c125a4f0d278f4528834fb0004 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Wed Nov 18 21:22:55 2015 +0100 Fix invalid location of html element commit 3c93a0786fcbb853407617145899e1654898dbb5 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Wed Nov 18 21:26:24 2015 +0100 Replace invalid "image" tag commit 84e7d5cdbd3a8938251d8e42d1ec645542b42b8f Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Wed Nov 18 21:39:35 2015 +0100 Add <strong> on link commit 728f3b168044643918bfa3e02571015b72e234f6 Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Mar 20 10:27:02 2017 +0100 fixes #1386: Update struts to 2.3.32 Summary of changes: .../webapp/WEB-INF/decorators/layout-default.jsp | 26 +++++++++------------- .../webapp/WEB-INF/jsp/poll/createPoll_choices.jsp | 6 ++--- .../webapp/WEB-INF/jsp/poll/displayDateChoice.jsp | 2 +- .../webapp/WEB-INF/jsp/poll/displayImageChoice.jsp | 2 +- .../WEB-INF/jsp/poll/displayPersonToList.jsp | 2 +- .../webapp/WEB-INF/jsp/poll/displayTextChoice.jsp | 2 +- .../webapp/WEB-INF/jsp/poll/displayVotingList.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/poll/summary.jsp | 11 +++++---- pom.xml | 2 +- 9 files changed, 24 insertions(+), 31 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git commit 728f3b168044643918bfa3e02571015b72e234f6 Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Mar 20 10:27:02 2017 +0100 fixes #1386: Update struts to 2.3.32 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e8a8ce9..d778c1d 100644 --- a/pom.xml +++ b/pom.xml @@ -162,7 +162,7 @@ <nuitonUtilsVersion>2.6.12</nuitonUtilsVersion> <h2Version>1.3.172</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> - <struts2Version>2.3.15.3</struts2Version> + <struts2Version>2.3.32</struts2Version> <jqueryPluginVersion>3.5.0</jqueryPluginVersion> <shiroVersion>1.2.2</shiroVersion> <slf4jVersion>1.7.5</slf4jVersion> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git commit 84e7d5cdbd3a8938251d8e42d1ec645542b42b8f Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Wed Nov 18 21:39:35 2015 +0100 Add <strong> on link --- .../src/main/webapp/WEB-INF/jsp/poll/summary.jsp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/summary.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/summary.jsp index 3e38062..d0e5db5 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/summary.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/summary.jsp @@ -4,7 +4,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 @@ -154,7 +154,7 @@ </s:a> <span class="fright url" id='voteUrl'> <s:property value="%{moderateUrl}"/> - </span> + </span> </div> <%--Edit--%> @@ -167,7 +167,7 @@ </s:a> <span class="fright url" id='voteUrl'> <s:property value="%{editUrl}"/> - </span> + </span> </div> <%--Export--%> @@ -186,7 +186,7 @@ alt="<s:text name='pollen.action.clonePoll.help'/>" title="<s:text name='pollen.action.clonePoll.help'/>"/> <s:a href="%{cloneUrl}"> - <strong> <s:text name='pollen.label.pollClonePage'/></strong> + <strong><s:text name='pollen.label.pollClonePage'/></strong> </s:a> </div> @@ -199,7 +199,6 @@ <s:a href="#" onclick="return confirmClosePoll('%{pollUri}')"> <strong><s:text name='pollen.label.pollClosePage'/></strong> </s:a> - </div> </s:if> @@ -209,7 +208,7 @@ alt="<s:text name='pollen.action.deletePoll.help'/>" title="<s:text name='pollen.action.deletePoll.help'/>"/> <s:a href="#" onclick="return confirmDeletePoll('%{pollUri}')"> - <s:text name='pollen.label.pollDeletePage'/> + <strong><s:text name='pollen.label.pollDeletePage'/></strong> </s:a> </div> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git commit 3c93a0786fcbb853407617145899e1654898dbb5 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Wed Nov 18 21:26:24 2015 +0100 Replace invalid "image" tag --- .../src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp | 6 +++--- .../src/main/webapp/WEB-INF/jsp/poll/displayDateChoice.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/poll/displayImageChoice.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/poll/displayPersonToList.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/poll/displayTextChoice.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/poll/displayVotingList.jsp | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp index bf5e1d9..50658ef 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp @@ -62,7 +62,7 @@ <s:if test="!voteStarted"> <s:a href='#' onclick="return deleteChoice('choicesTEXT_%{choiceNumber}')"> - <image alt='<s:property value="deleteTitle"/>' + <img alt='<s:property value="deleteTitle"/>' title='<s:property value="deleteTitle"/>' src="<s:url value='/img/delete.png'/>"></image> </s:a> @@ -103,7 +103,7 @@ <s:if test="!voteStarted"> <s:a href='#' onclick="return deleteChoice('choicesDATE_%{choiceNumber}')"> - <image alt='<s:property value="deleteTitle"/>' + <img alt='<s:property value="deleteTitle"/>' title='<s:property value="deleteTitle"/>' src="<s:url value='/img/delete.png'/>"></image> </s:a> @@ -178,7 +178,7 @@ <s:if test="!voteStarted"> <s:a href='#' onclick="return deleteChoice('choicesIMAGE_%{choiceNumber}')"> - <image alt='<s:property value="deleteTitle"/>' + <img alt='<s:property value="deleteTitle"/>' title='<s:property value="deleteTitle"/>' src="<s:url value='/img/delete.png'/>"></image> </s:a> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayDateChoice.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayDateChoice.jsp index c116ae6..db4b6ed 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayDateChoice.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayDateChoice.jsp @@ -47,7 +47,7 @@ <s:textarea cols="30" id="%{#prefix}.description" label='' theme="simple" key="%{#prefix}.description" value="%{choice.description}"/> <s:a href='#' onclick="return deleteChoice('choicesDATE_%{choiceNumber}')"> - <image alt='<s:property value="deleteTitle"/>' + <img alt='<s:property value="deleteTitle"/>' title='<s:property value="deleteTitle"/>' src="<s:url value='/img/delete.png'/>"></image> </s:a> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayImageChoice.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayImageChoice.jsp index 74a7820..8bb9d91 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayImageChoice.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayImageChoice.jsp @@ -56,7 +56,7 @@ <s:textarea cols="30" id="%{#prefix}.description" label='' theme="simple" key="%{#prefix}.description" value="%{choice.description}"/> <s:a href='#' onclick="return deleteChoice('choicesIMAGE_%{choiceNumber}')"> - <image alt='<s:property value="deleteTitle"/>' + <img alt='<s:property value="deleteTitle"/>' title='<s:property value="deleteTitle"/>' src="<s:url value='/img/delete.png'/>"></image> </s:a> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPersonToList.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPersonToList.jsp index 66c9076..27f7fa9 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPersonToList.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPersonToList.jsp @@ -67,7 +67,7 @@ <s:if test="!voteStarted"> <div class="fright"> <s:a href='#' onclick="return deletePersonToList('%{#personPrefix}')"> - <image alt='<s:property value="%{#deletePersonTitle}"/>' + <img alt='<s:property value="%{#deletePersonTitle}"/>' title='<s:property value="%{#deletePersonTitle}"/>' src="<s:url value='/img/delete.png'/>"></image> </s:a> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayTextChoice.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayTextChoice.jsp index 22274e0..a193a79 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayTextChoice.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayTextChoice.jsp @@ -44,7 +44,7 @@ <s:textarea cols="30" id="%{#prefix}.description" label='' theme="simple" key="%{#prefix}.description" value="%{choice.description}"/> <s:a href='#' onclick="return deleteChoice('choicesTEXT_%{choiceNumber}')"> - <image alt='<s:property value="deleteTitle"/>' + <img alt='<s:property value="deleteTitle"/>' title='<s:property value="deleteTitle"/>' src="<s:url value='/img/delete.png'/>"></image> </s:a> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingList.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingList.jsp index 1a61050..92357fb 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingList.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingList.jsp @@ -52,7 +52,7 @@ </div> <div id='<s:property value="%{#prefix}"/>_actions' class="fright"> <s:a href='#' onclick="return deleteVotingList('%{#prefix}')"> - <image alt='<s:property value="deleteVotingListTitle"/>' + <img alt='<s:property value="deleteVotingListTitle"/>' title='<s:property value="deleteVotingListTitle"/>' src="<s:url value='/img/delete.png'/>"></image> </s:a> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git commit 28b0936a9fe510c125a4f0d278f4528834fb0004 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 | 26 +++++++++------------- 1 file changed, 10 insertions(+), 16 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 c85a7da..c89624b 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 @@ -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>.
participants (1)
-
chorem.org scm