branch pollen-udpate-1.6 updated (c3e47af -> 8a01ba7)
This is an automated email from the git hooks/post-receive script. New change to branch pollen-udpate-1.6 in repository pollen_1.x. See http://git.chorem.org/pollen_1.x.git from c3e47af Fix java8 javadoc, deps... new b4ef665 Import new c4cffda Fix deprecated method new 7f3e6ca Fix invalid location of html element new 8a01ba7 Replace invalid "image" tag 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 8a01ba7acc06215f41c39d126478405da36b9fe5 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Wed Nov 18 21:26:24 2015 +0100 Replace invalid "image" tag commit 7f3e6ca1f551e3e3ec288bab067e51e1c2b1774c Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Wed Nov 18 21:22:55 2015 +0100 Fix invalid location of html element commit c4cffda45f9d7f3210c22b6c16571fda0ce609e2 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Wed Nov 18 21:22:40 2015 +0100 Fix deprecated method commit b4ef665e3f8999fcfcc9c008dd0e9d2836fc5819 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Wed Nov 18 21:22:22 2015 +0100 Import Summary of changes: .../pollen/services/impl/PollCommentService.java | 1 - .../java/org/chorem/pollen/ui/PollenUIUtils.java | 10 ++++---- .../chorem/pollen/ui/converters/DateConverter.java | 8 +++---- .../ui/security/AbstractPollenAuthorization.java | 12 +++++----- .../ui/security/PollCreatorAccessRequired.java | 8 +++---- .../ui/security/PollResultAccessRequired.java | 6 ++--- .../pollen/ui/security/PollVoteAccessRequired.java | 6 ++--- .../webapp/WEB-INF/decorators/layout-default.jsp | 28 +++++++++------------- .../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 +- 14 files changed, 44 insertions(+), 51 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 pollen-udpate-1.6 in repository pollen_1.x. See http://git.chorem.org/pollen_1.x.git commit b4ef665e3f8999fcfcc9c008dd0e9d2836fc5819 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Wed Nov 18 21:22:22 2015 +0100 Import --- .../main/java/org/chorem/pollen/services/impl/PollCommentService.java | 1 - 1 file changed, 1 deletion(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java b/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java index 5b28e0b..3e03355 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java @@ -33,7 +33,6 @@ import org.chorem.pollen.business.persistence.UserAccount; import org.chorem.pollen.services.PollenServiceSupport; import org.chorem.pollen.services.exceptions.PollCommentNotFound; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.persistence.pager.TopiaPagerBean; import java.util.List; -- 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 pollen-udpate-1.6 in repository pollen_1.x. See http://git.chorem.org/pollen_1.x.git commit c4cffda45f9d7f3210c22b6c16571fda0ce609e2 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Wed Nov 18 21:22:40 2015 +0100 Fix deprecated method --- .../src/main/java/org/chorem/pollen/ui/PollenUIUtils.java | 10 +++++----- .../java/org/chorem/pollen/ui/converters/DateConverter.java | 8 ++++---- .../pollen/ui/security/AbstractPollenAuthorization.java | 12 ++++++------ .../chorem/pollen/ui/security/PollCreatorAccessRequired.java | 8 ++++---- .../chorem/pollen/ui/security/PollResultAccessRequired.java | 6 +++--- .../chorem/pollen/ui/security/PollVoteAccessRequired.java | 6 +++--- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java index c58084f..88cea41 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java @@ -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 @@ -29,7 +29,7 @@ import javax.servlet.ServletContext; import javax.servlet.ServletRequest; import java.util.Locale; -import static org.nuiton.i18n.I18n.l_; +import static org.nuiton.i18n.I18n.l; /** * Useful ui methods. @@ -68,11 +68,11 @@ public class PollenUIUtils { int i = poll.sizeVote(); String result; if (i == 0) { - result = l_(locale, "pollen.common.voteNoVote"); + result = l(locale, "pollen.common.voteNoVote"); } else if (i == 1) { - result = l_(locale, "pollen.common.voteOneVote"); + result = l(locale, "pollen.common.voteOneVote"); } else { - result = l_(locale, "pollen.common.voteNbVotes", i); + result = l(locale, "pollen.common.voteNbVotes", i); } return result; } diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/DateConverter.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/DateConverter.java index 3e4b030..9377452 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/DateConverter.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/DateConverter.java @@ -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 @@ -34,7 +34,7 @@ import java.util.Date; import java.util.Locale; import java.util.Map; -import static org.nuiton.i18n.I18n.l_; +import static org.nuiton.i18n.I18n.l; /** * Created: 18/04/12 @@ -88,13 +88,13 @@ public class DateConverter extends StrutsTypeConverter { private static String getDateTimePattern() { Locale locale = ActionContext.getContext().getLocale(); - String result = l_(locale, "pollen.common.dateTimePattern"); + String result = l(locale, "pollen.common.dateTimePattern"); return result; } private static String getDatePattern() { Locale locale = ActionContext.getContext().getLocale(); - String result = l_(locale, "pollen.common.datePattern"); + String result = l(locale, "pollen.common.datePattern"); return result; } } diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/AbstractPollenAuthorization.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/AbstractPollenAuthorization.java index 35d0a2e..d00f310 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/AbstractPollenAuthorization.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/AbstractPollenAuthorization.java @@ -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 @@ -22,7 +22,7 @@ */ package org.chorem.pollen.ui.security; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; import java.io.IOException; import java.util.Locale; @@ -123,14 +123,14 @@ public abstract class AbstractPollenAuthorization extends AuthorizationFilter { if (pollUri == null) { // no pollUri in url - errorMessage = n_("pollen.security.error.no.pollId"); + errorMessage = n("pollen.security.error.no.pollId"); } else { if (!pollUri.isPollIdNotBlank()) { // no pollId in uri - errorMessage = n_("pollen.security.error.no.pollId"); + errorMessage = n("pollen.security.error.no.pollId"); } else { // there is a pollId check that it exists @@ -143,7 +143,7 @@ public abstract class AbstractPollenAuthorization extends AuthorizationFilter { if (poll == null) { // poll not found - errorMessage = n_("pollen.security.error.poll.not.found"); + errorMessage = n("pollen.security.error.poll.not.found"); } if (log.isDebugEnabled()) { @@ -171,7 +171,7 @@ public abstract class AbstractPollenAuthorization extends AuthorizationFilter { if (!accountExist) { // bad accountId - errorMessage = n_("pollen.security.error.bad.accountId"); + errorMessage = n("pollen.security.error.bad.accountId"); registerError(request, errorMessage); } diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollCreatorAccessRequired.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollCreatorAccessRequired.java index cf94184..bf5d68d 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollCreatorAccessRequired.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollCreatorAccessRequired.java @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2015 CodeLutin * %% * 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 @@ -28,7 +28,7 @@ import org.chorem.pollen.ui.PollenUIUtils; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * Check that a user can show results of a poll. @@ -61,7 +61,7 @@ public class PollCreatorAccessRequired extends AbstractPollenAuthorization { // bad accountId isAccessAllowed = false; registerError( - request, n_("pollen.security.error.bad.accountId")); + request, n("pollen.security.error.bad.accountId")); } } } @@ -79,7 +79,7 @@ public class PollCreatorAccessRequired extends AbstractPollenAuthorization { isAccessAllowed = false; registerError( request, - n_("pollen.security.error.creatorId.or.admin.required")); + n("pollen.security.error.creatorId.or.admin.required")); } } diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollResultAccessRequired.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollResultAccessRequired.java index 6e0aec4..3c7f627 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollResultAccessRequired.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollResultAccessRequired.java @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2015 CodeLutin * %% * 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 @@ -29,7 +29,7 @@ import org.chorem.pollen.ui.PollenUIUtils; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * Check that a user can show results of a poll. @@ -63,7 +63,7 @@ public class PollResultAccessRequired extends AbstractPollenAuthorization { isAccessAllowed = false; registerError( request, - n_("pollen.security.error.bad.accountId")); + n("pollen.security.error.bad.accountId")); } } } diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollVoteAccessRequired.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollVoteAccessRequired.java index b2fd002..92e294b 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollVoteAccessRequired.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollVoteAccessRequired.java @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2015 CodeLutin * %% * 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 @@ -29,7 +29,7 @@ import org.chorem.pollen.ui.PollenUIUtils; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * Check that a user can vote. @@ -61,7 +61,7 @@ public class PollVoteAccessRequired extends AbstractPollenAuthorization { // bad accountId isAccessAllowed = false; registerError(request, - n_("pollen.security.error.bad.accountId")); + n("pollen.security.error.bad.accountId")); } } } -- 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 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>.
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 8a01ba7acc06215f41c39d126478405da36b9fe5 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>.
participants (1)
-
chorem.org scm