April 2012 - Pollen-commits - mailman.cloud.codelutin.com

r3263 - / branches trunk
by maven-release＠users.chorem.org April 13, 2012

April 13, 2012

Author: maven-release Date: 2012-04-13 17:48:45 +0200 (Fri, 13 Apr 2012) New Revision: 3263 Url: http://chorem.org/repositories/revision/pollen/3263 Log: move struts2 branch to trunk Added: trunk/ Removed: branches/pollen-1.2.6-struts2/ Property changes on: trunk ___________________________________________________________________ Added: svn:ignore + target nbactions.xml .settings .classpath .project *.ipr *.iws *.iml .idea Added: svn:mergeinfo +

1 0

r3262 - /
by maven-release＠users.chorem.org April 13, 2012

April 13, 2012

Author: maven-release Date: 2012-04-13 17:46:47 +0200 (Fri, 13 Apr 2012) New Revision: 3262 Url: http://chorem.org/repositories/revision/pollen/3262 Log: delete 2.0 beta trunk, the branch struts2 will be moved to trunk Removed: trunk/

1 0

r3261 - branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security
by fdesbois＠users.chorem.org April 13, 2012

April 13, 2012

Author: fdesbois Date: 2012-04-13 17:41:56 +0200 (Fri, 13 Apr 2012) New Revision: 3261 Url: http://chorem.org/repositories/revision/pollen/3261 Log: use error style for security Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/admin_required.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/connected_required.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_access_required.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_creator_required.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_required.jsp Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/admin_required.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/admin_required.jsp 2012-04-13 15:41:50 UTC (rev 3260) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/admin_required.jsp 2012-04-13 15:41:56 UTC (rev 3261) @@ -22,7 +22,8 @@ #L% --%> <%@ page contentType="text/html;charset=UTF-8" language="java" %> -<html> -<head><title></title></head> -<body>Vous devez être connecter en administrateur pour accéder à cette page.</body> -</html> \ No newline at end of file +<div class="info_error"> + <ul class="actionErrors"> + <li><span>Vous devez être connecter en administrateur pour accéder à cette page.</span></li> + </ul> +</div> \ No newline at end of file Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/connected_required.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/connected_required.jsp 2012-04-13 15:41:50 UTC (rev 3260) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/connected_required.jsp 2012-04-13 15:41:56 UTC (rev 3261) @@ -22,7 +22,8 @@ #L% --%> <%@ page contentType="text/html;charset=UTF-8" language="java" %> -<html> -<head><title></title></head> -<body>Vous devez être connecter pour accéder à cette page.</body> -</html> \ No newline at end of file +<div class="info_error"> + <ul class="actionErrors"> + <li><span>Vous devez être connecter pour accéder à cette page.</span></li> + </ul> +</div> \ No newline at end of file Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_access_required.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_access_required.jsp 2012-04-13 15:41:50 UTC (rev 3260) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_access_required.jsp 2012-04-13 15:41:56 UTC (rev 3261) @@ -22,7 +22,8 @@ #L% --%> <%@ page contentType="text/html;charset=UTF-8" language="java" %> -<html> -<head><title></title></head> -<body>Vous n'êtes pas autorisé à accéder à cette page de sondage.</body> -</html> \ No newline at end of file +<div class="info_error"> + <ul class="actionErrors"> + <li><span>Vous n'êtes pas autorisé à accéder à cette page de sondage.</span></li> + </ul> +</div> \ No newline at end of file Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_creator_required.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_creator_required.jsp 2012-04-13 15:41:50 UTC (rev 3260) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_creator_required.jsp 2012-04-13 15:41:56 UTC (rev 3261) @@ -22,7 +22,8 @@ #L% --%> <%@ page contentType="text/html;charset=UTF-8" language="java" %> -<html> -<head><title></title></head> -<body>Seul le créateur du sondage ou un administratuer peut accéder à cette page.</body> -</html> \ No newline at end of file +<div class="info_error"> + <ul class="actionErrors"> + <li><span>Seul le créateur du sondage ou un administratuer peut accéder à cette page.</span></li> + </ul> +</div> \ No newline at end of file Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_required.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_required.jsp 2012-04-13 15:41:50 UTC (rev 3260) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_required.jsp 2012-04-13 15:41:56 UTC (rev 3261) @@ -22,7 +22,8 @@ #L% --%> <%@ page contentType="text/html;charset=UTF-8" language="java" %> -<html> -<head><title></title></head> -<body>Aucun sondage à l'url donné.</body> -</html> \ No newline at end of file +<div class="info_error"> + <ul class="actionErrors"> + <li><span>Aucun sondage à l'url donné.</span></li> + </ul> +</div> \ No newline at end of file

1 0

r3260 - in branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions: . admin poll user
by fdesbois＠users.chorem.org April 13, 2012

April 13, 2012

Author: fdesbois Date: 2012-04-13 17:41:50 +0200 (Fri, 13 Apr 2012) New Revision: 3260 Url: http://chorem.org/repositories/revision/pollen/3260 Log: use enumeration for skin (pageLogo, jqueryTheme) Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PageSkin.java Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatedList.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ParticipatedList.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteList.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Show.java Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PageSkin.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PageSkin.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PageSkin.java 2012-04-13 15:41:50 UTC (rev 3260) @@ -0,0 +1,35 @@ +package org.chorem.pollen.ui.actions; + +/** + * Created: 13/04/12 + * + * @author fdesbois <desbois(a)codelutin.com> + * @since 1.3 + */ +public enum PageSkin { + + INDEX("Index", "yellow"), + + VOTE("Vote", "green"), + + RESULT("VoteCounting", "cupertino"), + + EDITION("Creation", "cupertino"); + + private String cssSuffix; + + private String theme; + + private PageSkin(String cssSuffix, String theme) { + this.cssSuffix = cssSuffix; + this.theme = theme; + } + + public String getCssSuffix() { + return cssSuffix; + } + + public String getTheme() { + return theme; + } +} Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java 2012-04-13 15:41:42 UTC (rev 3259) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java 2012-04-13 15:41:50 UTC (rev 3260) @@ -64,13 +64,7 @@ public class PollenActionSupport extends BaseAction implements TopiaTransactionAware { private static final long serialVersionUID = 1L; - - protected static final String JQUERY_THEME_BLUE = "cupertino"; - protected static final String JQUERY_THEME_YELLOW = "yellow"; - - protected static final String JQUERY_THEME_GREEN = "green"; - private static DateFormat dateTimeFormat; private DateFormat dateFormat; @@ -100,10 +94,18 @@ protected transient TopiaContext transaction; + public PageSkin getSkin() { + return PageSkin.INDEX; + } + public String getPageLogo() { - return "Index"; + return getSkin().getCssSuffix(); } + public String getJqueryTheme() { + return getSkin().getTheme(); + } + public PollenSession getPollenSession() { if (pollenSession == null) { pollenSession = PollenSession.get(getActionContext()); @@ -128,10 +130,6 @@ URL url = getServiceContext().getApplicationURL(); return url; } - - public String getJqueryTheme() { - return JQUERY_THEME_BLUE; - } /** * Fabrique pour récupérer le ServiceContext tel qu'il devrait être fourni Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java 2012-04-13 15:41:42 UTC (rev 3259) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java 2012-04-13 15:41:50 UTC (rev 3260) @@ -33,8 +33,4 @@ private static final long serialVersionUID = 1L; - @Override - public String getJqueryTheme() { - return JQUERY_THEME_YELLOW; - } } Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java 2012-04-13 15:41:42 UTC (rev 3259) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java 2012-04-13 15:41:50 UTC (rev 3260) @@ -43,11 +43,6 @@ protected UserAccount user; - @Override - public String getJqueryTheme() { - return JQUERY_THEME_YELLOW; - } - public UserAccount getUser() { if (user == null) { UserService service = newService(UserService.class); Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java 2012-04-13 15:41:42 UTC (rev 3259) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java 2012-04-13 15:41:50 UTC (rev 3260) @@ -40,6 +40,7 @@ import org.chorem.pollen.common.VoteCountingType; import org.chorem.pollen.services.PollenServiceFunctions; import org.chorem.pollen.services.impl.PollService; +import org.chorem.pollen.ui.actions.PageSkin; import org.chorem.pollen.ui.actions.PollenActionSupport; import java.util.Collection; @@ -105,8 +106,8 @@ private transient Function<Choice, Choice> imageChoiceCreator; @Override - public String getPageLogo() { - return "Creation"; + public PageSkin getSkin() { + return PageSkin.EDITION; } protected PollService getPollService() { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java 2012-04-13 15:41:42 UTC (rev 3259) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java 2012-04-13 15:41:50 UTC (rev 3260) @@ -46,6 +46,7 @@ import org.chorem.pollen.services.impl.PollResultsService; import org.chorem.pollen.services.impl.PollService; import org.chorem.pollen.services.impl.VoteService; +import org.chorem.pollen.ui.actions.PageSkin; import java.text.DateFormat; import java.util.Date; @@ -103,8 +104,8 @@ private Map<String, String[]> parameters; @Override - public String getPageLogo() { - return "Vote"; + public PageSkin getSkin() { + return PageSkin.VOTE; } protected PollResultsService getPollResultsService() { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatedList.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatedList.java 2012-04-13 15:41:42 UTC (rev 3259) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatedList.java 2012-04-13 15:41:50 UTC (rev 3260) @@ -23,6 +23,7 @@ */ package org.chorem.pollen.ui.actions.poll; +import org.chorem.pollen.ui.actions.PageSkin; import org.chorem.pollen.ui.actions.PollenActionSupport; /** @@ -36,7 +37,7 @@ private static final long serialVersionUID = 1L; @Override - public String getPageLogo() { - return "Creation"; + public PageSkin getSkin() { + return PageSkin.EDITION; } } Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ParticipatedList.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ParticipatedList.java 2012-04-13 15:41:42 UTC (rev 3259) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ParticipatedList.java 2012-04-13 15:41:50 UTC (rev 3260) @@ -23,6 +23,7 @@ */ package org.chorem.pollen.ui.actions.poll; +import org.chorem.pollen.ui.actions.PageSkin; import org.chorem.pollen.ui.actions.PollenActionSupport; /** @@ -36,12 +37,7 @@ private static final long serialVersionUID = 1L; @Override - public String getPageLogo() { - return "Vote"; + public PageSkin getSkin() { + return PageSkin.VOTE; } - - @Override - public String getJqueryTheme() { - return JQUERY_THEME_GREEN; - } } Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java 2012-04-13 15:41:42 UTC (rev 3259) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java 2012-04-13 15:41:50 UTC (rev 3260) @@ -44,6 +44,7 @@ import org.chorem.pollen.services.exceptions.PollNotFoundException; import org.chorem.pollen.services.impl.PollResultsService; import org.chorem.pollen.services.impl.PollService; +import org.chorem.pollen.ui.actions.PageSkin; import org.nuiton.util.StringUtil; import java.net.URL; @@ -89,8 +90,8 @@ private List<PollResult> topRanking; @Override - public final String getPageLogo() { - return "VoteCounting"; + public PageSkin getSkin() { + return PageSkin.RESULT; } public Poll getPoll() { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java 2012-04-13 15:41:42 UTC (rev 3259) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java 2012-04-13 15:41:50 UTC (rev 3260) @@ -27,6 +27,7 @@ import org.chorem.pollen.services.exceptions.UserEmailAlreadyUsedException; import org.chorem.pollen.services.exceptions.UserInvalidPasswordException; import org.chorem.pollen.services.impl.UserService; +import org.chorem.pollen.ui.actions.PageSkin; import org.chorem.pollen.ui.actions.PollenActionSupport; /** @@ -45,8 +46,9 @@ protected String newPassword2; - public String getPageLogo() { - return "Creation"; + @Override + public PageSkin getSkin() { + return PageSkin.EDITION; } public UserAccount getUser() { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteList.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteList.java 2012-04-13 15:41:42 UTC (rev 3259) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteList.java 2012-04-13 15:41:50 UTC (rev 3260) @@ -32,6 +32,7 @@ import org.chorem.pollen.services.exceptions.FavoriteListNotOwnedByUserException; import org.chorem.pollen.services.exceptions.ParticipantAlreadyFoundInListException; import org.chorem.pollen.services.impl.FavoriteService; +import org.chorem.pollen.ui.actions.PageSkin; import org.chorem.pollen.ui.actions.PollenActionSupport; import java.util.Map; @@ -49,8 +50,8 @@ private Map<String, String[]> parameters; @Override - public String getPageLogo() { - return "Creation"; + public PageSkin getSkin() { + return PageSkin.EDITION; } protected String action; Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java 2012-04-13 15:41:42 UTC (rev 3259) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java 2012-04-13 15:41:50 UTC (rev 3260) @@ -27,6 +27,7 @@ import org.chorem.pollen.business.persistence.PersonList; import org.chorem.pollen.services.exceptions.FavoriteListAlreadyExistException; import org.chorem.pollen.services.impl.FavoriteService; +import org.chorem.pollen.ui.actions.PageSkin; import org.chorem.pollen.ui.actions.PollenActionSupport; import java.io.File; @@ -90,8 +91,8 @@ } @Override - public String getPageLogo() { - return "Creation"; + public PageSkin getSkin() { + return PageSkin.EDITION; } public String create() throws Exception { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java 2012-04-13 15:41:42 UTC (rev 3259) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java 2012-04-13 15:41:50 UTC (rev 3260) @@ -27,6 +27,7 @@ import org.chorem.pollen.services.exceptions.UserEmailAlreadyUsedException; import org.chorem.pollen.services.exceptions.UserLoginAlreadyUsedException; import org.chorem.pollen.services.impl.UserService; +import org.chorem.pollen.ui.actions.PageSkin; import org.chorem.pollen.ui.actions.PollenActionSupport; /** @@ -59,8 +60,9 @@ this.password2 = password2; } - public String getPageLogo() { - return "Creation"; + @Override + public PageSkin getSkin() { + return PageSkin.EDITION; } @Override Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Show.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Show.java 2012-04-13 15:41:42 UTC (rev 3259) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Show.java 2012-04-13 15:41:50 UTC (rev 3260) @@ -24,6 +24,7 @@ package org.chorem.pollen.ui.actions.user; import org.chorem.pollen.business.persistence.UserAccount; +import org.chorem.pollen.ui.actions.PageSkin; import org.chorem.pollen.ui.actions.PollenActionSupport; /** @@ -36,8 +37,9 @@ private static final long serialVersionUID = 1L; - public String getPageLogo() { - return "Creation"; + @Override + public PageSkin getSkin() { + return PageSkin.EDITION; } public UserAccount getUser() {

1 0

r3259 - in branches/pollen-1.2.6-struts2: pollen-services/src/main/java/org/chorem/pollen/services/exceptions pollen-services/src/main/java/org/chorem/pollen/services/impl pollen-services/src/main/resources/i18n pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user pollen-ui-struts2/src/main/resources pollen-ui-struts2/src/main/resources/config pollen-ui-struts2/src/main/resources/i18n pollen-ui-struts2/src/main/webapp/WEB-INF pollen-ui-struts2/src/main/webapp/WEB-INF/decorators
by fdesbois＠users.chorem.org April 13, 2012

April 13, 2012

Author: fdesbois Date: 2012-04-13 17:41:42 +0200 (Fri, 13 Apr 2012) New Revision: 3259 Url: http://chorem.org/repositories/revision/pollen/3259 Log: fixes #86 : lost password link Added: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/InvalidEmailException.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/LostPassword.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/SendMail.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java branches/pollen-1.2.6-struts2/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties branches/pollen-1.2.6-struts2/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-user.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/shiro.ini branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp Added: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/InvalidEmailException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/InvalidEmailException.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/InvalidEmailException.java 2012-04-13 15:41:42 UTC (rev 3259) @@ -0,0 +1,12 @@ +package org.chorem.pollen.services.exceptions; + +/** + * Created: 13/04/12 + * + * @author fdesbois <desbois(a)codelutin.com> + * @since 1.3 + */ +public class InvalidEmailException extends Exception { + + private static final long serialVersionUID = 1L; +} Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java 2012-04-13 15:41:30 UTC (rev 3258) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java 2012-04-13 15:41:42 UTC (rev 3259) @@ -64,14 +64,36 @@ user.getDisplayName(), user.getLogin(), user.getPassword(), url); - PollEmail pollEmail = createPollEmail(user.getEmail(), - subject, - content); + PollenEmail pollenEmail = createPollenEmail(user.getEmail(), + subject, + content); - sendEmail(pollEmail); + sendEmail(pollenEmail); } } + public void onLostPassword(UserAccount user, String newPassword) { + + URL url = serviceContext.getApplicationURL(); + + if (url != null) { + + Locale locale = getLocale(); + + String subject = l_(locale, "pollen.email.lostPassword.subject", + user.getLogin()); + String content = l_(locale, "pollen.email.lostPassword.content", + user.getDisplayName(), + user.getLogin(), newPassword, url); + + PollenEmail pollenEmail = createPollenEmail(user.getEmail(), + subject, + content); + + sendEmail(pollenEmail); + } + } + public void onVoteAdded(Poll poll, PollUrl voteURL, PollUrl modifURL) { URL url = serviceContext.getApplicationURL(); @@ -93,10 +115,10 @@ String content = l_(locale, "pollen.email.voteEmail.content", pollTitle, nbVotes, voteURL, modifURL); - PollEmail pollEmail = createPollEmail( + PollenEmail pollenEmail = createPollenEmail( poll.getCreator().getEmail(), subject, content); - sendEmail(pollEmail); + sendEmail(pollenEmail); } } @@ -119,10 +141,10 @@ String content = l_(locale, "pollen.email.creatorEmail.content", pollTitle, voteURL, modifURL); - PollEmail pollEmail = createPollEmail( + PollenEmail pollenEmail = createPollenEmail( poll.getCreator().getEmail(), subject, content); - sendEmail(pollEmail); + sendEmail(pollenEmail); } // Mails à tous les votants @@ -132,13 +154,13 @@ String subject = l_(locale, "pollen.email.votingEmail.subject", pollTitle); - List<PollEmail> emails = Lists.newArrayList(); + List<PollenEmail> emails = Lists.newArrayList(); for (PollAccount account : votingPollAccounts) { - PollEmail pollEmail = + PollenEmail pollenEmail = createVotingEmail(locale, pollTitle, account, voteURL); - emails.add(pollEmail); + emails.add(pollenEmail); } sendEmail(emails); @@ -156,34 +178,13 @@ String pollTitle = poll.getTitle(); - PollEmail pollEmail = + PollenEmail pollenEmail = createVotingEmail(locale, pollTitle, account, voteURL); - sendEmail(pollEmail); + sendEmail(pollenEmail); } } - - private PollEmail createVotingEmail(Locale locale, - String pollTitle, - PollAccount account, - PollUrl voteURL) { - String subject = l_(locale, "pollen.email.votingEmail.subject", - pollTitle); - - PollUrl accountVoteURL = - PollUrl.newPollUrl(voteURL, account.getAccountId()); - - String content = - l_(locale, "pollen.email.votingEmail.content", - pollTitle, account.getVotingId(), accountVoteURL); - - PollEmail result = createPollEmail( - account.getEmail(), subject, content); - - return result; - } - public void onPollReminder(Poll poll, PollUrl voteURL) { URL url = serviceContext.getApplicationURL(); @@ -201,7 +202,7 @@ String subject = l_(locale, "pollen.email.reminderEmail.subject", pollTitle); - List<PollEmail> emails = Lists.newArrayList(); + List<PollenEmail> emails = Lists.newArrayList(); for (PollAccount account : votingPollAccounts) { PollUrl accountVoteURL = PollUrl.newPollUrl(voteURL, account.getAccountId()); @@ -210,21 +211,42 @@ l_(locale, "pollen.email.reminderEmail.content", pollTitle, account.getVotingId(), accountVoteURL); - PollEmail pollEmail = createPollEmail( + PollenEmail pollenEmail = createPollenEmail( account.getEmail(), subject, content); - emails.add(pollEmail); + emails.add(pollenEmail); } sendEmail(emails); } } } - protected void sendEmail(Iterable<PollEmail> pollEmails) { + private PollenEmail createVotingEmail(Locale locale, + String pollTitle, + PollAccount account, + PollUrl voteURL) { + String subject = l_(locale, "pollen.email.votingEmail.subject", + pollTitle); + + PollUrl accountVoteURL = + PollUrl.newPollUrl(voteURL, account.getAccountId()); + + String content = + l_(locale, "pollen.email.votingEmail.content", + pollTitle, account.getVotingId(), accountVoteURL); + + PollenEmail result = createPollenEmail( + account.getEmail(), subject, content); + + return result; + } + + protected void sendEmail(Iterable<PollenEmail> pollEmails) { + //TODO tchemit If two much mails then use SendEmail thread... - for (PollEmail pollEmail : pollEmails) { - sendEmail(pollEmail); + for (PollenEmail pollenEmail : pollEmails) { + sendEmail(pollenEmail); } // // send mail preparation @@ -239,17 +261,17 @@ } - protected void sendEmail(PollEmail pollEmail) { + protected void sendEmail(PollenEmail pollenEmail) { - Preconditions.checkNotNull(pollEmail); + Preconditions.checkNotNull(pollenEmail); - String to = pollEmail.getTo(); + String to = pollenEmail.getTo(); Preconditions.checkNotNull(to); - String subject = pollEmail.getSubject(); + String subject = pollenEmail.getSubject(); Preconditions.checkNotNull(subject); - String content = pollEmail.getContent(); + String content = pollenEmail.getContent(); Preconditions.checkNotNull(content); try { @@ -284,13 +306,13 @@ } } - public static PollEmail createPollEmail(String to, - String subject, - String content) { - return new PollEmail(to, subject, content); + public static PollenEmail createPollenEmail(String to, + String subject, + String content) { + return new PollenEmail(to, subject, content); } - public static class PollEmail { + public static class PollenEmail { protected String subject; @@ -299,7 +321,7 @@ protected String to; - private PollEmail(String to, String subject, String content) { + private PollenEmail(String to, String subject, String content) { this.subject = subject; this.content = content; this.to = to; Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/SendMail.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/SendMail.java 2012-04-13 15:41:30 UTC (rev 3258) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/SendMail.java 2012-04-13 15:41:42 UTC (rev 3259) @@ -191,13 +191,13 @@ // index contains next index to treat so == is ok if (currentIndex >= index) { - EmailService.PollEmail pollEmail = - EmailService.createPollEmail( + EmailService.PollenEmail pollenEmail = + EmailService.createPollenEmail( receiver, subject, body ); - emailService.sendEmail(pollEmail); + emailService.sendEmail(pollenEmail); // MailUtil.sendMail(configuration.getProperty("email_host"), // Integer.parseInt(configuration.getProperty("email_port")), @@ -249,7 +249,7 @@ * @throws IOException */ public void prepareMails(String id, - List<EmailService.PollEmail> mailData) throws IOException { + List<EmailService.PollenEmail> mailData) throws IOException { Writer fileWriter = null; CSVWriter cvsWriter = null; @@ -260,7 +260,7 @@ fileWriter = new OutputStreamWriter(new BufferedOutputStream(new FileOutputStream(emailFile))); cvsWriter = new CSVWriter(fileWriter); - for (EmailService.PollEmail singleMailData : mailData) { + for (EmailService.PollenEmail singleMailData : mailData) { String[] nextLine = new String[]{ singleMailData.getTo(), singleMailData.getSubject(), Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java 2012-04-13 15:41:30 UTC (rev 3258) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java 2012-04-13 15:41:42 UTC (rev 3259) @@ -33,6 +33,7 @@ import org.chorem.pollen.business.persistence.UserAccountDAO; import org.chorem.pollen.entities.PollenBinderHelper; import org.chorem.pollen.services.PollenServiceSupport; +import org.chorem.pollen.services.exceptions.InvalidEmailException; import org.chorem.pollen.services.exceptions.UserEmailAlreadyUsedException; import org.chorem.pollen.services.exceptions.UserInvalidPasswordException; import org.chorem.pollen.services.exceptions.UserLoginAlreadyUsedException; @@ -101,7 +102,7 @@ if (byAdmin) { // let's generate the new password - password = RandomStringUtils.randomAlphanumeric(8); + password = generatePassword(); user.setPassword(password); } @@ -189,6 +190,47 @@ } } + /** + * This service is used to retrieve the userAccount associated to the given + * {@code email}. If the user is found, an email will be send with a new + * password. Otherwise an error will occured. + * + * @param email User email + * @throws InvalidEmailException if the email is not valid + * @throws UserNotFoundException if no user matches the given email + */ + public void lostPassword(String email) throws UserNotFoundException, InvalidEmailException { + + Preconditions.checkNotNull(email); + + if (!StringUtil.isEmail(email)) { + throw new InvalidEmailException(); + } + + UserAccount user; + UserAccountDAO dao = getDAO(UserAccount.class); + try { + user = dao.findByEmail(email); + } catch (TopiaException e) { + throw new PollenTechnicalException(e); + } + + if (user == null) { + throw new UserNotFoundException(); + } + + String newPassword = generatePassword(); + String encodedPassword = encodePassword(newPassword); + + user.setPassword(encodedPassword); + + // send the email + EmailService emailService = newService(EmailService.class); + emailService.onLostPassword(user, newPassword); + + commitTransaction("Can't update lost user password"); + } + public UserAccount getNewUser() { UserAccountDAO dao = getDAO(UserAccount.class); UserAccount result = newInstance(dao); @@ -260,6 +302,10 @@ } } + protected String generatePassword() { + return RandomStringUtils.randomAlphanumeric(8); + } + protected String encodePassword(String password) { return StringUtil.encodeMD5(password); } Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties 2012-04-13 15:41:30 UTC (rev 3258) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties 2012-04-13 15:41:42 UTC (rev 3259) @@ -10,6 +10,8 @@ pollen.common.numberVote-total-votes=Total votes pollen.email.creatorEmail.content=You had just created the new poll\: "%s".\nYou can access to this poll by following the links below.\n\nVote page\: \n%s\nEdit page\: \n%s pollen.email.creatorEmail.subject=[Pollen] Poll creation (%s) +pollen.email.lostPassword.content=Hello %1$s. You have just asked for a new password generation for your Pollen account.\n\nLogin\: %2$s\nPassword\: %3$s\n\nYou can now manage your polls by logging on the website \: \n%4$s +pollen.email.lostPassword.subject=[Pollen] Lost password for %s pollen.email.reminderEmail.content=You have not yet voted for the poll "%s".\nYou can still participate with the identifier %s by following this link\: \n%s pollen.email.reminderEmail.subject=[Pollen] Reminder (%s) pollen.email.userRegister.content=Welcome %1$s. You had just created an account on the web application Pollen.\n\nLogin\: %2$s\nPassword\: %3$s\n\nYou can now manage your polls by logging on the website \: \n%4$s Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties 2012-04-13 15:41:30 UTC (rev 3258) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties 2012-04-13 15:41:42 UTC (rev 3259) @@ -12,6 +12,8 @@ pollen.email.createPoll.subject=[Pollen] Création d'un sondage (%1$s) pollen.email.creatorEmail.content=Vous venez de créer le sondage "%s".\nVous pouvez y accéder en suivant les liens ci-dessous.\n\nPage de vote \: \n%s\nPage de modification \: \n%s pollen.email.creatorEmail.subject=[Pollen] Création d'un sondage (%s) +pollen.email.lostPassword.content=Bonjour %1$s. Vous venez de demander la génération d'un nouveau mot de passe d'accès à votre compte Pollen.\n\nIdentifiant \: %2$s\nMot de passe \: %3$s\n\nVous pouvez dès maintenant gérer vos sondages en vous identifiant sur le site \: \n%4$s +pollen.email.lostPassword.subject=[Pollen] Mot de passe perdu du compte %s pollen.email.reminderEmail.content=Vous n'avez pas encore voté pour le sondage "%s".\nVous pouvez encore y participer avec l'identifiant %s à l'adresse suivante \: \n%s pollen.email.reminderEmail.subject=[Pollen] Rappel (%s) pollen.email.userRegister.content=Bienvenue %1$s. Vous venez de créer un compte sur l'application de sondage en ligne Pollen.\n\nIdentifiant \: %2$s\nMot de passe \: %3$s\n\nVous pouvez dès maintenant gérer vos sondages en vous identifiant sur le site \: \n%4$s Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/LostPassword.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/LostPassword.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/LostPassword.java 2012-04-13 15:41:42 UTC (rev 3259) @@ -0,0 +1,49 @@ +package org.chorem.pollen.ui.actions.user; + +import org.apache.commons.lang.StringUtils; +import org.chorem.pollen.services.exceptions.UserNotFoundException; +import org.chorem.pollen.services.impl.UserService; +import org.chorem.pollen.ui.actions.PollenActionSupport; +import org.nuiton.util.StringUtil; + +/** + * Created: 13/04/12 + * + * @author fdesbois <desbois(a)codelutin.com> + * @since 1.3 + */ +public class LostPassword extends PollenActionSupport { + + private static final long serialVersionUID = 1L; + + private String email; + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + @Override + public String execute() throws Exception { + + if (StringUtils.isBlank(email) || !StringUtil.isEmail(email)) { + addActionError( _("pollen.error.lostPassword.email")); + + } else { + + UserService service = newService(UserService.class); + try { + service.lostPassword(email); + + addActionMessage(_("pollen.information.lostPassword.success")); + + } catch (UserNotFoundException e) { + addActionError(_("pollen.error.lostPassword.user")); + } + } + return SUCCESS; + } +} Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-user.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-user.xml 2012-04-13 15:41:30 UTC (rev 3258) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-user.xml 2012-04-13 15:41:42 UTC (rev 3259) @@ -58,6 +58,12 @@ </result> </action> +  + <action name="lostPassword" class="org.chorem.pollen.ui.actions.user.LostPassword"> + <result name="input">/WEB-INF/jsp/user/dialogLostPassword.jsp</result> + <result type="redirectToHome"/> + </action> +  <action name="logout" class="org.chorem.pollen.ui.actions.user.Logout"> <result type="redirectToHome"/> Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-04-13 15:41:30 UTC (rev 3258) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-04-13 15:41:42 UTC (rev 3259) @@ -1,3 +1,4 @@ +email=E-mail pollen.action.addChoice=Add choice pollen.action.addComment=Add a comment pollen.action.addPersonToList=Add a voter @@ -39,6 +40,7 @@ pollen.action.pollVotingListDelete=Supprimer le groupe de votants pollen.action.pollVotingListEdit=Editer ce groupe de votants pollen.action.register=Register +pollen.action.send=Send pollen.action.validate=Submit pollen.common.aboutPoll=About the poll pollen.common.addingChoices=Adding choices @@ -131,6 +133,8 @@ pollen.error.favoriteList.participant.not.found.in.list=Member not found in favorite list pollen.error.favoriteListName.required=List name mandatory pollen.error.login.required=You must provide a login +pollen.error.lostPassword.email=The provided e-mail is not valid. +pollen.error.lostPassword.user=No user matches the given e-mail pollen.error.no.poll.found=Poll not found with id %s pollen.error.password.required=Your must provide a password pollen.error.password2.required=You must repeat your password for confirmation @@ -160,6 +164,7 @@ pollen.error.user.alreadyVoted=Someone has already used the name %s to vote. pollen.error.user.bad.login.or.password=Login or password invalid. pollen.error.user.email.already.used=This email is already used +pollen.error.user.invalid.email=Invalid e-mail pollen.error.user.invalid.password=Invalid password pollen.error.user.login.already.used=This login is already used pollen.error.user.not.found=User not found @@ -192,6 +197,7 @@ pollen.information.favoriteList.created=Favorite list %s created. pollen.information.favoriteList.deleted=Favorite list %s deleted. pollen.information.irreversible.operation=Be ware, this operation is irreversible. +pollen.information.lostPassword.success=An e-mail was sent with your new password. You can change it on your user account page. pollen.information.need.login=You must be logged to access this page. Please fill the form below. pollen.information.poll.created=Poll created pollen.information.poll.form.voteStarted=Votes are started, some options can't be updated. @@ -217,6 +223,7 @@ pollen.legend.login=Login pollen.legend.select.favoriteList.to.add=Sélectionner la liste de favoris à ajouter pollen.legend.select.personList.to.create.votingList=Sélectionner la liste des votant à importer dans le nouveau groupe +pollen.link.lostPassword=Forget password ? pollen.menu.admin=Administration pollen.menu.createPoll=Create a poll pollen.menu.home=Home Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-04-13 15:41:30 UTC (rev 3258) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-04-13 15:41:42 UTC (rev 3259) @@ -1,3 +1,4 @@ +email=E-mail pollen.action.addChoice=Ajouter un choix pollen.action.addComment=Ajouter un commentaire pollen.action.addPersonListFromVotingList=Ajouter des votants à partir d'une liste de votants @@ -44,6 +45,7 @@ pollen.action.pollVotingListDelete=Supprimer le groupe de votants pollen.action.pollVotingListEdit=Editer ce groupe de votants pollen.action.register=S'enregistrer +pollen.action.send=Envoyer pollen.action.validate=Valider pollen.common.aboutPoll=A propos du sondage pollen.common.addingChoices=Ajout des choix @@ -138,6 +140,8 @@ pollen.error.favoriteList.participant.not.found.in.list=Membre non trouvé dans la liste pollen.error.favoriteListName.required=Nom de liste obligatoire pollen.error.login.required=Login obligatoire +pollen.error.lostPassword.email=L'e-mail saisi n'est pas valide. +pollen.error.lostPassword.user=Aucun utilisateur correspond au courriel renseigné. pollen.error.no.poll.found=Sondage non trouvé avec l'id %s pollen.error.password.required=Mot de passe obligatoire pollen.error.password2.required=Mot de passe répété obligatoire @@ -167,6 +171,7 @@ pollen.error.user.alreadyVoted=Une personne a déjà voté sous le nom %s. pollen.error.user.bad.login.or.password=Mauvais identifiant ou mot de passe. pollen.error.user.email.already.used=Le courriel saisi est déjà utilisé par un autre utilisateur +pollen.error.user.invalid.email=E-mail invalide pollen.error.user.invalid.password=Mot de passe invalide pollen.error.user.login.already.used=Le login saisie est déjà utilisé par un autre utilisateur pollen.error.user.not.found=Utilisateur non trouvé @@ -200,6 +205,8 @@ pollen.information.favoriteList.created=La liste %s a été créée. pollen.information.favoriteList.deleted=La liste %s a été supprimée. pollen.information.irreversible.operation=Attention, Cette opération est irréversible. +pollen.information.lostPassword=Vous allez recevoir un nouveau mot de passe sur l'e-mail suivant +pollen.information.lostPassword.success=Un e-mail vous a été envoyé avec votre nouveau mot de passe. Vous pouvez le changer sur la page d'édition de votre compte. pollen.information.need.login=Vous devez être identifié pour pouvoir accéder à cette page. Veuillez remplir le formulaire ci-dessous. pollen.information.poll.created=Sondage créé pollen.information.poll.form.voteStarted=Les votes ont commencé, certaines options ne sont pas modifiables. @@ -225,6 +232,7 @@ pollen.legend.login=Login pollen.legend.select.favoriteList.to.add=Sélectionner la liste de favoris à ajouter pollen.legend.select.personList.to.create.votingList=Sélectionner la liste des votant à importer dans le nouveau groupe +pollen.link.lostPassword=Mot de passe oublié ? pollen.menu.admin=Administration pollen.menu.createPoll=Créer un sondage pollen.menu.home=Accueil Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/shiro.ini =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/shiro.ini 2012-04-13 15:41:30 UTC (rev 3258) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/shiro.ini 2012-04-13 15:41:42 UTC (rev 3259) @@ -18,8 +18,9 @@ [urls] # anon urls -/user/login = anon -/user/register** = anon +/user/login=anon +/user/register**=anon +/user/lostPassword**=anon # connected urls /user/**=connected Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2012-04-13 15:41:30 UTC (rev 3258) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2012-04-13 15:41:42 UTC (rev 3259) @@ -52,7 +52,19 @@ jQuery(document).ready(function () { // apply common style - $('fieldset').attr('class', 'ui-widget-content ui-corner-all') + $('fieldset').attr('class', 'ui-widget-content ui-corner-all'); + + // Popup for lostPassword + $('#lostPasswordLink').click(function() { + + $('.ui-dialog-title').html('<s:text name="pollen.link.lostPassword"/>'); + + var url = '<s:url action="lostPassword" method="input" namespace="/user"/>'; + var dialog = $("#lostPasswordDialog"); + dialog.load(url); + dialog.dialog('open'); + return false; + }); }); </script> <s:set var="user" value="%{#session.pollenSession.userAccount}"/> @@ -119,6 +131,9 @@ <div class="dropdown_menu" id="login_menu" style="display: none;"> <div class="top_right${pageLogo}"></div> <div class="top_left${pageLogo}"></div> + + <sj:dialog id="lostPasswordDialog" autoOpen="false" modal="true" width="500"/> + <s:form id="connection" method="POST" namespace="/user" action="login"> <ul class="top_middle${pageLogo}"> <li> @@ -136,6 +151,11 @@ label="" theme="simple"/> </li> <li> + <a id="lostPasswordLink"> + <s:text name="pollen.link.lostPassword"/> + </a> + </li> + <li> <s:submit id="submitform" action="login" key="pollen.action.login" align="right"/> </li> Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators.xml 2012-04-13 15:41:30 UTC (rev 3258) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators.xml 2012-04-13 15:41:42 UTC (rev 3259) @@ -29,10 +29,9 @@ <pattern>/images/*</pattern> <pattern>/config-browser/*</pattern> <pattern>/json/*</pattern> - <pattern>/user/confirm*</pattern> - <pattern>/admin/confirm*</pattern> - <pattern>/poll/confirm*</pattern> + <pattern>/*/confirm*</pattern> <pattern>/poll/display*</pattern> + <pattern>/user/lostPassword*</pattern> <pattern>/poll/importPersonList*</pattern> <pattern>/poll/selectPersonListTo*</pattern> <pattern>/io/*</pattern> Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp 2012-04-13 15:41:42 UTC (rev 3259) @@ -0,0 +1,50 @@ +<%-- + #%L + Pollen :: UI (strust2) + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2012 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 + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<%@ taglib prefix="s" uri="/struts-tags" %> +<script type="text/javascript"> + function cancel() { + $('#lostPasswordDialog').dialog('close'); + return false; + } +</script> +<s:form method="POST" namespace="/user"> + <fieldset class="ui-widget-content ui-corner-all"> + + <s:text name="pollen.information.lostPassword"/> + + <div style="padding: 1em; margin-bottom: 3em;"> + <s:textfield key="email" required="true" size="30"/> + </div> + + <hr/> + + <div align="right"> + <s:submit onclick="return cancel();" theme="simple" + key="pollen.action.cancel"/> + <s:submit key="pollen.action.send" theme="simple" + action="lostPassword"/> + </div> + </fieldset> +</s:form> \ No newline at end of file

1 0

r3258 - branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp
by fdesbois＠users.chorem.org April 13, 2012

April 13, 2012

Author: fdesbois Date: 2012-04-13 17:41:30 +0200 (Fri, 13 Apr 2012) New Revision: 3258 Url: http://chorem.org/repositories/revision/pollen/3258 Log: repair broken links on home page Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/home.jsp Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/home.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/home.jsp 2012-04-13 11:28:02 UTC (rev 3257) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/home.jsp 2012-04-13 15:41:30 UTC (rev 3258) @@ -32,13 +32,9 @@ </div> <div class="center"> - <s:a action="create" namespace="/poll" method="input"> + <s:a action="create" namespace="/poll"> <img src="<s:url value='/img/smallCreation_%{safeLanguage}.png' />" alt="poll creation"/> </s:a> - <s:a action="createForm" namespace="/poll"> - <img src="<s:url value='/img/smallVote_%{safeLanguage}.png' />" alt="vote"/> - </s:a> - <s:a action="createForm" namespace="/poll"> - <img src="<s:url value='/img/smallVoteCounting_%{safeLanguage}.png' />" alt="voteCounting"/> - </s:a> + <img src="<s:url value='/img/smallVote_%{safeLanguage}.png' />" alt="vote"/> + <img src="<s:url value='/img/smallVoteCounting_%{safeLanguage}.png' />" alt="voteCounting"/> </div> \ No newline at end of file

1 0

r3257 - in branches/pollen-1.2.6-struts2: pollen-domain/src/main/java/org/chorem/poll/domain pollen-domain/src/main/java/org/chorem/poll/domain/poll pollen-domain/src/main/java/org/chorem/poll/domain/strategy pollen-domain/src/test/java/org/chorem/poll/domain pollen-domain/src/test/java/org/chorem/poll/domain/strategy pollen-persistence/src/main/java/org/chorem/pollen pollen-persistence/src/main/java/org/chorem/pollen/entities/migration pollen-persistence/src/main/xmi pollen-persistence/src
by fdesbois＠users.chorem.org April 13, 2012

April 13, 2012

Author: fdesbois Date: 2012-04-13 13:28:02 +0200 (Fri, 13 Apr 2012) New Revision: 3257 Url: http://chorem.org/repositories/revision/pollen/3257 Log: set version 1.3 (replace @since 1.2.6 and update migration model version) Added: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3.java Removed: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2_6.java Modified: branches/pollen-1.2.6-struts2/pollen-domain/src/main/java/org/chorem/poll/domain/ImportExportService.java branches/pollen-1.2.6-struts2/pollen-domain/src/main/java/org/chorem/poll/domain/PollenDomainFunctions.java branches/pollen-1.2.6-struts2/pollen-domain/src/main/java/org/chorem/poll/domain/VoteCountingService.java branches/pollen-1.2.6-struts2/pollen-domain/src/main/java/org/chorem/poll/domain/poll/I18nAble.java branches/pollen-1.2.6-struts2/pollen-domain/src/main/java/org/chorem/poll/domain/strategy/VoteCountingStrategy.java branches/pollen-1.2.6-struts2/pollen-domain/src/test/java/org/chorem/poll/domain/ImportExportServiceTest.java branches/pollen-1.2.6-struts2/pollen-domain/src/test/java/org/chorem/poll/domain/VoteCountingServiceTest.java branches/pollen-1.2.6-struts2/pollen-domain/src/test/java/org/chorem/poll/domain/strategy/CondorcetVoteCountingStrategyTest.java branches/pollen-1.2.6-struts2/pollen-domain/src/test/java/org/chorem/poll/domain/strategy/NumberVoteCountingStrategyTest.java branches/pollen-1.2.6-struts2/pollen-domain/src/test/java/org/chorem/poll/domain/strategy/PercentageVoteCountingStrategyTest.java branches/pollen-1.2.6-struts2/pollen-domain/src/test/java/org/chorem/poll/domain/strategy/StandardVoteCountingStrategyTest.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PolleIOUtil.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenFunctions.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTechnicalException.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTopiaRootContextFactory.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallback.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_1.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/xmi/pollen.properties branches/pollen-1.2.6-struts2/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/AbstractDAOTest.java branches/pollen-1.2.6-struts2/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollAccountDAOTest.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/PollDateChoice.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/PollImageChoice.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/PollResult.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/PollUri.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenNotifierWorker.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenService.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFactory.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFunctions.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListAlreadyExistException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotFoundException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotOwnedByUserException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantAlreadyFoundInListException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantExistWithoutMailException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundInListException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAccountNotFound.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyClosedException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyExistException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollChoiceNotFoundException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollCommentNotFound.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollNotFoundException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollVoteNotFoundException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UnauthorizedPollAccessException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserEmailAlreadyUsedException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserInvalidPasswordException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserLoginAlreadyUsedException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserNotFoundException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteDoubloonException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotAllowedException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotFoundException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollFeedService.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollResultsService.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PreventRuleService.java branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/EmailServiceTest.java branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/PollServiceTest.java branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/VoteServiceTest.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationContext.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTopiaTransactionFilter.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/Confirm.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/DeleteUser.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GenerateChart.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GetPollImageChoice.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteList.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccount.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccounts.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteLists.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPollComments.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractDisplayChoice.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollUriIdAction.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AddChoice.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AddComment.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ClosePoll.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteChoice.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteComment.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteVote.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmPollAction.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatedList.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteChoice.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteComment.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeletePoll.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteVote.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayDateChoice.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayImageChoice.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPersonToList.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayTextChoice.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayVotingList.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/EditVote.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ExportPoll.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/GetPollFeed.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ImportPersonListToVotingList.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ParticipatedList.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SelectPersonListToVotingList.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Confirm.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeleteFavoriteList.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeletePollAccount.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Logout.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteList.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Show.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenFileUploadInterceptor.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/common/I18nAble.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ImportExportService.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/VoteCountingService.java Modified: branches/pollen-1.2.6-struts2/pollen-domain/src/main/java/org/chorem/poll/domain/ImportExportService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-domain/src/main/java/org/chorem/poll/domain/ImportExportService.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-domain/src/main/java/org/chorem/poll/domain/ImportExportService.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -53,7 +53,7 @@ * Service to import / export a poll to or from his xml representation. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class ImportExportService { Modified: branches/pollen-1.2.6-struts2/pollen-domain/src/main/java/org/chorem/poll/domain/PollenDomainFunctions.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-domain/src/main/java/org/chorem/poll/domain/PollenDomainFunctions.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-domain/src/main/java/org/chorem/poll/domain/PollenDomainFunctions.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -4,7 +4,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollenDomainFunctions { Modified: branches/pollen-1.2.6-struts2/pollen-domain/src/main/java/org/chorem/poll/domain/VoteCountingService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-domain/src/main/java/org/chorem/poll/domain/VoteCountingService.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-domain/src/main/java/org/chorem/poll/domain/VoteCountingService.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -49,7 +49,7 @@ * Service qui permet le dépouillement d'un sondage. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class VoteCountingService { Modified: branches/pollen-1.2.6-struts2/pollen-domain/src/main/java/org/chorem/poll/domain/poll/I18nAble.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-domain/src/main/java/org/chorem/poll/domain/poll/I18nAble.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-domain/src/main/java/org/chorem/poll/domain/poll/I18nAble.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ * Contract to expose a i18n key. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public interface I18nAble { Modified: branches/pollen-1.2.6-struts2/pollen-domain/src/main/java/org/chorem/poll/domain/strategy/VoteCountingStrategy.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-domain/src/main/java/org/chorem/poll/domain/strategy/VoteCountingStrategy.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-domain/src/main/java/org/chorem/poll/domain/strategy/VoteCountingStrategy.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -9,7 +9,7 @@ * Contract of a strategy of a vote countig. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public interface VoteCountingStrategy { Modified: branches/pollen-1.2.6-struts2/pollen-domain/src/test/java/org/chorem/poll/domain/ImportExportServiceTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-domain/src/test/java/org/chorem/poll/domain/ImportExportServiceTest.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-domain/src/test/java/org/chorem/poll/domain/ImportExportServiceTest.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -6,7 +6,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class ImportExportServiceTest { Modified: branches/pollen-1.2.6-struts2/pollen-domain/src/test/java/org/chorem/poll/domain/VoteCountingServiceTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-domain/src/test/java/org/chorem/poll/domain/VoteCountingServiceTest.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-domain/src/test/java/org/chorem/poll/domain/VoteCountingServiceTest.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -6,7 +6,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class VoteCountingServiceTest { @Test Modified: branches/pollen-1.2.6-struts2/pollen-domain/src/test/java/org/chorem/poll/domain/strategy/CondorcetVoteCountingStrategyTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-domain/src/test/java/org/chorem/poll/domain/strategy/CondorcetVoteCountingStrategyTest.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-domain/src/test/java/org/chorem/poll/domain/strategy/CondorcetVoteCountingStrategyTest.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -6,7 +6,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class CondorcetVoteCountingStrategyTest { Modified: branches/pollen-1.2.6-struts2/pollen-domain/src/test/java/org/chorem/poll/domain/strategy/NumberVoteCountingStrategyTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-domain/src/test/java/org/chorem/poll/domain/strategy/NumberVoteCountingStrategyTest.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-domain/src/test/java/org/chorem/poll/domain/strategy/NumberVoteCountingStrategyTest.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -6,7 +6,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class NumberVoteCountingStrategyTest { Modified: branches/pollen-1.2.6-struts2/pollen-domain/src/test/java/org/chorem/poll/domain/strategy/PercentageVoteCountingStrategyTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-domain/src/test/java/org/chorem/poll/domain/strategy/PercentageVoteCountingStrategyTest.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-domain/src/test/java/org/chorem/poll/domain/strategy/PercentageVoteCountingStrategyTest.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -6,7 +6,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PercentageVoteCountingStrategyTest { Modified: branches/pollen-1.2.6-struts2/pollen-domain/src/test/java/org/chorem/poll/domain/strategy/StandardVoteCountingStrategyTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-domain/src/test/java/org/chorem/poll/domain/strategy/StandardVoteCountingStrategyTest.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-domain/src/test/java/org/chorem/poll/domain/strategy/StandardVoteCountingStrategyTest.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -6,7 +6,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class StandardVoteCountingStrategyTest { Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PolleIOUtil.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PolleIOUtil.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PolleIOUtil.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -32,7 +32,7 @@ * Some utils IO methods. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PolleIOUtil { Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -46,7 +46,7 @@ * Pollen configuration. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollenConfiguration { Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -36,7 +36,7 @@ * All Pollen configuration options. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public enum PollenConfigurationOption implements ApplicationConfig.OptionDef { Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenFunctions.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenFunctions.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenFunctions.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -48,7 +48,7 @@ * Usefull pollen functions. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollenFunctions { Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTechnicalException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTechnicalException.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTechnicalException.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -25,7 +25,7 @@ /** * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollenTechnicalException extends RuntimeException { Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTopiaRootContextFactory.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTopiaRootContextFactory.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTopiaRootContextFactory.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -41,7 +41,7 @@ /** * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollenTopiaRootContextFactory { Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallback.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallback.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallback.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -34,7 +34,7 @@ * Pollen Migration callback. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollenMigrationCallback extends TopiaMigrationCallbackByClass { @@ -42,11 +42,11 @@ public static final Version V_1_2 = VersionUtil.valueOf("1.2"); - public static final Version V_1_2_6 = VersionUtil.valueOf("1.2.6"); + public static final Version V_1_3 = VersionUtil.valueOf("1.3"); /** Les versions de mise à jour disponibles. */ public static final Version[] AVAILABLE_VERSIONS = new Version[]{ - V_1_1, V_1_2, V_1_2_6 + V_1_1, V_1_2, V_1_3 }; public PollenMigrationCallback() { Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_1.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_1.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_1.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -37,7 +37,7 @@ * Migration for version {@code 1.1}. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollenMigrationCallbackV1_1 extends TopiaMigrationCallbackByClass.MigrationCallBackForVersion { Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -37,7 +37,7 @@ * Migration for version {@code 1.2}. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollenMigrationCallbackV1_2 extends TopiaMigrationCallbackByClass.MigrationCallBackForVersion { Deleted: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2_6.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2_6.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2_6.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -1,314 +0,0 @@ -/* - * #%L - * Pollen :: Persistence - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 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 - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.pollen.entities.migration; - -import com.google.common.base.Function; -import com.google.common.collect.Maps; -import org.apache.commons.lang3.tuple.Pair; -import org.chorem.pollen.PollenTechnicalException; -import org.chorem.pollen.common.ChoiceType; -import org.chorem.pollen.common.PollType; -import org.chorem.pollen.common.VoteCountingType; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.framework.TopiaContextImplementor; -import org.nuiton.topia.framework.TopiaSQLQuery; -import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.List; -import java.util.Map; - -/** - * Migration for version {@code 1.2.6}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 - */ -public class PollenMigrationCallbackV1_2_6 extends TopiaMigrationCallbackByClass.MigrationCallBackForVersion { - - public PollenMigrationCallbackV1_2_6(TopiaMigrationCallbackByClass callBack) { - super(PollenMigrationCallback.V_1_2_6, callBack); - } - - @Override - protected void prepareMigrationScript(TopiaContextImplementor tx, - List<String> queries, - boolean showSql, - boolean showProgression) throws TopiaException { - -// Dialect dialect = -// Dialect.getDialect(tx.getHibernateConfiguration().getProperties()); -// -// if (dialect instanceof PostgreSQLDialect) { -// -// } else if (dialect instanceof H2Dialect) { -// } - - // change choice type to use enumeration - migrateChoiceTypes(tx, queries); - - // change poll type to use enumeration - migratePollTypes(tx, queries); - - // change vote counting type to use enumeration - migrateVoteCountingTypes(tx, queries); - - // change all Boolean properties to boolean - migrateToPrimitiveTypes(queries); - - // add foreign key indexes - addForeignKeyIndexes(queries); - - // add author column for Comment - addCommentAuthorColumn(queries); - } - - private void addCommentAuthorColumn(List<String> queries) { - - queries.add("ALTER TABLE comment ADD COLUMN author VARCHAR(255);"); - - queries.add("UPDATE comment c SET c.author = (SELECT p.votingId FROM pollAccount p WHERE c.pollAccount = p.topiaId);"); - - queries.add("ALTER TABLE comment ALTER COLUMN author VARCHAR(255) NOT NULL;"); - } - - private void addForeignKeyIndexes(List<String> queries) { - - queries.add("CREATE INDEX idx_PollAccount_pollsCreated ON poll(creator);"); - queries.add("CREATE INDEX idx_PollAccount_comment ON comment(pollAccount);"); - queries.add("CREATE INDEX idx_PollAccount_vote ON vote(pollAccount);"); - queries.add("CREATE INDEX idx_Poll_vote ON vote(poll);"); - queries.add("CREATE INDEX idx_Poll_choice ON choice(poll);"); - queries.add("CREATE INDEX idx_Poll_result ON result(poll);"); - queries.add("CREATE INDEX idx_Poll_comment ON comment(poll);"); - queries.add("CREATE INDEX idx_Poll_preventRule ON preventRule(poll);"); - queries.add("CREATE INDEX idx_Poll_votingList ON votingList(poll);"); - queries.add("CREATE INDEX idx_UserAccount_favoriteList ON personList(owner);"); - queries.add("CREATE INDEX idx_UserAccount_pollAccount ON pollAccount(userAccount);"); - queries.add("CREATE INDEX idx_PersonList_pollAccount ON pollAccount(personList);"); - } - - private void migrateToPrimitiveTypes(List<String> queries) throws TopiaException { - - migrateBoolean(queries, "useraccount", "administrator"); - migrateBoolean(queries, "choice", "validate"); - migrateBoolean(queries, "personToList", "hasVoted"); - migrateBoolean(queries, "poll", "closed"); - migrateBoolean(queries, "poll", "choiceAddAllowed"); - migrateBoolean(queries, "poll", "anonymousVoteAllowed"); - migrateBoolean(queries, "poll", "anonymous"); - migrateBoolean(queries, "poll", "publicResults"); - migrateBoolean(queries, "poll", "continuousResults"); - migrateBoolean(queries, "preventRule", "repeated"); - migrateBoolean(queries, "preventRule", "active"); - migrateBoolean(queries, "preventRule", "oneTime"); - migrateBoolean(queries, "result", "byGroup"); - migrateBoolean(queries, "vote", "anonymous"); - - migrateNumber(queries, "poll", "maxChoiceNb"); - migrateNumber(queries, "preventRule", "sensibility"); - - migrateNumber(queries, "PersonToList", "weight"); - migrateNumber(queries, "VotingList", "weight"); - migrateNumber(queries, "Vote", "weight"); - } - - public static final String UPDATE_PRIMITIVE_TO_DEFAULT_VALUE = "UPDATE %1$s SET %2$s = %3$s where %2$s IS NULL;"; - - public static final String ADD_PRIMITIVE_NOT_NULL_CONSTRAINST = "ALTER TABLE %s ALTER COLUMN %s SET NOT NULL;"; - - public static final String ADD_PRIMITIVE_DEFAULT_VALUE = "ALTER TABLE %s ALTER COLUMN %s SET DEFAULT %s;"; - - private void migrateBoolean(List<String> queries, String tableName, String field) { - - Object defaultValue = false; - queries.add(String.format(UPDATE_PRIMITIVE_TO_DEFAULT_VALUE, tableName, field, defaultValue)); - queries.add(String.format(ADD_PRIMITIVE_NOT_NULL_CONSTRAINST, tableName, field)); - queries.add(String.format(ADD_PRIMITIVE_DEFAULT_VALUE, tableName, field, defaultValue)); - - } - - private void migrateNumber(List<String> queries, String tableName, String field) { - - Object defaultValue = 0; - queries.add(String.format(UPDATE_PRIMITIVE_TO_DEFAULT_VALUE, tableName, field, defaultValue)); - queries.add(String.format(ADD_PRIMITIVE_NOT_NULL_CONSTRAINST, tableName, field)); - queries.add(String.format(ADD_PRIMITIVE_DEFAULT_VALUE, tableName, field, defaultValue)); - } - - private void migrateChoiceTypes(TopiaContextImplementor tx, - List<String> queries) throws TopiaException { - - // build the new mapping between old choice type id associated to new choicetype enum ordinal - Map<String, Integer> mapping = getMapping(tx, "choicetype", ChoiceType.values()); - - replaceColumn(tx, - "poll", - "fk3497bf5b0b3601", - "choicetype", - "choicetype", - mapping, - queries); - - // drop choicetype table - queries.add("DROP TABLE choicetype;"); - } - - private void migratePollTypes(TopiaContextImplementor tx, - List<String> queries) throws TopiaException { - - // build the new mapping between old choice type id associated to new choicetype enum ordinal - Map<String, Integer> mapping = getMapping(tx, "polltype", PollType.values()); - - replaceColumn(tx, - "poll", - "fk3497bf978bfd", - "polltype", - "polltype", - mapping, - queries); - - // drop pollType table - queries.add("DROP TABLE polltype;"); - } - - private void migrateVoteCountingTypes(TopiaContextImplementor tx, - List<String> queries) throws TopiaException { - - // build the new mapping between old id associated to new enum ordinal - Map<String, Integer> mapping = getMapping(tx, "votecounting", VoteCountingType.values()); - - replaceColumn(tx, - "poll", - "fk3497bf7d358045", - "votecounting", - "votecountingtype", - mapping, - queries); - - replaceColumn(tx, - "result", - "fkc84dc81d7d358045", - "votecounting", - "votecountingtype", - mapping, - queries); - - // drop votecounting table - queries.add("DROP TABLE votecounting;"); - } - - private <E extends Enum<E>> Map<String, Integer> getMapping(TopiaContextImplementor tx, String tableName, E... enums) throws TopiaException { - - List<Pair<String, String>> entitiesFromDb = - new TopiaIdSQLQueryToPair("select topiaId, name from " + tableName).findMultipleResult(tx); - - Map<String, Pair<String, String>> entityByTopiaIdAndName = - Maps.uniqueIndex(entitiesFromDb, PAIR_TO_VALUE); - - // build the new mapping between old id associated to new enum ordinal - Map<String, Integer> result = Maps.newHashMap(); - - for (Enum choiceType : enums) { - - // find it in existing mapping - String name = choiceType.name(); - Pair<String, String> choiceTypePair = entityByTopiaIdAndName.get(name); - if (choiceTypePair == null) { - - // this can not happen - throw new PollenTechnicalException( - "Could not find in db to migrate choicetype with name " + name); - } - - String id = choiceTypePair.getKey(); - result.put(id, choiceType.ordinal()); - } - return result; - } - - private void replaceColumn(TopiaContextImplementor tx, - String tableName, String fk, - String oldColumn, - String newColum, - Map<String, Integer> mapping, - List<String> queries) throws TopiaException { - - List<Pair<String, String>> rowsToReplace = - new TopiaIdSQLQueryToPair("select topiaId, " + oldColumn + " from " + tableName).findMultipleResult(tx); - - queries.add("ALTER TABLE " + tableName + " DROP CONSTRAINT " + fk + ";"); - queries.add("ALTER TABLE " + tableName + " DROP COLUMN " + oldColumn + ";"); - queries.add("ALTER TABLE " + tableName + " ADD COLUMN " + newColum + " INT NOT NULL DEFAULT 0;"); - queries.add("ALTER TABLE " + tableName + " ALTER COLUMN " + newColum + " DROP NOT NULL;"); - - String updateRequest = "update " + tableName + " set " + newColum + " = %s where topiaid = '%s';"; - for (Pair<String, String> pollByChoice : rowsToReplace) { - - String tableRowId = pollByChoice.getKey(); - String typeId = pollByChoice.getValue(); - - Integer ordinalValue = mapping.get(typeId); - if (ordinalValue == null) { - - // use a 0 value - ordinalValue = 0; - } - String query = String.format(updateRequest, ordinalValue, tableRowId); - queries.add(query); - } - } - - private static class TopiaIdSQLQueryToPair extends TopiaSQLQuery<Pair<String, String>> { - - protected final String request; - - private TopiaIdSQLQueryToPair(String request) { - this.request = request; - } - - @Override - protected PreparedStatement prepareQuery(Connection connection) throws SQLException { - PreparedStatement prepareStatement = connection.prepareStatement(request); - return prepareStatement; - } - - @Override - protected Pair<String, String> prepareResult(ResultSet set) throws SQLException { - Pair<String, String> result = Pair.of(set.getString(1), set.getString(2)); - return result; - } - } - - public static final Function<Pair<String, String>, String> PAIR_TO_VALUE = new Function<Pair<String, String>, String>() { - @Override - public String apply(Pair<String, String> input) { - return input.getValue(); - } - }; - -} Copied: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3.java (from rev 3256, branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2_6.java) =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -0,0 +1,314 @@ +/* + * #%L + * Pollen :: Persistence + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 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 + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.entities.migration; + +import com.google.common.base.Function; +import com.google.common.collect.Maps; +import org.apache.commons.lang3.tuple.Pair; +import org.chorem.pollen.PollenTechnicalException; +import org.chorem.pollen.common.ChoiceType; +import org.chorem.pollen.common.PollType; +import org.chorem.pollen.common.VoteCountingType; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.framework.TopiaSQLQuery; +import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.List; +import java.util.Map; + +/** + * Migration for version {@code 1.2.6}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.3 + */ +public class PollenMigrationCallbackV1_3 extends TopiaMigrationCallbackByClass.MigrationCallBackForVersion { + + public PollenMigrationCallbackV1_3(TopiaMigrationCallbackByClass callBack) { + super(PollenMigrationCallback.V_1_3, callBack); + } + + @Override + protected void prepareMigrationScript(TopiaContextImplementor tx, + List<String> queries, + boolean showSql, + boolean showProgression) throws TopiaException { + +// Dialect dialect = +// Dialect.getDialect(tx.getHibernateConfiguration().getProperties()); +// +// if (dialect instanceof PostgreSQLDialect) { +// +// } else if (dialect instanceof H2Dialect) { +// } + + // change choice type to use enumeration + migrateChoiceTypes(tx, queries); + + // change poll type to use enumeration + migratePollTypes(tx, queries); + + // change vote counting type to use enumeration + migrateVoteCountingTypes(tx, queries); + + // change all Boolean properties to boolean + migrateToPrimitiveTypes(queries); + + // add foreign key indexes + addForeignKeyIndexes(queries); + + // add author column for Comment + addCommentAuthorColumn(queries); + } + + private void addCommentAuthorColumn(List<String> queries) { + + queries.add("ALTER TABLE comment ADD COLUMN author VARCHAR(255);"); + + queries.add("UPDATE comment c SET c.author = (SELECT p.votingId FROM pollAccount p WHERE c.pollAccount = p.topiaId);"); + + queries.add("ALTER TABLE comment ALTER COLUMN author VARCHAR(255) NOT NULL;"); + } + + private void addForeignKeyIndexes(List<String> queries) { + + queries.add("CREATE INDEX idx_PollAccount_pollsCreated ON poll(creator);"); + queries.add("CREATE INDEX idx_PollAccount_comment ON comment(pollAccount);"); + queries.add("CREATE INDEX idx_PollAccount_vote ON vote(pollAccount);"); + queries.add("CREATE INDEX idx_Poll_vote ON vote(poll);"); + queries.add("CREATE INDEX idx_Poll_choice ON choice(poll);"); + queries.add("CREATE INDEX idx_Poll_result ON result(poll);"); + queries.add("CREATE INDEX idx_Poll_comment ON comment(poll);"); + queries.add("CREATE INDEX idx_Poll_preventRule ON preventRule(poll);"); + queries.add("CREATE INDEX idx_Poll_votingList ON votingList(poll);"); + queries.add("CREATE INDEX idx_UserAccount_favoriteList ON personList(owner);"); + queries.add("CREATE INDEX idx_UserAccount_pollAccount ON pollAccount(userAccount);"); + queries.add("CREATE INDEX idx_PersonList_pollAccount ON pollAccount(personList);"); + } + + private void migrateToPrimitiveTypes(List<String> queries) throws TopiaException { + + migrateBoolean(queries, "useraccount", "administrator"); + migrateBoolean(queries, "choice", "validate"); + migrateBoolean(queries, "personToList", "hasVoted"); + migrateBoolean(queries, "poll", "closed"); + migrateBoolean(queries, "poll", "choiceAddAllowed"); + migrateBoolean(queries, "poll", "anonymousVoteAllowed"); + migrateBoolean(queries, "poll", "anonymous"); + migrateBoolean(queries, "poll", "publicResults"); + migrateBoolean(queries, "poll", "continuousResults"); + migrateBoolean(queries, "preventRule", "repeated"); + migrateBoolean(queries, "preventRule", "active"); + migrateBoolean(queries, "preventRule", "oneTime"); + migrateBoolean(queries, "result", "byGroup"); + migrateBoolean(queries, "vote", "anonymous"); + + migrateNumber(queries, "poll", "maxChoiceNb"); + migrateNumber(queries, "preventRule", "sensibility"); + + migrateNumber(queries, "PersonToList", "weight"); + migrateNumber(queries, "VotingList", "weight"); + migrateNumber(queries, "Vote", "weight"); + } + + public static final String UPDATE_PRIMITIVE_TO_DEFAULT_VALUE = "UPDATE %1$s SET %2$s = %3$s where %2$s IS NULL;"; + + public static final String ADD_PRIMITIVE_NOT_NULL_CONSTRAINST = "ALTER TABLE %s ALTER COLUMN %s SET NOT NULL;"; + + public static final String ADD_PRIMITIVE_DEFAULT_VALUE = "ALTER TABLE %s ALTER COLUMN %s SET DEFAULT %s;"; + + private void migrateBoolean(List<String> queries, String tableName, String field) { + + Object defaultValue = false; + queries.add(String.format(UPDATE_PRIMITIVE_TO_DEFAULT_VALUE, tableName, field, defaultValue)); + queries.add(String.format(ADD_PRIMITIVE_NOT_NULL_CONSTRAINST, tableName, field)); + queries.add(String.format(ADD_PRIMITIVE_DEFAULT_VALUE, tableName, field, defaultValue)); + + } + + private void migrateNumber(List<String> queries, String tableName, String field) { + + Object defaultValue = 0; + queries.add(String.format(UPDATE_PRIMITIVE_TO_DEFAULT_VALUE, tableName, field, defaultValue)); + queries.add(String.format(ADD_PRIMITIVE_NOT_NULL_CONSTRAINST, tableName, field)); + queries.add(String.format(ADD_PRIMITIVE_DEFAULT_VALUE, tableName, field, defaultValue)); + } + + private void migrateChoiceTypes(TopiaContextImplementor tx, + List<String> queries) throws TopiaException { + + // build the new mapping between old choice type id associated to new choicetype enum ordinal + Map<String, Integer> mapping = getMapping(tx, "choicetype", ChoiceType.values()); + + replaceColumn(tx, + "poll", + "fk3497bf5b0b3601", + "choicetype", + "choicetype", + mapping, + queries); + + // drop choicetype table + queries.add("DROP TABLE choicetype;"); + } + + private void migratePollTypes(TopiaContextImplementor tx, + List<String> queries) throws TopiaException { + + // build the new mapping between old choice type id associated to new choicetype enum ordinal + Map<String, Integer> mapping = getMapping(tx, "polltype", PollType.values()); + + replaceColumn(tx, + "poll", + "fk3497bf978bfd", + "polltype", + "polltype", + mapping, + queries); + + // drop pollType table + queries.add("DROP TABLE polltype;"); + } + + private void migrateVoteCountingTypes(TopiaContextImplementor tx, + List<String> queries) throws TopiaException { + + // build the new mapping between old id associated to new enum ordinal + Map<String, Integer> mapping = getMapping(tx, "votecounting", VoteCountingType.values()); + + replaceColumn(tx, + "poll", + "fk3497bf7d358045", + "votecounting", + "votecountingtype", + mapping, + queries); + + replaceColumn(tx, + "result", + "fkc84dc81d7d358045", + "votecounting", + "votecountingtype", + mapping, + queries); + + // drop votecounting table + queries.add("DROP TABLE votecounting;"); + } + + private <E extends Enum<E>> Map<String, Integer> getMapping(TopiaContextImplementor tx, String tableName, E... enums) throws TopiaException { + + List<Pair<String, String>> entitiesFromDb = + new TopiaIdSQLQueryToPair("select topiaId, name from " + tableName).findMultipleResult(tx); + + Map<String, Pair<String, String>> entityByTopiaIdAndName = + Maps.uniqueIndex(entitiesFromDb, PAIR_TO_VALUE); + + // build the new mapping between old id associated to new enum ordinal + Map<String, Integer> result = Maps.newHashMap(); + + for (Enum choiceType : enums) { + + // find it in existing mapping + String name = choiceType.name(); + Pair<String, String> choiceTypePair = entityByTopiaIdAndName.get(name); + if (choiceTypePair == null) { + + // this can not happen + throw new PollenTechnicalException( + "Could not find in db to migrate choicetype with name " + name); + } + + String id = choiceTypePair.getKey(); + result.put(id, choiceType.ordinal()); + } + return result; + } + + private void replaceColumn(TopiaContextImplementor tx, + String tableName, String fk, + String oldColumn, + String newColum, + Map<String, Integer> mapping, + List<String> queries) throws TopiaException { + + List<Pair<String, String>> rowsToReplace = + new TopiaIdSQLQueryToPair("select topiaId, " + oldColumn + " from " + tableName).findMultipleResult(tx); + + queries.add("ALTER TABLE " + tableName + " DROP CONSTRAINT " + fk + ";"); + queries.add("ALTER TABLE " + tableName + " DROP COLUMN " + oldColumn + ";"); + queries.add("ALTER TABLE " + tableName + " ADD COLUMN " + newColum + " INT NOT NULL DEFAULT 0;"); + queries.add("ALTER TABLE " + tableName + " ALTER COLUMN " + newColum + " DROP NOT NULL;"); + + String updateRequest = "update " + tableName + " set " + newColum + " = %s where topiaid = '%s';"; + for (Pair<String, String> pollByChoice : rowsToReplace) { + + String tableRowId = pollByChoice.getKey(); + String typeId = pollByChoice.getValue(); + + Integer ordinalValue = mapping.get(typeId); + if (ordinalValue == null) { + + // use a 0 value + ordinalValue = 0; + } + String query = String.format(updateRequest, ordinalValue, tableRowId); + queries.add(query); + } + } + + private static class TopiaIdSQLQueryToPair extends TopiaSQLQuery<Pair<String, String>> { + + protected final String request; + + private TopiaIdSQLQueryToPair(String request) { + this.request = request; + } + + @Override + protected PreparedStatement prepareQuery(Connection connection) throws SQLException { + PreparedStatement prepareStatement = connection.prepareStatement(request); + return prepareStatement; + } + + @Override + protected Pair<String, String> prepareResult(ResultSet set) throws SQLException { + Pair<String, String> result = Pair.of(set.getString(1), set.getString(2)); + return result; + } + } + + public static final Function<Pair<String, String>, String> PAIR_TO_VALUE = new Function<Pair<String, String>, String>() { + @Override + public String apply(Pair<String, String> input) { + return input.getValue(); + } + }; + +} Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/xmi/pollen.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/xmi/pollen.properties 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/xmi/pollen.properties 2012-04-13 11:28:02 UTC (rev 3257) @@ -25,6 +25,6 @@ #model.tagvalue.dbSchema=Pollen model.tagvalue.constantPrefix=PROPERTY_ model.tagvalue.java.lang.String=text -model.tagvalue.version=1.2.6 +model.tagvalue.version=1.3 model.tagvalue.doNotGenerateBooleanGetMethods=true model.tagvalue.indexForeignKeys=true Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/AbstractDAOTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/AbstractDAOTest.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/AbstractDAOTest.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -43,7 +43,7 @@ * Base test for daos. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class AbstractDAOTest { Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollAccountDAOTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollAccountDAOTest.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollAccountDAOTest.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -32,7 +32,7 @@ * Test the {@link PollAccountDAO}. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollAccountDAOTest extends AbstractDAOTest { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/PollDateChoice.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/PollDateChoice.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/PollDateChoice.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -33,7 +33,7 @@ * (during poll creation). * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollDateChoice extends ChoiceImpl { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/PollImageChoice.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/PollImageChoice.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/PollImageChoice.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -31,7 +31,7 @@ * (during poll creation). * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollImageChoice extends ChoiceImpl { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/PollResult.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/PollResult.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/PollResult.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -32,7 +32,7 @@ /** * Classe DTO représentant un résultat de sondage. * - * @since 1.2.6 + * @since 1.3 */ public class PollResult implements Serializable { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/PollUri.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/PollUri.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/PollUri.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -32,7 +32,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollUri implements Serializable { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -36,7 +36,7 @@ * Instances of this class will be given to service factory. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class DefaultPollenServiceContext implements PollenServiceContext { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenNotifierWorker.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenNotifierWorker.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenNotifierWorker.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -44,7 +44,7 @@ * store in {@link PreventRule}. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollenNotifierWorker implements Runnable, Closeable { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenService.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenService.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -30,7 +30,7 @@ * * @author tchemit <chemit(a)codelutin.com> * @see PollenServiceContext - * @since 1.2.6 + * @since 1.3 */ public interface PollenService { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -37,7 +37,7 @@ * {@link PollenServiceFactory#newService(Class, PollenServiceContext)} * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public interface PollenServiceContext { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFactory.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFactory.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFactory.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -31,7 +31,7 @@ * Factory of services. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollenServiceFactory { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFunctions.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFunctions.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFunctions.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -43,7 +43,7 @@ * Usefull functions for the service (and higher) layers. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollenServiceFunctions { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -39,7 +39,7 @@ /** * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollenServiceSupport implements PollenService { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListAlreadyExistException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListAlreadyExistException.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListAlreadyExistException.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class FavoriteListAlreadyExistException extends Exception { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotFoundException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotFoundException.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotFoundException.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class FavoriteListNotFoundException extends Exception { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotOwnedByUserException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotOwnedByUserException.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotOwnedByUserException.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class FavoriteListNotOwnedByUserException extends Exception { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantAlreadyFoundInListException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantAlreadyFoundInListException.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantAlreadyFoundInListException.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class ParticipantAlreadyFoundInListException extends Exception { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantExistWithoutMailException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantExistWithoutMailException.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantExistWithoutMailException.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class ParticipantExistWithoutMailException extends Exception { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundException.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundException.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class ParticipantNotFoundException extends Exception { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundInListException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundInListException.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundInListException.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class ParticipantNotFoundInListException extends Exception { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAccountNotFound.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAccountNotFound.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAccountNotFound.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollAccountNotFound extends Exception { private static final long serialVersionUID = 1L; Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyClosedException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyClosedException.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyClosedException.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollAlreadyClosedException extends Exception { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyExistException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyExistException.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyExistException.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollAlreadyExistException extends Exception { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollChoiceNotFoundException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollChoiceNotFoundException.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollChoiceNotFoundException.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ * When a poll choice not found. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollChoiceNotFoundException extends Exception { private static final long serialVersionUID = 1L; Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollCommentNotFound.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollCommentNotFound.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollCommentNotFound.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollCommentNotFound extends Exception { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollNotFoundException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollNotFoundException.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollNotFoundException.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollNotFoundException extends Exception { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollVoteNotFoundException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollVoteNotFoundException.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollVoteNotFoundException.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ * When a pooll vote not found. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollVoteNotFoundException extends Exception { private static final long serialVersionUID = 1L; Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UnauthorizedPollAccessException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UnauthorizedPollAccessException.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UnauthorizedPollAccessException.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class UnauthorizedPollAccessException extends Exception { private static final long serialVersionUID = 1L; Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserEmailAlreadyUsedException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserEmailAlreadyUsedException.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserEmailAlreadyUsedException.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class UserEmailAlreadyUsedException extends Exception { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserInvalidPasswordException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserInvalidPasswordException.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserInvalidPasswordException.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class UserInvalidPasswordException extends Exception { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserLoginAlreadyUsedException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserLoginAlreadyUsedException.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserLoginAlreadyUsedException.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class UserLoginAlreadyUsedException extends Exception { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserNotFoundException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserNotFoundException.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserNotFoundException.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class UserNotFoundException extends Exception { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteDoubloonException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteDoubloonException.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteDoubloonException.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class VoteDoubloonException extends Exception { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotAllowedException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotAllowedException.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotAllowedException.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class VoteNotAllowedException extends Exception { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotFoundException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotFoundException.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotFoundException.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ * When a vote is not found. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class VoteNotFoundException extends Exception { private static final long serialVersionUID = 1L; Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -43,7 +43,7 @@ * Manage comments on a poll. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollCommentService extends PollenServiceSupport { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollFeedService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollFeedService.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollFeedService.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -56,7 +56,7 @@ * Service to manage feed of a poll. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollFeedService extends PollenServiceSupport { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollResultsService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollResultsService.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollResultsService.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -65,7 +65,7 @@ * Deals with poll results. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollResultsService extends PollenServiceSupport { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PreventRuleService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PreventRuleService.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PreventRuleService.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -37,7 +37,7 @@ * Manage prevent rules of a poll. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PreventRuleService extends PollenServiceSupport { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/EmailServiceTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/EmailServiceTest.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/EmailServiceTest.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -31,7 +31,7 @@ * Test {@link EmailService}. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class EmailServiceTest extends AbstractPollenServiceTest { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -34,7 +34,7 @@ * Tests the {@link FavoriteService}. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ @Ignore public class FavoriteServiceTest extends AbstractPollenServiceTest { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/PollServiceTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/PollServiceTest.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/PollServiceTest.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -33,7 +33,7 @@ * Tests the {@link PollService}. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ @Ignore public class PollServiceTest extends AbstractPollenServiceTest { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -32,7 +32,7 @@ * Tests the {@link UserService}. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ @Ignore public class UserServiceTest extends AbstractPollenServiceTest { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/VoteServiceTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/VoteServiceTest.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/VoteServiceTest.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -31,7 +31,7 @@ * Tests the {@link VoteService}. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class VoteServiceTest extends AbstractPollenServiceTest { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationContext.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationContext.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationContext.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -33,7 +33,7 @@ /** * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollenApplicationContext { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -56,7 +56,7 @@ * On stop, just release the application configuration. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollenApplicationListener implements ServletContextListener { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -38,7 +38,7 @@ * User session to put in servlet session. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollenSession { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTopiaTransactionFilter.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTopiaTransactionFilter.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTopiaTransactionFilter.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -39,7 +39,7 @@ * EchoBase implementation of the {@link TopiaTransactionFilter}. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollenTopiaTransactionFilter extends TopiaTransactionFilter { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -36,7 +36,7 @@ * Usefull ui methods. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollenUIUtils { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -59,7 +59,7 @@ * untranslated key. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollenActionSupport extends BaseAction implements TopiaTransactionAware { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/Confirm.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/Confirm.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/Confirm.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -34,7 +34,7 @@ * Action for confirmation * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class Confirm extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/DeleteUser.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/DeleteUser.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/DeleteUser.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -33,7 +33,7 @@ * Delete a selected user. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class DeleteUser extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ /** * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class ManagePolls extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -33,7 +33,7 @@ /** * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class ManageUsers extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GenerateChart.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GenerateChart.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GenerateChart.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -46,7 +46,7 @@ * Action to generate a chart given the values (and optional subtitles). * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class GenerateChart extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GetPollImageChoice.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GetPollImageChoice.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GetPollImageChoice.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -36,7 +36,7 @@ * Obtain the image choice of a given choice of an image-like poll. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class GetPollImageChoice extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -33,7 +33,7 @@ * Abstract JSON action with pagination support. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public abstract class AbstractJSONPaginedAction extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -37,7 +37,7 @@ * Obtain created polls to put in grid for the connected user. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class GetCreatedPolls extends AbstractJSONPaginedAction { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteList.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteList.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteList.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -34,7 +34,7 @@ * Get given favorite list. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class GetFavoriteList extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccount.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccount.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccount.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -35,7 +35,7 @@ * Get pagined list of poll accounts of a given favorite list. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class GetFavoriteListPollAccount extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccounts.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccounts.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccounts.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -36,7 +36,7 @@ * Get pagined list of poll accounts of a given favorite list. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class GetFavoriteListPollAccounts extends AbstractJSONPaginedAction { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteLists.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteLists.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteLists.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -34,7 +34,7 @@ * Get pagined list of favorite lists of the connected user. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class GetFavoriteLists extends AbstractJSONPaginedAction { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -40,7 +40,7 @@ * Obtain invited polls to put in grid for the connected user. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class GetInvitedPolls extends AbstractJSONPaginedAction { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -37,7 +37,7 @@ * Obtain participated polls to put in grid for the connected user. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class GetParticipatedPolls extends AbstractJSONPaginedAction { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPollComments.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPollComments.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPollComments.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -40,7 +40,7 @@ * Get paginated list of poll comments. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class GetPollComments extends AbstractJSONPaginedAction { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -37,7 +37,7 @@ * Obtain paginated users. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class GetPolls extends AbstractJSONPaginedAction { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -35,7 +35,7 @@ * Get user datas. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class GetUser extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -37,7 +37,7 @@ * Obtain paginated users. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class GetUsers extends AbstractJSONPaginedAction { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractDisplayChoice.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractDisplayChoice.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractDisplayChoice.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -34,7 +34,7 @@ * To generate the display for a text choice. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public abstract class AbstractDisplayChoice extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollUriIdAction.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollUriIdAction.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollUriIdAction.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -34,7 +34,7 @@ * * @author tchemit <chemit(a)codelutin.com> * @author fdesbois <fdesbois(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public abstract class AbstractPollUriIdAction extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -57,7 +57,7 @@ * * @author tchemit <chemit(a)codelutin.com> * @author fdesbois <fdesbois(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public abstract class AbstractVoteAction extends AbstractPollUriIdAction implements ParameterAware { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AddChoice.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AddChoice.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AddChoice.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -42,7 +42,7 @@ * To add a poll comment. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class AddChoice extends AbstractVoteAction implements Preparable, FileUploadAware { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AddComment.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AddComment.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AddComment.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -32,7 +32,7 @@ * To add a poll comment. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class AddComment extends AbstractVoteAction implements Preparable { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ClosePoll.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ClosePoll.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ClosePoll.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -29,7 +29,7 @@ * Closes an existing poll. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class ClosePoll extends AbstractPollUriIdAction { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteChoice.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteChoice.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteChoice.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -32,7 +32,7 @@ * To confirm delete of a poll choice. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class ConfirmDeleteChoice extends AbstractPollUriIdAction { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteComment.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteComment.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteComment.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -32,7 +32,7 @@ * To confirm a comment delete. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class ConfirmDeleteComment extends AbstractPollUriIdAction { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteVote.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteVote.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteVote.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -32,7 +32,7 @@ * To confirm delete of a poll vote * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class ConfirmDeleteVote extends AbstractPollUriIdAction { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmPollAction.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmPollAction.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmPollAction.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -31,7 +31,7 @@ * To confirm a poll action (such as delete or close). * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class ConfirmPollAction extends AbstractPollUriIdAction { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatedList.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatedList.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatedList.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -29,7 +29,7 @@ * Display list of created polls. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class CreatedList extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteChoice.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteChoice.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteChoice.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -30,7 +30,7 @@ * To delete a poll choice * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class DeleteChoice extends AbstractPollUriIdAction { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteComment.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteComment.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteComment.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -33,7 +33,7 @@ * To delete a poll comment. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class DeleteComment extends AbstractVoteAction { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeletePoll.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeletePoll.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeletePoll.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -29,7 +29,7 @@ * Deletes an existing poll. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class DeletePoll extends AbstractPollUriIdAction { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteVote.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteVote.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteVote.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -30,7 +30,7 @@ * To delete a poll vote. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class DeleteVote extends AbstractPollUriIdAction { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayDateChoice.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayDateChoice.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayDateChoice.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -29,7 +29,7 @@ * To generate the display for a date choice. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class DisplayDateChoice extends AbstractDisplayChoice { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayImageChoice.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayImageChoice.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayImageChoice.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -30,7 +30,7 @@ * To generate the display for a image choice. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class DisplayImageChoice extends AbstractDisplayChoice { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPersonToList.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPersonToList.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPersonToList.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -33,7 +33,7 @@ * To display a personToList (use at a poll creation). * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class DisplayPersonToList extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayTextChoice.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayTextChoice.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayTextChoice.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -30,7 +30,7 @@ * To generate the display for a text choice. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class DisplayTextChoice extends AbstractDisplayChoice { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayVotingList.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayVotingList.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayVotingList.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -33,7 +33,7 @@ * To display a voting list of a poll (use at a poll creation). * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class DisplayVotingList extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/EditVote.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/EditVote.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/EditVote.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -28,7 +28,7 @@ * uri with {@code accountId} and {@code pollId}. * * @author fdesbois <fdesbois(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class EditVote extends AbstractPollUriIdAction { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ExportPoll.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ExportPoll.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ExportPoll.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -33,7 +33,7 @@ * Exports an existing poll. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class ExportPoll extends AbstractPollUriIdAction { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/GetPollFeed.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/GetPollFeed.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/GetPollFeed.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -38,7 +38,7 @@ * Obtain the feed of a given poll. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class GetPollFeed extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ImportPersonListToVotingList.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ImportPersonListToVotingList.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ImportPersonListToVotingList.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -37,7 +37,7 @@ * Load in session a personToList to import into a votingList. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class ImportPersonListToVotingList extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ParticipatedList.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ParticipatedList.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ParticipatedList.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -29,7 +29,7 @@ * Display list of participated polls. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class ParticipatedList extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -57,7 +57,7 @@ * Display results of a poll. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class ResultForPoll extends AbstractPollUriIdAction { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -69,7 +69,7 @@ * Creates a new poll. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class SavePoll extends AbstractPollForm implements Preparable, ParameterAware, FileUploadAware { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SelectPersonListToVotingList.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SelectPersonListToVotingList.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SelectPersonListToVotingList.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -37,7 +37,7 @@ * Select a person list to add into an existing voting list. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class SelectPersonListToVotingList extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -40,7 +40,7 @@ * * @author tchemit <chemit(a)codelutin.com> * @author fdesbois <fdesbois(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class VoteForPoll extends AbstractVoteAction implements Preparable { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Confirm.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Confirm.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Confirm.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -33,7 +33,7 @@ * Action for confirmation * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class Confirm extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeleteFavoriteList.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeleteFavoriteList.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeleteFavoriteList.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -33,7 +33,7 @@ * Delete a selected favorite list for the connected user. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class DeleteFavoriteList extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeletePollAccount.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeletePollAccount.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeletePollAccount.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -33,7 +33,7 @@ * Delete a selected favorite list for the connected user. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class DeletePollAccount extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -33,7 +33,7 @@ * Update a user. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class Edit extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -34,7 +34,7 @@ * Login user to pollen. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class Login extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Logout.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Logout.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Logout.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -29,7 +29,7 @@ * Logout from pollen. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class Logout extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteList.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteList.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteList.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -40,7 +40,7 @@ * Manage a selected favorite lists of a connected user. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class ManageFavoriteList extends PollenActionSupport implements Preparable, ParameterAware { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -35,7 +35,7 @@ * Manage favorite lists of a connected user. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class ManageFavoriteLists extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -33,7 +33,7 @@ * Register a new user. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class Register extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Show.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Show.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Show.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -30,7 +30,7 @@ * Show user account. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class Show extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenFileUploadInterceptor.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenFileUploadInterceptor.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenFileUploadInterceptor.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -54,7 +54,7 @@ * TODO tchemit 2012-03-05 submit a patch to struts guys to avoid this fork. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollenFileUploadInterceptor extends FileUploadInterceptor { private static final long serialVersionUID = 1L; Modified: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/common/I18nAble.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/common/I18nAble.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/common/I18nAble.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ * Contract to expose a i18n key. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public interface I18nAble { Modified: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ImportExportService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ImportExportService.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ImportExportService.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -54,7 +54,7 @@ * Service to import / export a poll to or from his xml representation. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class ImportExportService { Modified: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/VoteCountingService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/VoteCountingService.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/VoteCountingService.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -49,7 +49,7 @@ * Service qui permet le dépouillement d'un sondage. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class VoteCountingService {

1 0

r3256 - in branches/pollen-1.2.6-struts2: . pollen-persistence pollen-services pollen-ui-struts2 pollen-votecounting
by fdesbois＠users.chorem.org April 13, 2012

April 13, 2012

Author: fdesbois Date: 2012-04-13 13:07:28 +0200 (Fri, 13 Apr 2012) New Revision: 3256 Url: http://chorem.org/repositories/revision/pollen/3256 Log: set to version 1.3 Modified: branches/pollen-1.2.6-struts2/pollen-persistence/pom.xml branches/pollen-1.2.6-struts2/pollen-services/pom.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/pom.xml branches/pollen-1.2.6-struts2/pollen-votecounting/pom.xml branches/pollen-1.2.6-struts2/pom.xml Modified: branches/pollen-1.2.6-struts2/pollen-persistence/pom.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/pom.xml 2012-04-13 10:57:08 UTC (rev 3255) +++ branches/pollen-1.2.6-struts2/pollen-persistence/pom.xml 2012-04-13 11:07:28 UTC (rev 3256) @@ -12,7 +12,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.2.6-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: branches/pollen-1.2.6-struts2/pollen-services/pom.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/pom.xml 2012-04-13 10:57:08 UTC (rev 3255) +++ branches/pollen-1.2.6-struts2/pollen-services/pom.xml 2012-04-13 11:07:28 UTC (rev 3256) @@ -12,7 +12,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.2.6-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/pom.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/pom.xml 2012-04-13 10:57:08 UTC (rev 3255) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/pom.xml 2012-04-13 11:07:28 UTC (rev 3256) @@ -12,7 +12,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.2.6-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: branches/pollen-1.2.6-struts2/pollen-votecounting/pom.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/pom.xml 2012-04-13 10:57:08 UTC (rev 3255) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/pom.xml 2012-04-13 11:07:28 UTC (rev 3256) @@ -8,7 +8,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.2.6-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: branches/pollen-1.2.6-struts2/pom.xml =================================================================== --- branches/pollen-1.2.6-struts2/pom.xml 2012-04-13 10:57:08 UTC (rev 3255) +++ branches/pollen-1.2.6-struts2/pom.xml 2012-04-13 11:07:28 UTC (rev 3256) @@ -17,7 +17,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.2.6-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> <modules> <module>pollen-votecounting</module>

1 0

r3255 - in branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main: java/org/chorem/pollen/ui/actions java/org/chorem/pollen/ui/actions/admin java/org/chorem/pollen/ui/actions/poll resources/template resources/template/themes resources/template/themes/green resources/template/themes/green/images resources/template/themes/yellow resources/template/themes/yellow/images webapp/WEB-INF/decorators
by fdesbois＠users.chorem.org April 13, 2012

April 13, 2012

Author: fdesbois Date: 2012-04-13 12:57:08 +0200 (Fri, 13 Apr 2012) New Revision: 3255 Url: http://chorem.org/repositories/revision/pollen/3255 Log: add jquery-ui themes for green and yellow pages Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/README.txt branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_flat_0_aaaaaa_40x100.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_flat_75_b0f580_40x100.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_55_fbf9ee_1x400.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_65_368000_1x400.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_65_55cb00_1x400.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_75_4bb300_1x400.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_75_55cb00_1x400.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_75_b0f580_1x400.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_highlight-soft_75_55cb00_1x100.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_inset-soft_95_fef1ec_1x100.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_17990a_256x240.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_222222_256x240.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_227c24_256x240.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_454545_256x240.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_888888_256x240.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_cd0a0a_256x240.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/jquery-ui.css branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_flat_0_aaaaaa_40x100.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_flat_75_ffffaa_40x100.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_glass_55_fbf9ee_1x400.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_glass_65_ffcc00_1x400.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_glass_75_fff71f_1x400.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_glass_75_ffff0f_1x400.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_highlight-soft_75_ffff0f_1x100.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_inset-soft_95_fef1ec_1x100.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_222222_256x240.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_454545_256x240.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_cd0a0a_256x240.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_dcb104_256x240.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_ffcc00_256x240.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/jquery-ui.css Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ParticipatedList.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java 2012-04-13 08:16:54 UTC (rev 3254) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java 2012-04-13 10:57:08 UTC (rev 3255) @@ -64,7 +64,13 @@ public class PollenActionSupport extends BaseAction implements TopiaTransactionAware { private static final long serialVersionUID = 1L; + + protected static final String JQUERY_THEME_BLUE = "cupertino"; + protected static final String JQUERY_THEME_YELLOW = "yellow"; + + protected static final String JQUERY_THEME_GREEN = "green"; + private static DateFormat dateTimeFormat; private DateFormat dateFormat; @@ -122,6 +128,10 @@ URL url = getServiceContext().getApplicationURL(); return url; } + + public String getJqueryTheme() { + return JQUERY_THEME_BLUE; + } /** * Fabrique pour récupérer le ServiceContext tel qu'il devrait être fourni Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java 2012-04-13 08:16:54 UTC (rev 3254) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java 2012-04-13 10:57:08 UTC (rev 3255) @@ -32,4 +32,9 @@ public class ManagePolls extends PollenActionSupport { private static final long serialVersionUID = 1L; + + @Override + public String getJqueryTheme() { + return JQUERY_THEME_YELLOW; + } } Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java 2012-04-13 08:16:54 UTC (rev 3254) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java 2012-04-13 10:57:08 UTC (rev 3255) @@ -43,6 +43,11 @@ protected UserAccount user; + @Override + public String getJqueryTheme() { + return JQUERY_THEME_YELLOW; + } + public UserAccount getUser() { if (user == null) { UserService service = newService(UserService.class); Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ParticipatedList.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ParticipatedList.java 2012-04-13 08:16:54 UTC (rev 3254) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ParticipatedList.java 2012-04-13 10:57:08 UTC (rev 3255) @@ -39,4 +39,9 @@ public String getPageLogo() { return "Vote"; } + + @Override + public String getJqueryTheme() { + return JQUERY_THEME_GREEN; + } } Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/README.txt =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/README.txt (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/README.txt 2012-04-13 10:57:08 UTC (rev 3255) @@ -0,0 +1,8 @@ +Links to jQuery-UI ThemeRoller +------------------------------ + +green: +http://jqueryui.com/themeroller/#ffDefault=Verdana%2CArial%2Csans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=55cb00&bgTextureHeader=03_highlight_soft.png&bgImgOpacityHeader=75&borderColorHeader=17990a&fcHeader=222222&iconColorHeader=17990a&bgColorContent=b0f580&bgTextureContent=01_flat.png&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=55cb00&bgTextureDefault=02_glass.png&bgImgOpacityDefault=75&borderColorDefault=17990a&fcDefault=0a5403&iconColorDefault=17990a&bgColorHover=4bb300&bgTextureHover=02_glass.png&bgImgOpacityHover=75&borderColorHover=17990a&fcHover=212121&iconColorHover=222222&bgColorActive=368000&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=17990a&fcActive=ffffff&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=02_glass.png&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=000000&iconColorHighlight=227c24&bgColorError=fef1ec&bgTextureError=05_inset_soft.png&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px + +yellow: +http://jqueryui.com/themeroller/#ffDefault=Verdana%2CArial%2Csans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=ffff0f&bgTextureHeader=03_highlight_soft.png&bgImgOpacityHeader=75&borderColorHeader=e0e00b&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffaa&bgTextureContent=01_flat.png&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=ffff0f&bgTextureDefault=02_glass.png&bgImgOpacityDefault=75&borderColorDefault=e0e00b&fcDefault=b89300&iconColorDefault=dcb104&bgColorHover=fff71f&bgTextureHover=02_glass.png&bgImgOpacityHover=75&borderColorHover=e0e00b&fcHover=212121&iconColorHover=454545&bgColorActive=ffcc00&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=99990a&fcActive=1f1f1f&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=02_glass.png&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=000000&iconColorHighlight=ffcc00&bgColorError=fef1ec&bgTextureError=05_inset_soft.png&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px \ No newline at end of file Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_flat_0_aaaaaa_40x100.png =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_flat_0_aaaaaa_40x100.png (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_flat_0_aaaaaa_40x100.png 2012-04-13 10:57:08 UTC (rev 3255) @@ -0,0 +1,4 @@ +�PNG + + +IHDR(d�drz{IDATh��1� 1��7Y$t��3�;_�TUAUPTUAUPTUAUPTUAUPTUAUPTUAUPTUAUPTUAUPTUAUPTUAUPTUAUPTUAUPTüŝc�)IEND�B`� \ No newline at end of file Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_flat_75_b0f580_40x100.png =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_flat_75_b0f580_40x100.png (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_flat_75_b0f580_40x100.png 2012-04-13 10:57:08 UTC (rev 3255) @@ -0,0 +1,4 @@ +�PNG + + +IHDR(d�drz}IDATh��1� A$9�,�,n��/�]��c��IAUPTUAUPTUAUPTUAUPTUAUPTUAUPTUAUPTUAUPTUAUPTUAUPTUAUPTUAUPTUA�X��BIEND�B`� \ No newline at end of file Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_55_fbf9ee_1x400.png =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_55_fbf9ee_1x400.png (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_55_fbf9ee_1x400.png 2012-04-13 10:57:08 UTC (rev 3255) @@ -0,0 +1,6 @@ +�PNG + + +IHDR�oX +�?IDAT8��1 +�0Bѯ��l��`�6C�s��<]�:��[��&�B�A ��e7�l�QJ��ŜQY�*IEND�B`� \ No newline at end of file Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_65_368000_1x400.png =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_65_368000_1x400.png (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_65_368000_1x400.png 2012-04-13 10:57:08 UTC (rev 3255) @@ -0,0 +1,6 @@ +�PNG + + +IHDR�oX +�RIDAT8��ϱ +�0DџÉ��X� ؁Q�pJ@��Y�+̶��$�-�u�R�L5sԬ#�:f�"ΎLm.��I��& JIEND�B`� \ No newline at end of file Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_65_55cb00_1x400.png =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_65_55cb00_1x400.png (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_65_55cb00_1x400.png 2012-04-13 10:57:08 UTC (rev 3255) @@ -0,0 +1,6 @@ +�PNG + + +IHDR�_:M�IDAT8��1 +�@��y+Y� +��`!z��̋��7H �G�`��l`m�vf�}�@�ᆎ�v��d]�|��\7�[(jyV��=�T��)��?/�n�#o[��V(XB�%�U#��)4��#��yy,H\hIEND�B`� \ No newline at end of file Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_75_4bb300_1x400.png =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_75_4bb300_1x400.png (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_75_4bb300_1x400.png 2012-04-13 10:57:08 UTC (rev 3255) @@ -0,0 +1,5 @@ +�PNG + + +IHDR�_:M�IDAT8�ch8�󟉁��a �ӯ�00�;10)��r��g��}�8XxF��v/�� +��`p��#�8�z;'3//�?�(�/�07+?3�`p�(A%e��(R�IEND�B`� \ No newline at end of file Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_75_55cb00_1x400.png =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_75_55cb00_1x400.png (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_75_55cb00_1x400.png 2012-04-13 10:57:08 UTC (rev 3255) @@ -0,0 +1,6 @@ +�PNG + + +IHDR�oX +�SIDAT8��ϻ�0Q��FJMG4c�Q�\��qmI +��h?5��"�*�*ܪ(��BmV��Ef�� ^�i��@�X�IEND�B`� \ No newline at end of file Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_75_b0f580_1x400.png =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_75_b0f580_1x400.png (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_75_b0f580_1x400.png 2012-04-13 10:57:08 UTC (rev 3255) @@ -0,0 +1,5 @@ +�PNG + + +IHDR�oX +�OIDAT8��ϱ�@��?埄b!" <^�L��s�o�s0��<�(��T��ԁ��1,��A+��-I�l�uIEND�B`� \ No newline at end of file Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_highlight-soft_75_55cb00_1x100.png =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_highlight-soft_75_55cb00_1x100.png (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_highlight-soft_75_55cb00_1x100.png 2012-04-13 10:57:08 UTC (rev 3255) @@ -0,0 +1,5 @@ +�PNG + + +IHDRd0+j�IDAT�� +�@��`DD��ܤY,4BD��cXV�^r��E�n��`n {�N�=��|Y��sA�52�/��+$7��C�#2o��yStmhQ�3g��`PT=��q�IEND�B`� \ No newline at end of file Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_inset-soft_95_fef1ec_1x100.png =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_inset-soft_95_fef1ec_1x100.png (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_inset-soft_95_fef1ec_1x100.png 2012-04-13 10:57:08 UTC (rev 3255) @@ -0,0 +1,4 @@ +�PNG + + +IHDRdG,Z`BIDAT��;�B��Rm��`�'K��֥��Fb��Z&��Ѻv�Й��|��3��x�[��IEND�B`� \ No newline at end of file Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_17990a_256x240.png =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_17990a_256x240.png (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_17990a_256x240.png 2012-04-13 10:57:08 UTC (rev 3255) @@ -0,0 +1,41 @@ +�PNG + + +IHDR��IJ��PLTE�� +6NtRNS2P��."Tp@f`� <BHJZ&0R,�4��j��8D��|��(��$� +��b��lߝF>n~�hh�H��IDATx��]�b۶�H�儒-{i�ZK:g�lk�n��-��tI��q�q? E�$��dK>$�>�;��P�Z��s�V��h!�Sy��0E�0}H�)-��tk��o�ܪKp�\R�Ϡ ��.�E�7�� +�)�*V;~�Pe�� +Bx�*�,=$z��Dؾ�� J��Ҹٻ��9�{ ��Ǹ�Hp�qW@��"2'��B��[�$�� @T��i�H�/��b٥9�6�!�X�Hq`DE��*R�� +HV!�%��;��"�� +�i��]�dddddddd��4y��5 �� Rb�@(�8��Cd��Ū�ݡ�,�@T�@i��b�rq0a�lX!��p��e�, ��=4bW �{� +5��Ƭhu~�(�Q�^@��3�=��"�b��5XC@J��C��T��7��6��q_��5��@,r šɩ�D�)�T�|�O��@� +ON-ՙ�� [n@��R��X�Im�݋(��F �@�?��=0��puL��;g$��@6η�� +�K`��>п� @h գ��KV�n�"a�"��%l�@.v�$/��U^��G�:#`�`�� u��TtK��~�ŋ�Z��5T��%�k��x��k��]\*�Q�� +,҇��B��44�OXK�|�y��g��+_M�(�lоE�O�� + V$�T1BX��b�-�|?@ �f��B�Xr��%'@ҹA\�I��J,}��BBc��\V +��r��h(�]tI��^��}��o�צo�S3� ";��ʙ��b}��"߰ ��){b$��Gwwݾ��a��b"��)��T@p��F_er6JvШ��"m�ޭ�M-��d7��6��x��˰6ӥ;��/��`>KrP\��_��^u�1%��O�T�M��.�}��Q3��.Nس��}��)��>��-�w�`��a��+sy$��t��)�N�bFFFF��Be�j��nN��Vn4��,��A*��X��*��5��>��P��G��a��3 ��{�oB� +�&<��L[��Nc.��ö�i=�`�Q@�d�� +͆I��.I��l�`\t�[< �Cit�48��4�-r��+��f��쑱�B��CB ��MH� i��y}��>��rx��p|z�;B��Ǐ;�b�u��r��c�K��4t��z��1�G~��`��ؚ��K��| ̔>��ۡ��O$��~ +�Ao)��0pzz +�}i��`;AD��m8n:�cf�A@s7��L�� Z�/..��h8�o��r? +� +�N��9��3B��~o_��'`��o��pO-�� +:�TG� L;��7��]`��B��%�˛>��*wT��pM��0H�}&t��^1��'Oq�r'�2P�͡��+�z,tIW''|en��=ǳg��R�m�[N�S�t�K{��҉m��ؓV�t�6��ҲR`��ζN�&}��B U��(�r<�qȁVyr�rA**��دzg6�D#�� YP�`��v��s��~(�z�Ml�e�|u��Q�a�*}�+T�� +��R��Xc"+*�N�l��N�hc�Ft�<N+;-}�،Xtٕ$��à^��|uv��*��~�'E�_��5��1�q�s�*�R�`�OΒ��9�#x4�4�9�#��WHۏ��Z��)]0�`p�<��ߝ��N��oY{�4�7��6�ǹ�>�ۗ&��1%�Q''��?�l��׸�+&�r{�j�N�಻��4�)��`�N狌�.��߭�� ǣ��)q �2�?��n�3H�b��`�}� ��.`��pqY1�e_b��u�7��e+N��_F��(�D�T��,��L}LL�r��mP5��|��x芥1�c��x DAb��`��M(��7��NED�~<v\ %,��ߚ/��p��R��~/^��l��np� +��7t��0_��0��l4��_��b�0�MWΦj�m��б�Ɏ�l +|re�� +�ȫ`B-��v.i��Ro�x}� +�)��%#`�Ђ�R5C��A�2su��a��sYy3��=jaeoI�7�~��.�plA��΃� +`O��)�� ^�>��Mz� ��+4��BXd.��Mz��v͈��P�d8�p��<6?��8�N��*x��.��6ڍ6G��F�Z��)��O�� !��l�S�s��h��ss�N��p8�`'�0�/<��s��}�.�@Ǩ�s�7ξ�O۟V�D��a5��a�v��]��m1��+��3��y�6�۠��>@�u50��P�s��5��1=��=�p�� *��KV�ҫ܂��ݻc$N�4�(�X�r2###c-��賟L��δ�>��]��5�.�s��Ys�1��f0�;�'̨��Y�g銛�{�@9�� `aC(��=%b�o�2��=��n��1� j��B��o��S$n��#��m��=i��0�c��i9��}�oI�� q�T��]�W%.��(��؅�]z�\�x� +f��"]o��'u�䫵�t�k{�v;A��C3ֆw��w�R_#��X��(x��ҋ/q%��W��hp��k_I�X��'b��/fX��K�i�"#####�QCL�i��2t�� +��5��L0 +��Qi�H�2;y�T�Ook;ע�ٶ`��R��Ng{z�y�!�Kx��m�?A(v��U�~��mL�(`o/!n��mX��-{�v��[�� d�w�=�n「��sdw��z��n�(��}O�y�~��m� +��?XU�;,��V'+��V�&�J�R��Z]᧭�:��zC'��-߆��@�y +�4��u��`Vۓw��ъ#��zP@Q� +N>2/��{�\o)��W��~a�3xL�w +:_Q�;��=p�ּ�dt��\'8��~3�SRP��6��y+��X��Q�*��޺r +��̗ѭ*��޺r +g��l�/�\U^��u�$��|mb��Vn��w�\V��|��D�͊NVN��y��7��k<;��/�E}?E*ǳg�O ��~��g��/9��6��f +c�D}%��g$�Q�G�7�o��)��UJ��o�,O@�0߾Q(��;�b��w��:5� �N�wR��N5�I��y'K�?}��:9�m��ֽ��*��@f�@jU9�m��ҫ��Í�{��$�ؗ�}��dF��p��|%!DdF��>��}G��{��@FFFFFFƦQܞH � +��3 +��u ��M�o��~�vy�}�m�wz<�7��nP9�r�Wk��u=��|��_�n��z쿳}@��IX�n��?��s<uPIEND�B`� \ No newline at end of file Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_222222_256x240.png =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_222222_256x240.png (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_222222_256x240.png 2012-04-13 10:57:08 UTC (rev 3255) @@ -0,0 +1,40 @@ +�PNG + + +IHDR��IJ��PLTE$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$�ÈNtRNS2P��."Tp@f`� <BHJZ&0R,�4��j��8D��|��(��$� +��b��lߝF>n~�hh�H��IDATx��]�b۶�H�儒-{i�ZK:g�lk�n��-��tI��q�q? E�$��dK>$�>�;��P�Z��s�V��h!�Sy��0E�0}H�)-��tk��o�ܪKp�\R�Ϡ ��.�E�7�� +�)�*V;~�Pe�� +Bx�*�,=$z��Dؾ�� J��Ҹٻ��9�{ ��Ǹ�Hp�qW@��"2'��B��[�$�� @T��i�H�/��b٥9�6�!�X�Hq`DE��*R�� +HV!�%��;��"�� +�i��]�dddddddd��4y��5 �� Rb�@(�8��Cd��Ū�ݡ�,�@T�@i��b�rq0a�lX!��p��e�, ��=4bW �{� +5��Ƭhu~�(�Q�^@��3�=��"�b��5XC@J��C��T��7��6��q_��5��@,r šɩ�D�)�T�|�O��@� +ON-ՙ�� [n@��R��X�Im�݋(��F �@�?��=0��puL��;g$��@6η�� +�K`��>п� @h գ��KV�n�"a�"��%l�@.v�$/��U^��G�:#`�`�� u��TtK��~�ŋ�Z��5T��%�k��x��k��]\*�Q�� +,҇��B��44�OXK�|�y��g��+_M�(�lоE�O�� + V$�T1BX��b�-�|?@ �f��B�Xr��%'@ҹA\�I��J,}��BBc��\V +��r��h(�]tI��^��}��o�צo�S3� ";��ʙ��b}��"߰ ��){b$��Gwwݾ��a��b"��)��T@p��F_er6JvШ��"m�ޭ�M-��d7��6��x��˰6ӥ;��/��`>KrP\��_��^u�1%��O�T�M��.�}��Q3��.Nس��}��)��>��-�w�`��a��+sy$��t��)�N�bFFFF��Be�j��nN��Vn4��,��A*��X��*��5��>��P��G��a��3 ��{�oB� +�&<��L[��Nc.��ö�i=�`�Q@�d�� +͆I��.I��l�`\t�[< �Cit�48��4�-r��+��f��쑱�B��CB ��MH� i��y}��>��rx��p|z�;B��Ǐ;�b�u��r��c�K��4t��z��1�G~��`��ؚ��K��| ̔>��ۡ��O$��~ +�Ao)��0pzz +�}i��`;AD��m8n:�cf�A@s7��L�� Z�/..��h8�o��r? +� +�N��9��3B��~o_��'`��o��pO-�� +:�TG� L;��7��]`��B��%�˛>��*wT��pM��0H�}&t��^1��'Oq�r'�2P�͡��+�z,tIW''|en��=ǳg��R�m�[N�S�t�K{��҉m��ؓV�t�6��ҲR`��ζN�&}��B U��(�r<�qȁVyr�rA**��دzg6�D#�� YP�`��v��s��~(�z�Ml�e�|u��Q�a�*}�+T�� +��R��Xc"+*�N�l��N�hc�Ft�<N+;-}�،Xtٕ$��à^��|uv��*��~�'E�_��5��1�q�s�*�R�`�OΒ��9�#x4�4�9�#��WHۏ��Z��)]0�`p�<��ߝ��N��oY{�4�7��6�ǹ�>�ۗ&��1%�Q''��?�l��׸�+&�r{�j�N�಻��4�)��`�N狌�.��߭�� ǣ��)q �2�?��n�3H�b��`�}� ��.`��pqY1�e_b��u�7��e+N��_F��(�D�T��,��L}LL�r��mP5��|��x芥1�c��x DAb��`��M(��7��NED�~<v\ %,��ߚ/��p��R��~/^��l��np� +��7t��0_��0��l4��_��b�0�MWΦj�m��б�Ɏ�l +|re�� +�ȫ`B-��v.i��Ro�x}� +�)��%#`�Ђ�R5C��A�2su��a��sYy3��=jaeoI�7�~��.�plA��΃� +`O��)�� ^�>��Mz� ��+4��BXd.��Mz��v͈��P�d8�p��<6?��8�N��*x��.��6ڍ6G��F�Z��)��O�� !��l�S�s��h��ss�N��p8�`'�0�/<��s��}�.�@Ǩ�s�7ξ�O۟V�D��a5��a�v��]��m1��+��3��y�6�۠��>@�u50��P�s��5��1=��=�p�� *��KV�ҫ܂��ݻc$N�4�(�X�r2###c-��賟L��δ�>��]��5�.�s��Ys�1��f0�;�'̨��Y�g銛�{�@9�� `aC(��=%b�o�2��=��n��1� j��B��o��S$n��#��m��=i��0�c��i9��}�oI�� q�T��]�W%.��(��؅�]z�\�x� +f��"]o��'u�䫵�t�k{�v;A��C3ֆw��w�R_#��X��(x��ҋ/q%��W��hp��k_I�X��'b��/fX��K�i�"#####�QCL�i��2t�� +��5��L0 +��Qi�H�2;y�T�Ook;ע�ٶ`��R��Ng{z�y�!�Kx��m�?A(v��U�~��mL�(`o/!n��mX��-{�v��[�� d�w�=�n「��sdw��z��n�(��}O�y�~��m� +��?XU�;,��V'+��V�&�J�R��Z]᧭�:��zC'��-߆��@�y +�4��u��`Vۓw��ъ#��zP@Q� +N>2/��{�\o)��W��~a�3xL�w +:_Q�;��=p�ּ�dt��\'8��~3�SRP��6��y+��X��Q�*��޺r +��̗ѭ*��޺r +g��l�/�\U^��u�$��|mb��Vn��w�\V��|��D�͊NVN��y��7��k<;��/�E}?E*ǳg�O ��~��g��/9��6��f +c�D}%��g$�Q�G�7�o��)��UJ��o�,O@�0߾Q(��;�b��w��:5� �N�wR��N5�I��y'K�?}��:9�m��ֽ��*��@f�@jU9�m��ҫ��Í�{��$�ؗ�}��dF��p��|%!DdF��>��}G��{��@FFFFFFƦQܞH � +��3 +��u ��M�o��~�vy�}�m�wz<�7��nP9�r�Wk��u=��|��_�n��z쿳}@��IX�n��?��s<uPIEND�B`� \ No newline at end of file Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_227c24_256x240.png =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_227c24_256x240.png (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_227c24_256x240.png 2012-04-13 10:57:08 UTC (rev 3255) @@ -0,0 +1,45 @@ +�PNG + + +IHDR��Nzo�PLTE$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$$~$��NtRNS2P��."Tp@f`� <BHJZ&0R,�4��j��8D��|��(��$� +��b��lߝF>n~�hh�H�_IDATx��]c۶�JZ��gv�,ٲ&{?:-[3��Ү��3�q��J�O��p��t�B�� }6x9��sSm�C��Xȸ��R<QήF� ?S��Hf+&�y��t�SE-G��8�>�A��m٪d�� ~Z#��s�կ6�'�аfN��( +��0%��#r(DXXK�Q�L�^J�*�K��ʱzT��A��~�yd-TLie�S�S(K��ň�< ��b��ۜ��E%N��S~�._��c�$��QUb=+C�5��>W-��Z�8BH��ؗ+$~��ǫ�+e��9*9��J*�VD��o��q�@�.��i�� +��o��v�R~S��H�6w�_v� +cU˂5�y�@~�Rת��#�J9��"�!ꎾ�J�:�d�$�. +�3@nVew��%�w�>#��v��S��v�ᤵ��#,e��]Tq�/��|�c��թb�fpp�ߋbH1F��S �s��L��(?"��#Y��P�)��C6C\$V-�A��$��b��ߏ�3�R4��m��`G\��~� +c:C.��U�a��s�uC]7<e7,��4 ��ʯ�U��W��-��C��v7��uT{%*��9��"��V��z��O�F��U�8�ь)Y~�+�%�X�4�STaWD�SW��eju�^�ѓI��Mg/_M�oe"�&�~m �'� +s�O��W�7�-��;�3�x�f��7y�r��#C��+9ckM].�8qY�d#R��`��kaU^k��#�/P?*u�$�~��HY��52��֟��^|��b�{|a�,?k��E/v��kL��?��o=;d�xl��E�{��A:?a�M2�$Gq�B+�h�C>t�e_O8��d��0wPl�E�`� +�AAɂ��[�.��zd�aVĀ�#O�4&��k�?��V�� +��`]�ْP�#N�J7Ybe�7�,H[�F�2�4eY��S�ۉ|�B&�]K�R�˥ŶAT�S��6?��h{��9��"�\��v��r9U{�q�v�k��/�0�W��+?��q�"GW˨��`wͤ��W�A��F�-�`a��e�]�n"��bMB]�p+5�޿�� +3�G]SÎ.1Yax��)��Ã��[��<��+�>��sm��T��؆*�sɴ��,K۶�\��ij`e��rY��9ya�Щ +�L�|Ϟ)L[�T7G��R��P�P��$�/0��*vS��tWF��CE��/2:��ht�L��?�8;>l<Q7F��v��A@l��ˠU��lF(��t�6��?��sS�\��VOø��vW��"�O�У +�3�u��&�Xz��xv3\w?�w?=2�V\��@%��q��@F[�;��U( +�R�^8��k�?tK��wJ(�料͋t�3T�� +K`k��"B=��(��Y��{��"N�|��X�H=P ��22�� }pw=��l��<��]�T�-��c�H�̍�s�&�I d<x�1nͷ��p?��5�Q/^O<k-��Ed:��z��/'�<��I=�jZP��s'AV��-�fT��}�G2v{�,|XA��6A�NYɸB��z�ٺ��r"V�S@��(��|�?��@0�:��㊏�;��q�;��ճ�v� +��.8of%zSRO��F�F�x��&\�8� w�O�(��_�G�� +ؽ-�?��q�w��Ǐ�Y�G4��T+N[�>�fYd��6ɩ��}{Zi��uk��D��Jӟ��S\^zL,uF��t��Kyh��}j��drf$��3�<A10�ǟ{q>��:Cd��.��U��ٽ{�A��ojRN�� 簐��џQ �S��/]��VT��q_�G��9�sE$Zw��a��͏�FU�H#�� e G��1�Zw��V7>�na�O[��+ʀ��4�HF��^� +׆��O�Nf��Tpza��ƀV@O//��S��]S�ύ�wx�Tn�ځ�ZG�#N�"��a]s��՜��X7 +�`��G{v��´��?�V��W_��FYͩi+�U'��4V��7��%yT`뇪r��X�f�O��o�@�Ao>W��n2�K*�fǦM��h:�7��5�M�+Џ�y�N��<ÊP Lon��>�h:Ǚv�I~�9�畺K 5f� +d��ķc��=�8��983��K4j�v��y�i�|@v0cN��v+̩1�W��rJ��<=Q��m��[=��(�A3L��J��L�X ��H˦��6:խ�ziJ�c�'��f&��L��t��v}1��5��|��%�۶�%�2��oC��m ��_x�\��c�)V�aF�3<nF|w�a +��,��~��sK�p=��Bb֊v�91��n%c��N��X8��;��T�!�C� ��7��Ǎ0��=��v�wOӡ��O?a��1s�x�22��az�2p#�O��|@UT��ǝ��`�S�M�\�7f��~7�� +�!��`�Y��QP2 ��A�c�%�� TY��{��mWn��A%��D(��q��Q��ݤ]��^�JD�`��A0�( x��z��A�{�,��+��z+ +��`��x<x��ޕ��<>p[��<�o'� +av}f�PK�� @t�âxfj�8�~?|h�pP��'�222:�^v�2�`v�{'`�� +�^}9@�#p��=�,'�@H�C~XH��U0|�bO∀|c��p =��kc��w*##㡣��7�K>��oǽ�$\��F�F�O�"v��p�30��F�z8L�&2pG�>��0V~X�Q��O��~��!E� +��0t$��{� +�� +F0�{F�「��{��bZ),\�(<�`��0��o��%��J��VA=��#J֟߆��L4��lO/ܫbĪ��(X��&��ܮ��`��X�Z�w��222��>*Dg��)� ��0�ݱ��*�ouJ(=��M�^ 8IV },�f��>�+!�>��?� ��@��e�jB�D8��pO�agd|P�T�q��g�$��Ǐ8i�)�s�0,C~\:U�V�6��U� +\��`�77��`V1��c@f�N/�ɪǿf��PʃV]*h��w.�藢�{7�iH�u}��Jn3��@ �ve��b�d�?w�P��y�W�˂��E��rٵ��yI�*�RV2~E�T�~�=N��8e�! *{�,F�-��:.Y��g (��^!.�j��4�^6�Ե�5�o �B}|~�[ +�]�;CU� +[�R�)��a��T>�7��/{�Ky&��Ϥ�{QO��y�)��#�â��r�ύ~��a!�&W��z +Z��졽�T��ץ<vhA�'^��ٕg"��Ӗ��zT@��z��S2Z��9}T Ua�-��H��M�N7*��g��1;n��I� +fp�Bk%��y�!է#]@ X�5�B��W�@�_aEW�&��u@�Ѩ��eC�N�絷6�!d�Y��GF'��sÀ�rA��/X&��f��ӂ�Xt��V_��B��_��W�o�^��-�9 +�m��)�K-�}��X�l:}��oB��U;M�8��N)�S�_N��]��rdɕ��/N��t�3�� +_�B� +��gZ��z>��R��ҥ_�s��]4"��oE��D��AwU�T�8�H��v��o%sn\H�y$ȴ��h��z��4q�R��;yu5:??�@�V'.�vl�c�l77��^��W��Qg��Z-&�5�_�D��?��1E��B��T��N��N ٞ�qJ�/{�^��b�!#��{ ��~�M�{��x/-J��n��)��Ql�jk=%��4��6��}��t�� +�yX��3KȊ7D�:��m��{μ��0-��2�TU�L��PĆ��X@ �׎|M#�D��/v�z��X��p�<� %#��_%�=��/�9�(@C@�� YM��kf�#�-r�@�C�ʭd8��aG�@�ƌ<��@�޻@Fƃǃ~?l��l�ǆ�/��wl�T��L��ǆR�n��F��Wb��A%��I�gש��½��'�39R�^��MR�V��֡��U�u�C +��+��0�i�=��YS��}�!��u�ۖ��,�V/B�5��, +��.�C�|��r�� Z^;��0p&�h"��?ȏ�o��7~ol�ap,l�r_U��a��FH\��zh��+G_mB�[޶��C�շ��jSz��322`t��裇��:��{��G�C��@�{E� +�:�\��^�� +�?*;ۢ9�/�B�Ao_�� +@��[@�] Q��lu��f;��s��IEND�B`� \ No newline at end of file Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_454545_256x240.png =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_454545_256x240.png (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_454545_256x240.png 2012-04-13 10:57:08 UTC (rev 3255) @@ -0,0 +1,40 @@ +�PNG + + +IHDR��IJ��PLTEDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDm�:NtRNS2P��."Tp@f`� <BHJZ&0R,�4��j��8D��|��(��$� +��b��lߝF>n~�hh�H��IDATx��]�b۶�H�儒-{i�ZK:g�lk�n��-��tI��q�q? E�$��dK>$�>�;��P�Z��s�V��h!�Sy��0E�0}H�)-��tk��o�ܪKp�\R�Ϡ ��.�E�7�� +�)�*V;~�Pe�� +Bx�*�,=$z��Dؾ�� J��Ҹٻ��9�{ ��Ǹ�Hp�qW@��"2'��B��[�$�� @T��i�H�/��b٥9�6�!�X�Hq`DE��*R�� +HV!�%��;��"�� +�i��]�dddddddd��4y��5 �� Rb�@(�8��Cd��Ū�ݡ�,�@T�@i��b�rq0a�lX!��p��e�, ��=4bW �{� +5��Ƭhu~�(�Q�^@��3�=��"�b��5XC@J��C��T��7��6��q_��5��@,r šɩ�D�)�T�|�O��@� +ON-ՙ�� [n@��R��X�Im�݋(��F �@�?��=0��puL��;g$��@6η�� +�K`��>п� @h գ��KV�n�"a�"��%l�@.v�$/��U^��G�:#`�`�� u��TtK��~�ŋ�Z��5T��%�k��x��k��]\*�Q�� +,҇��B��44�OXK�|�y��g��+_M�(�lоE�O�� + V$�T1BX��b�-�|?@ �f��B�Xr��%'@ҹA\�I��J,}��BBc��\V +��r��h(�]tI��^��}��o�צo�S3� ";��ʙ��b}��"߰ ��){b$��Gwwݾ��a��b"��)��T@p��F_er6JvШ��"m�ޭ�M-��d7��6��x��˰6ӥ;��/��`>KrP\��_��^u�1%��O�T�M��.�}��Q3��.Nس��}��)��>��-�w�`��a��+sy$��t��)�N�bFFFF��Be�j��nN��Vn4��,��A*��X��*��5��>��P��G��a��3 ��{�oB� +�&<��L[��Nc.��ö�i=�`�Q@�d�� +͆I��.I��l�`\t�[< �Cit�48��4�-r��+��f��쑱�B��CB ��MH� i��y}��>��rx��p|z�;B��Ǐ;�b�u��r��c�K��4t��z��1�G~��`��ؚ��K��| ̔>��ۡ��O$��~ +�Ao)��0pzz +�}i��`;AD��m8n:�cf�A@s7��L�� Z�/..��h8�o��r? +� +�N��9��3B��~o_��'`��o��pO-�� +:�TG� L;��7��]`��B��%�˛>��*wT��pM��0H�}&t��^1��'Oq�r'�2P�͡��+�z,tIW''|en��=ǳg��R�m�[N�S�t�K{��҉m��ؓV�t�6��ҲR`��ζN�&}��B U��(�r<�qȁVyr�rA**��دzg6�D#�� YP�`��v��s��~(�z�Ml�e�|u��Q�a�*}�+T�� +��R��Xc"+*�N�l��N�hc�Ft�<N+;-}�،Xtٕ$��à^��|uv��*��~�'E�_��5��1�q�s�*�R�`�OΒ��9�#x4�4�9�#��WHۏ��Z��)]0�`p�<��ߝ��N��oY{�4�7��6�ǹ�>�ۗ&��1%�Q''��?�l��׸�+&�r{�j�N�಻��4�)��`�N狌�.��߭�� ǣ��)q �2�?��n�3H�b��`�}� ��.`��pqY1�e_b��u�7��e+N��_F��(�D�T��,��L}LL�r��mP5��|��x芥1�c��x DAb��`��M(��7��NED�~<v\ %,��ߚ/��p��R��~/^��l��np� +��7t��0_��0��l4��_��b�0�MWΦj�m��б�Ɏ�l +|re�� +�ȫ`B-��v.i��Ro�x}� +�)��%#`�Ђ�R5C��A�2su��a��sYy3��=jaeoI�7�~��.�plA��΃� +`O��)�� ^�>��Mz� ��+4��BXd.��Mz��v͈��P�d8�p��<6?��8�N��*x��.��6ڍ6G��F�Z��)��O�� !��l�S�s��h��ss�N��p8�`'�0�/<��s��}�.�@Ǩ�s�7ξ�O۟V�D��a5��a�v��]��m1��+��3��y�6�۠��>@�u50��P�s��5��1=��=�p�� *��KV�ҫ܂��ݻc$N�4�(�X�r2###c-��賟L��δ�>��]��5�.�s��Ys�1��f0�;�'̨��Y�g銛�{�@9�� `aC(��=%b�o�2��=��n��1� j��B��o��S$n��#��m��=i��0�c��i9��}�oI�� q�T��]�W%.��(��؅�]z�\�x� +f��"]o��'u�䫵�t�k{�v;A��C3ֆw��w�R_#��X��(x��ҋ/q%��W��hp��k_I�X��'b��/fX��K�i�"#####�QCL�i��2t�� +��5��L0 +��Qi�H�2;y�T�Ook;ע�ٶ`��R��Ng{z�y�!�Kx��m�?A(v��U�~��mL�(`o/!n��mX��-{�v��[�� d�w�=�n「��sdw��z��n�(��}O�y�~��m� +��?XU�;,��V'+��V�&�J�R��Z]᧭�:��zC'��-߆��@�y +�4��u��`Vۓw��ъ#��zP@Q� +N>2/��{�\o)��W��~a�3xL�w +:_Q�;��=p�ּ�dt��\'8��~3�SRP��6��y+��X��Q�*��޺r +��̗ѭ*��޺r +g��l�/�\U^��u�$��|mb��Vn��w�\V��|��D�͊NVN��y��7��k<;��/�E}?E*ǳg�O ��~��g��/9��6��f +c�D}%��g$�Q�G�7�o��)��UJ��o�,O@�0߾Q(��;�b��w��:5� �N�wR��N5�I��y'K�?}��:9�m��ֽ��*��@f�@jU9�m��ҫ��Í�{��$�ؗ�}��dF��p��|%!DdF��>��}G��{��@FFFFFFƦQܞH � +��3 +��u ��M�o��~�vy�}�m�wz<�7��nP9�r�Wk��u=��|��_�n��z쿳}@��IX�n��?��s<uPIEND�B`� \ No newline at end of file Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_888888_256x240.png =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_888888_256x240.png (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_888888_256x240.png 2012-04-13 10:57:08 UTC (rev 3255) @@ -0,0 +1,40 @@ +�PNG + + +IHDR��IJ��PLTE��ƁONtRNS2P��."Tp@f`� <BHJZ&0R,�4��j��8D��|��(��$� +��b��lߝF>n~�hh�H��IDATx��]�b۶�H�儒-{i�ZK:g�lk�n��-��tI��q�q? E�$��dK>$�>�;��P�Z��s�V��h!�Sy��0E�0}H�)-��tk��o�ܪKp�\R�Ϡ ��.�E�7�� +�)�*V;~�Pe�� +Bx�*�,=$z��Dؾ�� J��Ҹٻ��9�{ ��Ǹ�Hp�qW@��"2'��B��[�$�� @T��i�H�/��b٥9�6�!�X�Hq`DE��*R�� +HV!�%��;��"�� +�i��]�dddddddd��4y��5 �� Rb�@(�8��Cd��Ū�ݡ�,�@T�@i��b�rq0a�lX!��p��e�, ��=4bW �{� +5��Ƭhu~�(�Q�^@��3�=��"�b��5XC@J��C��T��7��6��q_��5��@,r šɩ�D�)�T�|�O��@� +ON-ՙ�� [n@��R��X�Im�݋(��F �@�?��=0��puL��;g$��@6η�� +�K`��>п� @h գ��KV�n�"a�"��%l�@.v�$/��U^��G�:#`�`�� u��TtK��~�ŋ�Z��5T��%�k��x��k��]\*�Q�� +,҇��B��44�OXK�|�y��g��+_M�(�lоE�O�� + V$�T1BX��b�-�|?@ �f��B�Xr��%'@ҹA\�I��J,}��BBc��\V +��r��h(�]tI��^��}��o�צo�S3� ";��ʙ��b}��"߰ ��){b$��Gwwݾ��a��b"��)��T@p��F_er6JvШ��"m�ޭ�M-��d7��6��x��˰6ӥ;��/��`>KrP\��_��^u�1%��O�T�M��.�}��Q3��.Nس��}��)��>��-�w�`��a��+sy$��t��)�N�bFFFF��Be�j��nN��Vn4��,��A*��X��*��5��>��P��G��a��3 ��{�oB� +�&<��L[��Nc.��ö�i=�`�Q@�d�� +͆I��.I��l�`\t�[< �Cit�48��4�-r��+��f��쑱�B��CB ��MH� i��y}��>��rx��p|z�;B��Ǐ;�b�u��r��c�K��4t��z��1�G~��`��ؚ��K��| ̔>��ۡ��O$��~ +�Ao)��0pzz +�}i��`;AD��m8n:�cf�A@s7��L�� Z�/..��h8�o��r? +� +�N��9��3B��~o_��'`��o��pO-�� +:�TG� L;��7��]`��B��%�˛>��*wT��pM��0H�}&t��^1��'Oq�r'�2P�͡��+�z,tIW''|en��=ǳg��R�m�[N�S�t�K{��҉m��ؓV�t�6��ҲR`��ζN�&}��B U��(�r<�qȁVyr�rA**��دzg6�D#�� YP�`��v��s��~(�z�Ml�e�|u��Q�a�*}�+T�� +��R��Xc"+*�N�l��N�hc�Ft�<N+;-}�،Xtٕ$��à^��|uv��*��~�'E�_��5��1�q�s�*�R�`�OΒ��9�#x4�4�9�#��WHۏ��Z��)]0�`p�<��ߝ��N��oY{�4�7��6�ǹ�>�ۗ&��1%�Q''��?�l��׸�+&�r{�j�N�಻��4�)��`�N狌�.��߭�� ǣ��)q �2�?��n�3H�b��`�}� ��.`��pqY1�e_b��u�7��e+N��_F��(�D�T��,��L}LL�r��mP5��|��x芥1�c��x DAb��`��M(��7��NED�~<v\ %,��ߚ/��p��R��~/^��l��np� +��7t��0_��0��l4��_��b�0�MWΦj�m��б�Ɏ�l +|re�� +�ȫ`B-��v.i��Ro�x}� +�)��%#`�Ђ�R5C��A�2su��a��sYy3��=jaeoI�7�~��.�plA��΃� +`O��)�� ^�>��Mz� ��+4��BXd.��Mz��v͈��P�d8�p��<6?��8�N��*x��.��6ڍ6G��F�Z��)��O�� !��l�S�s��h��ss�N��p8�`'�0�/<��s��}�.�@Ǩ�s�7ξ�O۟V�D��a5��a�v��]��m1��+��3��y�6�۠��>@�u50��P�s��5��1=��=�p�� *��KV�ҫ܂��ݻc$N�4�(�X�r2###c-��賟L��δ�>��]��5�.�s��Ys�1��f0�;�'̨��Y�g銛�{�@9�� `aC(��=%b�o�2��=��n��1� j��B��o��S$n��#��m��=i��0�c��i9��}�oI�� q�T��]�W%.��(��؅�]z�\�x� +f��"]o��'u�䫵�t�k{�v;A��C3ֆw��w�R_#��X��(x��ҋ/q%��W��hp��k_I�X��'b��/fX��K�i�"#####�QCL�i��2t�� +��5��L0 +��Qi�H�2;y�T�Ook;ע�ٶ`��R��Ng{z�y�!�Kx��m�?A(v��U�~��mL�(`o/!n��mX��-{�v��[�� d�w�=�n「��sdw��z��n�(��}O�y�~��m� +��?XU�;,��V'+��V�&�J�R��Z]᧭�:��zC'��-߆��@�y +�4��u��`Vۓw��ъ#��zP@Q� +N>2/��{�\o)��W��~a�3xL�w +:_Q�;��=p�ּ�dt��\'8��~3�SRP��6��y+��X��Q�*��޺r +��̗ѭ*��޺r +g��l�/�\U^��u�$��|mb��Vn��w�\V��|��D�͊NVN��y��7��k<;��/�E}?E*ǳg�O ��~��g��/9��6��f +c�D}%��g$�Q�G�7�o��)��UJ��o�,O@�0߾Q(��;�b��w��:5� �N�wR��N5�I��y'K�?}��:9�m��ֽ��*��@f�@jU9�m��ҫ��Í�{��$�ؗ�}��dF��p��|%!DdF��>��}G��{��@FFFFFFƦQܞH � +��3 +��u ��M�o��~�vy�}�m�wz<�7��nP9�r�Wk��u=��|��_�n��z쿳}@��IX�n��?��s<uPIEND�B`� \ No newline at end of file Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_cd0a0a_256x240.png =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_cd0a0a_256x240.png (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_cd0a0a_256x240.png 2012-04-13 10:57:08 UTC (rev 3255) @@ -0,0 +1,119 @@ +�PNG + + +IHDR��IJ��PLTE� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +�FcNtRNS2P��."Tp@f`� <BHJZ&0R,�4��j��8D��|��(��$� +��b��lߝF>n~�hh�H��IDATx��]�b۶�H�儒-{i�ZK:g�lk�n��-��tI��q�q? E�$��dK>$�>�;��P�Z��s�V��h!�Sy��0E�0}H�)-��tk��o�ܪKp�\R�Ϡ ��.�E�7�� +�)�*V;~�Pe�� +Bx�*�,=$z��Dؾ�� J��Ҹٻ��9�{ ��Ǹ�Hp�qW@��"2'��B��[�$�� @T��i�H�/��b٥9�6�!�X�Hq`DE��*R�� +HV!�%��;��"�� +�i��]�dddddddd��4y��5 �� Rb�@(�8��Cd��Ū�ݡ�,�@T�@i��b�rq0a�lX!��p��e�, ��=4bW �{� +5��Ƭhu~�(�Q�^@��3�=��"�b��5XC@J��C��T��7��6��q_��5��@,r šɩ�D�)�T�|�O��@� +ON-ՙ�� [n@��R��X�Im�݋(��F �@�?��=0��puL��;g$��@6η�� +�K`��>п� @h գ��KV�n�"a�"��%l�@.v�$/��U^��G�:#`�`�� u��TtK��~�ŋ�Z��5T��%�k��x��k��]\*�Q�� +,҇��B��44�OXK�|�y��g��+_M�(�lоE�O�� + V$�T1BX��b�-�|?@ �f��B�Xr��%'@ҹA\�I��J,}��BBc��\V +��r��h(�]tI��^��}��o�צo�S3� ";��ʙ��b}��"߰ ��){b$��Gwwݾ��a��b"��)��T@p��F_er6JvШ��"m�ޭ�M-��d7��6��x��˰6ӥ;��/��`>KrP\��_��^u�1%��O�T�M��.�}��Q3��.Nس��}��)��>��-�w�`��a��+sy$��t��)�N�bFFFF��Be�j��nN��Vn4��,��A*��X��*��5��>��P��G��a��3 ��{�oB� +�&<��L[��Nc.��ö�i=�`�Q@�d�� +͆I��.I��l�`\t�[< �Cit�48��4�-r��+��f��쑱�B��CB ��MH� i��y}��>��rx��p|z�;B��Ǐ;�b�u��r��c�K��4t��z��1�G~��`��ؚ��K��| ̔>��ۡ��O$��~ +�Ao)��0pzz +�}i��`;AD��m8n:�cf�A@s7��L�� Z�/..��h8�o��r? +� +�N��9��3B��~o_��'`��o��pO-�� +:�TG� L;��7��]`��B��%�˛>��*wT��pM��0H�}&t��^1��'Oq�r'�2P�͡��+�z,tIW''|en��=ǳg��R�m�[N�S�t�K{��҉m��ؓV�t�6��ҲR`��ζN�&}��B U��(�r<�qȁVyr�rA**��دzg6�D#�� YP�`��v��s��~(�z�Ml�e�|u��Q�a�*}�+T�� +��R��Xc"+*�N�l��N�hc�Ft�<N+;-}�،Xtٕ$��à^��|uv��*��~�'E�_��5��1�q�s�*�R�`�OΒ��9�#x4�4�9�#��WHۏ��Z��)]0�`p�<��ߝ��N��oY{�4�7��6�ǹ�>�ۗ&��1%�Q''��?�l��׸�+&�r{�j�N�಻��4�)��`�N狌�.��߭�� ǣ��)q �2�?��n�3H�b��`�}� ��.`��pqY1�e_b��u�7��e+N��_F��(�D�T��,��L}LL�r��mP5��|��x芥1�c��x DAb��`��M(��7��NED�~<v\ %,��ߚ/��p��R��~/^��l��np� +��7t��0_��0��l4��_��b�0�MWΦj�m��б�Ɏ�l +|re�� +�ȫ`B-��v.i��Ro�x}� +�)��%#`�Ђ�R5C��A�2su��a��sYy3��=jaeoI�7�~��.�plA��΃� +`O��)�� ^�>��Mz� ��+4��BXd.��Mz��v͈��P�d8�p��<6?��8�N��*x��.��6ڍ6G��F�Z��)��O�� !��l�S�s��h��ss�N��p8�`'�0�/<��s��}�.�@Ǩ�s�7ξ�O۟V�D��a5��a�v��]��m1��+��3��y�6�۠��>@�u50��P�s��5��1=��=�p�� *��KV�ҫ܂��ݻc$N�4�(�X�r2###c-��賟L��δ�>��]��5�.�s��Ys�1��f0�;�'̨��Y�g銛�{�@9�� `aC(��=%b�o�2��=��n��1� j��B��o��S$n��#��m��=i��0�c��i9��}�oI�� q�T��]�W%.��(��؅�]z�\�x� +f��"]o��'u�䫵�t�k{�v;A��C3ֆw��w�R_#��X��(x��ҋ/q%��W��hp��k_I�X��'b��/fX��K�i�"#####�QCL�i��2t�� +��5��L0 +��Qi�H�2;y�T�Ook;ע�ٶ`��R��Ng{z�y�!�Kx��m�?A(v��U�~��mL�(`o/!n��mX��-{�v��[�� d�w�=�n「��sdw��z��n�(��}O�y�~��m� +��?XU�;,��V'+��V�&�J�R��Z]᧭�:��zC'��-߆��@�y +�4��u��`Vۓw��ъ#��zP@Q� +N>2/��{�\o)��W��~a�3xL�w +:_Q�;��=p�ּ�dt��\'8��~3�SRP��6��y+��X��Q�*��޺r +��̗ѭ*��޺r +g��l�/�\U^��u�$��|mb��Vn��w�\V��|��D�͊NVN��y��7��k<;��/�E}?E*ǳg�O ��~��g��/9��6��f +c�D}%��g$�Q�G�7�o��)��UJ��o�,O@�0߾Q(��;�b��w��:5� �N�wR��N5�I��y'K�?}��:9�m��ֽ��*��@f�@jU9�m��ҫ��Í�{��$�ؗ�}��dF��p��|%!DdF��>��}G��{��@FFFFFFƦQܞH � +��3 +��u ��M�o��~�vy�}�m�wz<�7��nP9�r�Wk��u=��|��_�n��z쿳}@��IX�n��?��s<uPIEND�B`� \ No newline at end of file Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/jquery-ui.css =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/jquery-ui.css (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/green/jquery-ui.css 2012-04-13 10:57:08 UTC (rev 3255) @@ -0,0 +1,555 @@ +/* + * jQuery UI CSS Framework 1.8.18 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Theming/API + */ + +/* Layout helpers +----------------------------------*/ +.ui-helper-hidden { display: none; } +.ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); } +.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; } +.ui-helper-clearfix:before, .ui-helper-clearfix:after { content: ""; display: table; } +.ui-helper-clearfix:after { clear: both; } +.ui-helper-clearfix { zoom: 1; } +.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); } + + +/* Interaction Cues +----------------------------------*/ +.ui-state-disabled { cursor: default !important; } + + +/* Icons +----------------------------------*/ + +/* states and images */ +.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; } + + +/* Misc visuals +----------------------------------*/ + +/* Overlays */ +.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; } + + +/* + * jQuery UI CSS Framework 1.8.18 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Theming/API + * + * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana,Arial,sans-serif&fwDefau… + */ + + +/* Component containers +----------------------------------*/ +.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; } +.ui-widget .ui-widget { font-size: 1em; } +.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; } +.ui-widget-content { border: 1px solid #aaaaaa; background: #b0f580 url(images/ui-bg_flat_75_b0f580_40x100.png) 50% 50% repeat-x; color: #222222; } +.ui-widget-content a { color: #222222; } +.ui-widget-header { border: 1px solid #17990a; background: #55cb00 url(images/ui-bg_highlight-soft_75_55cb00_1x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; } +.ui-widget-header a { color: #222222; } + +/* Interaction states +----------------------------------*/ +.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #17990a; background: #55cb00 url(images/ui-bg_glass_75_55cb00_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #0a5403; } +.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #0a5403; text-decoration: none; } +.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #17990a; background: #4bb300 url(images/ui-bg_glass_75_4bb300_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; } +.ui-state-hover a, .ui-state-hover a:hover { color: #212121; text-decoration: none; } +.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #17990a; background: #368000 url(images/ui-bg_glass_65_368000_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #ffffff; } +.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #ffffff; text-decoration: none; } +.ui-widget :active { outline: none; } + +/* Interaction Cues +----------------------------------*/ +.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {border: 1px solid #fcefa1; background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x; color: #000000; } +.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #000000; } +.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-bg_inset-soft_95_fef1ec_1x100.png) 50% bottom repeat-x; color: #cd0a0a; } +.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a; } +.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a; } +.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; } +.ui-priority-secondary, .ui-widget-content .ui-priority-secondary, .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; } +.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; } + +/* Icons +----------------------------------*/ + +/* states and images */ +.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); } +.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); } +.ui-widget-header .ui-icon {background-image: url(images/ui-icons_17990a_256x240.png); } +.ui-state-default .ui-icon { background-image: url(images/ui-icons_17990a_256x240.png); } +.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); } +.ui-state-active .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); } +.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_227c24_256x240.png); } +.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png); } + +/* positioning */ +.ui-icon-carat-1-n { background-position: 0 0; } +.ui-icon-carat-1-ne { background-position: -16px 0; } +.ui-icon-carat-1-e { background-position: -32px 0; } +.ui-icon-carat-1-se { background-position: -48px 0; } +.ui-icon-carat-1-s { background-position: -64px 0; } +.ui-icon-carat-1-sw { background-position: -80px 0; } +.ui-icon-carat-1-w { background-position: -96px 0; } +.ui-icon-carat-1-nw { background-position: -112px 0; } +.ui-icon-carat-2-n-s { background-position: -128px 0; } +.ui-icon-carat-2-e-w { background-position: -144px 0; } +.ui-icon-triangle-1-n { background-position: 0 -16px; } +.ui-icon-triangle-1-ne { background-position: -16px -16px; } +.ui-icon-triangle-1-e { background-position: -32px -16px; } +.ui-icon-triangle-1-se { background-position: -48px -16px; } +.ui-icon-triangle-1-s { background-position: -64px -16px; } +.ui-icon-triangle-1-sw { background-position: -80px -16px; } +.ui-icon-triangle-1-w { background-position: -96px -16px; } +.ui-icon-triangle-1-nw { background-position: -112px -16px; } +.ui-icon-triangle-2-n-s { background-position: -128px -16px; } +.ui-icon-triangle-2-e-w { background-position: -144px -16px; } +.ui-icon-arrow-1-n { background-position: 0 -32px; } +.ui-icon-arrow-1-ne { background-position: -16px -32px; } +.ui-icon-arrow-1-e { background-position: -32px -32px; } +.ui-icon-arrow-1-se { background-position: -48px -32px; } +.ui-icon-arrow-1-s { background-position: -64px -32px; } +.ui-icon-arrow-1-sw { background-position: -80px -32px; } +.ui-icon-arrow-1-w { background-position: -96px -32px; } +.ui-icon-arrow-1-nw { background-position: -112px -32px; } +.ui-icon-arrow-2-n-s { background-position: -128px -32px; } +.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; } +.ui-icon-arrow-2-e-w { background-position: -160px -32px; } +.ui-icon-arrow-2-se-nw { background-position: -176px -32px; } +.ui-icon-arrowstop-1-n { background-position: -192px -32px; } +.ui-icon-arrowstop-1-e { background-position: -208px -32px; } +.ui-icon-arrowstop-1-s { background-position: -224px -32px; } +.ui-icon-arrowstop-1-w { background-position: -240px -32px; } +.ui-icon-arrowthick-1-n { background-position: 0 -48px; } +.ui-icon-arrowthick-1-ne { background-position: -16px -48px; } +.ui-icon-arrowthick-1-e { background-position: -32px -48px; } +.ui-icon-arrowthick-1-se { background-position: -48px -48px; } +.ui-icon-arrowthick-1-s { background-position: -64px -48px; } +.ui-icon-arrowthick-1-sw { background-position: -80px -48px; } +.ui-icon-arrowthick-1-w { background-position: -96px -48px; } +.ui-icon-arrowthick-1-nw { background-position: -112px -48px; } +.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; } +.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; } +.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; } +.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; } +.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; } +.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; } +.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; } +.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; } +.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; } +.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; } +.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; } +.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; } +.ui-icon-arrowreturn-1-w { background-position: -64px -64px; } +.ui-icon-arrowreturn-1-n { background-position: -80px -64px; } +.ui-icon-arrowreturn-1-e { background-position: -96px -64px; } +.ui-icon-arrowreturn-1-s { background-position: -112px -64px; } +.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; } +.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; } +.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; } +.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; } +.ui-icon-arrow-4 { background-position: 0 -80px; } +.ui-icon-arrow-4-diag { background-position: -16px -80px; } +.ui-icon-extlink { background-position: -32px -80px; } +.ui-icon-newwin { background-position: -48px -80px; } +.ui-icon-refresh { background-position: -64px -80px; } +.ui-icon-shuffle { background-position: -80px -80px; } +.ui-icon-transfer-e-w { background-position: -96px -80px; } +.ui-icon-transferthick-e-w { background-position: -112px -80px; } +.ui-icon-folder-collapsed { background-position: 0 -96px; } +.ui-icon-folder-open { background-position: -16px -96px; } +.ui-icon-document { background-position: -32px -96px; } +.ui-icon-document-b { background-position: -48px -96px; } +.ui-icon-note { background-position: -64px -96px; } +.ui-icon-mail-closed { background-position: -80px -96px; } +.ui-icon-mail-open { background-position: -96px -96px; } +.ui-icon-suitcase { background-position: -112px -96px; } +.ui-icon-comment { background-position: -128px -96px; } +.ui-icon-person { background-position: -144px -96px; } +.ui-icon-print { background-position: -160px -96px; } +.ui-icon-trash { background-position: -176px -96px; } +.ui-icon-locked { background-position: -192px -96px; } +.ui-icon-unlocked { background-position: -208px -96px; } +.ui-icon-bookmark { background-position: -224px -96px; } +.ui-icon-tag { background-position: -240px -96px; } +.ui-icon-home { background-position: 0 -112px; } +.ui-icon-flag { background-position: -16px -112px; } +.ui-icon-calendar { background-position: -32px -112px; } +.ui-icon-cart { background-position: -48px -112px; } +.ui-icon-pencil { background-position: -64px -112px; } +.ui-icon-clock { background-position: -80px -112px; } +.ui-icon-disk { background-position: -96px -112px; } +.ui-icon-calculator { background-position: -112px -112px; } +.ui-icon-zoomin { background-position: -128px -112px; } +.ui-icon-zoomout { background-position: -144px -112px; } +.ui-icon-search { background-position: -160px -112px; } +.ui-icon-wrench { background-position: -176px -112px; } +.ui-icon-gear { background-position: -192px -112px; } +.ui-icon-heart { background-position: -208px -112px; } +.ui-icon-star { background-position: -224px -112px; } +.ui-icon-link { background-position: -240px -112px; } +.ui-icon-cancel { background-position: 0 -128px; } +.ui-icon-plus { background-position: -16px -128px; } +.ui-icon-plusthick { background-position: -32px -128px; } +.ui-icon-minus { background-position: -48px -128px; } +.ui-icon-minusthick { background-position: -64px -128px; } +.ui-icon-close { background-position: -80px -128px; } +.ui-icon-closethick { background-position: -96px -128px; } +.ui-icon-key { background-position: -112px -128px; } +.ui-icon-lightbulb { background-position: -128px -128px; } +.ui-icon-scissors { background-position: -144px -128px; } +.ui-icon-clipboard { background-position: -160px -128px; } +.ui-icon-copy { background-position: -176px -128px; } +.ui-icon-contact { background-position: -192px -128px; } +.ui-icon-image { background-position: -208px -128px; } +.ui-icon-video { background-position: -224px -128px; } +.ui-icon-script { background-position: -240px -128px; } +.ui-icon-alert { background-position: 0 -144px; } +.ui-icon-info { background-position: -16px -144px; } +.ui-icon-notice { background-position: -32px -144px; } +.ui-icon-help { background-position: -48px -144px; } +.ui-icon-check { background-position: -64px -144px; } +.ui-icon-bullet { background-position: -80px -144px; } +.ui-icon-radio-off { background-position: -96px -144px; } +.ui-icon-radio-on { background-position: -112px -144px; } +.ui-icon-pin-w { background-position: -128px -144px; } +.ui-icon-pin-s { background-position: -144px -144px; } +.ui-icon-play { background-position: 0 -160px; } +.ui-icon-pause { background-position: -16px -160px; } +.ui-icon-seek-next { background-position: -32px -160px; } +.ui-icon-seek-prev { background-position: -48px -160px; } +.ui-icon-seek-end { background-position: -64px -160px; } +.ui-icon-seek-start { background-position: -80px -160px; } +/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */ +.ui-icon-seek-first { background-position: -80px -160px; } +.ui-icon-stop { background-position: -96px -160px; } +.ui-icon-eject { background-position: -112px -160px; } +.ui-icon-volume-off { background-position: -128px -160px; } +.ui-icon-volume-on { background-position: -144px -160px; } +.ui-icon-power { background-position: 0 -176px; } +.ui-icon-signal-diag { background-position: -16px -176px; } +.ui-icon-signal { background-position: -32px -176px; } +.ui-icon-battery-0 { background-position: -48px -176px; } +.ui-icon-battery-1 { background-position: -64px -176px; } +.ui-icon-battery-2 { background-position: -80px -176px; } +.ui-icon-battery-3 { background-position: -96px -176px; } +.ui-icon-circle-plus { background-position: 0 -192px; } +.ui-icon-circle-minus { background-position: -16px -192px; } +.ui-icon-circle-close { background-position: -32px -192px; } +.ui-icon-circle-triangle-e { background-position: -48px -192px; } +.ui-icon-circle-triangle-s { background-position: -64px -192px; } +.ui-icon-circle-triangle-w { background-position: -80px -192px; } +.ui-icon-circle-triangle-n { background-position: -96px -192px; } +.ui-icon-circle-arrow-e { background-position: -112px -192px; } +.ui-icon-circle-arrow-s { background-position: -128px -192px; } +.ui-icon-circle-arrow-w { background-position: -144px -192px; } +.ui-icon-circle-arrow-n { background-position: -160px -192px; } +.ui-icon-circle-zoomin { background-position: -176px -192px; } +.ui-icon-circle-zoomout { background-position: -192px -192px; } +.ui-icon-circle-check { background-position: -208px -192px; } +.ui-icon-circlesmall-plus { background-position: 0 -208px; } +.ui-icon-circlesmall-minus { background-position: -16px -208px; } +.ui-icon-circlesmall-close { background-position: -32px -208px; } +.ui-icon-squaresmall-plus { background-position: -48px -208px; } +.ui-icon-squaresmall-minus { background-position: -64px -208px; } +.ui-icon-squaresmall-close { background-position: -80px -208px; } +.ui-icon-grip-dotted-vertical { background-position: 0 -224px; } +.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; } +.ui-icon-grip-solid-vertical { background-position: -32px -224px; } +.ui-icon-grip-solid-horizontal { background-position: -48px -224px; } +.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; } +.ui-icon-grip-diagonal-se { background-position: -80px -224px; } + + +/* Misc visuals +----------------------------------*/ + +/* Corner radius */ +.ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; -khtml-border-top-left-radius: 4px; border-top-left-radius: 4px; } +.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; -khtml-border-top-right-radius: 4px; border-top-right-radius: 4px; } +.ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; -khtml-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; } +.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; -khtml-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; } + +/* Overlays */ +.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); } +.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/* + * jQuery UI Resizable 1.8.18 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Resizable#theming + */ +.ui-resizable { position: relative;} +.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block; } +.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; } +.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; } +.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; } +.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; } +.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; } +.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; } +.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; } +.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; } +.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/* + * jQuery UI Selectable 1.8.18 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Selectable#theming + */ +.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; } +/* + * jQuery UI Accordion 1.8.18 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Accordion#theming + */ +/* IE/Win - Fix animation bug - #4615 */ +.ui-accordion { width: 100%; } +.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; } +.ui-accordion .ui-accordion-li-fix { display: inline; } +.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; } +.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em .7em; } +.ui-accordion-icons .ui-accordion-header a { padding-left: 2.2em; } +.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; } +.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; } +.ui-accordion .ui-accordion-content-active { display: block; } +/* + * jQuery UI Autocomplete 1.8.18 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Autocomplete#theming + */ +.ui-autocomplete { position: absolute; cursor: default; } + +/* workarounds */ +* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */ + +/* + * jQuery UI Menu 1.8.18 + * + * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Menu#theming + */ +.ui-menu { + list-style:none; + padding: 2px; + margin: 0; + display:block; + float: left; +} +.ui-menu .ui-menu { + margin-top: -3px; +} +.ui-menu .ui-menu-item { + margin:0; + padding: 0; + zoom: 1; + float: left; + clear: left; + width: 100%; +} +.ui-menu .ui-menu-item a { + text-decoration:none; + display:block; + padding:.2em .4em; + line-height:1.5; + zoom:1; +} +.ui-menu .ui-menu-item a.ui-state-hover, +.ui-menu .ui-menu-item a.ui-state-active { + font-weight: normal; + margin: -1px; +} +/* + * jQuery UI Button 1.8.18 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Button#theming + */ +.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: hidden; *overflow: visible; } /* the overflow property removes extra width in IE */ +.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */ +button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */ +.ui-button-icons-only { width: 3.4em; } +button.ui-button-icons-only { width: 3.7em; } + +/*button text element */ +.ui-button .ui-button-text { display: block; line-height: 1.4; } +.ui-button-text-only .ui-button-text { padding: .4em 1em; } +.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; } +.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; } +.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; } +.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; } +/* no icon support for input elements, provide padding by default */ +input.ui-button { padding: .4em 1em; } + +/*button icon element(s) */ +.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; } +.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; } +.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; } +.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; } +.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; } + +/*button sets*/ +.ui-buttonset { margin-right: 7px; } +.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; } + +/* workarounds */ +button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */ +/* + * jQuery UI Dialog 1.8.18 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Dialog#theming + */ +.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; } +.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative; } +.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; } +.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; } +.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; } +.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; } +.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; } +.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; } +.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; } +.ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; } +.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; } +.ui-draggable .ui-dialog-titlebar { cursor: move; } +/* + * jQuery UI Slider 1.8.18 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Slider#theming + */ +.ui-slider { position: relative; text-align: left; } +.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; } +.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; } + +.ui-slider-horizontal { height: .8em; } +.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; } +.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; } +.ui-slider-horizontal .ui-slider-range-min { left: 0; } +.ui-slider-horizontal .ui-slider-range-max { right: 0; } + +.ui-slider-vertical { width: .8em; height: 100px; } +.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; } +.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; } +.ui-slider-vertical .ui-slider-range-min { bottom: 0; } +.ui-slider-vertical .ui-slider-range-max { top: 0; }/* + * jQuery UI Tabs 1.8.18 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Tabs#theming + */ +.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */ +.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; } +.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 1px; margin: 0 .2em 1px 0; border-bottom: 0 !important; padding: 0; white-space: nowrap; } +.ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; } +.ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: 0; padding-bottom: 1px; } +.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; } +.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */ +.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; } +.ui-tabs .ui-tabs-hide { display: none !important; } +/* + * jQuery UI Datepicker 1.8.18 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Datepicker#theming + */ +.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; } +.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; } +.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; } +.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; } +.ui-datepicker .ui-datepicker-prev { left:2px; } +.ui-datepicker .ui-datepicker-next { right:2px; } +.ui-datepicker .ui-datepicker-prev-hover { left:1px; } +.ui-datepicker .ui-datepicker-next-hover { right:1px; } +.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px; } +.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; } +.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; } +.ui-datepicker select.ui-datepicker-month-year {width: 100%;} +.ui-datepicker select.ui-datepicker-month, +.ui-datepicker select.ui-datepicker-year { width: 49%;} +.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; } +.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0; } +.ui-datepicker td { border: 0; padding: 1px; } +.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; } +.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; } +.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; } +.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; } + +/* with multiple calendars */ +.ui-datepicker.ui-datepicker-multi { width:auto; } +.ui-datepicker-multi .ui-datepicker-group { float:left; } +.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; } +.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; } +.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; } +.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; } +.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; } +.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; } +.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; } +.ui-datepicker-row-break { clear:both; width:100%; font-size:0em; } + +/* RTL support */ +.ui-datepicker-rtl { direction: rtl; } +.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; } +.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; } +.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; } +.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; } +.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; } +.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; } +.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; } +.ui-datepicker-rtl .ui-datepicker-group { float:right; } +.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; } +.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; } + +/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */ +.ui-datepicker-cover { + display: none; /*sorry for IE5*/ + display/**/: block; /*sorry for IE5*/ + position: absolute; /*must have*/ + z-index: -1; /*must have*/ + filter: mask(); /*must have*/ + top: -4px; /*must have*/ + left: -4px; /*must have*/ + width: 200px; /*must have*/ + height: 200px; /*must have*/ +} \ No newline at end of file Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_flat_0_aaaaaa_40x100.png =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_flat_0_aaaaaa_40x100.png (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_flat_0_aaaaaa_40x100.png 2012-04-13 10:57:08 UTC (rev 3255) @@ -0,0 +1,4 @@ +�PNG + + +IHDR(d�drz{IDATh��1� 1��7Y$t��3�;_�TUAUPTUAUPTUAUPTUAUPTUAUPTUAUPTUAUPTUAUPTUAUPTUAUPTUAUPTUAUPTüŝc�)IEND�B`� \ No newline at end of file Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_flat_75_ffffaa_40x100.png =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_flat_75_ffffaa_40x100.png (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_flat_75_ffffaa_40x100.png 2012-04-13 10:57:08 UTC (rev 3255) @@ -0,0 +1,4 @@ +�PNG + + +IHDR(d�drz{IDATh��1� 1�%��J�pCyfά��_+�J��+�J��+�J��+�J��+�J��+�J��+�J��+�J��+�J��+�J��+�J��+�J��o��IEND�B`� \ No newline at end of file Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_glass_55_fbf9ee_1x400.png =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_glass_55_fbf9ee_1x400.png (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_glass_55_fbf9ee_1x400.png 2012-04-13 10:57:08 UTC (rev 3255) @@ -0,0 +1,4 @@ +�PNG + + +IHDR�_:MWIDAT8��1�0�F��"^P�CYNQǊe��($P�0�0x�8y��f�g�GqWÒ1(��ڃ�;I�v�?��H<W!�<k��IEND�B`� \ No newline at end of file Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_glass_65_ffcc00_1x400.png =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_glass_65_ffcc00_1x400.png (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_glass_65_ffcc00_1x400.png 2012-04-13 10:57:08 UTC (rev 3255) @@ -0,0 +1,6 @@ +�PNG + + +IHDR�oX +�JIDAT8��ϻ +�PCћ+>a-�g�!T��Jsd.�u�%@�4�:(��1\�H�Dܐ؞d��X��3MӼr}yvNV��IEND�B`� \ No newline at end of file Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_glass_75_fff71f_1x400.png =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_glass_75_fff71f_1x400.png (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_glass_75_fff71f_1x400.png 2012-04-13 10:57:08 UTC (rev 3255) @@ -0,0 +1,6 @@ +�PNG + + +IHDR�_:MpIDAT8��1 +�@��T +ҥRb!x��+{��&c��p��z3<��#�)��1��x��fyb�f��Z^R�1:�肥q��k@��K�'��6д�-�̩ ��IEND�B`� \ No newline at end of file Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_glass_75_ffff0f_1x400.png =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_glass_75_ffff0f_1x400.png (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_glass_75_ffff0f_1x400.png 2012-04-13 10:57:08 UTC (rev 3255) @@ -0,0 +1,8 @@ +�PNG + + +IHDR�oX +�KIDAT8��ϱ +�@C��r +۱�$g��P�'vaֺ-��i� +�e��@��` H1�=+A";�1j��L�4�<l��(+)IEND�B`� \ No newline at end of file Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_highlight-soft_75_ffff0f_1x100.png =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_highlight-soft_75_ffff0f_1x100.png (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_highlight-soft_75_ffff0f_1x100.png 2012-04-13 10:57:08 UTC (rev 3255) @@ -0,0 +1,7 @@ +�PNG + + +IHDRd0+j�pIDAT�� +Aļ�-P%mR��8��^g��8!$Nvg��b!z��j��n�1;A#��}XI�J� +{hCW۸�:U��e�' +�;�Kk�IEND�B`� \ No newline at end of file Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_inset-soft_95_fef1ec_1x100.png =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_inset-soft_95_fef1ec_1x100.png (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_inset-soft_95_fef1ec_1x100.png 2012-04-13 10:57:08 UTC (rev 3255) @@ -0,0 +1,4 @@ +�PNG + + +IHDRdG,Z`BIDAT��;�B��Rm��`�'K��֥��Fb��Z&��Ѻv�Й��|��3��x�[��IEND�B`� \ No newline at end of file Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_222222_256x240.png =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_222222_256x240.png (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_222222_256x240.png 2012-04-13 10:57:08 UTC (rev 3255) @@ -0,0 +1,40 @@ +�PNG + + +IHDR��IJ��PLTE$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$$"$�ÈNtRNS2P��."Tp@f`� <BHJZ&0R,�4��j��8D��|��(��$� +��b��lߝF>n~�hh�H��IDATx��]�b۶�H�儒-{i�ZK:g�lk�n��-��tI��q�q? E�$��dK>$�>�;��P�Z��s�V��h!�Sy��0E�0}H�)-��tk��o�ܪKp�\R�Ϡ ��.�E�7�� +�)�*V;~�Pe�� +Bx�*�,=$z��Dؾ�� J��Ҹٻ��9�{ ��Ǹ�Hp�qW@��"2'��B��[�$�� @T��i�H�/��b٥9�6�!�X�Hq`DE��*R�� +HV!�%��;��"�� +�i��]�dddddddd��4y��5 �� Rb�@(�8��Cd��Ū�ݡ�,�@T�@i��b�rq0a�lX!��p��e�, ��=4bW �{� +5��Ƭhu~�(�Q�^@��3�=��"�b��5XC@J��C��T��7��6��q_��5��@,r šɩ�D�)�T�|�O��@� +ON-ՙ�� [n@��R��X�Im�݋(��F �@�?��=0��puL��;g$��@6η�� +�K`��>п� @h գ��KV�n�"a�"��%l�@.v�$/��U^��G�:#`�`�� u��TtK��~�ŋ�Z��5T��%�k��x��k��]\*�Q�� +,҇��B��44�OXK�|�y��g��+_M�(�lоE�O�� + V$�T1BX��b�-�|?@ �f��B�Xr��%'@ҹA\�I��J,}��BBc��\V +��r��h(�]tI��^��}��o�צo�S3� ";��ʙ��b}��"߰ ��){b$��Gwwݾ��a��b"��)��T@p��F_er6JvШ��"m�ޭ�M-��d7��6��x��˰6ӥ;��/��`>KrP\��_��^u�1%��O�T�M��.�}��Q3��.Nس��}��)��>��-�w�`��a��+sy$��t��)�N�bFFFF��Be�j��nN��Vn4��,��A*��X��*��5��>��P��G��a��3 ��{�oB� +�&<��L[��Nc.��ö�i=�`�Q@�d�� +͆I��.I��l�`\t�[< �Cit�48��4�-r��+��f��쑱�B��CB ��MH� i��y}��>��rx��p|z�;B��Ǐ;�b�u��r��c�K��4t��z��1�G~��`��ؚ��K��| ̔>��ۡ��O$��~ +�Ao)��0pzz +�}i��`;AD��m8n:�cf�A@s7��L�� Z�/..��h8�o��r? +� +�N��9��3B��~o_��'`��o��pO-�� +:�TG� L;��7��]`��B��%�˛>��*wT��pM��0H�}&t��^1��'Oq�r'�2P�͡��+�z,tIW''|en��=ǳg��R�m�[N�S�t�K{��҉m��ؓV�t�6��ҲR`��ζN�&}��B U��(�r<�qȁVyr�rA**��دzg6�D#�� YP�`��v��s��~(�z�Ml�e�|u��Q�a�*}�+T�� +��R��Xc"+*�N�l��N�hc�Ft�<N+;-}�،Xtٕ$��à^��|uv��*��~�'E�_��5��1�q�s�*�R�`�OΒ��9�#x4�4�9�#��WHۏ��Z��)]0�`p�<��ߝ��N��oY{�4�7��6�ǹ�>�ۗ&��1%�Q''��?�l��׸�+&�r{�j�N�಻��4�)��`�N狌�.��߭�� ǣ��)q �2�?��n�3H�b��`�}� ��.`��pqY1�e_b��u�7��e+N��_F��(�D�T��,��L}LL�r��mP5��|��x芥1�c��x DAb��`��M(��7��NED�~<v\ %,��ߚ/��p��R��~/^��l��np� +��7t��0_��0��l4��_��b�0�MWΦj�m��б�Ɏ�l +|re�� +�ȫ`B-��v.i��Ro�x}� +�)��%#`�Ђ�R5C��A�2su��a��sYy3��=jaeoI�7�~��.�plA��΃� +`O��)�� ^�>��Mz� ��+4��BXd.��Mz��v͈��P�d8�p��<6?��8�N��*x��.��6ڍ6G��F�Z��)��O�� !��l�S�s��h��ss�N��p8�`'�0�/<��s��}�.�@Ǩ�s�7ξ�O۟V�D��a5��a�v��]��m1��+��3��y�6�۠��>@�u50��P�s��5��1=��=�p�� *��KV�ҫ܂��ݻc$N�4�(�X�r2###c-��賟L��δ�>��]��5�.�s��Ys�1��f0�;�'̨��Y�g銛�{�@9�� `aC(��=%b�o�2��=��n��1� j��B��o��S$n��#��m��=i��0�c��i9��}�oI�� q�T��]�W%.��(��؅�]z�\�x� +f��"]o��'u�䫵�t�k{�v;A��C3ֆw��w�R_#��X��(x��ҋ/q%��W��hp��k_I�X��'b��/fX��K�i�"#####�QCL�i��2t�� +��5��L0 +��Qi�H�2;y�T�Ook;ע�ٶ`��R��Ng{z�y�!�Kx��m�?A(v��U�~��mL�(`o/!n��mX��-{�v��[�� d�w�=�n「��sdw��z��n�(��}O�y�~��m� +��?XU�;,��V'+��V�&�J�R��Z]᧭�:��zC'��-߆��@�y +�4��u��`Vۓw��ъ#��zP@Q� +N>2/��{�\o)��W��~a�3xL�w +:_Q�;��=p�ּ�dt��\'8��~3�SRP��6��y+��X��Q�*��޺r +��̗ѭ*��޺r +g��l�/�\U^��u�$��|mb��Vn��w�\V��|��D�͊NVN��y��7��k<;��/�E}?E*ǳg�O ��~��g��/9��6��f +c�D}%��g$�Q�G�7�o��)��UJ��o�,O@�0߾Q(��;�b��w��:5� �N�wR��N5�I��y'K�?}��:9�m��ֽ��*��@f�@jU9�m��ҫ��Í�{��$�ؗ�}��dF��p��|%!DdF��>��}G��{��@FFFFFFƦQܞH � +��3 +��u ��M�o��~�vy�}�m�wz<�7��nP9�r�Wk��u=��|��_�n��z쿳}@��IX�n��?��s<uPIEND�B`� \ No newline at end of file Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_454545_256x240.png =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_454545_256x240.png (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_454545_256x240.png 2012-04-13 10:57:08 UTC (rev 3255) @@ -0,0 +1,40 @@ +�PNG + + +IHDR��IJ��PLTEDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDDFDm�:NtRNS2P��."Tp@f`� <BHJZ&0R,�4��j��8D��|��(��$� +��b��lߝF>n~�hh�H��IDATx��]�b۶�H�儒-{i�ZK:g�lk�n��-��tI��q�q? E�$��dK>$�>�;��P�Z��s�V��h!�Sy��0E�0}H�)-��tk��o�ܪKp�\R�Ϡ ��.�E�7�� +�)�*V;~�Pe�� +Bx�*�,=$z��Dؾ�� J��Ҹٻ��9�{ ��Ǹ�Hp�qW@��"2'��B��[�$�� @T��i�H�/��b٥9�6�!�X�Hq`DE��*R�� +HV!�%��;��"�� +�i��]�dddddddd��4y��5 �� Rb�@(�8��Cd��Ū�ݡ�,�@T�@i��b�rq0a�lX!��p��e�, ��=4bW �{� +5��Ƭhu~�(�Q�^@��3�=��"�b��5XC@J��C��T��7��6��q_��5��@,r šɩ�D�)�T�|�O��@� +ON-ՙ�� [n@��R��X�Im�݋(��F �@�?��=0��puL��;g$��@6η�� +�K`��>п� @h գ��KV�n�"a�"��%l�@.v�$/��U^��G�:#`�`�� u��TtK��~�ŋ�Z��5T��%�k��x��k��]\*�Q�� +,҇��B��44�OXK�|�y��g��+_M�(�lоE�O�� + V$�T1BX��b�-�|?@ �f��B�Xr��%'@ҹA\�I��J,}��BBc��\V +��r��h(�]tI��^��}��o�צo�S3� ";��ʙ��b}��"߰ ��){b$��Gwwݾ��a��b"��)��T@p��F_er6JvШ��"m�ޭ�M-��d7��6��x��˰6ӥ;��/��`>KrP\��_��^u�1%��O�T�M��.�}��Q3��.Nس��}��)��>��-�w�`��a��+sy$��t��)�N�bFFFF��Be�j��nN��Vn4��,��A*��X��*��5��>��P��G��a��3 ��{�oB� +�&<��L[��Nc.��ö�i=�`�Q@�d�� +͆I��.I��l�`\t�[< �Cit�48��4�-r��+��f��쑱�B��CB ��MH� i��y}��>��rx��p|z�;B��Ǐ;�b�u��r��c�K��4t��z��1�G~��`��ؚ��K��| ̔>��ۡ��O$��~ +�Ao)��0pzz +�}i��`;AD��m8n:�cf�A@s7��L�� Z�/..��h8�o��r? +� +�N��9��3B��~o_��'`��o��pO-�� +:�TG� L;��7��]`��B��%�˛>��*wT��pM��0H�}&t��^1��'Oq�r'�2P�͡��+�z,tIW''|en��=ǳg��R�m�[N�S�t�K{��҉m��ؓV�t�6��ҲR`��ζN�&}��B U��(�r<�qȁVyr�rA**��دzg6�D#�� YP�`��v��s��~(�z�Ml�e�|u��Q�a�*}�+T�� +��R��Xc"+*�N�l��N�hc�Ft�<N+;-}�،Xtٕ$��à^��|uv��*��~�'E�_��5��1�q�s�*�R�`�OΒ��9�#x4�4�9�#��WHۏ��Z��)]0�`p�<��ߝ��N��oY{�4�7��6�ǹ�>�ۗ&��1%�Q''��?�l��׸�+&�r{�j�N�಻��4�)��`�N狌�.��߭�� ǣ��)q �2�?��n�3H�b��`�}� ��.`��pqY1�e_b��u�7��e+N��_F��(�D�T��,��L}LL�r��mP5��|��x芥1�c��x DAb��`��M(��7��NED�~<v\ %,��ߚ/��p��R��~/^��l��np� +��7t��0_��0��l4��_��b�0�MWΦj�m��б�Ɏ�l +|re�� +�ȫ`B-��v.i��Ro�x}� +�)��%#`�Ђ�R5C��A�2su��a��sYy3��=jaeoI�7�~��.�plA��΃� +`O��)�� ^�>��Mz� ��+4��BXd.��Mz��v͈��P�d8�p��<6?��8�N��*x��.��6ڍ6G��F�Z��)��O�� !��l�S�s��h��ss�N��p8�`'�0�/<��s��}�.�@Ǩ�s�7ξ�O۟V�D��a5��a�v��]��m1��+��3��y�6�۠��>@�u50��P�s��5��1=��=�p�� *��KV�ҫ܂��ݻc$N�4�(�X�r2###c-��賟L��δ�>��]��5�.�s��Ys�1��f0�;�'̨��Y�g銛�{�@9�� `aC(��=%b�o�2��=��n��1� j��B��o��S$n��#��m��=i��0�c��i9��}�oI�� q�T��]�W%.��(��؅�]z�\�x� +f��"]o��'u�䫵�t�k{�v;A��C3ֆw��w�R_#��X��(x��ҋ/q%��W��hp��k_I�X��'b��/fX��K�i�"#####�QCL�i��2t�� +��5��L0 +��Qi�H�2;y�T�Ook;ע�ٶ`��R��Ng{z�y�!�Kx��m�?A(v��U�~��mL�(`o/!n��mX��-{�v��[�� d�w�=�n「��sdw��z��n�(��}O�y�~��m� +��?XU�;,��V'+��V�&�J�R��Z]᧭�:��zC'��-߆��@�y +�4��u��`Vۓw��ъ#��zP@Q� +N>2/��{�\o)��W��~a�3xL�w +:_Q�;��=p�ּ�dt��\'8��~3�SRP��6��y+��X��Q�*��޺r +��̗ѭ*��޺r +g��l�/�\U^��u�$��|mb��Vn��w�\V��|��D�͊NVN��y��7��k<;��/�E}?E*ǳg�O ��~��g��/9��6��f +c�D}%��g$�Q�G�7�o��)��UJ��o�,O@�0߾Q(��;�b��w��:5� �N�wR��N5�I��y'K�?}��:9�m��ֽ��*��@f�@jU9�m��ҫ��Í�{��$�ؗ�}��dF��p��|%!DdF��>��}G��{��@FFFFFFƦQܞH � +��3 +��u ��M�o��~�vy�}�m�wz<�7��nP9�r�Wk��u=��|��_�n��z쿳}@��IX�n��?��s<uPIEND�B`� \ No newline at end of file Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_cd0a0a_256x240.png =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_cd0a0a_256x240.png (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_cd0a0a_256x240.png 2012-04-13 10:57:08 UTC (rev 3255) @@ -0,0 +1,119 @@ +�PNG + + +IHDR��IJ��PLTE� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +� +�FcNtRNS2P��."Tp@f`� <BHJZ&0R,�4��j��8D��|��(��$� +��b��lߝF>n~�hh�H��IDATx��]�b۶�H�儒-{i�ZK:g�lk�n��-��tI��q�q? E�$��dK>$�>�;��P�Z��s�V��h!�Sy��0E�0}H�)-��tk��o�ܪKp�\R�Ϡ ��.�E�7�� +�)�*V;~�Pe�� +Bx�*�,=$z��Dؾ�� J��Ҹٻ��9�{ ��Ǹ�Hp�qW@��"2'��B��[�$�� @T��i�H�/��b٥9�6�!�X�Hq`DE��*R�� +HV!�%��;��"�� +�i��]�dddddddd��4y��5 �� Rb�@(�8��Cd��Ū�ݡ�,�@T�@i��b�rq0a�lX!��p��e�, ��=4bW �{� +5��Ƭhu~�(�Q�^@��3�=��"�b��5XC@J��C��T��7��6��q_��5��@,r šɩ�D�)�T�|�O��@� +ON-ՙ�� [n@��R��X�Im�݋(��F �@�?��=0��puL��;g$��@6η�� +�K`��>п� @h գ��KV�n�"a�"��%l�@.v�$/��U^��G�:#`�`�� u��TtK��~�ŋ�Z��5T��%�k��x��k��]\*�Q�� +,҇��B��44�OXK�|�y��g��+_M�(�lоE�O�� + V$�T1BX��b�-�|?@ �f��B�Xr��%'@ҹA\�I��J,}��BBc��\V +��r��h(�]tI��^��}��o�צo�S3� ";��ʙ��b}��"߰ ��){b$��Gwwݾ��a��b"��)��T@p��F_er6JvШ��"m�ޭ�M-��d7��6��x��˰6ӥ;��/��`>KrP\��_��^u�1%��O�T�M��.�}��Q3��.Nس��}��)��>��-�w�`��a��+sy$��t��)�N�bFFFF��Be�j��nN��Vn4��,��A*��X��*��5��>��P��G��a��3 ��{�oB� +�&<��L[��Nc.��ö�i=�`�Q@�d�� +͆I��.I��l�`\t�[< �Cit�48��4�-r��+��f��쑱�B��CB ��MH� i��y}��>��rx��p|z�;B��Ǐ;�b�u��r��c�K��4t��z��1�G~��`��ؚ��K��| ̔>��ۡ��O$��~ +�Ao)��0pzz +�}i��`;AD��m8n:�cf�A@s7��L�� Z�/..��h8�o��r? +� +�N��9��3B��~o_��'`��o��pO-�� +:�TG� L;��7��]`��B��%�˛>��*wT��pM��0H�}&t��^1��'Oq�r'�2P�͡��+�z,tIW''|en��=ǳg��R�m�[N�S�t�K{��҉m��ؓV�t�6��ҲR`��ζN�&}��B U��(�r<�qȁVyr�rA**��دzg6�D#�� YP�`��v��s��~(�z�Ml�e�|u��Q�a�*}�+T�� +��R��Xc"+*�N�l��N�hc�Ft�<N+;-}�،Xtٕ$��à^��|uv��*��~�'E�_��5��1�q�s�*�R�`�OΒ��9�#x4�4�9�#��WHۏ��Z��)]0�`p�<��ߝ��N��oY{�4�7��6�ǹ�>�ۗ&��1%�Q''��?�l��׸�+&�r{�j�N�಻��4�)��`�N狌�.��߭�� ǣ��)q �2�?��n�3H�b��`�}� ��.`��pqY1�e_b��u�7��e+N��_F��(�D�T��,��L}LL�r��mP5��|��x芥1�c��x DAb��`��M(��7��NED�~<v\ %,��ߚ/��p��R��~/^��l��np� +��7t��0_��0��l4��_��b�0�MWΦj�m��б�Ɏ�l +|re�� +�ȫ`B-��v.i��Ro�x}� +�)��%#`�Ђ�R5C��A�2su��a��sYy3��=jaeoI�7�~��.�plA��΃� +`O��)�� ^�>��Mz� ��+4��BXd.��Mz��v͈��P�d8�p��<6?��8�N��*x��.��6ڍ6G��F�Z��)��O�� !��l�S�s��h��ss�N��p8�`'�0�/<��s��}�.�@Ǩ�s�7ξ�O۟V�D��a5��a�v��]��m1��+��3��y�6�۠��>@�u50��P�s��5��1=��=�p�� *��KV�ҫ܂��ݻc$N�4�(�X�r2###c-��賟L��δ�>��]��5�.�s��Ys�1��f0�;�'̨��Y�g銛�{�@9�� `aC(��=%b�o�2��=��n��1� j��B��o��S$n��#��m��=i��0�c��i9��}�oI�� q�T��]�W%.��(��؅�]z�\�x� +f��"]o��'u�䫵�t�k{�v;A��C3ֆw��w�R_#��X��(x��ҋ/q%��W��hp��k_I�X��'b��/fX��K�i�"#####�QCL�i��2t�� +��5��L0 +��Qi�H�2;y�T�Ook;ע�ٶ`��R��Ng{z�y�!�Kx��m�?A(v��U�~��mL�(`o/!n��mX��-{�v��[�� d�w�=�n「��sdw��z��n�(��}O�y�~��m� +��?XU�;,��V'+��V�&�J�R��Z]᧭�:��zC'��-߆��@�y +�4��u��`Vۓw��ъ#��zP@Q� +N>2/��{�\o)��W��~a�3xL�w +:_Q�;��=p�ּ�dt��\'8��~3�SRP��6��y+��X��Q�*��޺r +��̗ѭ*��޺r +g��l�/�\U^��u�$��|mb��Vn��w�\V��|��D�͊NVN��y��7��k<;��/�E}?E*ǳg�O ��~��g��/9��6��f +c�D}%��g$�Q�G�7�o��)��UJ��o�,O@�0߾Q(��;�b��w��:5� �N�wR��N5�I��y'K�?}��:9�m��ֽ��*��@f�@jU9�m��ҫ��Í�{��$�ؗ�}��dF��p��|%!DdF��>��}G��{��@FFFFFFƦQܞH � +��3 +��u ��M�o��~�vy�}�m�wz<�7��nP9�r�Wk��u=��|��_�n��z쿳}@��IX�n��?��s<uPIEND�B`� \ No newline at end of file Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_dcb104_256x240.png =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_dcb104_256x240.png (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_dcb104_256x240.png 2012-04-13 10:57:08 UTC (rev 3255) @@ -0,0 +1,40 @@ +�PNG + + +IHDR��IJ��PLTEܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲܲ��NtRNS2P��."Tp@f`� <BHJZ&0R,�4��j��8D��|��(��$� +��b��lߝF>n~�hh�H��IDATx��]�b۶�H�儒-{i�ZK:g�lk�n��-��tI��q�q? E�$��dK>$�>�;��P�Z��s�V��h!�Sy��0E�0}H�)-��tk��o�ܪKp�\R�Ϡ ��.�E�7�� +�)�*V;~�Pe�� +Bx�*�,=$z��Dؾ�� J��Ҹٻ��9�{ ��Ǹ�Hp�qW@��"2'��B��[�$�� @T��i�H�/��b٥9�6�!�X�Hq`DE��*R�� +HV!�%��;��"�� +�i��]�dddddddd��4y��5 �� Rb�@(�8��Cd��Ū�ݡ�,�@T�@i��b�rq0a�lX!��p��e�, ��=4bW �{� +5��Ƭhu~�(�Q�^@��3�=��"�b��5XC@J��C��T��7��6��q_��5��@,r šɩ�D�)�T�|�O��@� +ON-ՙ�� [n@��R��X�Im�݋(��F �@�?��=0��puL��;g$��@6η�� +�K`��>п� @h գ��KV�n�"a�"��%l�@.v�$/��U^��G�:#`�`�� u��TtK��~�ŋ�Z��5T��%�k��x��k��]\*�Q�� +,҇��B��44�OXK�|�y��g��+_M�(�lоE�O�� + V$�T1BX��b�-�|?@ �f��B�Xr��%'@ҹA\�I��J,}��BBc��\V +��r��h(�]tI��^��}��o�צo�S3� ";��ʙ��b}��"߰ ��){b$��Gwwݾ��a��b"��)��T@p��F_er6JvШ��"m�ޭ�M-��d7��6��x��˰6ӥ;��/��`>KrP\��_��^u�1%��O�T�M��.�}��Q3��.Nس��}��)��>��-�w�`��a��+sy$��t��)�N�bFFFF��Be�j��nN��Vn4��,��A*��X��*��5��>��P��G��a��3 ��{�oB� +�&<��L[��Nc.��ö�i=�`�Q@�d�� +͆I��.I��l�`\t�[< �Cit�48��4�-r��+��f��쑱�B��CB ��MH� i��y}��>��rx��p|z�;B��Ǐ;�b�u��r��c�K��4t��z��1�G~��`��ؚ��K��| ̔>��ۡ��O$��~ +�Ao)��0pzz +�}i��`;AD��m8n:�cf�A@s7��L�� Z�/..��h8�o��r? +� +�N��9��3B��~o_��'`��o��pO-�� +:�TG� L;��7��]`��B��%�˛>��*wT��pM��0H�}&t��^1��'Oq�r'�2P�͡��+�z,tIW''|en��=ǳg��R�m�[N�S�t�K{��҉m��ؓV�t�6��ҲR`��ζN�&}��B U��(�r<�qȁVyr�rA**��دzg6�D#�� YP�`��v��s��~(�z�Ml�e�|u��Q�a�*}�+T�� +��R��Xc"+*�N�l��N�hc�Ft�<N+;-}�،Xtٕ$��à^��|uv��*��~�'E�_��5��1�q�s�*�R�`�OΒ��9�#x4�4�9�#��WHۏ��Z��)]0�`p�<��ߝ��N��oY{�4�7��6�ǹ�>�ۗ&��1%�Q''��?�l��׸�+&�r{�j�N�಻��4�)��`�N狌�.��߭�� ǣ��)q �2�?��n�3H�b��`�}� ��.`��pqY1�e_b��u�7��e+N��_F��(�D�T��,��L}LL�r��mP5��|��x芥1�c��x DAb��`��M(��7��NED�~<v\ %,��ߚ/��p��R��~/^��l��np� +��7t��0_��0��l4��_��b�0�MWΦj�m��б�Ɏ�l +|re�� +�ȫ`B-��v.i��Ro�x}� +�)��%#`�Ђ�R5C��A�2su��a��sYy3��=jaeoI�7�~��.�plA��΃� +`O��)�� ^�>��Mz� ��+4��BXd.��Mz��v͈��P�d8�p��<6?��8�N��*x��.��6ڍ6G��F�Z��)��O�� !��l�S�s��h��ss�N��p8�`'�0�/<��s��}�.�@Ǩ�s�7ξ�O۟V�D��a5��a�v��]��m1��+��3��y�6�۠��>@�u50��P�s��5��1=��=�p�� *��KV�ҫ܂��ݻc$N�4�(�X�r2###c-��賟L��δ�>��]��5�.�s��Ys�1��f0�;�'̨��Y�g銛�{�@9�� `aC(��=%b�o�2��=��n��1� j��B��o��S$n��#��m��=i��0�c��i9��}�oI�� q�T��]�W%.��(��؅�]z�\�x� +f��"]o��'u�䫵�t�k{�v;A��C3ֆw��w�R_#��X��(x��ҋ/q%��W��hp��k_I�X��'b��/fX��K�i�"#####�QCL�i��2t�� +��5��L0 +��Qi�H�2;y�T�Ook;ע�ٶ`��R��Ng{z�y�!�Kx��m�?A(v��U�~��mL�(`o/!n��mX��-{�v��[�� d�w�=�n「��sdw��z��n�(��}O�y�~��m� +��?XU�;,��V'+��V�&�J�R��Z]᧭�:��zC'��-߆��@�y +�4��u��`Vۓw��ъ#��zP@Q� +N>2/��{�\o)��W��~a�3xL�w +:_Q�;��=p�ּ�dt��\'8��~3�SRP��6��y+��X��Q�*��޺r +��̗ѭ*��޺r +g��l�/�\U^��u�$��|mb��Vn��w�\V��|��D�͊NVN��y��7��k<;��/�E}?E*ǳg�O ��~��g��/9��6��f +c�D}%��g$�Q�G�7�o��)��UJ��o�,O@�0߾Q(��;�b��w��:5� �N�wR��N5�I��y'K�?}��:9�m��ֽ��*��@f�@jU9�m��ҫ��Í�{��$�ؗ�}��dF��p��|%!DdF��>��}G��{��@FFFFFFƦQܞH � +��3 +��u ��M�o��~�vy�}�m�wz<�7��nP9�r�Wk��u=��|��_�n��z쿳}@��IX�n��?��s<uPIEND�B`� \ No newline at end of file Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_ffcc00_256x240.png =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_ffcc00_256x240.png (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_ffcc00_256x240.png 2012-04-13 10:57:08 UTC (rev 3255) @@ -0,0 +1,40 @@ +�PNG + + +IHDR��IJ��PLTE��w��hNtRNS2P��."Tp@f`� <BHJZ&0R,�4��j��8D��|��(��$� +��b��lߝF>n~�hh�H��IDATx��]�b۶�H�儒-{i�ZK:g�lk�n��-��tI��q�q? E�$��dK>$�>�;��P�Z��s�V��h!�Sy��0E�0}H�)-��tk��o�ܪKp�\R�Ϡ ��.�E�7�� +�)�*V;~�Pe�� +Bx�*�,=$z��Dؾ�� J��Ҹٻ��9�{ ��Ǹ�Hp�qW@��"2'��B��[�$�� @T��i�H�/��b٥9�6�!�X�Hq`DE��*R�� +HV!�%��;��"�� +�i��]�dddddddd��4y��5 �� Rb�@(�8��Cd��Ū�ݡ�,�@T�@i��b�rq0a�lX!��p��e�, ��=4bW �{� +5��Ƭhu~�(�Q�^@��3�=��"�b��5XC@J��C��T��7��6��q_��5��@,r šɩ�D�)�T�|�O��@� +ON-ՙ�� [n@��R��X�Im�݋(��F �@�?��=0��puL��;g$��@6η�� +�K`��>п� @h գ��KV�n�"a�"��%l�@.v�$/��U^��G�:#`�`�� u��TtK��~�ŋ�Z��5T��%�k��x��k��]\*�Q�� +,҇��B��44�OXK�|�y��g��+_M�(�lоE�O�� + V$�T1BX��b�-�|?@ �f��B�Xr��%'@ҹA\�I��J,}��BBc��\V +��r��h(�]tI��^��}��o�צo�S3� ";��ʙ��b}��"߰ ��){b$��Gwwݾ��a��b"��)��T@p��F_er6JvШ��"m�ޭ�M-��d7��6��x��˰6ӥ;��/��`>KrP\��_��^u�1%��O�T�M��.�}��Q3��.Nس��}��)��>��-�w�`��a��+sy$��t��)�N�bFFFF��Be�j��nN��Vn4��,��A*��X��*��5��>��P��G��a��3 ��{�oB� +�&<��L[��Nc.��ö�i=�`�Q@�d�� +͆I��.I��l�`\t�[< �Cit�48��4�-r��+��f��쑱�B��CB ��MH� i��y}��>��rx��p|z�;B��Ǐ;�b�u��r��c�K��4t��z��1�G~��`��ؚ��K��| ̔>��ۡ��O$��~ +�Ao)��0pzz +�}i��`;AD��m8n:�cf�A@s7��L�� Z�/..��h8�o��r? +� +�N��9��3B��~o_��'`��o��pO-�� +:�TG� L;��7��]`��B��%�˛>��*wT��pM��0H�}&t��^1��'Oq�r'�2P�͡��+�z,tIW''|en��=ǳg��R�m�[N�S�t�K{��҉m��ؓV�t�6��ҲR`��ζN�&}��B U��(�r<�qȁVyr�rA**��دzg6�D#�� YP�`��v��s��~(�z�Ml�e�|u��Q�a�*}�+T�� +��R��Xc"+*�N�l��N�hc�Ft�<N+;-}�،Xtٕ$��à^��|uv��*��~�'E�_��5��1�q�s�*�R�`�OΒ��9�#x4�4�9�#��WHۏ��Z��)]0�`p�<��ߝ��N��oY{�4�7��6�ǹ�>�ۗ&��1%�Q''��?�l��׸�+&�r{�j�N�಻��4�)��`�N狌�.��߭�� ǣ��)q �2�?��n�3H�b��`�}� ��.`��pqY1�e_b��u�7��e+N��_F��(�D�T��,��L}LL�r��mP5��|��x芥1�c��x DAb��`��M(��7��NED�~<v\ %,��ߚ/��p��R��~/^��l��np� +��7t��0_��0��l4��_��b�0�MWΦj�m��б�Ɏ�l +|re�� +�ȫ`B-��v.i��Ro�x}� +�)��%#`�Ђ�R5C��A�2su��a��sYy3��=jaeoI�7�~��.�plA��΃� +`O��)�� ^�>��Mz� ��+4��BXd.��Mz��v͈��P�d8�p��<6?��8�N��*x��.��6ڍ6G��F�Z��)��O�� !��l�S�s��h��ss�N��p8�`'�0�/<��s��}�.�@Ǩ�s�7ξ�O۟V�D��a5��a�v��]��m1��+��3��y�6�۠��>@�u50��P�s��5��1=��=�p�� *��KV�ҫ܂��ݻc$N�4�(�X�r2###c-��賟L��δ�>��]��5�.�s��Ys�1��f0�;�'̨��Y�g銛�{�@9�� `aC(��=%b�o�2��=��n��1� j��B��o��S$n��#��m��=i��0�c��i9��}�oI�� q�T��]�W%.��(��؅�]z�\�x� +f��"]o��'u�䫵�t�k{�v;A��C3ֆw��w�R_#��X��(x��ҋ/q%��W��hp��k_I�X��'b��/fX��K�i�"#####�QCL�i��2t�� +��5��L0 +��Qi�H�2;y�T�Ook;ע�ٶ`��R��Ng{z�y�!�Kx��m�?A(v��U�~��mL�(`o/!n��mX��-{�v��[�� d�w�=�n「��sdw��z��n�(��}O�y�~��m� +��?XU�;,��V'+��V�&�J�R��Z]᧭�:��zC'��-߆��@�y +�4��u��`Vۓw��ъ#��zP@Q� +N>2/��{�\o)��W��~a�3xL�w +:_Q�;��=p�ּ�dt��\'8��~3�SRP��6��y+��X��Q�*��޺r +��̗ѭ*��޺r +g��l�/�\U^��u�$��|mb��Vn��w�\V��|��D�͊NVN��y��7��k<;��/�E}?E*ǳg�O ��~��g��/9��6��f +c�D}%��g$�Q�G�7�o��)��UJ��o�,O@�0߾Q(��;�b��w��:5� �N�wR��N5�I��y'K�?}��:9�m��ֽ��*��@f�@jU9�m��ҫ��Í�{��$�ؗ�}��dF��p��|%!DdF��>��}G��{��@FFFFFFƦQܞH � +��3 +��u ��M�o��~�vy�}�m�wz<�7��nP9�r�Wk��u=��|��_�n��z쿳}@��IX�n��?��s<uPIEND�B`� \ No newline at end of file Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/jquery-ui.css =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/jquery-ui.css (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/themes/yellow/jquery-ui.css 2012-04-13 10:57:08 UTC (rev 3255) @@ -0,0 +1,555 @@ +/* + * jQuery UI CSS Framework 1.8.18 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Theming/API + */ + +/* Layout helpers +----------------------------------*/ +.ui-helper-hidden { display: none; } +.ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); } +.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; } +.ui-helper-clearfix:before, .ui-helper-clearfix:after { content: ""; display: table; } +.ui-helper-clearfix:after { clear: both; } +.ui-helper-clearfix { zoom: 1; } +.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); } + + +/* Interaction Cues +----------------------------------*/ +.ui-state-disabled { cursor: default !important; } + + +/* Icons +----------------------------------*/ + +/* states and images */ +.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; } + + +/* Misc visuals +----------------------------------*/ + +/* Overlays */ +.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; } + + +/* + * jQuery UI CSS Framework 1.8.18 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Theming/API + * + * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana,Arial,sans-serif&fwDefau… + */ + + +/* Component containers +----------------------------------*/ +.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; } +.ui-widget .ui-widget { font-size: 1em; } +.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; } +.ui-widget-content { border: 1px solid #aaaaaa; background: #ffffaa url(images/ui-bg_flat_75_ffffaa_40x100.png) 50% 50% repeat-x; color: #222222; } +.ui-widget-content a { color: #222222; } +.ui-widget-header { border: 1px solid #e0e00b; background: #ffff0f url(images/ui-bg_highlight-soft_75_ffff0f_1x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; } +.ui-widget-header a { color: #222222; } + +/* Interaction states +----------------------------------*/ +.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #e0e00b; background: #ffff0f url(images/ui-bg_glass_75_ffff0f_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #b89300; } +.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #b89300; text-decoration: none; } +.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #e0e00b; background: #fff71f url(images/ui-bg_glass_75_fff71f_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; } +.ui-state-hover a, .ui-state-hover a:hover { color: #212121; text-decoration: none; } +.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #99990a; background: #ffcc00 url(images/ui-bg_glass_65_ffcc00_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #1f1f1f; } +.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #1f1f1f; text-decoration: none; } +.ui-widget :active { outline: none; } + +/* Interaction Cues +----------------------------------*/ +.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {border: 1px solid #fcefa1; background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x; color: #000000; } +.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #000000; } +.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-bg_inset-soft_95_fef1ec_1x100.png) 50% bottom repeat-x; color: #cd0a0a; } +.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a; } +.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a; } +.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; } +.ui-priority-secondary, .ui-widget-content .ui-priority-secondary, .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; } +.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; } + +/* Icons +----------------------------------*/ + +/* states and images */ +.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); } +.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); } +.ui-widget-header .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); } +.ui-state-default .ui-icon { background-image: url(images/ui-icons_dcb104_256x240.png); } +.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); } +.ui-state-active .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); } +.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_ffcc00_256x240.png); } +.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png); } + +/* positioning */ +.ui-icon-carat-1-n { background-position: 0 0; } +.ui-icon-carat-1-ne { background-position: -16px 0; } +.ui-icon-carat-1-e { background-position: -32px 0; } +.ui-icon-carat-1-se { background-position: -48px 0; } +.ui-icon-carat-1-s { background-position: -64px 0; } +.ui-icon-carat-1-sw { background-position: -80px 0; } +.ui-icon-carat-1-w { background-position: -96px 0; } +.ui-icon-carat-1-nw { background-position: -112px 0; } +.ui-icon-carat-2-n-s { background-position: -128px 0; } +.ui-icon-carat-2-e-w { background-position: -144px 0; } +.ui-icon-triangle-1-n { background-position: 0 -16px; } +.ui-icon-triangle-1-ne { background-position: -16px -16px; } +.ui-icon-triangle-1-e { background-position: -32px -16px; } +.ui-icon-triangle-1-se { background-position: -48px -16px; } +.ui-icon-triangle-1-s { background-position: -64px -16px; } +.ui-icon-triangle-1-sw { background-position: -80px -16px; } +.ui-icon-triangle-1-w { background-position: -96px -16px; } +.ui-icon-triangle-1-nw { background-position: -112px -16px; } +.ui-icon-triangle-2-n-s { background-position: -128px -16px; } +.ui-icon-triangle-2-e-w { background-position: -144px -16px; } +.ui-icon-arrow-1-n { background-position: 0 -32px; } +.ui-icon-arrow-1-ne { background-position: -16px -32px; } +.ui-icon-arrow-1-e { background-position: -32px -32px; } +.ui-icon-arrow-1-se { background-position: -48px -32px; } +.ui-icon-arrow-1-s { background-position: -64px -32px; } +.ui-icon-arrow-1-sw { background-position: -80px -32px; } +.ui-icon-arrow-1-w { background-position: -96px -32px; } +.ui-icon-arrow-1-nw { background-position: -112px -32px; } +.ui-icon-arrow-2-n-s { background-position: -128px -32px; } +.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; } +.ui-icon-arrow-2-e-w { background-position: -160px -32px; } +.ui-icon-arrow-2-se-nw { background-position: -176px -32px; } +.ui-icon-arrowstop-1-n { background-position: -192px -32px; } +.ui-icon-arrowstop-1-e { background-position: -208px -32px; } +.ui-icon-arrowstop-1-s { background-position: -224px -32px; } +.ui-icon-arrowstop-1-w { background-position: -240px -32px; } +.ui-icon-arrowthick-1-n { background-position: 0 -48px; } +.ui-icon-arrowthick-1-ne { background-position: -16px -48px; } +.ui-icon-arrowthick-1-e { background-position: -32px -48px; } +.ui-icon-arrowthick-1-se { background-position: -48px -48px; } +.ui-icon-arrowthick-1-s { background-position: -64px -48px; } +.ui-icon-arrowthick-1-sw { background-position: -80px -48px; } +.ui-icon-arrowthick-1-w { background-position: -96px -48px; } +.ui-icon-arrowthick-1-nw { background-position: -112px -48px; } +.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; } +.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; } +.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; } +.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; } +.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; } +.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; } +.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; } +.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; } +.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; } +.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; } +.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; } +.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; } +.ui-icon-arrowreturn-1-w { background-position: -64px -64px; } +.ui-icon-arrowreturn-1-n { background-position: -80px -64px; } +.ui-icon-arrowreturn-1-e { background-position: -96px -64px; } +.ui-icon-arrowreturn-1-s { background-position: -112px -64px; } +.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; } +.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; } +.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; } +.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; } +.ui-icon-arrow-4 { background-position: 0 -80px; } +.ui-icon-arrow-4-diag { background-position: -16px -80px; } +.ui-icon-extlink { background-position: -32px -80px; } +.ui-icon-newwin { background-position: -48px -80px; } +.ui-icon-refresh { background-position: -64px -80px; } +.ui-icon-shuffle { background-position: -80px -80px; } +.ui-icon-transfer-e-w { background-position: -96px -80px; } +.ui-icon-transferthick-e-w { background-position: -112px -80px; } +.ui-icon-folder-collapsed { background-position: 0 -96px; } +.ui-icon-folder-open { background-position: -16px -96px; } +.ui-icon-document { background-position: -32px -96px; } +.ui-icon-document-b { background-position: -48px -96px; } +.ui-icon-note { background-position: -64px -96px; } +.ui-icon-mail-closed { background-position: -80px -96px; } +.ui-icon-mail-open { background-position: -96px -96px; } +.ui-icon-suitcase { background-position: -112px -96px; } +.ui-icon-comment { background-position: -128px -96px; } +.ui-icon-person { background-position: -144px -96px; } +.ui-icon-print { background-position: -160px -96px; } +.ui-icon-trash { background-position: -176px -96px; } +.ui-icon-locked { background-position: -192px -96px; } +.ui-icon-unlocked { background-position: -208px -96px; } +.ui-icon-bookmark { background-position: -224px -96px; } +.ui-icon-tag { background-position: -240px -96px; } +.ui-icon-home { background-position: 0 -112px; } +.ui-icon-flag { background-position: -16px -112px; } +.ui-icon-calendar { background-position: -32px -112px; } +.ui-icon-cart { background-position: -48px -112px; } +.ui-icon-pencil { background-position: -64px -112px; } +.ui-icon-clock { background-position: -80px -112px; } +.ui-icon-disk { background-position: -96px -112px; } +.ui-icon-calculator { background-position: -112px -112px; } +.ui-icon-zoomin { background-position: -128px -112px; } +.ui-icon-zoomout { background-position: -144px -112px; } +.ui-icon-search { background-position: -160px -112px; } +.ui-icon-wrench { background-position: -176px -112px; } +.ui-icon-gear { background-position: -192px -112px; } +.ui-icon-heart { background-position: -208px -112px; } +.ui-icon-star { background-position: -224px -112px; } +.ui-icon-link { background-position: -240px -112px; } +.ui-icon-cancel { background-position: 0 -128px; } +.ui-icon-plus { background-position: -16px -128px; } +.ui-icon-plusthick { background-position: -32px -128px; } +.ui-icon-minus { background-position: -48px -128px; } +.ui-icon-minusthick { background-position: -64px -128px; } +.ui-icon-close { background-position: -80px -128px; } +.ui-icon-closethick { background-position: -96px -128px; } +.ui-icon-key { background-position: -112px -128px; } +.ui-icon-lightbulb { background-position: -128px -128px; } +.ui-icon-scissors { background-position: -144px -128px; } +.ui-icon-clipboard { background-position: -160px -128px; } +.ui-icon-copy { background-position: -176px -128px; } +.ui-icon-contact { background-position: -192px -128px; } +.ui-icon-image { background-position: -208px -128px; } +.ui-icon-video { background-position: -224px -128px; } +.ui-icon-script { background-position: -240px -128px; } +.ui-icon-alert { background-position: 0 -144px; } +.ui-icon-info { background-position: -16px -144px; } +.ui-icon-notice { background-position: -32px -144px; } +.ui-icon-help { background-position: -48px -144px; } +.ui-icon-check { background-position: -64px -144px; } +.ui-icon-bullet { background-position: -80px -144px; } +.ui-icon-radio-off { background-position: -96px -144px; } +.ui-icon-radio-on { background-position: -112px -144px; } +.ui-icon-pin-w { background-position: -128px -144px; } +.ui-icon-pin-s { background-position: -144px -144px; } +.ui-icon-play { background-position: 0 -160px; } +.ui-icon-pause { background-position: -16px -160px; } +.ui-icon-seek-next { background-position: -32px -160px; } +.ui-icon-seek-prev { background-position: -48px -160px; } +.ui-icon-seek-end { background-position: -64px -160px; } +.ui-icon-seek-start { background-position: -80px -160px; } +/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */ +.ui-icon-seek-first { background-position: -80px -160px; } +.ui-icon-stop { background-position: -96px -160px; } +.ui-icon-eject { background-position: -112px -160px; } +.ui-icon-volume-off { background-position: -128px -160px; } +.ui-icon-volume-on { background-position: -144px -160px; } +.ui-icon-power { background-position: 0 -176px; } +.ui-icon-signal-diag { background-position: -16px -176px; } +.ui-icon-signal { background-position: -32px -176px; } +.ui-icon-battery-0 { background-position: -48px -176px; } +.ui-icon-battery-1 { background-position: -64px -176px; } +.ui-icon-battery-2 { background-position: -80px -176px; } +.ui-icon-battery-3 { background-position: -96px -176px; } +.ui-icon-circle-plus { background-position: 0 -192px; } +.ui-icon-circle-minus { background-position: -16px -192px; } +.ui-icon-circle-close { background-position: -32px -192px; } +.ui-icon-circle-triangle-e { background-position: -48px -192px; } +.ui-icon-circle-triangle-s { background-position: -64px -192px; } +.ui-icon-circle-triangle-w { background-position: -80px -192px; } +.ui-icon-circle-triangle-n { background-position: -96px -192px; } +.ui-icon-circle-arrow-e { background-position: -112px -192px; } +.ui-icon-circle-arrow-s { background-position: -128px -192px; } +.ui-icon-circle-arrow-w { background-position: -144px -192px; } +.ui-icon-circle-arrow-n { background-position: -160px -192px; } +.ui-icon-circle-zoomin { background-position: -176px -192px; } +.ui-icon-circle-zoomout { background-position: -192px -192px; } +.ui-icon-circle-check { background-position: -208px -192px; } +.ui-icon-circlesmall-plus { background-position: 0 -208px; } +.ui-icon-circlesmall-minus { background-position: -16px -208px; } +.ui-icon-circlesmall-close { background-position: -32px -208px; } +.ui-icon-squaresmall-plus { background-position: -48px -208px; } +.ui-icon-squaresmall-minus { background-position: -64px -208px; } +.ui-icon-squaresmall-close { background-position: -80px -208px; } +.ui-icon-grip-dotted-vertical { background-position: 0 -224px; } +.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; } +.ui-icon-grip-solid-vertical { background-position: -32px -224px; } +.ui-icon-grip-solid-horizontal { background-position: -48px -224px; } +.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; } +.ui-icon-grip-diagonal-se { background-position: -80px -224px; } + + +/* Misc visuals +----------------------------------*/ + +/* Corner radius */ +.ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; -khtml-border-top-left-radius: 4px; border-top-left-radius: 4px; } +.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; -khtml-border-top-right-radius: 4px; border-top-right-radius: 4px; } +.ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; -khtml-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; } +.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; -khtml-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; } + +/* Overlays */ +.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); } +.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/* + * jQuery UI Resizable 1.8.18 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Resizable#theming + */ +.ui-resizable { position: relative;} +.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block; } +.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; } +.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; } +.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; } +.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; } +.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; } +.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; } +.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; } +.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; } +.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/* + * jQuery UI Selectable 1.8.18 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Selectable#theming + */ +.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; } +/* + * jQuery UI Accordion 1.8.18 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Accordion#theming + */ +/* IE/Win - Fix animation bug - #4615 */ +.ui-accordion { width: 100%; } +.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; } +.ui-accordion .ui-accordion-li-fix { display: inline; } +.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; } +.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em .7em; } +.ui-accordion-icons .ui-accordion-header a { padding-left: 2.2em; } +.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; } +.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; } +.ui-accordion .ui-accordion-content-active { display: block; } +/* + * jQuery UI Autocomplete 1.8.18 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Autocomplete#theming + */ +.ui-autocomplete { position: absolute; cursor: default; } + +/* workarounds */ +* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */ + +/* + * jQuery UI Menu 1.8.18 + * + * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Menu#theming + */ +.ui-menu { + list-style:none; + padding: 2px; + margin: 0; + display:block; + float: left; +} +.ui-menu .ui-menu { + margin-top: -3px; +} +.ui-menu .ui-menu-item { + margin:0; + padding: 0; + zoom: 1; + float: left; + clear: left; + width: 100%; +} +.ui-menu .ui-menu-item a { + text-decoration:none; + display:block; + padding:.2em .4em; + line-height:1.5; + zoom:1; +} +.ui-menu .ui-menu-item a.ui-state-hover, +.ui-menu .ui-menu-item a.ui-state-active { + font-weight: normal; + margin: -1px; +} +/* + * jQuery UI Button 1.8.18 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Button#theming + */ +.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: hidden; *overflow: visible; } /* the overflow property removes extra width in IE */ +.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */ +button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */ +.ui-button-icons-only { width: 3.4em; } +button.ui-button-icons-only { width: 3.7em; } + +/*button text element */ +.ui-button .ui-button-text { display: block; line-height: 1.4; } +.ui-button-text-only .ui-button-text { padding: .4em 1em; } +.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; } +.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; } +.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; } +.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; } +/* no icon support for input elements, provide padding by default */ +input.ui-button { padding: .4em 1em; } + +/*button icon element(s) */ +.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; } +.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; } +.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; } +.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; } +.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; } + +/*button sets*/ +.ui-buttonset { margin-right: 7px; } +.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; } + +/* workarounds */ +button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */ +/* + * jQuery UI Dialog 1.8.18 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Dialog#theming + */ +.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; } +.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative; } +.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; } +.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; } +.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; } +.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; } +.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; } +.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; } +.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; } +.ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; } +.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; } +.ui-draggable .ui-dialog-titlebar { cursor: move; } +/* + * jQuery UI Slider 1.8.18 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Slider#theming + */ +.ui-slider { position: relative; text-align: left; } +.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; } +.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; } + +.ui-slider-horizontal { height: .8em; } +.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; } +.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; } +.ui-slider-horizontal .ui-slider-range-min { left: 0; } +.ui-slider-horizontal .ui-slider-range-max { right: 0; } + +.ui-slider-vertical { width: .8em; height: 100px; } +.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; } +.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; } +.ui-slider-vertical .ui-slider-range-min { bottom: 0; } +.ui-slider-vertical .ui-slider-range-max { top: 0; }/* + * jQuery UI Tabs 1.8.18 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Tabs#theming + */ +.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */ +.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; } +.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 1px; margin: 0 .2em 1px 0; border-bottom: 0 !important; padding: 0; white-space: nowrap; } +.ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; } +.ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: 0; padding-bottom: 1px; } +.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; } +.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */ +.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; } +.ui-tabs .ui-tabs-hide { display: none !important; } +/* + * jQuery UI Datepicker 1.8.18 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Datepicker#theming + */ +.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; } +.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; } +.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; } +.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; } +.ui-datepicker .ui-datepicker-prev { left:2px; } +.ui-datepicker .ui-datepicker-next { right:2px; } +.ui-datepicker .ui-datepicker-prev-hover { left:1px; } +.ui-datepicker .ui-datepicker-next-hover { right:1px; } +.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px; } +.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; } +.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; } +.ui-datepicker select.ui-datepicker-month-year {width: 100%;} +.ui-datepicker select.ui-datepicker-month, +.ui-datepicker select.ui-datepicker-year { width: 49%;} +.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; } +.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0; } +.ui-datepicker td { border: 0; padding: 1px; } +.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; } +.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; } +.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; } +.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; } + +/* with multiple calendars */ +.ui-datepicker.ui-datepicker-multi { width:auto; } +.ui-datepicker-multi .ui-datepicker-group { float:left; } +.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; } +.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; } +.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; } +.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; } +.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; } +.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; } +.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; } +.ui-datepicker-row-break { clear:both; width:100%; font-size:0em; } + +/* RTL support */ +.ui-datepicker-rtl { direction: rtl; } +.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; } +.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; } +.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; } +.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; } +.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; } +.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; } +.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; } +.ui-datepicker-rtl .ui-datepicker-group { float:right; } +.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; } +.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; } + +/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */ +.ui-datepicker-cover { + display: none; /*sorry for IE5*/ + display/**/: block; /*sorry for IE5*/ + position: absolute; /*must have*/ + z-index: -1; /*must have*/ + filter: mask(); /*must have*/ + top: -4px; /*must have*/ + left: -4px; /*must have*/ + width: 200px; /*must have*/ + height: 200px; /*must have*/ +} \ No newline at end of file Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2012-04-13 08:16:54 UTC (rev 3254) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2012-04-13 10:57:08 UTC (rev 3255) @@ -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="cupertino"/> + <sj:head jqueryui="true" jquerytheme="%{jqueryTheme}"/> </head> <%-- TODO AThimel 24/01/2012 Remove this when refactoring is over --%>

1 0

r3254 - in branches/pollen-1.2.6-struts2: . pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll
by fdesbois＠users.chorem.org April 13, 2012

April 13, 2012

Author: fdesbois Date: 2012-04-13 10:16:54 +0200 (Fri, 13 Apr 2012) New Revision: 3254 Url: http://chorem.org/repositories/revision/pollen/3254 Log: use nuiton-struts2 1.11 to use fielderror tag Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPersonToList.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingList.jsp branches/pollen-1.2.6-struts2/pom.xml Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java 2012-04-12 16:27:37 UTC (rev 3253) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java 2012-04-13 08:16:54 UTC (rev 3254) @@ -474,7 +474,7 @@ if (StringUtils.isEmpty(votingListName)) { addOptionsError( - fieldNamePrefix + ".name", + fieldNamePrefix, _("pollen.error.poll.required.votingList.name")); } else { @@ -484,7 +484,7 @@ // name doublon addOptionsError( - fieldNamePrefix + ".name", + fieldNamePrefix, _("pollen.error.poll.votingList.name.doublon")); } @@ -497,7 +497,7 @@ // no weight filled (can be a bad conversion) addOptionsError( - fieldNamePrefix + ".weight", + fieldNamePrefix, _("pollen.error.poll.votingList.weight.not.valid")); } } @@ -548,7 +548,7 @@ // voter doublon addOptionsError( - fieldNamePrefix + ".votingId", + fieldNamePrefix, _("pollen.error.poll.personToList.votingId.doublon")); } } @@ -557,7 +557,7 @@ if (StringUtils.isEmpty(email)) { addOptionsError( - fieldNamePrefix + ".email", + fieldNamePrefix, _("pollen.error.poll.personToList.email.required")); } else { @@ -567,7 +567,7 @@ // not a valid email addOptionsError( - fieldNamePrefix + ".email", + fieldNamePrefix, _("pollen.error.poll.personToList.email.not.valid")); } else { @@ -577,7 +577,7 @@ // email doublon addOptionsError( - fieldNamePrefix + ".email", + fieldNamePrefix, _("pollen.error.poll.personToList.email.doublon")); } } @@ -588,7 +588,7 @@ // no weight filled (can be a bad conversion) addOptionsError( - fieldNamePrefix + ".weight", + fieldNamePrefix, _("pollen.error.poll.personToList.weight.not.valid")); } } Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPersonToList.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPersonToList.jsp 2012-04-12 16:27:37 UTC (rev 3253) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPersonToList.jsp 2012-04-13 08:16:54 UTC (rev 3254) @@ -23,6 +23,7 @@ --%> <%@ page language="java" contentType="text/html" pageEncoding="utf-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="sp" uri="/nuiton-tags" %> <s:set name="personPrefix">votingList<s:property value="votingListType"/>_<s:property value="votingListNumber"/>PersonToList_<s:property value="personToListNumber"/> </s:set> @@ -34,6 +35,7 @@ <s:div id='%{#personPrefix}' cssClass="personToList"> <s:hidden key='%{#personPrefix}.topiaId' value='%{#personToList.topiaId}' label=''/> <s:hidden key='%{#personPrefix}.accountId' value='%{#personToList.pollAccount.accountId}' label=''/> + <sp:fielderror fieldName="%{#personPrefix}"/> <div class="fleft choiceName"> <s:label for="%{#personPrefix}.votingId" id="%{#personPrefix}_label" theme="simple" value=''/> Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingList.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingList.jsp 2012-04-12 16:27:37 UTC (rev 3253) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingList.jsp 2012-04-13 08:16:54 UTC (rev 3254) @@ -23,6 +23,7 @@ --%> <%@ page language="java" contentType="text/html" pageEncoding="utf-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="sp" uri="/nuiton-tags" %> <s:set name="prefix">votingList<s:property value="votingListType"/>_<s:property value="votingListNumber"/></s:set> @@ -36,7 +37,7 @@ <s:div id='%{#prefix}' cssClass="votingList"> <fieldset class="ui-widget-content ui-corner-all"> - <s:fielderror fieldName="%{#prefix}"/> + <sp:fielderror fieldName="%{#prefix}"/> <s:if test='%{#votingListType == "GROUP"}'> <%--<div>--%> <div class="fleft choiceName"> Modified: branches/pollen-1.2.6-struts2/pom.xml =================================================================== --- branches/pollen-1.2.6-struts2/pom.xml 2012-04-12 16:27:37 UTC (rev 3253) +++ branches/pollen-1.2.6-struts2/pom.xml 2012-04-13 08:16:54 UTC (rev 3254) @@ -451,7 +451,7 @@ <eugenePluginVersion>2.4.2</eugenePluginVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <tapestryVersion>5.1.0.5</tapestryVersion> - <nuitonWebVersion>1.10</nuitonWebVersion> + <nuitonWebVersion>1.11</nuitonWebVersion> <nuitonUtilsVersion>2.4.7</nuitonUtilsVersion> <h2Version>1.3.165</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion>

1 0