Author: tchemit Date: 2012-04-25 08:39:41 +0200 (Wed, 25 Apr 2012) New Revision: 3314 Url: http://chorem.org/repositories/revision/pollen/3314 Log: fixes #532: S?\195?\169paration en deux pages de la liste des sondages invit?\195?\169s et particip?\195?\169s Added: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/InvitedList.java trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/invitedList.jsp Modified: trunk/pollen-ui-struts2/pom.xml trunk/pollen-ui-struts2/src/main/resources/config/struts-user.xml trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/participatedList.jsp Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-04-24 13:36:59 UTC (rev 3313) +++ trunk/pollen-ui-struts2/pom.xml 2012-04-25 06:39:41 UTC (rev 3314) @@ -263,6 +263,18 @@ </plugin> <plugin> + <groupId>org.apache.tomcat.maven</groupId> + <artifactId>tomcat6-maven-plugin</artifactId> + <configuration> + <path>/pollen</path> + <systemProperties> + <siteUrl>http://localhost:8080/pollen</siteUrl> + </systemProperties> + <uriEncoding>UTF-8</uriEncoding> + </configuration> + </plugin> + + <plugin> <artifactId>maven-war-plugin</artifactId> <configuration> <archive> Added: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/InvitedList.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/InvitedList.java (rev 0) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/InvitedList.java 2012-04-25 06:39:41 UTC (rev 3314) @@ -0,0 +1,43 @@ +/* + * #%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% + */ +package org.chorem.pollen.ui.actions.poll; + +import org.chorem.pollen.ui.actions.PageSkin; +import org.chorem.pollen.ui.actions.PollenActionSupport; + +/** + * Display the list of invited polls for the connected user. + * + * @author tchemit <chemit@codelutin.com> + * @since 1.3 + */ +public class InvitedList extends PollenActionSupport { + + private static final long serialVersionUID = 1L; + + @Override + public PageSkin getSkin() { + return PageSkin.VOTE; + } +} Property changes on: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/InvitedList.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-ui-struts2/src/main/resources/config/struts-user.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/config/struts-user.xml 2012-04-24 13:36:59 UTC (rev 3313) +++ trunk/pollen-ui-struts2/src/main/resources/config/struts-user.xml 2012-04-25 06:39:41 UTC (rev 3314) @@ -145,6 +145,13 @@ <result>/WEB-INF/jsp/user/createdList.jsp</result> </action> + <!-- display invited polls --> + <action name="invitedList" + class="org.chorem.pollen.ui.actions.poll.InvitedList"> + <interceptor-ref name="pollenBasicStack"/> + <result>/WEB-INF/jsp/user/invitedList.jsp</result> + </action> + <!-- display participated polls --> <action name="participatedList" class="org.chorem.pollen.ui.actions.poll.ParticipatedList"> Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-04-24 13:36:59 UTC (rev 3313) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-04-25 06:39:41 UTC (rev 3314) @@ -253,6 +253,7 @@ pollen.menu.manageUsers=Manage Users pollen.menu.polls=Polls pollen.menu.pollsCreatedList=Created polls +pollen.menu.pollsInvitedList=Invited polls pollen.menu.pollsParticipatedList=Participated polls pollen.menu.preferences=My account pollen.menu.register=Register Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-04-24 13:36:59 UTC (rev 3313) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-04-25 06:39:41 UTC (rev 3314) @@ -256,6 +256,7 @@ pollen.menu.manageUsers=Gérer les utilisateurs pollen.menu.polls=Sondages pollen.menu.pollsCreatedList=Sondages créés +pollen.menu.pollsInvitedList=Sondages invités pollen.menu.pollsParticipatedList=Sondages participés pollen.menu.preferences=Mon compte pollen.menu.register=Inscrivez-vous @@ -274,6 +275,7 @@ pollen.title.myAccount=Mon compte pollen.title.pollsCreatedList=Sondages créés pollen.title.pollsCreatedList.legend=Liste des sondages que vous avez proposés +pollen.title.pollsInvitedList=Sondages invités pollen.title.pollsInvitedList.legend=Liste des sondages pour lesquels vous êtes invité à voter pollen.title.pollsList=Liste des sondages pollen.title.pollsParticipatedList=Sondages participés Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2012-04-24 13:36:59 UTC (rev 3313) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2012-04-25 06:39:41 UTC (rev 3314) @@ -198,6 +198,11 @@ </s:a> </li> <li> + <s:a action="invitedList" namespace="/user"> + <s:text name="pollen.menu.pollsInvitedList"/> + </s:a> + </li> + <li> <s:a action="participatedList" namespace="/user"> <s:text name="pollen.menu.pollsParticipatedList"/> </s:a> Added: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/invitedList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/invitedList.jsp (rev 0) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/invitedList.jsp 2012-04-25 06:39:41 UTC (rev 3314) @@ -0,0 +1,59 @@ +<%-- + #%L + Pollen :: UI (strust2) + + $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% + --%> +<%@page contentType="text/html" pageEncoding="UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="sjg" uri="/struts-jquery-grid-tags" %> +<script type="text/javascript"> + var redirectUrl = '<s:url namespace="/user" action="invitedList"/>'; +</script> +<%@include file="/WEB-INF/jsp/pollListHelper.jsp"%> + +<title><s:text name="pollen.title.pollsInvitedList"/></title> + +<h1 class="title${pageLogo}"><s:text name="pollen.title.pollsInvitedList"/></h1> + +<h4><s:text name="pollen.title.pollsInvitedList.legend"/></h4> + +<s:url id="loadInvitedUrl" action="getInvitedPolls" + namespace="/json" escapeAmp="false"/> + +<sjg:grid dataType="json" href="%{loadInvitedUrl}" gridModel="polls" + sortable="true" pager="true" pagerButtons="true" pagerInput="true" + navigator="true" rownumbers="false" autowidth="true" + onSelectRowTopics='users-rowSelect' editurl="%{loadUrl}" + onCompleteTopics='users-cleanSelect' + navigatorEdit="false" navigatorDelete="false" + navigatorSearch="false" navigatorRefresh="false" + navigatorAdd="false" viewrecords="true" + rowList="10,15,20,50,100" rowNum="10"> + <sjg:gridColumn name="id" title="id" hidden="true"/> + + <sjg:gridColumn name="title" title='%{getText("pollen.common.title")}' /> + <sjg:gridColumn name="description" title='%{getText("pollen.common.description")}'/> + <sjg:gridColumn name="addingChoices" title='%{getText("pollen.common.addingChoices")}'/> + <sjg:gridColumn name="beginDate" title='%{getText("pollen.common.beginDate")}'/> + <sjg:gridColumn name="endDate" title='%{getText("pollen.common.endDate")}'/> + <sjg:gridColumn name="functions" title='%{getText("pollen.common.functions")}' + formatter="pollFunctions" width="180" sortable="false"/> +</sjg:grid> Property changes on: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/invitedList.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/participatedList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/participatedList.jsp 2012-04-24 13:36:59 UTC (rev 3313) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/participatedList.jsp 2012-04-25 06:39:41 UTC (rev 3314) @@ -33,32 +33,6 @@ <h1 class="title${pageLogo}"><s:text name="pollen.title.pollsParticipatedList"/></h1> -<h4><s:text name="pollen.title.pollsInvitedList.legend"/></h4> - -<s:url id="loadInvitedUrl" action="getInvitedPolls" - namespace="/json" escapeAmp="false"/> - -<sjg:grid dataType="json" href="%{loadInvitedUrl}" gridModel="polls" - sortable="true" pager="true" pagerButtons="true" pagerInput="true" - navigator="true" rownumbers="false" autowidth="true" - onSelectRowTopics='users-rowSelect' editurl="%{loadUrl}" - onCompleteTopics='users-cleanSelect' - navigatorEdit="false" navigatorDelete="false" - navigatorSearch="false" navigatorRefresh="false" - navigatorAdd="false" viewrecords="true" - rowList="10,15,20,50,100" rowNum="10"> - <sjg:gridColumn name="id" title="id" hidden="true"/> - - <sjg:gridColumn name="title" title='%{getText("pollen.common.title")}' /> - <sjg:gridColumn name="description" title='%{getText("pollen.common.description")}'/> - <sjg:gridColumn name="addingChoices" title='%{getText("pollen.common.addingChoices")}'/> - <sjg:gridColumn name="beginDate" title='%{getText("pollen.common.beginDate")}'/> - <sjg:gridColumn name="endDate" title='%{getText("pollen.common.endDate")}'/> - <sjg:gridColumn name="functions" title='%{getText("pollen.common.functions")}' - formatter="pollFunctions" width="180" sortable="false"/> -</sjg:grid> - - <h4><s:text name="pollen.title.pollsParticipatedList.legend"/></h4> <s:url id="loadParticipatedUrl" action="getParticipatedPolls"