Author: tchemit Date: 2012-03-28 09:59:26 +0200 (Wed, 28 Mar 2012) New Revision: 3213 Url: http://chorem.org/repositories/revision/pollen/3213 Log: move some actions to user namespace + pass into devmode Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/DateChoice.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/ImageChoice.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/PersonToList.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/TextChoice.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/VotingList.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/participatedList.jsp Removed: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createdList.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/dateChoice.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/imageChoice.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/participatedList.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/personToList.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/textChoice.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/votingList.jsp Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-admin.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-json.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-poll.xml 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/shiro.ini branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/struts.xml 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/resources/config/struts-admin.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-admin.xml 2012-03-27 19:09:51 UTC (rev 3212) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-admin.xml 2012-03-28 07:59:26 UTC (rev 3213) @@ -32,18 +32,25 @@ <package name="admin" extends="default" namespace="/admin"> - <default-interceptor-ref name="pollenBasicStack"/> + <default-interceptor-ref name="pollenParamsPrepareParamsStack"/> <!-- manage users --> <action name="usersList" method="input" class="org.chorem.pollen.ui.actions.admin.ManageUsers"> + <interceptor-ref name="pollenBasicStack"/> <result name="input">/WEB-INF/jsp/admin/usersList.jsp</result> </action> + <!-- manage polls --> + <action name="pollsList" method="input" + class="org.chorem.pollen.ui.actions.admin.ManagePolls"> + <interceptor-ref name="pollenBasicStack"/> + <result name="input">/WEB-INF/jsp/admin/pollsList.jsp</result> + </action> + <!-- create user --> <action name="create" method="create" class="org.chorem.pollen.ui.actions.admin.ManageUsers"> - <interceptor-ref name="pollenParamsPrepareParamsStack"/> <result name="input">/WEB-INF/jsp/admin/usersList.jsp</result> <result>/WEB-INF/jsp/admin/usersList.jsp</result> </action> @@ -51,7 +58,6 @@ <!-- save user --> <action name="edit" method="edit" class="org.chorem.pollen.ui.actions.admin.ManageUsers"> - <interceptor-ref name="pollenParamsPrepareParamsStack"/> <result name="input">/WEB-INF/jsp/admin/usersList.jsp</result> <result>/WEB-INF/jsp/admin/usersList.jsp</result> </action> @@ -59,17 +65,10 @@ <!-- delete user --> <action name="delete" method="delete" class="org.chorem.pollen.ui.actions.admin.ManageUsers"> - <interceptor-ref name="pollenParamsPrepareParamsStack"/> <result name="input">/WEB-INF/jsp/admin/usersList.jsp</result> <result>/WEB-INF/jsp/admin/usersList.jsp</result> </action> - <!-- manage polls --> - <action name="pollsList" method="input" - class="org.chorem.pollen.ui.actions.admin.ManagePolls"> - <result name="input">/WEB-INF/jsp/admin/pollsList.jsp</result> - </action> - </package> Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-json.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-json.xml 2012-03-27 19:09:51 UTC (rev 3212) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-json.xml 2012-03-28 07:59:26 UTC (rev 3213) @@ -31,79 +31,11 @@ <package name="json" extends="default" namespace="/json"> - <default-interceptor-ref name="pollenBasicStack"/> - - <action name="get*" - class="org.chorem.pollen.ui.actions.json.Get{1}"> + <action name="get*" class="org.chorem.pollen.ui.actions.json.Get{1}"> + <interceptor-ref name="pollenBasicStack"/> <result type="json"/> </action> - <!----> - <!--<!– get pagined users –>--> - <!--<action name="getUsers"--> - <!--class="org.chorem.pollen.ui.actions.json.GetUsers">--> - <!--<result type="json"/>--> - <!--</action>--> - <!--<!– get user detail –>--> - <!--<action name="getUser"--> - <!--class="org.chorem.pollen.ui.actions.json.GetUser">--> - <!--<result type="json"/>--> - <!--</action>--> - - <!--<!– get pagined favorite lists of user –>--> - <!--<action name="getFavoriteLists"--> - <!--class="org.chorem.pollen.ui.actions.json.GetFavoriteLists">--> - <!--<result type="json"/>--> - <!--</action>--> - - <!--<!– get selected favorite list of user –>--> - <!--<action name="getFavoriteList"--> - <!--class="org.chorem.pollen.ui.actions.json.GetFavoriteList">--> - <!--<result type="json"/>--> - <!--</action>--> - - <!--<!– get pagined poll accounts of a given favorite list –>--> - <!--<action name="getFavoriteListPollAccounts"--> - <!--class="org.chorem.pollen.ui.actions.json.GetFavoriteListPollAccounts">--> - <!--<result type="json"/>--> - <!--</action>--> - - <!--<!– get selected poll account of a given favorite list –>--> - <!--<action name="getFavoriteListPollAccount"--> - <!--class="org.chorem.pollen.ui.actions.json.GetFavoriteListPollAccount">--> - <!--<result type="json"/>--> - <!--</action>--> - - <!--<!– get pagined polls –>--> - <!--<action name="getPolls"--> - <!--class="org.chorem.pollen.ui.actions.json.GetPolls">--> - <!--<result type="json"/>--> - <!--</action>--> - - <!--<!– get pagined created polls –>--> - <!--<action name="getCreatedPolls"--> - <!--class="org.chorem.pollen.ui.actions.json.GetCreatedPolls">--> - <!--<result type="json"/>--> - <!--</action>--> - - <!--<!– get pagined invited polls –>--> - <!--<action name="getInvitedPolls"--> - <!--class="org.chorem.pollen.ui.actions.json.GetInvitedPolls">--> - <!--<result type="json"/>--> - <!--</action>--> - - <!--<!– get pagined created polls –>--> - <!--<action name="getParticipatedPolls"--> - <!--class="org.chorem.pollen.ui.actions.json.GetParticipatedPolls">--> - <!--<result type="json"/>--> - <!--</action>--> - - <!--<!– get pagined poll comments –>--> - <!--<action name="getPollComments"--> - <!--class="org.chorem.pollen.ui.actions.json.GetPollComments">--> - <!--<result type="json"/>--> - <!--</action>--> - </package> </struts> Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-poll.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-poll.xml 2012-03-27 19:09:51 UTC (rev 3212) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-poll.xml 2012-03-28 07:59:26 UTC (rev 3213) @@ -53,36 +53,42 @@ <result>/WEB-INF/jsp/poll/resume.jsp</result> </action> - <!-- display text choice --> - <action name="displayTextChoice" - class="org.chorem.pollen.ui.actions.poll.DisplayTextChoice"> - <result>/WEB-INF/jsp/poll/textChoice.jsp</result> + <!-- display * --> + <action name="display*" + class="org.chorem.pollen.ui.actions.poll.Display{1}"> + <result>/WEB-INF/jsp/poll/{1}.jsp</result> </action> - <!-- display date choice --> - <action name="displayDateChoice" - class="org.chorem.pollen.ui.actions.poll.DisplayDateChoice"> - <result>/WEB-INF/jsp/poll/dateChoice.jsp</result> - </action> + <!--<!– display text choice –>--> + <!--<action name="displayTextChoice"--> + <!--class="org.chorem.pollen.ui.actions.poll.DisplayTextChoice">--> + <!--<result>/WEB-INF/jsp/poll/TextChoice.jsp</result>--> + <!--</action>--> - <!-- display image choice --> - <action name="displayImageChoice" - class="org.chorem.pollen.ui.actions.poll.DisplayImageChoice"> - <result>/WEB-INF/jsp/poll/imageChoice.jsp</result> - </action> + <!--<!– display date choice –>--> + <!--<action name="displayDateChoice"--> + <!--class="org.chorem.pollen.ui.actions.poll.DisplayDateChoice">--> + <!--<result>/WEB-INF/jsp/poll/DateChoice.jsp</result>--> + <!--</action>--> - <!-- display a votingList --> - <action name="displayVotingList" - class="org.chorem.pollen.ui.actions.poll.DisplayVotingList"> - <result>/WEB-INF/jsp/poll/votingList.jsp</result> - </action> + <!--<!– display image choice –>--> + <!--<action name="displayImageChoice"--> + <!--class="org.chorem.pollen.ui.actions.poll.DisplayImageChoice">--> + <!--<result>/WEB-INF/jsp/poll/ImageChoice.jsp</result>--> + <!--</action>--> - <!-- display a personToList --> - <action name="displayPersonToList" - class="org.chorem.pollen.ui.actions.poll.DisplayPersonToList"> - <result>/WEB-INF/jsp/poll/personToList.jsp</result> - </action> + <!--<!– display a votingList –>--> + <!--<action name="displayVotingList"--> + <!--class="org.chorem.pollen.ui.actions.poll.DisplayVotingList">--> + <!--<result>/WEB-INF/jsp/poll/VotingList.jsp</result>--> + <!--</action>--> + <!--<!– display a personToList –>--> + <!--<action name="displayPersonToList"--> + <!--class="org.chorem.pollen.ui.actions.poll.DisplayPersonToList">--> + <!--<result>/WEB-INF/jsp/poll/PersonToList.jsp</result>--> + <!--</action>--> + <!-- edit poll --> <action name="modification/*" class="org.chorem.pollen.ui.actions.poll.EditPoll"> @@ -169,20 +175,6 @@ <result>/WEB-INF/jsp/poll/result.jsp</result> </action> - <!-- display createds polls --> - <action name="createdList" - class="org.chorem.pollen.ui.actions.poll.CreatedList"> - <interceptor-ref name="pollenBasicStack"/> - <result>/WEB-INF/jsp/poll/createdList.jsp</result> - </action> - - <!-- display participated polls --> - <action name="participatedList" - class="org.chorem.pollen.ui.actions.poll.ParticipatedList"> - <interceptor-ref name="pollenBasicStack"/> - <result>/WEB-INF/jsp/poll/participatedList.jsp</result> - </action> - <!-- confirm delete comment --> <action name="confirmDeleteComment" class="org.chorem.pollen.ui.actions.poll.ConfirmDeleteComment"> 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-03-27 19:09:51 UTC (rev 3212) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-user.xml 2012-03-28 07:59:26 UTC (rev 3213) @@ -118,6 +118,20 @@ <result>/WEB-INF/jsp/user/favoriteList.jsp</result> </action> + <!-- display createds polls --> + <action name="createdList" + class="org.chorem.pollen.ui.actions.poll.CreatedList"> + <interceptor-ref name="pollenBasicStack"/> + <result>/WEB-INF/jsp/user/createdList.jsp</result> + </action> + + <!-- display participated polls --> + <action name="participatedList" + class="org.chorem.pollen.ui.actions.poll.ParticipatedList"> + <interceptor-ref name="pollenBasicStack"/> + <result>/WEB-INF/jsp/user/participatedList.jsp</result> + </action> + </package> 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-03-27 19:09:51 UTC (rev 3212) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/shiro.ini 2012-03-28 07:59:26 UTC (rev 3213) @@ -17,15 +17,12 @@ [urls] +# anon urls +/user/login = anon +/user/register** = anon + # connected urls -/poll/createdList=connected -/poll/participatedList=connected -/user/favoriteLists=connected -/user/createFavoriteList=connected -/user/deleteFavoriteList=connected -/user/show=connected -/user/edit=connected -/user/editFavoriteList=connected +/user/**=connected /json/getFavoriteLists=connected /json/getFavoriteList=connected /json/getFavoriteListPollAccounts=connected @@ -36,16 +33,13 @@ # connected and admin urls /admin/**=connected,admin -/user/addPollAccount=connected,admin -/user/editPollAccount=connected,admin -/user/removePollAccount=connected,admin /json/getUsers=connected,admin /json/getUser=connected,admin /json/getPolls=connected,admin # is pollAccount (can vote and see result of a poll) /poll/votefor/**=poll,pollAccess -/poll/result/**=poll,pollAccess +/poll/results/**=poll,pollAccess # is pollCreator (can admin a poll) /poll/modification/**=poll,pollCreator \ No newline at end of file Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/struts.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/struts.xml 2012-03-27 19:09:51 UTC (rev 3212) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/struts.xml 2012-03-28 07:59:26 UTC (rev 3213) @@ -43,6 +43,7 @@ <constant name="struts.ui.theme" value="css_xhtml"/> <constant name="struts.multipart.maxSize" value="209715200"/> <constant name="struts.enable.SlashesInActionNames" value="true"/> + <constant name="struts.devMode" value="true"/> <!--Performance tuning--> <!--see http://struts.apache.org/2.2.3/docs/performance-tuning.html--> 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-03-27 19:09:51 UTC (rev 3212) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2012-03-28 07:59:26 UTC (rev 3213) @@ -153,7 +153,7 @@ <!-- Menu --> <ul id="menu"> <li class="menu_elt"> - <s:a action="home"> + <s:a action="home" namespace="/"> <s:text name="pollen.menu.home"/> </s:a> </li> @@ -172,12 +172,12 @@ </li> <s:if test="userExists"> <li> - <s:a action="createdList" namespace="/poll"> + <s:a action="createdList" namespace="/user"> <s:text name="pollen.menu.pollsCreatedList"/> </s:a> </li> <li> - <s:a action="participatedList" namespace="/poll"> + <s:a action="participatedList" namespace="/user"> <s:text name="pollen.menu.pollsParticipatedList"/> </s:a> </li> Copied: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/DateChoice.jsp (from rev 3205, branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/dateChoice.jsp) =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/DateChoice.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/DateChoice.jsp 2012-03-28 07:59:26 UTC (rev 3213) @@ -0,0 +1,70 @@ +<%-- + #%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 language="java" contentType="text/html" pageEncoding="utf-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="sj" uri="/struts-jquery-tags" %> + +<s:set name="prefix">dateChoice_<s:property value="choiceNumber"/></s:set> +<s:set id='deleteTitle'><s:text name="pollen.action.pollChoiceDelete"/></s:set> +<s:set id='upTitle'><s:text name="pollen.action.pollChoiceUp"/></s:set> +<s:set id='downTitle'><s:text name="pollen.action.pollChoiceDown"/></s:set> +<div id='choicesDATE_<s:property value="choiceNumber"/>'> + <s:hidden key='%{#prefix}.topiaId' value='%{choice.topiaId}' label=''/> + <div class="fleft choiceName"> + <s:label for="%{#prefix}.name" id="choicesDATE_label_%{choiceNumber}" + theme="simple" value=''/> + <sj:datepicker id='%{#prefix}.name' key="%{#prefix}.name" changeMonth="true" + changeYear="true" labelSeparator="" theme="simple" label="" + timepicker="true" value="%{choice.date}" displayFormat="dd/mm/yy"/> + - + <s:label for="%{#prefix}.description" key="pollen.common.description" + theme="simple"/> + </div> + <div class="fleft"> + <s:textarea cols="30" id="%{#prefix}.description" + key="%{#prefix}.description" label='' theme="simple" + value="%{choice.description}"/> + </div> + <div class="fright"> + <s:a href='#' onclick="return deleteChoice('choicesDATE_%{choiceNumber}')"> + <image alt='<s:property value="deleteTitle"/>' + title='<s:property value="deleteTitle"/>' + src="<s:url value='/img/delete.png'/>"></image> + </s:a> + <%--s:a id='choicesDATE_down_%{choiceNumber}' + cssClass="hidden" href='#' + onclick="return downChoice('choicesDATE_%{choiceNumber}')"> + <image alt='<s:property value="downTitle"/>' + title='<s:property value="downTitle"/>' + src="<s:url value='/img/1downarrow.png'/>"></image> + </s:a> + <s:a id='choicesDATE_up_%{choiceNumber}' href='#' cssClass="hidden" + onclick="return upChoice('choicesDATE_%{choiceNumber}')"> + <image alt='<s:property value="upTitle"/>' + title='<s:property value="upTitle"/>' + src="<s:url value='/img/1uparrow.png'/>"></image> + </s:a--%> + </div> + <div class="cleanBoth"></div> +</div> \ No newline at end of file Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/DateChoice.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/ImageChoice.jsp (from rev 3205, branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/imageChoice.jsp) =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/ImageChoice.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/ImageChoice.jsp 2012-03-28 07:59:26 UTC (rev 3213) @@ -0,0 +1,83 @@ +<%-- + #%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 language="java" contentType="text/html" pageEncoding="utf-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> + +<s:set name="prefix">imageChoice_<s:property value="choiceNumber"/></s:set> +<s:set name="prefix2">imageChoice[<s:property value="choiceNumber"/>]</s:set> +<s:set id='deleteTitle'><s:text name="pollen.action.pollChoiceDelete"/></s:set> +<s:set id='upTitle'><s:text name="pollen.action.pollChoiceUp"/></s:set> +<s:set id='downTitle'><s:text name="pollen.action.pollChoiceDown"/></s:set> +<div id='choicesIMAGE_<s:property value="choiceNumber"/>'> + <s:hidden key='%{#prefix}.topiaId' value='%{choice.topiaId}' label=''/> + <div class="fleft choiceName"> + <s:label for="%{#prefix}.name" id="choicesIMAGE_label_%{choiceNumber}" + theme="simple" value=''/> + <s:if test="choice.name != ''"> + + <%--Uploaded image--%> + <s:hidden id="%{#prefix}.name" name="%{#prefix}.name" + value="%{choice.name}" label='' theme="simple"/> + + <s:hidden id="%{#prefix}.location" name="%{#prefix}.location" + value="%{choice.location}" label='' theme="simple"/> + + <s:label label='' theme="simple" cssClass="nameField" + value="%{choice.name}" readonly="true"/> + </s:if> + <s:else> + <%--New image--%> + <s:file key='%{#prefix2}' label='' theme="simple" cssClass="nameField"/> + </s:else> + - + <s:label for="%{#prefix}.description" key="pollen.common.description" + theme="simple"/> + </div> + <div class="fleft"> + <s:textarea cols="30" id="%{#prefix}.description" label='' theme="simple" + key="%{#prefix}.description" value="%{choice.description}"/> + </div> + <div class="fright"> + <s:a href='#' onclick="return deleteChoice('choicesIMAGE_%{choiceNumber}')"> + <image alt='<s:property value="deleteTitle"/>' + title='<s:property value="deleteTitle"/>' + src="<s:url value='/img/delete.png'/>"></image> + </s:a> + <%--s:a id='choicesIMAGE_down_%{choiceNumber}' + cssClass="hidden" href='#' + onclick="return downChoice('choicesIMAGE_%{choiceNumber}')"> + <image alt='<s:property value="downTitle"/>' + title='<s:property value="downTitle"/>' + src="<s:url value='/img/1downarrow.png'/>"></image> + </s:a> + <s:a id='choicesIMAGE_up_%{choiceNumber}' href='#' cssClass="hidden" + onclick="return upChoice('choicesIMAGE_%{choiceNumber}')"> + <image alt='<s:property value="upTitle"/>' + title='<s:property value="upTitle"/>' + src="<s:url value='/img/1uparrow.png'/>"></image> + </s:a--%> + </div> + + <div class="cleanBoth"></div> +</div> \ No newline at end of file Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/ImageChoice.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/PersonToList.jsp (from rev 3205, branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/personToList.jsp) =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/PersonToList.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/PersonToList.jsp 2012-03-28 07:59:26 UTC (rev 3213) @@ -0,0 +1,62 @@ +<%-- + #%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 language="java" contentType="text/html" pageEncoding="utf-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> + +<s:set name="prefix">personToList_<s:property + value="votingListNumber"/>_<s:property value="personToListNumber"/> +</s:set> +<s:set id='deleteTitle'> + <s:text name="pollen.action.pollPersonToListDelete"/> +</s:set> +<s:div id='%{#prefix}'> + <s:fielderror/> + <s:hidden key='%{#prefix}.topiaId' value='%{personToList.topiaId}' label=''/> + <s:hidden key='%{#prefix}.accountId' value='%{personToList.pollAccount.accountId}' label=''/> + <div class="fleft choiceName"> + <s:label for="%{#prefix}.votingId" id="%{#prefix}_label" theme="simple" + value=''/> + <s:textfield cssClass="nameField" id='%{#prefix}.votingId' + key="%{#prefix}.votingId" label='' theme="simple" + value="%{personToList.pollAccount.votingId}"/> + - + <s:label for="%{#prefix}.email" key="pollen.common.email" theme="simple"/> + <s:textfield cols="30" id="%{#prefix}.email" key="%{#prefix}.email" + label='' theme="simple" size="30" + value="%{personToList.pollAccount.email}"/> + - + <s:label for="%{#prefix}.weight" key="pollen.common.weight" theme="simple"/> + <s:textfield id="%{#prefix}.weight" key="%{#prefix}.weight" size="1" + label='' theme="simple" value="%{personToList.weight}"/> + </div> + <div class="fright"> + <s:a href='#' onclick="return deletePersonToList('%{#prefix}')"> + <image alt='<s:property value="deleteTitle"/>' + title='<s:property value="deleteTitle"/>' + src="<s:url value='/img/delete.png'/>"></image> + </s:a> + </div> + + <div class="cleanBoth"></div> +</s:div> \ No newline at end of file Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/PersonToList.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/TextChoice.jsp (from rev 3205, branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/textChoice.jsp) =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/TextChoice.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/TextChoice.jsp 2012-03-28 07:59:26 UTC (rev 3213) @@ -0,0 +1,67 @@ +<%-- + #%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 language="java" contentType="text/html" pageEncoding="utf-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> + +<s:set name="prefix">textChoice_<s:property value="choiceNumber"/></s:set> +<s:set id='deleteTitle'><s:text name="pollen.action.pollChoiceDelete"/></s:set> +<s:set id='upTitle'><s:text name="pollen.action.pollChoiceUp"/></s:set> +<s:set id='downTitle'><s:text name="pollen.action.pollChoiceDown"/></s:set> +<div id='choicesTEXT_<s:property value="choiceNumber"/>'> + <s:hidden key='%{#prefix}.topiaId' value='%{choice.topiaId}' label=''/> + <div class="fleft choiceName"> + <s:label for="%{#prefix}.name" id="choicesTEXT_label_%{choiceNumber}" + theme="simple" value=''/> + <s:textfield cssClass="nameField" id='%{#prefix}.name' key="%{#prefix}.name" + label='' theme="simple" value="%{choice.name}"/> + - + <s:label for="%{#prefix}.description" key="pollen.common.description" + theme="simple"/> + <%--/div> + <div class="fleft"--%> + <s:textarea cols="30" id="%{#prefix}.description" label='' theme="simple" + key="%{#prefix}.description" value="%{choice.description}"/> + </div> + <div class="fright"> + <s:a href='#' onclick="return deleteChoice('choicesTEXT_%{choiceNumber}')"> + <image alt='<s:property value="deleteTitle"/>' + title='<s:property value="deleteTitle"/>' + src="<s:url value='/img/delete.png'/>"></image> + </s:a> + <%--s:a id='choicesTEXT_down_%{choiceNumber}' + cssClass="hidden" href='#' + onclick="return downChoice('choicesTEXT_%{choiceNumber}')"> + <image alt='<s:property value="downTitle"/>' + title='<s:property value="downTitle"/>' + src="<s:url value='/img/1downarrow.png'/>"></image> + </s:a> + <s:a id='choicesTEXT_up_%{choiceNumber}' href='#' cssClass="hidden" + onclick="return upChoice('choicesTEXT_%{choiceNumber}')"> + <image alt='<s:property value="upTitle"/>' + title='<s:property value="upTitle"/>' + src="<s:url value='/img/1uparrow.png'/>"></image> + </s:a--%> + </div> + <div class="cleanBoth"></div> +</div> \ No newline at end of file Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/TextChoice.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/VotingList.jsp (from rev 3205, branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/votingList.jsp) =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/VotingList.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/VotingList.jsp 2012-03-28 07:59:26 UTC (rev 3213) @@ -0,0 +1,90 @@ +<%-- + #%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 language="java" contentType="text/html" pageEncoding="utf-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> + +<s:set name="prefix">votingList_<s:property value="votingListNumber"/></s:set> +<s:set id='deleteTitle'> + <s:text name="pollen.action.pollVotingListDelete"/> +</s:set> + +<script type="text/javascript"> + jQuery(document).ready(function () { + // personToList loading + <s:iterator begin="1" end="nbPersonToLists" status="status"> + addPersonToList(<s:property value="votingListNumber"/>, <s:property value='%{#status.index}'/>, <s:property value="nbPersonToLists - 1"/>, '<s:property value="personToListTokenId" />'); + </s:iterator> + }); +</script> +<s:div id='votingLists_%{votingListNumber}'> + <fieldset class="ui-widget-content ui-corner-all"> + + <s:fielderror/> + <div class="groupPoll"> + <div class="fleft choiceName"> + <s:label for="%{#prefix}.name" theme="simple" + id="votingLists_%{votingListNumber}_label"/> + <s:textfield id='%{#prefix}.name' key="%{#prefix}.name" label='' + theme="simple" value="%{votingList.name}"/> + - + <s:label for="%{#prefix}.weight" key="pollen.common.weight" + theme="simple"/> + <s:textfield id="%{#prefix}.weight" key="%{#prefix}.weight" + value="%{votingList.weight}" + size="1" label='' theme="simple"/> + </div> + <div id='<s:property value="%{#prefix}"/>_actions' class="fright"> + <s:a href='#' + onclick="return deleteVotingList('votingLists_%{votingListNumber}')"> + <image alt='<s:property value="deleteTitle"/>' + title='<s:property value="deleteTitle"/>' + src="<s:url value='/img/delete.png'/>"></image> + </s:a> + </div> + <hr/> + </div> + <div class="cleanBoth"></div> + <s:hidden key='%{#prefix}.topiaId' value='%{votingList.topiaId}' label=''/> + + <s:div id='personToList_%{votingListNumber}'> + <%--Where to load personToList--%> + </s:div> + <hr/> + <div class="cleanBoth" align="center"> + <s:submit id='%{#prefix}_addPersonToList' + name='%{#prefix}_addPersonToList' + key="pollen.action.addPersonToList" theme="simple" + onclick='return addNewPersonToList("%{votingListNumber}");'/> + <s:if test="userLoggued"> + <s:submit id='%{#prefix}_addPersonToList' theme="simple" + name='%{#prefix}_addPersonToList' + key="pollen.action.addPersonListFromVotingList" + onclick='return selectPersonListToAddToVotingList("%{votingListNumber}");'/> + </s:if> + + </div> + + </fieldset> + <br/> +</s:div> Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/VotingList.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createdList.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createdList.jsp 2012-03-27 19:09:51 UTC (rev 3212) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createdList.jsp 2012-03-28 07:59:26 UTC (rev 3213) @@ -1,59 +0,0 @@ -<%-- - #%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="/poll" action="createdList"/>'; -</script> -<%@include file="/WEB-INF/jsp/pollListHelper.jsp"%> - -<title><s:text name="pollen.title.pollsCreatedList"/></title> - -<h1 class="title${pageLogo}"><s:text name="pollen.title.pollsCreatedList"/></h1> - -<h4><s:text name="pollen.title.pollsCreatedList.legend"/></h4> - -<s:url id="loadUrl" action="getCreatedPolls" namespace="/json" escapeAmp="false"/> - -<sjg:grid id="polls" dataType="json" href="%{loadUrl}" 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> Deleted: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/dateChoice.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/dateChoice.jsp 2012-03-27 19:09:51 UTC (rev 3212) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/dateChoice.jsp 2012-03-28 07:59:26 UTC (rev 3213) @@ -1,70 +0,0 @@ -<%-- - #%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 language="java" contentType="text/html" pageEncoding="utf-8" %> -<%@ taglib prefix="s" uri="/struts-tags" %> -<%@ taglib prefix="sj" uri="/struts-jquery-tags" %> - -<s:set name="prefix">dateChoice_<s:property value="choiceNumber"/></s:set> -<s:set id='deleteTitle'><s:text name="pollen.action.pollChoiceDelete"/></s:set> -<s:set id='upTitle'><s:text name="pollen.action.pollChoiceUp"/></s:set> -<s:set id='downTitle'><s:text name="pollen.action.pollChoiceDown"/></s:set> -<div id='choicesDATE_<s:property value="choiceNumber"/>'> - <s:hidden key='%{#prefix}.topiaId' value='%{choice.topiaId}' label=''/> - <div class="fleft choiceName"> - <s:label for="%{#prefix}.name" id="choicesDATE_label_%{choiceNumber}" - theme="simple" value=''/> - <sj:datepicker id='%{#prefix}.name' key="%{#prefix}.name" changeMonth="true" - changeYear="true" labelSeparator="" theme="simple" label="" - timepicker="true" value="%{choice.date}" displayFormat="dd/mm/yy"/> - - - <s:label for="%{#prefix}.description" key="pollen.common.description" - theme="simple"/> - </div> - <div class="fleft"> - <s:textarea cols="30" id="%{#prefix}.description" - key="%{#prefix}.description" label='' theme="simple" - value="%{choice.description}"/> - </div> - <div class="fright"> - <s:a href='#' onclick="return deleteChoice('choicesDATE_%{choiceNumber}')"> - <image alt='<s:property value="deleteTitle"/>' - title='<s:property value="deleteTitle"/>' - src="<s:url value='/img/delete.png'/>"></image> - </s:a> - <%--s:a id='choicesDATE_down_%{choiceNumber}' - cssClass="hidden" href='#' - onclick="return downChoice('choicesDATE_%{choiceNumber}')"> - <image alt='<s:property value="downTitle"/>' - title='<s:property value="downTitle"/>' - src="<s:url value='/img/1downarrow.png'/>"></image> - </s:a> - <s:a id='choicesDATE_up_%{choiceNumber}' href='#' cssClass="hidden" - onclick="return upChoice('choicesDATE_%{choiceNumber}')"> - <image alt='<s:property value="upTitle"/>' - title='<s:property value="upTitle"/>' - src="<s:url value='/img/1uparrow.png'/>"></image> - </s:a--%> - </div> - <div class="cleanBoth"></div> -</div> \ No newline at end of file Deleted: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/imageChoice.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/imageChoice.jsp 2012-03-27 19:09:51 UTC (rev 3212) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/imageChoice.jsp 2012-03-28 07:59:26 UTC (rev 3213) @@ -1,83 +0,0 @@ -<%-- - #%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 language="java" contentType="text/html" pageEncoding="utf-8" %> -<%@ taglib prefix="s" uri="/struts-tags" %> - -<s:set name="prefix">imageChoice_<s:property value="choiceNumber"/></s:set> -<s:set name="prefix2">imageChoice[<s:property value="choiceNumber"/>]</s:set> -<s:set id='deleteTitle'><s:text name="pollen.action.pollChoiceDelete"/></s:set> -<s:set id='upTitle'><s:text name="pollen.action.pollChoiceUp"/></s:set> -<s:set id='downTitle'><s:text name="pollen.action.pollChoiceDown"/></s:set> -<div id='choicesIMAGE_<s:property value="choiceNumber"/>'> - <s:hidden key='%{#prefix}.topiaId' value='%{choice.topiaId}' label=''/> - <div class="fleft choiceName"> - <s:label for="%{#prefix}.name" id="choicesIMAGE_label_%{choiceNumber}" - theme="simple" value=''/> - <s:if test="choice.name != ''"> - - <%--Uploaded image--%> - <s:hidden id="%{#prefix}.name" name="%{#prefix}.name" - value="%{choice.name}" label='' theme="simple"/> - - <s:hidden id="%{#prefix}.location" name="%{#prefix}.location" - value="%{choice.location}" label='' theme="simple"/> - - <s:label label='' theme="simple" cssClass="nameField" - value="%{choice.name}" readonly="true"/> - </s:if> - <s:else> - <%--New image--%> - <s:file key='%{#prefix2}' label='' theme="simple" cssClass="nameField"/> - </s:else> - - - <s:label for="%{#prefix}.description" key="pollen.common.description" - theme="simple"/> - </div> - <div class="fleft"> - <s:textarea cols="30" id="%{#prefix}.description" label='' theme="simple" - key="%{#prefix}.description" value="%{choice.description}"/> - </div> - <div class="fright"> - <s:a href='#' onclick="return deleteChoice('choicesIMAGE_%{choiceNumber}')"> - <image alt='<s:property value="deleteTitle"/>' - title='<s:property value="deleteTitle"/>' - src="<s:url value='/img/delete.png'/>"></image> - </s:a> - <%--s:a id='choicesIMAGE_down_%{choiceNumber}' - cssClass="hidden" href='#' - onclick="return downChoice('choicesIMAGE_%{choiceNumber}')"> - <image alt='<s:property value="downTitle"/>' - title='<s:property value="downTitle"/>' - src="<s:url value='/img/1downarrow.png'/>"></image> - </s:a> - <s:a id='choicesIMAGE_up_%{choiceNumber}' href='#' cssClass="hidden" - onclick="return upChoice('choicesIMAGE_%{choiceNumber}')"> - <image alt='<s:property value="upTitle"/>' - title='<s:property value="upTitle"/>' - src="<s:url value='/img/1uparrow.png'/>"></image> - </s:a--%> - </div> - - <div class="cleanBoth"></div> -</div> \ No newline at end of file Deleted: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/participatedList.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/participatedList.jsp 2012-03-27 19:09:51 UTC (rev 3212) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/participatedList.jsp 2012-03-28 07:59:26 UTC (rev 3213) @@ -1,85 +0,0 @@ -<%-- - #%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="/poll" action="participatedList"/>'; -</script> -<%@include file="/WEB-INF/jsp/pollListHelper.jsp"%> - -<title><s:text name="pollen.title.pollsParticipatedList"/></title> - -<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" - namespace="/json" escapeAmp="false"/> - -<sjg:grid dataType="json" href="%{loadParticipatedUrl}" 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> Deleted: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/personToList.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/personToList.jsp 2012-03-27 19:09:51 UTC (rev 3212) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/personToList.jsp 2012-03-28 07:59:26 UTC (rev 3213) @@ -1,62 +0,0 @@ -<%-- - #%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 language="java" contentType="text/html" pageEncoding="utf-8" %> -<%@ taglib prefix="s" uri="/struts-tags" %> - -<s:set name="prefix">personToList_<s:property - value="votingListNumber"/>_<s:property value="personToListNumber"/> -</s:set> -<s:set id='deleteTitle'> - <s:text name="pollen.action.pollPersonToListDelete"/> -</s:set> -<s:div id='%{#prefix}'> - <s:fielderror/> - <s:hidden key='%{#prefix}.topiaId' value='%{personToList.topiaId}' label=''/> - <s:hidden key='%{#prefix}.accountId' value='%{personToList.pollAccount.accountId}' label=''/> - <div class="fleft choiceName"> - <s:label for="%{#prefix}.votingId" id="%{#prefix}_label" theme="simple" - value=''/> - <s:textfield cssClass="nameField" id='%{#prefix}.votingId' - key="%{#prefix}.votingId" label='' theme="simple" - value="%{personToList.pollAccount.votingId}"/> - - - <s:label for="%{#prefix}.email" key="pollen.common.email" theme="simple"/> - <s:textfield cols="30" id="%{#prefix}.email" key="%{#prefix}.email" - label='' theme="simple" size="30" - value="%{personToList.pollAccount.email}"/> - - - <s:label for="%{#prefix}.weight" key="pollen.common.weight" theme="simple"/> - <s:textfield id="%{#prefix}.weight" key="%{#prefix}.weight" size="1" - label='' theme="simple" value="%{personToList.weight}"/> - </div> - <div class="fright"> - <s:a href='#' onclick="return deletePersonToList('%{#prefix}')"> - <image alt='<s:property value="deleteTitle"/>' - title='<s:property value="deleteTitle"/>' - src="<s:url value='/img/delete.png'/>"></image> - </s:a> - </div> - - <div class="cleanBoth"></div> -</s:div> \ No newline at end of file Deleted: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/textChoice.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/textChoice.jsp 2012-03-27 19:09:51 UTC (rev 3212) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/textChoice.jsp 2012-03-28 07:59:26 UTC (rev 3213) @@ -1,67 +0,0 @@ -<%-- - #%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 language="java" contentType="text/html" pageEncoding="utf-8" %> -<%@ taglib prefix="s" uri="/struts-tags" %> - -<s:set name="prefix">textChoice_<s:property value="choiceNumber"/></s:set> -<s:set id='deleteTitle'><s:text name="pollen.action.pollChoiceDelete"/></s:set> -<s:set id='upTitle'><s:text name="pollen.action.pollChoiceUp"/></s:set> -<s:set id='downTitle'><s:text name="pollen.action.pollChoiceDown"/></s:set> -<div id='choicesTEXT_<s:property value="choiceNumber"/>'> - <s:hidden key='%{#prefix}.topiaId' value='%{choice.topiaId}' label=''/> - <div class="fleft choiceName"> - <s:label for="%{#prefix}.name" id="choicesTEXT_label_%{choiceNumber}" - theme="simple" value=''/> - <s:textfield cssClass="nameField" id='%{#prefix}.name' key="%{#prefix}.name" - label='' theme="simple" value="%{choice.name}"/> - - - <s:label for="%{#prefix}.description" key="pollen.common.description" - theme="simple"/> - <%--/div> - <div class="fleft"--%> - <s:textarea cols="30" id="%{#prefix}.description" label='' theme="simple" - key="%{#prefix}.description" value="%{choice.description}"/> - </div> - <div class="fright"> - <s:a href='#' onclick="return deleteChoice('choicesTEXT_%{choiceNumber}')"> - <image alt='<s:property value="deleteTitle"/>' - title='<s:property value="deleteTitle"/>' - src="<s:url value='/img/delete.png'/>"></image> - </s:a> - <%--s:a id='choicesTEXT_down_%{choiceNumber}' - cssClass="hidden" href='#' - onclick="return downChoice('choicesTEXT_%{choiceNumber}')"> - <image alt='<s:property value="downTitle"/>' - title='<s:property value="downTitle"/>' - src="<s:url value='/img/1downarrow.png'/>"></image> - </s:a> - <s:a id='choicesTEXT_up_%{choiceNumber}' href='#' cssClass="hidden" - onclick="return upChoice('choicesTEXT_%{choiceNumber}')"> - <image alt='<s:property value="upTitle"/>' - title='<s:property value="upTitle"/>' - src="<s:url value='/img/1uparrow.png'/>"></image> - </s:a--%> - </div> - <div class="cleanBoth"></div> -</div> \ No newline at end of file Deleted: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/votingList.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/votingList.jsp 2012-03-27 19:09:51 UTC (rev 3212) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/votingList.jsp 2012-03-28 07:59:26 UTC (rev 3213) @@ -1,90 +0,0 @@ -<%-- - #%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 language="java" contentType="text/html" pageEncoding="utf-8" %> -<%@ taglib prefix="s" uri="/struts-tags" %> - -<s:set name="prefix">votingList_<s:property value="votingListNumber"/></s:set> -<s:set id='deleteTitle'> - <s:text name="pollen.action.pollVotingListDelete"/> -</s:set> - -<script type="text/javascript"> - jQuery(document).ready(function () { - // personToList loading - <s:iterator begin="1" end="nbPersonToLists" status="status"> - addPersonToList(<s:property value="votingListNumber"/>, <s:property value='%{#status.index}'/>, <s:property value="nbPersonToLists - 1"/>, '<s:property value="personToListTokenId" />'); - </s:iterator> - }); -</script> -<s:div id='votingLists_%{votingListNumber}'> - <fieldset class="ui-widget-content ui-corner-all"> - - <s:fielderror/> - <div class="groupPoll"> - <div class="fleft choiceName"> - <s:label for="%{#prefix}.name" theme="simple" - id="votingLists_%{votingListNumber}_label"/> - <s:textfield id='%{#prefix}.name' key="%{#prefix}.name" label='' - theme="simple" value="%{votingList.name}"/> - - - <s:label for="%{#prefix}.weight" key="pollen.common.weight" - theme="simple"/> - <s:textfield id="%{#prefix}.weight" key="%{#prefix}.weight" - value="%{votingList.weight}" - size="1" label='' theme="simple"/> - </div> - <div id='<s:property value="%{#prefix}"/>_actions' class="fright"> - <s:a href='#' - onclick="return deleteVotingList('votingLists_%{votingListNumber}')"> - <image alt='<s:property value="deleteTitle"/>' - title='<s:property value="deleteTitle"/>' - src="<s:url value='/img/delete.png'/>"></image> - </s:a> - </div> - <hr/> - </div> - <div class="cleanBoth"></div> - <s:hidden key='%{#prefix}.topiaId' value='%{votingList.topiaId}' label=''/> - - <s:div id='personToList_%{votingListNumber}'> - <%--Where to load personToList--%> - </s:div> - <hr/> - <div class="cleanBoth" align="center"> - <s:submit id='%{#prefix}_addPersonToList' - name='%{#prefix}_addPersonToList' - key="pollen.action.addPersonToList" theme="simple" - onclick='return addNewPersonToList("%{votingListNumber}");'/> - <s:if test="userLoggued"> - <s:submit id='%{#prefix}_addPersonToList' theme="simple" - name='%{#prefix}_addPersonToList' - key="pollen.action.addPersonListFromVotingList" - onclick='return selectPersonListToAddToVotingList("%{votingListNumber}");'/> - </s:if> - - </div> - - </fieldset> - <br/> -</s:div> Copied: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp (from rev 3205, branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createdList.jsp) =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp 2012-03-28 07:59:26 UTC (rev 3213) @@ -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="createdList"/>'; +</script> +<%@include file="/WEB-INF/jsp/pollListHelper.jsp"%> + +<title><s:text name="pollen.title.pollsCreatedList"/></title> + +<h1 class="title${pageLogo}"><s:text name="pollen.title.pollsCreatedList"/></h1> + +<h4><s:text name="pollen.title.pollsCreatedList.legend"/></h4> + +<s:url id="loadUrl" action="getCreatedPolls" namespace="/json" escapeAmp="false"/> + +<sjg:grid id="polls" dataType="json" href="%{loadUrl}" 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: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/participatedList.jsp (from rev 3205, branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/participatedList.jsp) =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/participatedList.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/participatedList.jsp 2012-03-28 07:59:26 UTC (rev 3213) @@ -0,0 +1,85 @@ +<%-- + #%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="participatedList"/>'; +</script> +<%@include file="/WEB-INF/jsp/pollListHelper.jsp"%> + +<title><s:text name="pollen.title.pollsParticipatedList"/></title> + +<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" + namespace="/json" escapeAmp="false"/> + +<sjg:grid dataType="json" href="%{loadParticipatedUrl}" 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: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/participatedList.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native