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

r3426 - trunk/pollen-services/src/license
by tchemit＠users.chorem.org June 6, 2012

June 6, 2012

Author: tchemit Date: 2012-06-06 13:19:59 +0200 (Wed, 06 Jun 2012) New Revision: 3426 Url: http://chorem.org/repositories/revision/pollen/3426 Log: optimize third parties Modified: trunk/pollen-services/src/license/THIRD-PARTY.properties Modified: trunk/pollen-services/src/license/THIRD-PARTY.properties =================================================================== --- trunk/pollen-services/src/license/THIRD-PARTY.properties 2012-06-05 17:02:11 UTC (rev 3425) +++ trunk/pollen-services/src/license/THIRD-PARTY.properties 2012-06-06 11:19:59 UTC (rev 3426) @@ -7,6 +7,7 @@ # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 # - GNU Affero General Public License version 3 +# - GNU Library or Lesser General Public License # - GPLv2+CE # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) v 3.0 @@ -22,10 +23,11 @@ # Please fill the missing licenses for dependencies : # # -#Fri Apr 13 19:36:08 CEST 2012 +#Wed Jun 06 13:16:20 CEST 2012 antlr--antlr--2.7.6=BSD License commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License +javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 jdom--jdom--1.0=The Apache Software License, Version 2.0 rome--rome--1.0=The Apache Software License, Version 2.0

1 0

r3425 - trunk/pollen-ui-struts2/src/main/resources/i18n
by tchemit＠users.chorem.org June 5, 2012

June 5, 2012

Author: tchemit Date: 2012-06-05 19:02:11 +0200 (Tue, 05 Jun 2012) New Revision: 3425 Url: http://chorem.org/repositories/revision/pollen/3425 Log: i18n Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 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-06-05 16:55:08 UTC (rev 3424) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-06-05 17:02:11 UTC (rev 3425) @@ -45,7 +45,7 @@ pollen.action.pollModerateVote=Administrer les votes pollen.action.pollPersonToListDelete=Supprimer ce votant pollen.action.pollResult=Afficher les résultats du sondage -pollen.action.pollSummary=Réumsé du sondage +pollen.action.pollSummary=Résumé du sondage pollen.action.pollVote=Voter pollen.action.pollVotingListDelete=Supprimer le groupe de votants pollen.action.pollVotingListEdit=Editer ce groupe de votants

1 0

r3424 - trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration
by tchemit＠users.chorem.org June 5, 2012

June 5, 2012

Author: tchemit Date: 2012-06-05 18:55:08 +0200 (Tue, 05 Jun 2012) New Revision: 3424 Url: http://chorem.org/repositories/revision/pollen/3424 Log: fix migration Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java 2012-06-05 16:50:22 UTC (rev 3423) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java 2012-06-05 16:55:08 UTC (rev 3424) @@ -136,6 +136,18 @@ String pollId = choiceId.getLeft(); String choiceName = choiceId.getRight(); + File pollChoiceImage = service.getPollChoiceImageFile( + pollId, choiceName, false); + + if (!pollChoiceImage.exists()) { + + // image does not exists, can not generate thumb + if (log.isWarnEnabled()) { + log.warn("Could not find image choice " + pollChoiceImage); + } + continue; + } + File pollChoiceImageThumb = service.getPollChoiceImageFile( pollId, choiceName, true);

1 0

June 5, 2012

Author: tchemit Date: 2012-06-05 18:50:22 +0200 (Tue, 05 Jun 2012) New Revision: 3423 Url: http://chorem.org/repositories/revision/pollen/3423 Log: - update file headers - move migration to service module (need now some services to perform migration) - move PollenApllicationContext to the service module (need now some services to perform migration) - fixes #582: Make the resume page bookmarkeable - fixes #584: Regenerate missing feed files - fixes #587: Improve poll admin actions Added: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollActions.java trunk/pollen-services/src/main/java/org/chorem/pollen/PollenApplicationContext.java trunk/pollen-services/src/main/java/org/chorem/pollen/entities/ trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java trunk/pollen-services/src/main/resources/META-INF/ trunk/pollen-services/src/main/resources/META-INF/services/ trunk/pollen-services/src/main/resources/META-INF/services/org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG$MigrationCallBackForVersion trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SummaryPoll.java trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/summary.jsp trunk/pollen-ui-struts2/src/main/webapp/css/summary.css trunk/pollen-ui-struts2/src/main/webapp/img/blank.png Removed: trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/ trunk/pollen-persistence/src/main/resources/META-INF/services/org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG$MigrationCallBackForVersion trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationContext.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResumePoll.java trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/resume.jsp trunk/pollen-ui-struts2/src/main/webapp/css/resume.css Modified: trunk/pollen-persistence/pom.xml trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenApplicationConfigProvider.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenFunctions.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenIOUtil.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenTechnicalException.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenTopiaRootContextFactory.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/CommentDAOImpl.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonListDAOImpl.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonToListDAOImpl.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollDAOImpl.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollImpl.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountDAOImpl.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountImpl.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VoteDAOImpl.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VotingListImpl.java trunk/pollen-persistence/src/main/xmi/pollen.properties trunk/pollen-persistence/src/site/site_en.xml trunk/pollen-persistence/src/site/site_fr.xml trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/AbstractDAOTest.java trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollAccountDAOTest.java trunk/pollen-persistence/src/test/resources/log4j.properties trunk/pollen-persistence/src/test/resources/pollen-fake.properties trunk/pollen-services/pom.xml trunk/pollen-services/src/main/java/org/chorem/pollen/bean/ChoiceHelper.java trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollDateChoice.java trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollImageChoice.java trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollResult.java trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollResultList.java trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollUri.java trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollUrl.java trunk/pollen-services/src/main/java/org/chorem/pollen/bean/UserPoll.java trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallback.java trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_1.java trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2.java trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3.java trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3_1.java trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/FavoriteListImport.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenNotifierWorker.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFactory.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFunctions.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServicePredicates.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListAlreadyExistException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListImportException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotFoundException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotOwnedByUserException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/InvalidEmailException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantAlreadyFoundInListException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantExistWithoutMailException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundInListException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAccountNotFound.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyClosedException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyExistException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollChoiceNotFoundException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollCommentNotFound.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollNotFoundException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollVoteNotFoundException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UnauthorizedPollAccessException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserEmailAlreadyUsedException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserInvalidPasswordException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserLoginAlreadyUsedException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserNotFoundException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteDoubloonException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotAllowedException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotFoundException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportCSV.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportLDAP.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollFeedService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollResultsService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollUrlService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PreventRuleService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java trunk/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties trunk/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties trunk/pollen-services/src/site/site_en.xml trunk/pollen-services/src/site/site_fr.xml trunk/pollen-services/src/test/java/org/chorem/pollen/services/AbstractPollenServiceTest.java trunk/pollen-services/src/test/java/org/chorem/pollen/services/FakeServiceContext.java trunk/pollen-services/src/test/java/org/chorem/pollen/services/impl/EmailServiceTest.java trunk/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java trunk/pollen-services/src/test/java/org/chorem/pollen/services/impl/PollServiceTest.java trunk/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java trunk/pollen-services/src/test/java/org/chorem/pollen/services/impl/VoteServiceTest.java trunk/pollen-services/src/test/resources/log4j.properties trunk/pollen-services/src/test/resources/pollen-fake.properties trunk/pollen-ui-struts2/src/main/assembly/bin.xml trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.properties trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTopiaTransactionFilter.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/FileUploadAware.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PageSkin.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/Confirm.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/DeleteUser.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GenerateChart.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GetPollImageChoice.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteList.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccount.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccounts.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteLists.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPollComments.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractDisplayChoice.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollUriIdAction.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AddChoice.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AddComment.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ClosePoll.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteChoice.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteComment.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteVote.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmPollAction.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatedList.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteChoice.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteComment.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeletePoll.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteVote.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayDateChoice.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayImageChoice.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPersonToList.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayTextChoice.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayVotingList.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/EditVote.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ExportPoll.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/GetPollFeed.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ImportPersonListToVotingList.java 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/LoadPoll.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ParticipatedList.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultLink.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SelectPersonListToVotingList.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Confirm.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeleteFavoriteList.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeletePollAccount.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Logout.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/LostPassword.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteList.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Show.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/BooleanIntegerConverter.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/DateConverter.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/PollUriConverter.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenFileUploadInterceptor.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/results/PollenServletActionRedirectResult.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/AbstractPollenAuthorization.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/AdminUserRequired.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/ConnectedUserRequired.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollAccessRequired.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollCreatorRequired.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollRequired.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/ResultAccessRequired.java trunk/pollen-ui-struts2/src/main/resources/config/struts-admin.xml trunk/pollen-ui-struts2/src/main/resources/config/struts-io.xml trunk/pollen-ui-struts2/src/main/resources/config/struts-json.xml trunk/pollen-ui-struts2/src/main/resources/config/struts-poll.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/resources/log4j.properties trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/business/persistence/VoteToChoice-conversion.properties trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/business/persistence/VoteToChoiceImpl-conversion.properties trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-create-validation.xml trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-edit-validation.xml trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Edit-validation.xml trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-addPollAccount-validation.xml trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-editPollAccount-validation.xml trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteLists-createFavoriteList-validation.xml trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Register-validation.xml trunk/pollen-ui-struts2/src/main/resources/pollen.properties trunk/pollen-ui-struts2/src/main/resources/struts.xml trunk/pollen-ui-struts2/src/main/resources/template/css_xhtml/checkbox.ftl trunk/pollen-ui-struts2/src/main/resources/template/css_xhtml/controlheader-core.ftl trunk/pollen-ui-struts2/src/main/resources/template/themes/green/jquery-ui.css trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/jquery-ui.css trunk/pollen-ui-struts2/src/main/resources/validators.xml trunk/pollen-ui-struts2/src/main/resources/xwork-conversion.properties trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators.xml trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteUser.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/pollsList.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/adminRequired.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/home.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmClonePoll.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmClosePoll.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePoll.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollChoice.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollComment.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollVote.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayDateChoice.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayImageChoice.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPersonToList.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComment.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComments.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayTextChoice.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingList.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingListPersons.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/personListToVotingList.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/result.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/resultLink.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/selectPersonListToAddToVotingList.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/selectPersonListToCreateNewVotingList.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/pollListHelper.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/admin_required.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/connected_required.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_access_required.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_creator_required.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_required.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/result_access_required.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/confirmDeleteFavoriteList.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/confirmDeletePollAccount.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/invitedList.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/login.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/participatedList.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/register.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/show.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/web.xml trunk/pollen-ui-struts2/src/main/webapp/css/common.css trunk/pollen-ui-struts2/src/main/webapp/css/main.css trunk/pollen-ui-struts2/src/main/webapp/css/pollCreation.css trunk/pollen-ui-struts2/src/main/webapp/css/results.css trunk/pollen-ui-struts2/src/main/webapp/css/vote.css trunk/pollen-ui-struts2/src/main/webapp/index.jsp trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js trunk/pollen-ui-struts2/src/main/webapp/js/favoriteList.js trunk/pollen-ui-struts2/src/main/webapp/js/favoriteLists.js trunk/pollen-ui-struts2/src/main/webapp/js/gridHelper.js trunk/pollen-ui-struts2/src/main/webapp/js/usersList.js trunk/pollen-ui-struts2/src/site/fr/rst/index.rst trunk/pollen-ui-struts2/src/site/site_en.xml trunk/pollen-ui-struts2/src/site/site_fr.xml trunk/pollen-votecounting/src/main/java/org/chorem/pollen/common/ChoiceType.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/common/I18nAble.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/common/PollType.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/common/VoteCountingType.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Choice.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/CondorcetMethod.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Context.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Group.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Method.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/NumberMethod.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/PercentageMethod.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/StandardMethod.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Vote.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/package-info.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/ChoiceDTO.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/CommentDTO.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollChoiceDTO.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollDTO.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollExportDTO.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VoteCountingResultDTO.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VoteToChoiceDTO.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VotingGroupDTO.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VotingPersonDTO.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/package-info.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ImportExportService.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceExport.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceExportImpl.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceVoteCounting.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceVoteCountingImpl.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/VoteCountingService.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/package-info.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/ListBehavior.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/PercentageBehavior.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/Utils.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/package-info.java trunk/pollen-votecounting/src/main/resources/log4j.properties trunk/pollen-votecounting/src/site/site_en.xml trunk/pollen-votecounting/src/site/site_fr.xml trunk/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/PollDTOCreator.java trunk/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/PollDTOCreatorVoteCounting.java trunk/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/ServiceVoteCountingImplTest.java trunk/src/site/fr/rst/configure.rst trunk/src/site/fr/rst/depouillement.rst trunk/src/site/fr/rst/index.rst trunk/src/site/rst/configure.rst trunk/src/site/rst/index.rst trunk/src/site/rst/methods.rst trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-persistence/pom.xml 2012-06-05 16:50:22 UTC (rev 3423) @@ -49,10 +49,6 @@ <artifactId>topia-persistence</artifactId> </dependency> <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-service-migration</artifactId> - </dependency> - <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> </dependency> Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenApplicationConfigProvider.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenApplicationConfigProvider.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenApplicationConfigProvider.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Persistence - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Persistence - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Persistence - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenFunctions.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenFunctions.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenFunctions.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Persistence - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenIOUtil.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenIOUtil.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenIOUtil.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Persistence - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenTechnicalException.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenTechnicalException.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenTechnicalException.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Persistence - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenTopiaRootContextFactory.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenTopiaRootContextFactory.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenTopiaRootContextFactory.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Persistence - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/CommentDAOImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/CommentDAOImpl.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/CommentDAOImpl.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Persistence - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonListDAOImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonListDAOImpl.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonListDAOImpl.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Persistence - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonToListDAOImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonToListDAOImpl.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonToListDAOImpl.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Persistence - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Persistence - * * $Id$ * $HeadURL$ * %% Added: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollActions.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollActions.java (rev 0) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollActions.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -0,0 +1,58 @@ +/* + * #%L + * Pollen :: Persistence + * $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.business.persistence; + +/** + * Enumeration to get all possible actions on poll. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.4 + */ +public enum PollActions { + + ATTACH("user/attachPoll"), + VOTE("poll/votefor"), + RESULT("poll/results"), + SUMMARY("poll/summary"), + MODERATE("poll/votefor"), + EDIT("poll/modification"), + CLOSE("poll/close"), + CLONE("poll/clone"), + EXPORT("poll/export"), + DELETE("poll/delete"); + + /** + * Prefix to render url. + * + * @since 1.4 + */ + private final String actionPrefix; + + private PollActions(String actionPrefix) { + this.actionPrefix = actionPrefix; + } + + public String getActionPrefix() { + return actionPrefix; + } +} Property changes on: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollActions.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollDAOImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollDAOImpl.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollDAOImpl.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Persistence - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollImpl.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollImpl.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Persistence - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountDAOImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountDAOImpl.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountDAOImpl.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Persistence - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountImpl.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountImpl.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Persistence - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VoteDAOImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VoteDAOImpl.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VoteDAOImpl.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Persistence - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VotingListImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VotingListImpl.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VotingListImpl.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Persistence - * * $Id$ * $HeadURL$ * %% Deleted: trunk/pollen-persistence/src/main/resources/META-INF/services/org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG$MigrationCallBackForVersion =================================================================== --- trunk/pollen-persistence/src/main/resources/META-INF/services/org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG$MigrationCallBackForVersion 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-persistence/src/main/resources/META-INF/services/org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG$MigrationCallBackForVersion 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,5 +0,0 @@ -org.chorem.pollen.entities.migration.PollenMigrationCallbackV1_1 -org.chorem.pollen.entities.migration.PollenMigrationCallbackV1_2 -org.chorem.pollen.entities.migration.PollenMigrationCallbackV1_3 -org.chorem.pollen.entities.migration.PollenMigrationCallbackV1_3_1 -org.chorem.pollen.entities.migration.PollenMigrationCallbackV1_4 \ No newline at end of file Modified: trunk/pollen-persistence/src/main/xmi/pollen.properties =================================================================== --- trunk/pollen-persistence/src/main/xmi/pollen.properties 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-persistence/src/main/xmi/pollen.properties 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ ### # #%L # Pollen :: Persistence -# # $Id$ # $HeadURL$ # %% @@ -34,3 +33,13 @@ org.chorem.pollen.business.persistence.Poll.attribute.vote.stereotype=ordered org.chorem.pollen.business.persistence.Poll.attribute.vote.tagvalue.orderBy=topiaCreateDate +# clef naturelle non modifiable sur Poll#pollId +org.chorem.pollen.business.persistence.Poll.class.tagValue.naturalIdMutable=true +org.chorem.pollen.business.persistence.Poll.attribute.pollId.stereotype=unique +org.chorem.pollen.business.persistence.Poll.attribute.pollId.tagValue.naturalId=true + +# clef naturelle non modifiable sur PollAccount#accountId +org.chorem.pollen.business.persistence.PollAccount.class.tagValue.naturalIdMutable=true +org.chorem.pollen.business.persistence.PollAccount.attribute.accountId.stereotype=unique +org.chorem.pollen.business.persistence.PollAccount.attribute.accountId.tagValue.naturalId=true + Modified: trunk/pollen-persistence/src/site/site_en.xml =================================================================== --- trunk/pollen-persistence/src/site/site_en.xml 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-persistence/src/site/site_en.xml 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,10 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?>  - <action name="resume/*" method="execute" - class="org.chorem.pollen.ui.actions.poll.ResumePoll"> + <action name="summary/*" method="execute" + class="org.chorem.pollen.ui.actions.poll.SummaryPoll"> <param name="uriId">{1}</param> - <result>/WEB-INF/jsp/poll/resume.jsp</result> + <result>/WEB-INF/jsp/poll/summary.jsp</result> </action>  Modified: trunk/pollen-ui-struts2/src/main/resources/config/struts-user.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/config/struts-user.xml 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/resources/config/struts-user.xml 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -12,12 +11,10 @@ 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% 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-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-06-05 16:50:22 UTC (rev 3423) @@ -20,6 +20,7 @@ pollen.action.delete=Delete pollen.action.deleteChoice=Delete the choice pollen.action.deleteFavoriteList=Delete a list +pollen.action.deletePoll=Delete the poll pollen.action.deletePollAccount=Delete selected member pollen.action.deleteUser=Delete selected user pollen.action.deleteVote=Supprimer ce vote @@ -44,6 +45,7 @@ pollen.action.pollModerateVote=Administrate votes pollen.action.pollPersonToListDelete=Delete this voter pollen.action.pollResult=Display poll results +pollen.action.pollSummary=Poll summary pollen.action.pollVote=Vote pollen.action.pollVotingListDelete=Supprimer le groupe de votants pollen.action.pollVotingListEdit=Editer ce groupe de votants @@ -255,10 +257,14 @@ pollen.information.vote.deleted=Vote deleted. pollen.information.your.are.loggued=You are logged. pollen.label.contact.administrator=Send an email to an administrator +pollen.label.pollClonePage=<strong>Clone your poll</strong> +pollen.label.pollClosePage=<strong>Close your poll</strong> +pollen.label.pollDeletePage=<strong>Delete your poll</strong> pollen.label.pollEditPage=<strong>To modify your poll</strong>. Save it to be able to modify your poll later if you need it or to close it\: +pollen.label.pollExportPage=<strong>Export your poll</strong> pollen.label.pollModerateVotePage=<strong>To moderate your poll (you can't vote from this url)</strong>. Save it to be able to delete votes and comments\: pollen.label.pollRegisterPage=If you are a logged user, you can find these links on the page -pollen.label.pollResultPage=The link below leads to the page to count the votes. Save it to be able to count the vote later\: +pollen.label.pollResultPage=<strong>To count the vote</strong>.Save it to be able to count the vote later\: pollen.label.pollVotePage=<strong>To vote on your poll</strong>. Save it and send it to the people that you want to vote\: pollen.legend.attachPoll=Attach an anonymous poll to your user account pollen.legend.login=Login 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-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-06-05 16:50:22 UTC (rev 3423) @@ -20,6 +20,7 @@ pollen.action.delete=Supprimer pollen.action.deleteChoice=Supprimer le choix pollen.action.deleteFavoriteList=Supprimer une liste sélectionnée +pollen.action.deletePoll=Supprimer le sondage pollen.action.deletePollAccount=Supprimer une membre de la liste pollen.action.deleteUser=Supprimer un utilisateur sélectionné pollen.action.deleteVote=Supprimer ce vote @@ -44,6 +45,7 @@ pollen.action.pollModerateVote=Administrer les votes pollen.action.pollPersonToListDelete=Supprimer ce votant pollen.action.pollResult=Afficher les résultats du sondage +pollen.action.pollSummary=Réumsé du sondage pollen.action.pollVote=Voter pollen.action.pollVotingListDelete=Supprimer le groupe de votants pollen.action.pollVotingListEdit=Editer ce groupe de votants @@ -255,10 +257,14 @@ pollen.information.vote.deleted=Vote supprimé. pollen.information.your.are.loggued=Vous êtes connecté. pollen.label.contact.administrator=Contacter un administrateur +pollen.label.pollClonePage=<strong>Cloner le sondage</strong> +pollen.label.pollClosePage=<strong>Fermer le sondage</strong> +pollen.label.pollDeletePage=<strong>Supprimer le sondage</strong> pollen.label.pollEditPage=<strong>Lien pour configurer le sondage</strong>. Enregistrez-le pour pouvoir modifier votre sondage au besoin ou le clore \: +pollen.label.pollExportPage=<strong>Exporter le sondage</strong> pollen.label.pollModerateVotePage=<strong>Lien pour modérer le sondage (ce lien ne permet pas de voter)</strong>. Enregistrez-le pour pouvoir supprimer des votes et commentaires \: pollen.label.pollRegisterPage=Si vous êtes un utilisateur identifié, vous pouvez retrouver ces liens dans la page -pollen.label.pollResultPage=Le lien ci-dessous mène à la page de dépouillement. Enregistrez-le pour pouvoir accéder au dépouillement plus tard \: +pollen.label.pollResultPage=<strong>Lien pour dépouiller le sondage</strong>. Enregistrez-le pour pouvoir accéder au dépouillement plus tard \: pollen.label.pollVotePage=<strong>Lien pour voter</strong>. Enregistrez-le et envoyez-le à ceux que vous voulez voir voter \: pollen.legend.attachPoll=Attacher un sondage anonyme à votre compte pollen.legend.login=Login Modified: trunk/pollen-ui-struts2/src/main/resources/log4j.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/log4j.properties 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/resources/log4j.properties 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ ### # #%L -# Pollen :: UI (strust2) -# +# Pollen :: UI (struts2) # $Id$ # $HeadURL$ # %% Modified: trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/business/persistence/VoteToChoice-conversion.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/business/persistence/VoteToChoice-conversion.properties 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/business/persistence/VoteToChoice-conversion.properties 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ ### # #%L -# Pollen :: UI (strust2) -# +# Pollen :: UI (struts2) # $Id$ # $HeadURL$ # %% @@ -21,4 +20,4 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### -voteValue=org.chorem.pollen.ui.converters.BooleanIntegerConverter \ No newline at end of file +voteValue=org.chorem.pollen.ui.converters.BooleanIntegerConverter Modified: trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/business/persistence/VoteToChoiceImpl-conversion.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/business/persistence/VoteToChoiceImpl-conversion.properties 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/business/persistence/VoteToChoiceImpl-conversion.properties 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ ### # #%L -# Pollen :: UI (strust2) -# +# Pollen :: UI (struts2) # $Id$ # $HeadURL$ # %% @@ -21,4 +20,4 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### -voteValue=org.chorem.pollen.ui.converters.BooleanIntegerConverter \ No newline at end of file +voteValue=org.chorem.pollen.ui.converters.BooleanIntegerConverter Modified: trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-create-validation.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-create-validation.xml 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-create-validation.xml 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <!-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% Modified: trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-edit-validation.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-edit-validation.xml 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-edit-validation.xml 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <!-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% Modified: trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Edit-validation.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Edit-validation.xml 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Edit-validation.xml 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <!-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% Modified: trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-addPollAccount-validation.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-addPollAccount-validation.xml 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-addPollAccount-validation.xml 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -49,4 +48,4 @@ </field> -</validators> \ No newline at end of file +</validators> Modified: trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-editPollAccount-validation.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-editPollAccount-validation.xml 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-editPollAccount-validation.xml 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -49,4 +48,4 @@ </field> -</validators> \ No newline at end of file +</validators> Modified: trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteLists-createFavoriteList-validation.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteLists-createFavoriteList-validation.xml 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteLists-createFavoriteList-validation.xml 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <!-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -11,12 +10,10 @@ 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% Modified: trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Register-validation.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Register-validation.xml 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Register-validation.xml 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <!-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% Modified: trunk/pollen-ui-struts2/src/main/resources/pollen.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/pollen.properties 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/resources/pollen.properties 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ ### # #%L -# Pollen :: UI (strust2) -# +# Pollen :: UI (struts2) # $Id$ # $HeadURL$ # %% Modified: trunk/pollen-ui-struts2/src/main/resources/struts.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/struts.xml 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/resources/struts.xml 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% Modified: trunk/pollen-ui-struts2/src/main/resources/template/css_xhtml/checkbox.ftl =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/template/css_xhtml/checkbox.ftl 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/resources/template/css_xhtml/checkbox.ftl 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <#-- #%L - EchoBase :: UI - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% Modified: trunk/pollen-ui-struts2/src/main/resources/template/css_xhtml/controlheader-core.ftl =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/template/css_xhtml/controlheader-core.ftl 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/resources/template/css_xhtml/controlheader-core.ftl 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <#-- #%L - EchoBase :: UI - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% Modified: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/jquery-ui.css =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/template/themes/green/jquery-ui.css 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/resources/template/themes/green/jquery-ui.css 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% @@ -575,4 +574,4 @@ left: -4px; /*must have*/ width: 200px; /*must have*/ height: 200px; /*must have*/ -} \ No newline at end of file +} Modified: trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/jquery-ui.css =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/jquery-ui.css 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/jquery-ui.css 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% @@ -575,4 +574,4 @@ left: -4px; /*must have*/ width: 200px; /*must have*/ height: 200px; /*must have*/ -} \ No newline at end of file +} Modified: trunk/pollen-ui-struts2/src/main/resources/validators.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/validators.xml 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/resources/validators.xml 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% Modified: trunk/pollen-ui-struts2/src/main/resources/xwork-conversion.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/xwork-conversion.properties 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/resources/xwork-conversion.properties 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ ### # #%L -# Pollen :: UI (strust2) -# +# Pollen :: UI (struts2) # $Id$ # $HeadURL$ # %% @@ -11,15 +10,15 @@ # 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% ### org.chorem.pollen.bean.PollUri=org.chorem.pollen.ui.converters.PollUriConverter -java.util.Date=org.chorem.pollen.ui.converters.DateConverter \ No newline at end of file +java.util.Date=org.chorem.pollen.ui.converters.DateConverter 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-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,7 @@ <%@ page import="org.chorem.pollen.ui.actions.PollenActionSupport" %> <%-- #%L - Pollen :: UI (strust2) + Pollen :: UI (struts2) $Id$ $HeadURL$ %% Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators.xml 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators.xml 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <!-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteUser.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteUser.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteUser.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -11,12 +10,10 @@ 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% @@ -53,4 +50,4 @@ <s:submit key="pollen.action.delete" theme="simple" action="deleteUser"/> </div> </fieldset> -</s:form> \ No newline at end of file +</s:form> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/pollsList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/pollsList.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/pollsList.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -52,5 +51,5 @@ <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"/> + formatter="pollFunctions" width="55" sortable="false"/> </sjg:grid> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/adminRequired.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/adminRequired.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/adminRequired.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/home.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/home.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/home.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -37,4 +36,4 @@ </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 +</div> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmClonePoll.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmClonePoll.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmClonePoll.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -11,12 +10,10 @@ 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% @@ -56,4 +53,4 @@ action="clone/%{pollId}"/> </div> </fieldset> -</s:form> \ No newline at end of file +</s:form> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmClosePoll.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmClosePoll.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmClosePoll.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -11,12 +10,10 @@ 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% @@ -53,4 +50,4 @@ action="close/%{pollId}"/> </div> </fieldset> -</s:form> \ No newline at end of file +</s:form> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePoll.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePoll.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePoll.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -11,12 +10,10 @@ 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% @@ -53,4 +50,4 @@ action="delete/%{pollId}"/> </div> </fieldset> -</s:form> \ No newline at end of file +</s:form> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollChoice.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollChoice.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollChoice.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -43,4 +42,4 @@ key="pollen.action.cancel"/> <s:submit key="pollen.action.delete" theme="simple"/> </div> -</s:form> \ No newline at end of file +</s:form> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollComment.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollComment.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollComment.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -48,4 +47,4 @@ key="pollen.action.cancel"/> <s:submit key="pollen.action.delete" theme="simple"/> </div> -</s:form> \ No newline at end of file +</s:form> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollVote.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollVote.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollVote.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -45,4 +44,4 @@ key="pollen.action.cancel"/> <s:submit key="pollen.action.delete" theme="simple"/> </div> -</s:form> \ No newline at end of file +</s:form> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -240,4 +239,4 @@ <hr/> <s:submit key="pollen.action.addChoice" align="center" onclick="return addNewChoice();" disabled="%{voteStarted}"/> -</fieldset> \ No newline at end of file +</fieldset> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayDateChoice.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayDateChoice.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayDateChoice.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -68,4 +67,4 @@ </s:a> </div> <div class="cleanBoth"></div> -</div> \ No newline at end of file +</div> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayImageChoice.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayImageChoice.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayImageChoice.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -97,4 +96,4 @@ </div> <div class="cleanBoth"></div> -</div> \ No newline at end of file +</div> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPersonToList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPersonToList.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPersonToList.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -66,4 +65,4 @@ </s:if> <div class="cleanBoth"></div> -</s:div> \ No newline at end of file +</s:div> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComment.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComment.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComment.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -44,4 +43,4 @@ <p> <s:property value='#comment.text'/> </p> -</div> \ No newline at end of file +</div> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComments.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComments.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComments.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -102,4 +101,4 @@ </tbody> </table> </div> -</div--%> \ No newline at end of file +</div--%> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayTextChoice.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayTextChoice.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayTextChoice.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -64,4 +63,4 @@ </s:a> </div> <div class="cleanBoth"></div> -</div> \ No newline at end of file +</div> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingList.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingList.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingListPersons.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingListPersons.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingListPersons.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/personListToVotingList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/personListToVotingList.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/personListToVotingList.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -11,12 +10,10 @@ 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% Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/result.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/result.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/result.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -192,4 +191,4 @@ <%--</div>--%> <%--</t:remove>--%> -</s:if> \ No newline at end of file +</s:if> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/resultLink.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/resultLink.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/resultLink.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -31,6 +30,7 @@ <div style="margin-top: 10px;"> <img src="<s:url value='/img/count.png'/>" alt="<s:text name='pollen.common.resultAction'/>" + title="<s:text name='pollen.common.resultAction'/>" style="margin-right: 18px;"/> <s:text name='pollen.label.pollResultPage'/> <br/> @@ -43,4 +43,4 @@ <s:a namespace="/user" action="createdList"> <s:text name="pollen.common.myPolls"/> </s:a>. -</div> \ No newline at end of file +</div> Deleted: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/resume.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/resume.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/resume.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,76 +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 language="java" contentType="text/html" pageEncoding="utf-8" %> -<%@ taglib prefix="s" uri="/struts-tags" %> -<link rel="stylesheet" type="text/css" href="<s:url value='/css/resume.css'/>"/> - -<h1 class="titleCreation"><s:property value="poll.title"/></h1> - -<h3><s:property value="poll.title"/> <s:text name="pollen.common.by"/> - <s:property value="poll.creator.votingId"/></h3> - -<div class="ui-widget-content ui-corner-all"> - - <s:label key="pollen.common.pollId" value="%{poll.pollId}"/> - <br/> -</div> - -<s:if test="freePoll"> - <div class="ui-widget-content-green ui-corner-all"> - <img src="<s:url value='/img/vote.png'/>" - alt="<s:text name='pollen.common.voteAction'/>" - style="margin-right: 18px;"/> - <s:text name="pollen.label.pollVotePage"/> - <br/> - <s:a href="%{pollVoteUrl}" cssStyle="margin-left:50px;"> - <s:property value="%{pollVoteUrl}"/> - </s:a> - </div> -</s:if> -<div class="ui-widget-content-yellow ui-corner-all"> - <img src="<s:url value='/img/moderate.png'/>" - alt="<s:text name='pollen.action.pollModerateVote'/>" - style="margin-right: 20px;"/> - <s:text name='pollen.label.pollModerateVotePage'/> - <br/> - <s:a href="%{pollModerateUrl}" cssStyle="margin-left:50px;"> - <s:property value="%{pollModerateUrl}"/> - </s:a> -</div> -<div class="ui-widget-content ui-corner-all"> - <img src="<s:url value='/img/edit.png'/>" - alt="<s:text name='pollen.common.editAction'/>" - style="margin-right: 20px;"/> - <s:text name='pollen.label.pollEditPage'/> - <br/> - <s:a href="%{pollEditUrl}" cssStyle="margin-left:50px;"> - <s:property value="%{pollEditUrl}"/> - </s:a> -</div> -<div style="margin-top: 30px;"> - <s:text name="pollen.label.pollRegisterPage"/> - <s:a namespace="/user" action="createdList"> - <s:text name="pollen.common.myPolls"/> - </s:a>. -</div> \ No newline at end of file Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/selectPersonListToAddToVotingList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/selectPersonListToAddToVotingList.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/selectPersonListToAddToVotingList.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/selectPersonListToCreateNewVotingList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/selectPersonListToCreateNewVotingList.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/selectPersonListToCreateNewVotingList.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -51,4 +50,4 @@ onclick="return importPersonListToNewVotingList($('#personList').val(), cancel);" key="pollen.action.importPersonListToNewVotingList"/> </div> -</fieldset> \ No newline at end of file +</fieldset> Copied: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/summary.jsp (from rev 3421, trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/resume.jsp) =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/summary.jsp (rev 0) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/summary.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -0,0 +1,167 @@ +<%-- + #%L + Pollen :: UI (struts2) + $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 language="java" contentType="text/html" pageEncoding="utf-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="sj" uri="/struts-jquery-tags" %> +<link rel="stylesheet" type="text/css" href="<s:url value='/css/summary.css'/>"/> + +<script type="text/javascript"> + var redirectUrl = '<s:url namespace="/poll" action="summary/%{uriId}"/>'; + + function confirmDeletePoll(id) { + $('.ui-dialog-title').html("<s:text name="pollen.title.delete.poll"/>"); + var dialog = $("#confirmDialog"); + dialog.html(''); + var url = "<s:url action='confirmDeletePoll/' namespace='/poll'/>"; + url += id + '?' + $.param({redirectUrl:redirectUrl}); + dialog.load(url); + dialog.dialog('open'); + return false; + } + + function confirmClosePoll(id) { + $('.ui-dialog-title').html("<s:text name="pollen.title.close.poll"/>"); + var dialog = $("#confirmDialog"); + dialog.html(''); + var url = "<s:url action='confirmClosePoll/' namespace='/poll'/>"; + url += id + '?' + $.param({redirectUrl:redirectUrl}); + dialog.load(url); + dialog.dialog('open'); + return false; + } +</script> + +<h1 class="titleCreation"><s:property value="poll.title"/></h1> + +<h3><s:property value="poll.title"/> <s:text name="pollen.common.by"/> + <s:property value="poll.creator.votingId"/></h3> + +<div class="ui-widget-content ui-corner-all"> + + <s:label key="pollen.common.pollId" value="%{poll.pollId}"/> + <br/> +</div> + +<%--Vote action--%> +<s:if test="canVote"> + <div class="ui-widget-content-green ui-corner-all"> + <img src="<s:url value='/img/vote.png'/>" class="imgAction" + alt="<s:text name='pollen.common.voteAction'/>" + title="<s:text name='pollen.common.voteAction'/>"/> + <s:text name="pollen.label.pollVotePage"/> + <br/> + <s:a href="%{voteUrl}"> + <s:property value="%{voteUrl}"/> + </s:a> + </div> +</s:if> + +<%--Show Results action--%> +<s:if test="canShowResult"> + <div class="ui-widget-content-green ui-corner-all"> + <img src="<s:url value='/img/count.png'/>" class="imgAction" + alt="<s:text name='pollen.action.pollResult'/>" + title="<s:text name='pollen.action.pollResult'/>"/> + <s:text name='pollen.label.pollResultPage'/> + <br/> + <s:a href="%{resultUrl}"> + <s:property value="%{resultUrl}"/> + </s:a> + </div> +</s:if> + +<%--Moderate action--%> +<div class="ui-widget-content-yellow ui-corner-all"> + <img src="<s:url value='/img/moderate.png'/>" class="imgAction" + alt="<s:text name='pollen.action.pollModerateVote'/>" + title="<s:text name='pollen.action.pollModerateVote'/>"/> + <s:text name='pollen.label.pollModerateVotePage'/> + <br/> + <s:a href="%{moderateUrl}"> + <s:property value="%{moderateUrl}"/> + </s:a> +</div> + +<%--Edit action--%> +<div class="ui-widget-content-yellow ui-corner-all"> + <img src="<s:url value='/img/edit.png'/>" class="imgAction" + alt="<s:text name='pollen.action.editPoll'/>" + title="<s:text name='pollen.action.editPoll'/>"/> + <s:text name='pollen.label.pollEditPage'/> + <br/> + <s:a href="%{editUrl}"> + <s:property value="%{editUrl}"/> + </s:a> +</div> + +<%--Export action--%> +<div class="ui-widget-content-blue ui-corner-all"> + <img src="<s:url value='/img/export.png'/>" class="imgAction" + alt="<s:text name='pollen.action.pollExport'/>" + title="<s:text name='pollen.action.pollExport'/>"/> + <s:a href="%{exportUrl}"> + <s:text name='pollen.label.pollExportPage'/> + </s:a> +</div> + +<%--Clone action--%> +<div class="ui-widget-content-blue ui-corner-all"> + <img src="<s:url value='/img/copy.png'/>" class="imgAction" + alt="<s:text name='pollen.action.clone'/>" + title="<s:text name='pollen.action.clone'/>"/> + <s:a href="%{cloneUrl}"> + <s:text name='pollen.label.pollClonePage'/> + </s:a> +</div> + +<%--Close action--%> +<s:if test="canClose"> + <div class="ui-widget-content-red ui-corner-all"> + <img src="<s:url value='/img/close.png'/>" class="imgAction" + alt="<s:text name='pollen.action.close'/>" + title="<s:text name='pollen.action.close'/>"/> + <s:a href="#" onclick="return confirmClosePoll('%{uriId}')"> + <s:text name='pollen.label.pollClosePage'/> + </s:a> + + </div> +</s:if> + +<%--Delete action--%> +<div class="ui-widget-content-red ui-corner-all"> + <img src="<s:url value='/img/delete.png'/>" class="imgAction" + alt="<s:text name='pollen.action.deletePoll'/>" + title="<s:text name='pollen.action.deletePoll'/>"/> + <s:a href="#" onclick="return confirmDeletePoll('%{uriId}')"> + <s:text name='pollen.label.pollDeletePage'/> + </s:a> +</div> + +<div style="margin-top: 30px;"> + <s:text name="pollen.label.pollRegisterPage"/> + <s:a namespace="/user" action="createdList"> + <s:text name="pollen.common.myPolls"/> + </s:a>. +</div> + +<sj:dialog id="confirmDialog" autoOpen="false" modal="true" width="500"/> Property changes on: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/summary.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/poll/vote.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -491,4 +490,4 @@ <sj:dialog id="confirmDialog" resizable="false" autoOpen="false" modal="true" width="800"/> </div> -</s:if> \ No newline at end of file +</s:if> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/pollListHelper.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/pollListHelper.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/pollListHelper.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -34,28 +33,34 @@ <s:url id='voteImg' value='/img/vote.png'/> <s:set id='voteTitle'><s:text name="pollen.action.pollVote"/></s:set> -<s:url id='moderateImg' value='/img/moderate.png'/> -<s:set id='moderateTitle'><s:text name="pollen.action.pollModerateVote"/></s:set> +<s:url id='blankImg' value='/img/blank.png'/> +<s:url id="summaryUrl" action="summary/" namespace="/poll"/> +<s:url id='summaryImg' value='/img/edit.png'/> +<s:set id='summaryTitle'><s:text name="pollen.action.pollSummary"/></s:set> + +<%--<s:url id='moderateImg' value='/img/moderate.png'/>--%> +<%--<s:set id='moderateTitle'><s:text name="pollen.action.pollModerateVote"/></s:set>--%> + <s:url id="resultUrl" action="results/" namespace="/poll"/> <s:url id='resultImg' value='/img/count.png'/> <s:set id='resultTitle'><s:text name="pollen.action.pollResult"/></s:set> -<s:url id="editUrl" action="modification/" namespace="/poll"/> -<s:url id='editImg' value='/img/edit.png'/> -<s:set id='editTitle'><s:text name="pollen.action.pollEdit"/></s:set> +<%--<s:url id="editUrl" action="modification/" namespace="/poll"/>--%> +<%--<s:url id='editImg' value='/img/edit.png'/>--%> +<%--<s:set id='editTitle'><s:text name="pollen.action.pollEdit"/></s:set>--%> -<s:url id="closeUrl" action="confirmClosePoll/" namespace="/poll"/> -<s:url id='closeImg' value='/img/close.png'/> -<s:set id='closeTitle'><s:text name="pollen.action.pollClose"/></s:set> +<%--<s:url id="closeUrl" action="confirmClosePoll/" namespace="/poll"/>--%> +<%--<s:url id='closeImg' value='/img/close.png'/>--%> +<%--<s:set id='closeTitle'><s:text name="pollen.action.pollClose"/></s:set>--%> -<s:url id="exportUrl" action="export/" namespace="/poll"/> -<s:url id='exportImg' value='/img/export.png'/> -<s:set id='exportTitle'><s:text name="pollen.action.pollExport"/></s:set> +<%--<s:url id="exportUrl" action="export/" namespace="/poll"/>--%> +<%--<s:url id='exportImg' value='/img/export.png'/>--%> +<%--<s:set id='exportTitle'><s:text name="pollen.action.pollExport"/></s:set>--%> -<s:url id="cloneUrl" action="clone/" namespace="/poll"/> -<s:url id='cloneImg' value='/img/copy.png'/> -<s:set id='cloneTitle'><s:text name="pollen.action.pollClone"/></s:set> +<%--<s:url id="cloneUrl" action="clone/" namespace="/poll"/>--%> +<%--<s:url id='cloneImg' value='/img/copy.png'/>--%> +<%--<s:set id='cloneTitle'><s:text name="pollen.action.pollClone"/></s:set>--%> <s:url id="deleteUrl" action="confirmDeletePoll/" namespace="/poll"/> <s:url id='deleteImg' value='/img/delete.png'/> @@ -96,6 +101,12 @@ if (cellvalue.indexOf('vote') > -1) { result += formatLink("${voteUrl}" + voteId, "${voteImg}", "Vote", "${voteTitle}") } + if (cellvalue.indexOf('novote') > -1) { + result +="<image src='${blankImg}'>"; + } + if (cellvalue.indexOf('summary') > -1) { + result += formatLink("${summaryUrl}" + adminId, "${summaryImg}", "Moderate", "${summaryTitle}") + } if (cellvalue.indexOf('moderate') > -1) { result += formatLink("${voteUrl}" + moderateId, "${moderateImg}", "Moderate", "${moderateTitle}") } Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/admin_required.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/admin_required.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/admin_required.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -26,4 +25,4 @@ <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 +</div> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/connected_required.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/connected_required.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/connected_required.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -26,4 +25,4 @@ <ul class="actionErrors"> <li><span>Vous devez être connecter pour accéder à cette page.</span></li> </ul> -</div> \ No newline at end of file +</div> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_access_required.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_access_required.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_access_required.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -26,4 +25,4 @@ <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 +</div> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_creator_required.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_creator_required.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_creator_required.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -26,4 +25,4 @@ <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 +</div> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_required.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_required.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_required.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -26,4 +25,4 @@ <ul class="actionErrors"> <li><span>Aucun sondage à l'url donné.</span></li> </ul> -</div> \ No newline at end of file +</div> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/result_access_required.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/result_access_required.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/result_access_required.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -26,4 +25,4 @@ <ul class="actionErrors"> <li><span>Vous n'êtes pas autorisé à accéder à cette page de résultas.</span></li> </ul> -</div> \ No newline at end of file +</div> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/confirmDeleteFavoriteList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/confirmDeleteFavoriteList.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/confirmDeleteFavoriteList.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -11,12 +10,10 @@ 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% @@ -53,4 +50,4 @@ action="deleteFavoriteList"/> </div> </fieldset> -</s:form> \ No newline at end of file +</s:form> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/confirmDeletePollAccount.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/confirmDeletePollAccount.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/confirmDeletePollAccount.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -11,12 +10,10 @@ 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% @@ -54,4 +51,4 @@ action="deletePollAccount"/> </div> </fieldset> -</s:form> \ No newline at end of file +</s:form> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -74,7 +73,7 @@ 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="200" sortable="false"/> + formatter="pollFunctions" width="65" sortable="false"/> </sjg:grid> <br/> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -11,12 +10,10 @@ 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% @@ -46,4 +43,4 @@ action="lostPassword"/> </div> </fieldset> -</s:form> \ No newline at end of file +</s:form> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -138,4 +137,4 @@ key="pollen.action.backToFavoriteLists" align="center"/> </s:form> -<sj:dialog id="confirmDialog" autoOpen="false" modal="true" width="500"/> \ No newline at end of file +<sj:dialog id="confirmDialog" autoOpen="false" modal="true" width="500"/> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -52,7 +51,7 @@ var editTitle = '<s:text name="pollen.action.editFavoriteList"/>'; var deleteImg = '<s:url value='/img/delete.png'/>'; var csvHelp = "<div><s:text name='pollen.common.favoriteList.csvImport.help'/>" + - "<br/><img src=\"<s:url value="/img/import_csv_help.png"/>\"/></div>" + "<br/><img src=\"<s:url value="/img/import_csv_help.png"/>\"/></div>"; jQuery(document).ready(function () { Modified: 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 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/invitedList.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -55,5 +54,5 @@ <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"/> + formatter="pollFunctions" width="55" sortable="false"/> </sjg:grid> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/login.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/login.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/login.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -66,4 +65,4 @@ <img src="<s:url value='/img/smallVoteCounting_%{safeLanguage}.png' />" alt="voteCounting"/> </s:a> -</div> \ No newline at end of file +</div> 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-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/participatedList.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -55,5 +54,5 @@ <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"/> + formatter="pollFunctions" width="55" sortable="false"/> </sjg:grid> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/register.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/register.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/register.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/show.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/show.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/show.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/web.xml 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/web.xml 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% Modified: trunk/pollen-ui-struts2/src/main/webapp/css/common.css =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/css/common.css 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/css/common.css 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% @@ -197,4 +196,4 @@ #tooltip .tipFooter { height:8px; background:url(images/tipFooter.gif) no-repeat; - } \ No newline at end of file + } Modified: trunk/pollen-ui-struts2/src/main/webapp/css/main.css =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/css/main.css 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/css/main.css 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% @@ -586,4 +585,4 @@ margin-bottom: 20px; padding: 10px 50px 10px 50px; border-top: 1px solid #aab; -} \ No newline at end of file +} Modified: trunk/pollen-ui-struts2/src/main/webapp/css/pollCreation.css =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/css/pollCreation.css 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/css/pollCreation.css 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% @@ -150,4 +149,4 @@ #toptions .wwlbl { width: 260px; -} \ No newline at end of file +} Modified: trunk/pollen-ui-struts2/src/main/webapp/css/results.css =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/css/results.css 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/css/results.css 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Deleted: trunk/pollen-ui-struts2/src/main/webapp/css/resume.css =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/css/resume.css 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/css/resume.css 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,33 +0,0 @@ -/* - * #%L - * Pollen :: UI (struts2) - * $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% - */ -.ui-widget-content-green { border: 1px solid #aaaaaa; background: #b0f580 url(images/ui-bg_flat_75_b0f580_40x100.png) 50% 50% repeat-x; color: #222222; } -.ui-widget-content-green a { color: #222222; } - -.ui-widget-content-yellow { border: 1px solid #aaaaaa; background: #ffffaa url(images/ui-bg_flat_75_ffffaa_40x100.png) 50% 50% repeat-x; color: #222222; } -.ui-widget-content-yellow a { color: #222222; } - -.ui-corner-all { - margin-top: 10px; - padding: 10px; -} - Copied: trunk/pollen-ui-struts2/src/main/webapp/css/summary.css (from rev 3421, trunk/pollen-ui-struts2/src/main/webapp/css/resume.css) =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/css/summary.css (rev 0) +++ trunk/pollen-ui-struts2/src/main/webapp/css/summary.css 2012-06-05 16:50:22 UTC (rev 3423) @@ -0,0 +1,46 @@ +/* + * #%L + * Pollen :: UI (struts2) + * $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% + */ +.ui-widget-content-green { border: 1px solid #aaaaaa; background: #b0f580 url(images/ui-bg_flat_75_b0f580_40x100.png) 50% 50% repeat-x; color: #222222; } +.ui-widget-content-green a { color: #222222; } + +.ui-widget-content-yellow { border: 1px solid #aaaaaa; background: #ffffaa url(images/ui-bg_flat_75_ffffaa_40x100.png) 50% 50% repeat-x; color: #222222; } +.ui-widget-content-yellow a { color: #222222; } + +.ui-widget-content-red { border: 1px solid #aaaaaa; background: #FFAAAA url(images/ui-bg_flat_75_ffffaa_40x100.png) 50% 50% repeat-x; color: #222222; } +.ui-widget-content-red a { color: #222222; } + +.ui-widget-content-blue { border: 1px solid #dddddd; background: #A9D4E3 url(images/ui-bg_highlight-hard_100_f2f5f7_1x100.png) 50% top repeat-x; color: #362b36; } +.ui-widget-content-blue a { color: #362b36; } + +.ui-corner-all { + margin-top: 10px; + padding: 10px; +} + +.showResultIcon { + background: #FFE3E3 url(../img/count.png) 80% 80% repeat-x; +} +.imgAction { + margin-right: 20px; +} + Property changes on: trunk/pollen-ui-struts2/src/main/webapp/css/summary.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-ui-struts2/src/main/webapp/css/vote.css =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/css/vote.css 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/css/vote.css 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% @@ -216,4 +215,4 @@ #commentsDiv div { padding: 5px 15px; -} \ No newline at end of file +} Copied: trunk/pollen-ui-struts2/src/main/webapp/img/blank.png (from rev 3421, trunk/pollen-ui-struts2/src/main/webapp/img/vote.png) =================================================================== (Binary files differ) Modified: trunk/pollen-ui-struts2/src/main/webapp/index.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/index.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/index.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% Modified: trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% @@ -651,4 +650,4 @@ changePollType(datas['pollType']); $('.tooltip').tipTip({ defaultPosition:'top' }); -}); \ No newline at end of file +}); Modified: trunk/pollen-ui-struts2/src/main/webapp/js/favoriteList.js =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/js/favoriteList.js 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/js/favoriteList.js 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% @@ -101,4 +100,4 @@ dialog.load(url); dialog.dialog('open'); return false; -} \ No newline at end of file +} Modified: trunk/pollen-ui-struts2/src/main/webapp/js/favoriteLists.js =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/js/favoriteLists.js 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/js/favoriteLists.js 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% @@ -96,4 +95,4 @@ dialog.load(url); dialog.dialog('open'); return false; -} \ No newline at end of file +} Modified: trunk/pollen-ui-struts2/src/main/webapp/js/gridHelper.js =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/js/gridHelper.js 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/js/gridHelper.js 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/webapp/js/usersList.js =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/js/usersList.js 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/js/usersList.js 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/site/fr/rst/index.rst =================================================================== --- trunk/pollen-ui-struts2/src/site/fr/rst/index.rst 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/site/fr/rst/index.rst 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ .. - .. * #%L .. * Pollen :: UI (struts2) -.. * .. * $Id$ .. * $HeadURL$ .. * %% Modified: trunk/pollen-ui-struts2/src/site/site_en.xml =================================================================== --- trunk/pollen-ui-struts2/src/site/site_en.xml 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/site/site_en.xml 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - Pollen - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -12,12 +11,10 @@ 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% Modified: trunk/pollen-ui-struts2/src/site/site_fr.xml =================================================================== --- trunk/pollen-ui-struts2/src/site/site_fr.xml 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/site/site_fr.xml 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - Pollen - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -12,12 +11,10 @@ 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% Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/common/ChoiceType.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/common/ChoiceType.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/common/ChoiceType.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -52,4 +51,4 @@ } return result; } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/common/I18nAble.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/common/I18nAble.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/common/I18nAble.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/common/PollType.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/common/PollType.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/common/PollType.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/common/VoteCountingType.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/common/VoteCountingType.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/common/VoteCountingType.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -52,4 +51,4 @@ } return result; } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Choice.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Choice.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Choice.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -160,4 +159,4 @@ public String toString() { return "Choice id=" + idChoice + " _ value=" + value; } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/CondorcetMethod.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/CondorcetMethod.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/CondorcetMethod.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -332,4 +331,4 @@ List<PercentageBehavior> list = new ArrayList<PercentageBehavior>(choices); choiceDTO.setPercentage(Utils.calculatePercentage(choice, list)); } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Context.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Context.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Context.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -228,4 +227,4 @@ return resChoices; } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Group.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Group.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Group.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -125,4 +124,4 @@ public List<Vote> list() { return getVotes(); } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Method.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Method.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Method.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -54,4 +53,4 @@ */ public void executeStats(List<Choice> choices, boolean groupCounting, Choice choice, ChoiceDTO choiceDTO); -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/NumberMethod.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/NumberMethod.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/NumberMethod.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/PercentageMethod.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/PercentageMethod.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/PercentageMethod.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -46,4 +45,4 @@ } return 0; } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/StandardMethod.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/StandardMethod.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/StandardMethod.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -126,4 +125,4 @@ List<PercentageBehavior> list = new ArrayList<PercentageBehavior>(choices); choiceDTO.setPercentage(Utils.calculatePercentage(choice, list)); } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Vote.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Vote.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Vote.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -79,4 +78,4 @@ public String getVotingID() { return this.votingID; } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/package-info.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/package-info.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/package-info.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -24,4 +23,4 @@ /** * Gestion des dépouillements. */ -package org.chorem.pollen.votecounting.business; \ No newline at end of file +package org.chorem.pollen.votecounting.business; Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/ChoiceDTO.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/ChoiceDTO.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/ChoiceDTO.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -121,4 +120,4 @@ public void setResult(boolean result) { this.result = result; } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/CommentDTO.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/CommentDTO.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/CommentDTO.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -54,4 +53,4 @@ public void setText(String text) { this.text = text; } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollChoiceDTO.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollChoiceDTO.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollChoiceDTO.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -82,4 +81,4 @@ public void setHidden(boolean hidden) { this.hidden = hidden; } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollDTO.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollDTO.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollDTO.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -255,4 +254,4 @@ public void setComments(List<CommentDTO> comments) { this.comments = comments; } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollExportDTO.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollExportDTO.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollExportDTO.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VoteCountingResultDTO.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VoteCountingResultDTO.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VoteCountingResultDTO.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -98,4 +97,4 @@ this.choices = choices; } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VoteToChoiceDTO.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VoteToChoiceDTO.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VoteToChoiceDTO.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -60,4 +59,4 @@ this.idChoice = idChoice; } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VotingGroupDTO.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VotingGroupDTO.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VotingGroupDTO.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -86,4 +85,4 @@ this.votingPersons = votingPersons; } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VotingPersonDTO.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VotingPersonDTO.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VotingPersonDTO.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -114,4 +113,4 @@ this.choices = choices; } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/package-info.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/package-info.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/package-info.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -24,4 +23,4 @@ /** * Data Transfert Objects. */ -package org.chorem.pollen.votecounting.dto; \ No newline at end of file +package org.chorem.pollen.votecounting.dto; Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ImportExportService.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ImportExportService.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ImportExportService.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceExport.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceExport.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceExport.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceExportImpl.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceExportImpl.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceExportImpl.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -564,4 +563,4 @@ return vectorChoices; } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceVoteCounting.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceVoteCounting.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceVoteCounting.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -36,4 +35,4 @@ public VoteCountingResultDTO executeVoteCounting(PollDTO poll); public VoteCountingResultDTO executeGroupCounting(PollDTO poll); -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceVoteCountingImpl.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceVoteCountingImpl.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceVoteCountingImpl.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -232,4 +231,4 @@ group.addVote(vote.getValue(), weight, votingID); } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/VoteCountingService.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/VoteCountingService.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/VoteCountingService.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/package-info.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/package-info.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/package-info.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -24,4 +23,4 @@ /** * Services proposés par le module VoteCounting. */ -package org.chorem.pollen.votecounting.services; \ No newline at end of file +package org.chorem.pollen.votecounting.services; Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/ListBehavior.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/ListBehavior.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/ListBehavior.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -32,4 +31,4 @@ */ public interface ListBehavior<T> { public List<T> list(); -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/PercentageBehavior.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/PercentageBehavior.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/PercentageBehavior.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -30,4 +29,4 @@ */ public interface PercentageBehavior { public double value(); -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/Utils.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/Utils.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/Utils.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -67,4 +66,4 @@ return nbVotes; } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/package-info.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/package-info.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/package-info.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -24,4 +23,4 @@ /** * Classes utilitaires. */ -package org.chorem.pollen.votecounting.utils; \ No newline at end of file +package org.chorem.pollen.votecounting.utils; Modified: trunk/pollen-votecounting/src/main/resources/log4j.properties =================================================================== --- trunk/pollen-votecounting/src/main/resources/log4j.properties 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/resources/log4j.properties 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ ### # #%L # Pollen :: Vote Counting -# # $Id$ # $HeadURL$ # %% Modified: trunk/pollen-votecounting/src/site/site_en.xml =================================================================== --- trunk/pollen-votecounting/src/site/site_en.xml 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/site/site_en.xml 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - Pollen - + Pollen :: Vote Counting $Id$ $HeadURL$ %% @@ -12,12 +11,10 @@ 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% Modified: trunk/pollen-votecounting/src/site/site_fr.xml =================================================================== --- trunk/pollen-votecounting/src/site/site_fr.xml 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/site/site_fr.xml 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - Pollen - + Pollen :: Vote Counting $Id$ $HeadURL$ %% @@ -12,12 +11,10 @@ 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% Modified: trunk/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/PollDTOCreator.java =================================================================== --- trunk/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/PollDTOCreator.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/PollDTOCreator.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -45,4 +44,4 @@ * @return le sondage */ public PollDTO createTestPoll(); -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/PollDTOCreatorVoteCounting.java =================================================================== --- trunk/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/PollDTOCreatorVoteCounting.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/PollDTOCreatorVoteCounting.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -247,4 +246,4 @@ return groups; } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/ServiceVoteCountingImplTest.java =================================================================== --- trunk/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/ServiceVoteCountingImplTest.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/ServiceVoteCountingImplTest.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -150,4 +149,4 @@ VoteCountingResultDTO result = instance.executeGroupCounting(poll); //assertEquals(expResult, result); } -} \ No newline at end of file +} Modified: trunk/src/site/fr/rst/configure.rst =================================================================== --- trunk/src/site/fr/rst/configure.rst 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/src/site/fr/rst/configure.rst 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ .. - .. * #%L .. * Pollen -.. * .. * $Id$ .. * $HeadURL$ .. * %% @@ -11,12 +10,12 @@ .. * 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% @@ -101,4 +100,4 @@ | MySql | org.hibernate.dialect.MySQLDialect | com.mysql.jdbc.Driver | jdbc:mysql:pollen | +-------------------------+------------------------------------------+-----------------------------------+------------------------------------------+ -.. _page des options: ./pollen-ui-struts2/application-config-report.html \ No newline at end of file +.. _page des options: ./pollen-ui-struts2/application-config-report.html Modified: trunk/src/site/fr/rst/depouillement.rst =================================================================== --- trunk/src/site/fr/rst/depouillement.rst 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/src/site/fr/rst/depouillement.rst 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ .. - .. * #%L .. * Pollen -.. * .. * $Id$ .. * $HeadURL$ .. * %% Modified: trunk/src/site/fr/rst/index.rst =================================================================== --- trunk/src/site/fr/rst/index.rst 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/src/site/fr/rst/index.rst 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ .. - .. * #%L .. * Pollen -.. * .. * $Id$ .. * $HeadURL$ .. * %% Modified: trunk/src/site/rst/configure.rst =================================================================== --- trunk/src/site/rst/configure.rst 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/src/site/rst/configure.rst 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ .. - .. * #%L .. * Pollen -.. * .. * $Id$ .. * $HeadURL$ .. * %% @@ -11,12 +10,12 @@ .. * 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% @@ -96,4 +95,4 @@ | MySql | org.hibernate.dialect.MySQLDialect | com.mysql.jdbc.Driver | jdbc:mysql:pollen | +-------------------------+------------------------------------------+-----------------------------------+------------------------------------------+ -.. _options page: ./application-config-report.html \ No newline at end of file +.. _options page: ./application-config-report.html Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/src/site/rst/index.rst 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ .. - .. * #%L .. * Pollen -.. * .. * $Id$ .. * $HeadURL$ .. * %% Modified: trunk/src/site/rst/methods.rst =================================================================== --- trunk/src/site/rst/methods.rst 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/src/site/rst/methods.rst 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ .. - .. * #%L .. * Pollen -.. * .. * $Id$ .. * $HeadURL$ .. * %% Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/src/site/site_en.xml 2012-06-05 16:50:22 UTC (rev 3423) @@ -2,7 +2,6 @@ <!-- #%L Pollen - $Id$ $HeadURL$ %% Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/src/site/site_fr.xml 2012-06-05 16:50:22 UTC (rev 3423) @@ -2,7 +2,6 @@ <!-- #%L Pollen - $Id$ $HeadURL$ %%

1 0

r3422 - in trunk: pollen-services/src/main/java/org/chorem/pollen/services pollen-services/src/main/java/org/chorem/pollen/services/impl pollen-services/src/test/java/org/chorem/pollen/services pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll
by tchemit＠users.chorem.org June 5, 2012

June 5, 2012

Author: tchemit Date: 2012-06-05 09:40:14 +0200 (Tue, 05 Jun 2012) New Revision: 3422 Url: http://chorem.org/repositories/revision/pollen/3422 Log: fixes #583: Make sure pollId is never used twice Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java trunk/pollen-services/src/test/java/org/chorem/pollen/services/FakeServiceContext.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/LoadPoll.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java 2012-06-05 07:32:19 UTC (rev 3421) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java 2012-06-05 07:40:14 UTC (rev 3422) @@ -30,7 +30,6 @@ import java.net.URL; import java.util.Date; import java.util.Locale; -import java.util.UUID; /** * Instances of this class will be given to service factory. @@ -116,17 +115,7 @@ return serviceFactory; } - /** - * Create an id to easily managed polls using urls. - * - * @return a fresh generated String - */ @Override - public String createPollenUrlId() { - return UUID.randomUUID().toString().replaceAll("-", ""); - } - - @Override public Date getCurrentTime() { return new Date(); } Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java 2012-06-05 07:32:19 UTC (rev 3421) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java 2012-06-05 07:40:14 UTC (rev 3422) @@ -55,15 +55,6 @@ <E extends PollenService> E newService(Class<E> clazz); - /** - * createPollenUrlId : - * Create a unique UId for entities which need it (PollAccount, Poll). - * This UId represent the entity in UI module. - * - * @return String - */ - String createPollenUrlId(); - /** @return the current date */ Date getCurrentTime(); Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java 2012-06-05 07:32:19 UTC (rev 3421) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java 2012-06-05 07:40:14 UTC (rev 3422) @@ -148,6 +148,13 @@ } } + protected <T extends TopiaEntity, D extends TopiaDAO<? super T>> T createWithProperties(D dao, Object... properties) { + try { + return (T) dao.create(properties); + } catch (TopiaException e) { + throw new PollenTechnicalException("Could not create entity ", e); + } + } protected <T extends TopiaEntity, D extends TopiaDAO<? super T>> T update(D dao, T entity) { try { return (T) dao.update(entity); Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-06-05 07:32:19 UTC (rev 3421) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-06-05 07:40:14 UTC (rev 3422) @@ -77,6 +77,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.UUID; import static org.nuiton.i18n.I18n.l_; @@ -85,44 +86,8 @@ /** Logger. */ private static final Log log = LogFactory.getLog(PollService.class); - /** - * Build a new Poll instance with given {@code user} as creator - * - * @param user Build a new Poll instance with given {@code user} as creator - * @return Build a new Poll instance with given {@code user} as creator - */ - public Poll getNewPoll(UserAccount user) { + public static final String THUMB_PREFIX = "thumb_"; - PollDAO pollDAO = getDAO(Poll.class); - Poll result = newInstance(pollDAO); - - PollenConfiguration configuration = getConfiguration(); - - // default values from configuration - result.setChoiceType(configuration.getDefaultChoiceType()); - result.setVoteCountingType(configuration.getDefaultVoteCountingType()); - result.setPollType(configuration.getDefaultPollType()); - - // Initialize creator of the poll - PollAccountDAO pollAccountDAO = getDAO(PollAccount.class); - PollAccount creator = newInstance(pollAccountDAO); - creator.setAccountId(serviceContext.createPollenUrlId()); - - if (user != null) { - - // Link the creator with the user - creator.setVotingId(user.getDisplayName()); - creator.setEmail(user.getEmail()); - creator.setUserAccount(user); - } - result.setCreator(creator); - - // Generate Uid to have a unique poll. Will avoid multi-submit, existing - // poll will be check by its uid. - result.setPollId(serviceContext.createPollenUrlId()); - return result; - } - /** * Retrieve a Poll for edition. It is loaded from database if {@code pollUid} * is defined, otherwise a new instance is returned. The {@code clone} @@ -132,122 +97,29 @@ * be attached to it. * * @param pollUid Uid of the poll to edit, if not defined, a new poll is instanciated - * @param userAccount User account to attach to the creator + * @param userAccount Optinal User account to attach to the creator * @param clone Flag to copy or not ids in case of poll cloning * @return the Poll ready for edition (no longer linked to the topia context) * @see #getNewPoll(UserAccount) - * @see #getNewPollCopy(Poll, UserAccount, boolean) + * @see #getNewPollCopy(String, UserAccount, boolean) */ - public Poll getPollEditable(String pollUid, UserAccount userAccount, boolean clone) { - + public Poll getPollEditable(String pollUid, + UserAccount userAccount, + boolean clone) throws PollNotFoundException { Poll result; - if (pollUid == null) { - result = getNewPoll(userAccount); + if (StringUtils.isEmpty(pollUid)) { + + // creates a new poll + result = getNewPoll(userAccount); } else { - Poll poll = getPollByPollId(pollUid); - - if (poll == null) { - result = getNewPoll(userAccount); - - } else { - result = getNewPollCopy(poll, userAccount, clone); - } + // obtains a copy of an existing poll + result = getNewPollCopy(pollUid, userAccount, clone); } return result; } - protected Poll getNewPollCopy(Poll source, UserAccount userAccount, boolean clone) { - - Preconditions.checkNotNull(source); - - PollDAO pollDAO = getDAO(Poll.class); - Poll result = newInstance(pollDAO); - - PollenBinderHelper.simpleCopy(source, result, !clone); - if (clone) { - result.setPollId(serviceContext.createPollenUrlId()); - } - - // -- Creator -- // - PollAccount creatorLoaded = source.getCreator(); - PollAccountDAO pollAccountDAO = getDAO(PollAccount.class); - PollAccount creatorEditable = newInstance(pollAccountDAO); - result.setCreator(creatorEditable); - - PollenBinderHelper.simpleCopy( - creatorLoaded, creatorEditable, !clone); - if (clone) { - creatorEditable.setAccountId(serviceContext.createPollenUrlId()); - } - - if (creatorLoaded.getUserAccount() != null) { - creatorEditable.setUserAccount(creatorLoaded.getUserAccount()); - - // Set userAccount from arguments - } else if (userAccount != null) { - creatorEditable.setUserAccount(userAccount); - } - - // -- Choice -- // - Function<Choice, Choice> choiceCreator = - PollenServiceFunctions.newChoiceCreator(source.getChoiceType()); - Iterable<Choice> choices = - Iterables.transform(source.getChoice(), choiceCreator); - - for (Choice choiceLoaded : choices) { - // Reset topiaId for clone case - if (clone) { - choiceLoaded.setTopiaId(null); - } - result.addChoice(choiceLoaded); - } - - // -- VotingList -- // - VotingListDAO votingListDAO = getDAO(VotingList.class); - PersonToListDAO personToListDAO = getDAO(PersonToList.class); - for (VotingList votingListLoaded : source.getVotingList()) { - VotingList votingListEditable = newInstance(votingListDAO); - result.addVotingList(votingListEditable); - // Do not keep votingLists topiaId, to simplify the update will delete old votingLists and create new ones - PollenBinderHelper.simpleCopy( - votingListLoaded, votingListEditable, false); - - for (PersonToList personToListLoaded : votingListLoaded.getPollAccountPersonToList()) { - PersonToList personToListEditable = newInstance(personToListDAO); - votingListEditable.addPollAccountPersonToList(personToListEditable); - // Do not keep personToLists topiaId, to simplify the update will delete old personToLists and create new ones - PollenBinderHelper.simpleCopy( - personToListLoaded, personToListEditable, false); - - PollAccount personLoaded = personToListLoaded.getPollAccount(); - PollAccount personEditable = newInstance(pollAccountDAO); - personToListEditable.setPollAccount(personEditable); - // copy the person, keeping topiaId is useless because we have the link with PersonToList - PollenBinderHelper.simpleCopy( - personLoaded, personEditable, false); - if (clone) { - personEditable.setAccountId(serviceContext.createPollenUrlId()); - } - } - } - - // -- PreventRule -- // - PreventRuleDAO preventRuleDAO = getDAO(PreventRule.class); - for (PreventRule preventRuleLoaded : source.getPreventRule()) { - PreventRule preventRuleEditable = newInstance(preventRuleDAO); - PollenBinderHelper.simpleCopy( - preventRuleLoaded, preventRuleEditable, !clone); - result.addPreventRule(preventRuleEditable); - } - - // Load votes to have the correct size used to check if vote is started - result.setVote(source.getVote()); - - return result; - } - public Map<String, Object> pollToMap(Poll poll, Binder<Poll, Poll> binder) { Map<String, Object> map = binder.obtainProperties( @@ -307,7 +179,8 @@ public Poll createPoll(Poll poll) { PollDAO pollDAO = getDAO(Poll.class); - Poll result = create(pollDAO); + Poll result = createWithProperties(pollDAO, + Poll.PROPERTY_POLL_ID, generateId()); // check max number choice authorized (can not be more than // XXX-fdesbois-2012-04-11 : don't know why the maxNbChoice must be @@ -328,7 +201,6 @@ result.setDescription(poll.getDescription()); result.setEndDate(poll.getEndDate()); result.setEndChoiceDate(poll.getEndChoiceDate()); - result.setPollId(poll.getPollId()); // TODO AThimel 04/06/2012 pollId coming from the JSP page ???? result.setPollType(poll.getPollType()); result.setMaxChoiceNb(poll.getMaxChoiceNb()); result.setPublicResults(poll.isPublicResults()); @@ -337,12 +209,13 @@ // create creator PollAccountDAO pollAccountDAO = getDAO(PollAccount.class); - PollAccount creatorCreated = create(pollAccountDAO); + PollAccount creatorCreated = createWithProperties( + pollAccountDAO, + PollAccount.PROPERTY_ACCOUNT_ID, generateId()); PollAccount creator = poll.getCreator(); creatorCreated.setVotingId(creator.getVotingId()); creatorCreated.setEmail(creator.getEmail()); creatorCreated.setUserAccount(creator.getUserAccount()); - creatorCreated.setAccountId(creator.getAccountId()); result.setCreator(creatorCreated); @@ -448,59 +321,6 @@ commitTransaction("Could not update poll [" + poll.getTopiaId() + "]"); } -// public PollUrl getPollVoteUrl(Poll poll, boolean moderate) { -// URL applicationUrl = serviceContext.getApplicationURL(); -// String baseUrl = applicationUrl + "/poll/votefor/"; -// PollUri pollUri = PollUri.newPollUri(poll.getPollId()); -// -// if (moderate) { -// String creatorId = poll.getCreator().getAccountId(); -// pollUri.setAccountId(creatorId); -// } -// -// PollUrl result = PollUrl.newPollUrl(baseUrl, pollUri); -// return result; -// } - -// public PollUrl getPollUpdateVoteUrl(Poll poll) { -// Preconditions.checkNotNull(poll); -// -// URL applicationUrl = serviceContext.getApplicationURL(); -// String baseUrl = applicationUrl + "/poll/votefor/"; -// PollUri pollUri = PollUri.newPollUri(poll.getPollId()); -// -// String creatorId = poll.getCreator().getAccountId(); -// pollUri.setAccountId(creatorId); -// -// PollUrl result = PollUrl.newPollUrl(baseUrl, pollUri); -// return result; -// } - -// public PollUrl getPollEditUrl(Poll poll) { -// URL applicationUrl = serviceContext.getApplicationURL(); -// String baseUrl = applicationUrl + "/poll/modification/"; -// -// String creatorId = poll.getCreator().getAccountId(); -// PollUri pollUri = PollUri.newPollUri(poll.getPollId(), creatorId); -// -// PollUrl result = PollUrl.newPollUrl(baseUrl, pollUri); -// return result; -// } - -// public PollUrl getPollResultUrl(Poll poll) { -// URL applicationUrl = serviceContext.getApplicationURL(); -// String baseUrl = applicationUrl + "/poll/results/"; -// PollUri pollUri = PollUri.newPollUri(poll.getPollId()); -// -// if (!poll.isPublicResults()) { -// String creatorId = poll.getCreator().getAccountId(); -// pollUri.setAccountId(creatorId); -// } -// -// PollUrl result = PollUrl.newPollUrl(baseUrl, pollUri); -// return result; -// } - public List<Poll> getPolls(TopiaFilterPagerUtil.FilterPagerBean pager) { Preconditions.checkNotNull(pager); @@ -626,7 +446,9 @@ * @throws PollAccountNotFound if accountId is defined and doesn't match any * existing PollAccount */ - public PollAccount getPollAccountEditable(String accountId, UserAccount userAccount, Poll poll) throws PollAccountNotFound { + public PollAccount getPollAccountEditable(String accountId, + UserAccount userAccount, + Poll poll) throws PollAccountNotFound { PollAccount result = null; if (StringUtils.isNotEmpty(accountId)) { PollAccount pollAccountLoaded = getPollAccountByAccountId(accountId); @@ -638,10 +460,11 @@ result.setUserAccount(userAccount); if (log.isDebugEnabled()) { - log.debug(String.format("Attach User '%s' [%s] to the existing Account [%s]", - userAccount.getDisplayName(), - userAccount.getTopiaId(), - accountId + log.debug(String.format( + "Attach User '%s' [%s] to the existing Account [%s]", + userAccount.getDisplayName(), + userAccount.getTopiaId(), + accountId )); } } @@ -653,7 +476,8 @@ PollAccountDAO pollAccountDAO = getDAO(PollAccount.class); PollAccount pollAccountLoaded; try { - pollAccountLoaded = pollAccountDAO.findByPollVoteUser(poll, userAccount); + pollAccountLoaded = + pollAccountDAO.findByPollVoteUser(poll, userAccount); } catch (TopiaException e) { throw new PollenTechnicalException(e); } @@ -663,9 +487,10 @@ } if (log.isDebugEnabled()) { - String account = result == null - ? "null" - : result.getVotingId() + " [" + result.getAccountId() + "]"; + String account = + result == null + ? "null" + : result.getVotingId() + " [" + result.getAccountId() + "]"; log.debug(String.format( "PollAccount found from user '%s' = %s", @@ -681,6 +506,149 @@ return result; } + /** + * Build a new Poll instance with given {@code user} as creator + * + * @param user Build a new Poll instance with given {@code user} as creator + * @return Build a new Poll instance with given {@code user} as creator + */ + protected Poll getNewPoll(UserAccount user) { + + PollDAO pollDAO = getDAO(Poll.class); + Poll result = newInstance(pollDAO); + + PollenConfiguration configuration = getConfiguration(); + + // default values from configuration + result.setChoiceType(configuration.getDefaultChoiceType()); + result.setVoteCountingType(configuration.getDefaultVoteCountingType()); + result.setPollType(configuration.getDefaultPollType()); + + // Initialize creator of the poll + PollAccountDAO pollAccountDAO = getDAO(PollAccount.class); + PollAccount creator = newInstance(pollAccountDAO); + + if (user != null) { + + // Link the creator with the user + creator.setVotingId(user.getDisplayName()); + creator.setEmail(user.getEmail()); + creator.setUserAccount(user); + } + result.setCreator(creator); + + return result; + } + + /** + * Obtains a copy of an existing poll given his {@code pollUid}. + * <p/> + * If flag {@code clone} is setted to {@code true}, then all id will + * be removed (pollId, accountId, topiaId). + * + * @param pollUid the {@link Poll#getPollId()} of the poll to copy + * @param userAccount optional incoming user account to link to the + * {@link Poll#getCreator()} + * @param clone flag to clone or not the copy of the poll (if setted + * to {@code true} then all id will be removed). + * @return the copy of the poll + * @throws PollNotFoundException if poll was not found + */ + protected Poll getNewPollCopy(String pollUid, + UserAccount userAccount, + boolean clone) throws PollNotFoundException { + + // pollUid can not be blank + Preconditions.checkState(StringUtils.isNotBlank(pollUid)); + + // load for sure existing poll + Poll poll = getExistingPollByPollId(pollUid); + + PollDAO pollDAO = getDAO(Poll.class); + Poll result = newInstance(pollDAO); + + PollenBinderHelper.simpleCopy(poll, result, !clone); + if (clone) { + // reset id for clone case + result.setPollId(null); + } + + // -- Creator -- // + PollAccount creatorLoaded = poll.getCreator(); + PollAccountDAO pollAccountDAO = getDAO(PollAccount.class); + PollAccount creatorEditable = newInstance(pollAccountDAO); + result.setCreator(creatorEditable); + + PollenBinderHelper.simpleCopy(creatorLoaded, creatorEditable, !clone); + if (clone) { + // reset id for clone case + creatorEditable.setAccountId(null); + } + + if (creatorEditable.getUserAccount() == null) { + // use the incoming userAccount + creatorEditable.setUserAccount(userAccount); + } + + // -- Choice -- // + Function<Choice, Choice> choiceCreator = + PollenServiceFunctions.newChoiceCreator(poll.getChoiceType()); + Iterable<Choice> choices = + Iterables.transform(poll.getChoice(), choiceCreator); + + for (Choice choiceLoaded : choices) { + if (clone) { + // reset id for clone case + choiceLoaded.setTopiaId(null); + } + result.addChoice(choiceLoaded); + } + + // -- VotingList -- // + VotingListDAO votingListDAO = getDAO(VotingList.class); + PersonToListDAO personToListDAO = getDAO(PersonToList.class); + for (VotingList votingListLoaded : poll.getVotingList()) { + VotingList votingListEditable = newInstance(votingListDAO); + result.addVotingList(votingListEditable); + // Do not keep votingLists topiaId, to simplify the update will delete old votingLists and create new ones + PollenBinderHelper.simpleCopy( + votingListLoaded, votingListEditable, false); + + for (PersonToList personToListLoaded : votingListLoaded.getPollAccountPersonToList()) { + PersonToList personToListEditable = newInstance(personToListDAO); + votingListEditable.addPollAccountPersonToList(personToListEditable); + // Do not keep personToLists topiaId, to simplify the update will delete old personToLists and create new ones + PollenBinderHelper.simpleCopy( + personToListLoaded, personToListEditable, false); + + PollAccount personLoaded = personToListLoaded.getPollAccount(); + PollAccount personEditable = newInstance(pollAccountDAO); + personToListEditable.setPollAccount(personEditable); + // copy the person, keeping topiaId is useless because we have the link with PersonToList + PollenBinderHelper.simpleCopy( + personLoaded, personEditable, false); + if (clone) { + // reset id for clone case + personEditable.setAccountId(null); + } + } + } + + // -- PreventRule -- // + PreventRuleDAO preventRuleDAO = getDAO(PreventRule.class); + for (PreventRule preventRuleLoaded : poll.getPreventRule()) { + PreventRule preventRuleEditable = newInstance(preventRuleDAO); + PollenBinderHelper.simpleCopy( + preventRuleLoaded, preventRuleEditable, !clone); + result.addPreventRule(preventRuleEditable); + } + + // Load votes to have the correct size used to check if vote is started + result.setVote(poll.getVote()); + + return result; + } + protected PollAccount copyPollAccount(PollAccount source) { PollAccountDAO dao = getDAO(PollAccount.class); PollAccount result = newInstance(dao); @@ -692,7 +660,6 @@ public PollAccount getNewPollAccount(UserAccount userAccount) { PollAccountDAO dao = getDAO(PollAccount.class); PollAccount result = newInstance(dao); - result.setAccountId(serviceContext.createPollenUrlId()); String votingId = userAccount != null ? userAccount.getDisplayName() : ""; result.setVotingId(votingId); result.setUserAccount(userAccount); @@ -861,7 +828,6 @@ } else if (choiceType == ChoiceType.DATE) { // date choice - PollDateChoice dateChoice = (PollDateChoice) choice; dateChoice.toChoice(choiceLoaded); @@ -985,8 +951,6 @@ } - public static final String THUMB_PREFIX = "thumb_"; - /** * Sauvegarde des images d'un choix de type image. * @@ -1008,38 +972,10 @@ createThumbnail(pollChoiceImage, pollChoiceImageThumb, 100); } -// public void addVoteToPoll(Poll poll, Vote vote) { -// -// String pollId = poll.getTopiaId(); -// String voteId = vote.getTopiaId(); -// -// Poll pollToUpdate = getEntityById(Poll.class, pollId); -// Vote voteToAdd = getEntityById(Vote.class, voteId); -// -// pollToUpdate.addVote(voteToAdd); -// -// // Update hasVoted flag for RESTRICTED/GROUP poll -// if (PollType.FREE != poll.getPollType()) { -// -// PersonToList personToList = pollToUpdate.getPersonToListByVote(voteToAdd); -// personToList.setHasVoted(true); -// } -// -// commitTransaction("Can't add the vote [" + voteId + "] to the poll [" + pollId + "]"); -// -// // Send notification if necessary -// PreventRuleService preventRuleService = newService(PreventRuleService.class); -// PollUrl pollVoteUrl = getPollVoteUrl(pollToUpdate, false); -// PollUrl modifUrl = getPollEditUrl(pollToUpdate); -// preventRuleService.onVoteAdded(poll, pollVoteUrl, modifUrl); -// } - public PersonToList getNewPersonToList(PollAccount pollAccount) { PersonToList result = newInstance(getDAO(PersonToList.class)); result.setWeight(1); PollAccount pollAccount2 = newInstance(getDAO(PollAccount.class)); - String accountId = serviceContext.createPollenUrlId(); - pollAccount2.setAccountId(accountId); result.setPollAccount(pollAccount2); if (pollAccount != null) { pollAccount2.setComment(pollAccount.getComment()); @@ -1050,7 +986,9 @@ return result; } - protected void saveVotingList(Poll poll, VotingList votingList, EmailService emailService) throws TopiaException { + protected void saveVotingList(Poll poll, + VotingList votingList, + EmailService emailService) throws TopiaException { VotingListDAO votingListDAO = getDAO(VotingList.class); PersonToListDAO personToListDAO = getDAO(PersonToList.class); @@ -1085,21 +1023,26 @@ PersonToList personToListLoaded; PollAccount pollAccountLoaded; if (personToList.getTopiaId() == null) { + + // creates a new PersonToList + personToListLoaded = create(personToListDAO); // The model doesn't have any composition for this relation, // the link must be set in both objects personToListLoaded.setVotingList(result); - // FIXME-fdesbois-2012-04-12 : find a better way to ensure accountId +// // FIXME-fdesbois-2012-04-12 : find a better way to ensure accountId String accountId = pollAccount.getAccountId(); - if (accountId == null) { - accountId = serviceContext.createPollenUrlId(); - } pollAccountLoaded = pollAccountDAO.findByAccountId(accountId); if (pollAccountLoaded == null) { - pollAccountLoaded = create(pollAccountDAO); + + // creates a new pollAccount + + pollAccountLoaded = createWithProperties( + pollAccountDAO, + PollAccount.PROPERTY_ACCOUNT_ID, generateId()); pollAccountLoaded.setAccountId(accountId); } @@ -1182,4 +1125,15 @@ + thumbCopied.length() + ")"); } } + + /** + * Generates a unique id usable for {@link Poll#getPollId()} or + * {@link PollAccount#getAccountId()}. + * + * @return a fresh generated id + * @since 1.4 + */ + public String generateId() { + return UUID.randomUUID().toString().replaceAll("-", ""); + } } Modified: trunk/pollen-services/src/test/java/org/chorem/pollen/services/FakeServiceContext.java =================================================================== --- trunk/pollen-services/src/test/java/org/chorem/pollen/services/FakeServiceContext.java 2012-06-05 07:32:19 UTC (rev 3421) +++ trunk/pollen-services/src/test/java/org/chorem/pollen/services/FakeServiceContext.java 2012-06-05 07:40:14 UTC (rev 3422) @@ -26,8 +26,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.pollen.PollenIOUtil; import org.chorem.pollen.PollenConfiguration; +import org.chorem.pollen.PollenIOUtil; import org.chorem.pollen.PollenTopiaRootContextFactory; import org.junit.rules.TestWatcher; import org.junit.runner.Description; @@ -41,7 +41,6 @@ import java.util.Date; import java.util.Locale; import java.util.Properties; -import java.util.UUID; /** * Provide an implementation of {@link PollenServiceContext} suitable for repeatable, @@ -65,7 +64,7 @@ protected Date fakeCurrentTime; protected File testDir; - + protected URL applicationUrl; public TopiaContext getRootContext() { @@ -156,17 +155,7 @@ this.applicationUrl = applicationUrl; } - /** - * Create an id to easily managed polls using urls. - * - * @return a fresh generated String - */ @Override - public String createPollenUrlId() { - return UUID.randomUUID().toString().replaceAll("-", ""); - } - - @Override public PollenConfiguration getConfiguration() { Properties props = new Properties(); Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/LoadPoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/LoadPoll.java 2012-06-05 07:32:19 UTC (rev 3421) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/LoadPoll.java 2012-06-05 07:40:14 UTC (rev 3422) @@ -33,9 +33,14 @@ import java.util.List; /** + * Load the poll form for modification (or only read if poll is no more + * editable). + * <p/> * Created: 04/04/12 * * @author fdesbois <desbois(a)codelutin.com> + * @author tchemit <chemit(a)codelutin.com> + * @since 1.3 */ public class LoadPoll extends AbstractPollForm { @@ -76,11 +81,12 @@ pollChoices, pollVotingLists, !isVoteStarted()); + //TODO-tchemit comment me Simplyf this! +// if (poll.getMaxChoiceNb() > 0) { +// setLimitChoice(true); +// } + setLimitChoice(poll.getMaxChoiceNb() > 0); - if (poll.getMaxChoiceNb() > 0) { - setLimitChoice(true); - } - PreventRule reminder = poll.getPreventRuleByScope( PreventRuleService.SCOPE_REMINDER); if (reminder != null) { Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java 2012-06-05 07:32:19 UTC (rev 3421) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java 2012-06-05 07:40:14 UTC (rev 3422) @@ -67,7 +67,7 @@ import java.util.regex.Pattern; /** - * Creates a new poll. + * Saves the incoming poll, could be a new poll or just an update. * * @author tchemit <chemit(a)codelutin.com> * @since 1.3 @@ -88,27 +88,41 @@ private static final Pattern IMAGE_CHOICE_NAME_PATTERN = Pattern.compile("imageChoice_(\\d+)\\.name"); - /** Flag when there is some errors on the information panel. */ + /** + * Flag when there is some errors on the information panel. + * + * @since 1.3 + */ protected boolean informationsError; - /** Flag when there is some errors on the options panel. */ + /** + * Flag when there is some errors on the options panel. + * + * @since 1.3 + */ private boolean optionsError; /** * All the parameters send by request used to build back choices of the * poll. + * + * @since 1.3 */ protected final Map<String, String[]> parameters = Maps.newTreeMap(); /** * Indexed choices retreive from parameters for the choiceType selected in * form. (Other choices are lost). + * + * @since 1.3 */ private Map<Integer, Choice> choices; /** * Indexed voting lists retreive from parameters for the pollType selected * in form. (Other voting lists are lost). + * + * @since 1.3 */ private Map<Integer, VotingList> votingLists; @@ -118,18 +132,34 @@ prepareFormPage(); String pollUid = getNonEmptyParameterValue("poll.pollId"); - + //TODO-tchemit comment me No ! inverse tests otherwise make possible to change owner of a poll! :( // Retrieve userAccount to attach to the poll - UserAccount userAccount = getPollenUserAccount(); - if (userAccount == null) { +// UserAccount userAccount = getPollenUserAccount(); +// if (userAccount == null) { +// +// // from parameter userId if defined during update loading +// String userId = getNonEmptyParameterValue("userId"); +// if (userId != null) { +// userAccount = getPollService().getEntityById(UserAccount.class, userId); +// } +// } + String userId = getNonEmptyParameterValue("userId"); + if (StringUtils.isBlank(userId)) { - // from parameter userId if defined during update loading - String userId = getNonEmptyParameterValue("userId"); - if (userId != null) { - userAccount = getPollService().getEntityById(UserAccount.class, userId); + // try to take the one from current user + UserAccount userAccount = getPollenUserAccount(); + if (userAccount != null) { + userId = userAccount.getTopiaId(); } } + UserAccount userAccount = null; + if (StringUtils.isNotBlank(userId)) { + // load use account to use + userAccount = + getPollService().getEntityById(UserAccount.class, userId); + } + // get a copy (or a fresh new poll) poll = getPollService().getPollEditable(pollUid, userAccount, false); // If vote is started, prepare choices and votingLists is useless @@ -155,16 +185,17 @@ choices = buildImageChoices(); break; } - + //TODO-tchemit comment me No the nullite tests is not possible : if pollType is null not possible ? PollType pollType; String pollTypeParam = getNonEmptyParameterValue("poll.pollType"); - if (pollTypeParam == null) { - pollType = poll.getPollType(); + pollType = PollType.valueOf(pollTypeParam); +// if (pollTypeParam == null) { +// pollType = poll.getPollType(); +// +// } else { +// pollType = PollType.valueOf(pollTypeParam); +// } - } else { - pollType = PollType.valueOf(pollTypeParam); - } - switch (pollType) { case FREE: @@ -198,10 +229,7 @@ Collection<VotingList> pollVotingLists = isVoteStarted() ? poll.getVotingList() : votingLists.values(); - loadChoicesAndvotingLists(poll, - pollChoices, - pollVotingLists, - true); + loadChoicesAndvotingLists(poll, pollChoices, pollVotingLists, true); return INPUT; } @@ -220,15 +248,19 @@ // Save choices and votingLists only if vote is not started if (!isVoteStarted()) { - + //TODO-tchemit comment me 2012-06-04 A merge would be nicer but more complex to code // Clear previous collections to save those from the form poll.clearChoice(); poll.clearVotingList(); - - Map<Integer, Choice> orderedChoices = choices; - - for (Integer index : orderedChoices.keySet()) { - Choice choice = orderedChoices.get(index); + //TODO-tchemit comment me this variables, works directly on choices +// Map<Integer, Choice> orderedChoices = choices; +// +// for (Integer index : orderedChoices.keySet()) { +// Choice choice = orderedChoices.get(index); +// poll.addChoice(choice); +// } + for (Integer index : choices.keySet()) { + Choice choice = choices.get(index); poll.addChoice(choice); } @@ -245,7 +277,7 @@ if (!isLimitChoice()) { poll.setMaxChoiceNb(0); } - + //TODO-tchemit comment me 2012-06-04 A merge would be nicer but more complex to code poll.clearPreventRule(); PreventRuleService preventRuleService = getPreventRuleService(); @@ -270,11 +302,13 @@ if (isEdit()) { getPollService().updatePoll(poll); - addFlashMessage(_("pollen.information.poll.updated", poll.getTitle())); + addFlashMessage( + _("pollen.information.poll.updated", poll.getTitle())); } else { getPollService().createPoll(poll); - addFlashMessage(_("pollen.information.poll.created", poll.getTitle())); + addFlashMessage( + _("pollen.information.poll.created", poll.getTitle())); } // remove all stuff from session @@ -285,9 +319,8 @@ @Override public void addFile(int index, File file) { - parameters.put( - "imageChoice_" + index + ".location", - new String[]{file.getAbsolutePath()}); + parameters.put("imageChoice_" + index + ".location", + new String[]{file.getAbsolutePath()}); } @Override @@ -297,8 +330,7 @@ @Override public void addFileName(int index, String fileName) { - parameters.put("imageChoice_" + index + ".name", - new String[]{fileName}); + parameters.put("imageChoice_" + index + ".name", new String[]{fileName}); } @Override

1 0

r3421 - in trunk: . pollen-persistence pollen-persistence/src pollen-persistence/src/site pollen-services pollen-services/src pollen-services/src/site pollen-ui-struts2 pollen-ui-struts2/src/site pollen-votecounting pollen-votecounting/src pollen-votecounting/src/site
by tchemit＠users.chorem.org June 5, 2012

June 5, 2012

Author: tchemit Date: 2012-06-05 09:32:19 +0200 (Tue, 05 Jun 2012) New Revision: 3421 Url: http://chorem.org/repositories/revision/pollen/3421 Log: improve site generation Added: trunk/pollen-persistence/src/site/ trunk/pollen-persistence/src/site/site_en.xml trunk/pollen-persistence/src/site/site_fr.xml trunk/pollen-services/src/site/ trunk/pollen-services/src/site/site_en.xml trunk/pollen-services/src/site/site_fr.xml trunk/pollen-votecounting/src/site/ trunk/pollen-votecounting/src/site/site_en.xml trunk/pollen-votecounting/src/site/site_fr.xml Removed: trunk/pollen-ui-struts2/src/site/rst/ Modified: trunk/pollen-persistence/pom.xml trunk/pollen-services/pom.xml trunk/pollen-ui-struts2/pom.xml trunk/pollen-ui-struts2/src/site/site_en.xml trunk/pollen-ui-struts2/src/site/site_fr.xml trunk/pollen-votecounting/pom.xml trunk/pom.xml Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2012-06-04 12:37:46 UTC (rev 3420) +++ trunk/pollen-persistence/pom.xml 2012-06-05 07:32:19 UTC (rev 3421) @@ -140,5 +140,45 @@ </plugins> </build> + <profiles> + + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <build> + <plugins> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <configuration> + <reportPlugins> + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <reports> + <report>index</report> + <report>project-team</report> + <report>mailing-list</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</report> + <report>dependency-convergence</report> + <report>dependency-management</report> + </reports> + </plugin> + </reportPlugins> + </configuration> + </plugin> + </plugins> + </build> + + </profile> + </profiles> + </project> Added: trunk/pollen-persistence/src/site/site_en.xml =================================================================== --- trunk/pollen-persistence/src/site/site_en.xml (rev 0) +++ trunk/pollen-persistence/src/site/site_en.xml 2012-06-05 07:32:19 UTC (rev 3421) @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<project name="${project.name}"> + +  + + <body> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}/index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="User"> + <item name="About" href="./index.html"/> + </menu> + + <menu name="Language"> + <item name="Français" href="index.html"/> + <item name="English" href="../index.html"/> + </menu> + + <menu ref="reports"/> + + <footer> + + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + + </body> +</project> + Added: trunk/pollen-persistence/src/site/site_fr.xml =================================================================== --- trunk/pollen-persistence/src/site/site_fr.xml (rev 0) +++ trunk/pollen-persistence/src/site/site_fr.xml 2012-06-05 07:32:19 UTC (rev 3421) @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<project name="${project.name}"> + +  + + <body> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}/index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur"> + <item name="A propos" href="./index.html"/> + </menu> + + <menu name="Language"> + <item name="Français" href="index.html"/> + <item name="English" href="../index.html"/> + </menu> + + <menu ref="reports"/> + + <footer> + + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + + </body> + +</project> + Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2012-06-04 12:37:46 UTC (rev 3420) +++ trunk/pollen-services/pom.xml 2012-06-05 07:32:19 UTC (rev 3421) @@ -116,5 +116,45 @@ </plugins> </build> + <profiles> + + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <build> + <plugins> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <configuration> + <reportPlugins> + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <reports> + <report>index</report> + <report>project-team</report> + <report>mailing-list</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</report> + <report>dependency-convergence</report> + <report>dependency-management</report> + </reports> + </plugin> + </reportPlugins> + </configuration> + </plugin> + </plugins> + </build> + + </profile> + </profiles> + </project> Added: trunk/pollen-services/src/site/site_en.xml =================================================================== --- trunk/pollen-services/src/site/site_en.xml (rev 0) +++ trunk/pollen-services/src/site/site_en.xml 2012-06-05 07:32:19 UTC (rev 3421) @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<project name="${project.name}"> + +  + + <body> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}/index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="User"> + <item name="About" href="./index.html"/> + </menu> + + <menu name="Language"> + <item name="Français" href="index.html"/> + <item name="English" href="../index.html"/> + </menu> + + <menu ref="reports"/> + + <footer> + + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + + </body> +</project> + Added: trunk/pollen-services/src/site/site_fr.xml =================================================================== --- trunk/pollen-services/src/site/site_fr.xml (rev 0) +++ trunk/pollen-services/src/site/site_fr.xml 2012-06-05 07:32:19 UTC (rev 3421) @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<project name="${project.name}"> + +  + + <body> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}/index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur"> + <item name="A propos" href="./index.html"/> + </menu> + + <menu name="Language"> + <item name="Français" href="index.html"/> + <item name="English" href="../index.html"/> + </menu> + + <menu ref="reports"/> + + <footer> + + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + + </body> + +</project> + Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-06-04 12:37:46 UTC (rev 3420) +++ trunk/pollen-ui-struts2/pom.xml 2012-06-05 07:32:19 UTC (rev 3421) @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -311,7 +313,8 @@ <phase>generate-resources</phase> <configuration> <target> - <mkdir dir="${basedir}/target/pollen-embedded-temp-${project.version}/WEB-INF/classes" /> + <mkdir + dir="${basedir}/target/pollen-embedded-temp-${project.version}/WEB-INF/classes"/> </target> </configuration> <goals> @@ -445,6 +448,43 @@ </build> </profile> + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <build> + <plugins> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <configuration> + <reportPlugins> + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <reports> + <report>index</report> + <report>project-team</report> + <report>mailing-list</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</report> + <report>dependency-convergence</report> + <report>dependency-management</report> + </reports> + </plugin> + </reportPlugins> + </configuration> + </plugin> + </plugins> + </build> + + </profile> + </profiles> </project> Modified: trunk/pollen-ui-struts2/src/site/site_en.xml =================================================================== --- trunk/pollen-ui-struts2/src/site/site_en.xml 2012-06-04 12:37:46 UTC (rev 3420) +++ trunk/pollen-ui-struts2/src/site/site_en.xml 2012-06-05 07:32:19 UTC (rev 3421) @@ -25,38 +25,22 @@ <project name="${project.name}"> - <bannerLeft> +  - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> - - <custom> - <fluidoSkin> - <topBarEnabled>true</topBarEnabled> - <googleSearch/> - <sideBarEnabled>false</sideBarEnabled> - <searchEnabled>true</searchEnabled> - <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> - </fluidoSkin> - </custom> - <body> <breadcrumbs> - <item name="${project.name}" href="${project.url}"/> + <item name="${project.name}" href="${project.url}/index.html"/> </breadcrumbs> <menu ref="parent"/> <menu name="User"> <item name="About" href="./index.html"/> - <item name="Configuration" href="./application-config-report.html"/> </menu> <menu name="Language"> @@ -64,12 +48,6 @@ <item name="English" href="../index.html"/> </menu> - <menu name="Download"> - <item name="Download" - href="http://www.chorem.org/projects/pollen/files"/> - </menu> - - <menu ref="reports"/> <footer> Modified: trunk/pollen-ui-struts2/src/site/site_fr.xml =================================================================== --- trunk/pollen-ui-struts2/src/site/site_fr.xml 2012-06-04 12:37:46 UTC (rev 3420) +++ trunk/pollen-ui-struts2/src/site/site_fr.xml 2012-06-05 07:32:19 UTC (rev 3421) @@ -25,38 +25,22 @@ <project name="${project.name}"> - <bannerLeft> +  - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> - - <custom> - <fluidoSkin> - <topBarEnabled>true</topBarEnabled> - <googleSearch/> - <sideBarEnabled>false</sideBarEnabled> - <searchEnabled>true</searchEnabled> - <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> - </fluidoSkin> - </custom> - <body> <breadcrumbs> - <item name="${project.name}" href="${project.url}"/> + <item name="${project.name}" href="${project.url}/index.html"/> </breadcrumbs> <menu ref="parent"/> <menu name="Utilisateur"> <item name="A propos" href="./index.html"/> - <item name="Configuration" href="./application-config-report.html"/> </menu> <menu name="Language"> @@ -64,11 +48,6 @@ <item name="English" href="../index.html"/> </menu> - <menu name="Téléchargement"> - <item name="Téléchargement" - href="http://www.chorem.org/projects/pollen/files"/> - </menu> - <menu ref="reports"/> <footer> Modified: trunk/pollen-votecounting/pom.xml =================================================================== --- trunk/pollen-votecounting/pom.xml 2012-06-04 12:37:46 UTC (rev 3420) +++ trunk/pollen-votecounting/pom.xml 2012-06-05 07:32:19 UTC (rev 3421) @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -61,4 +63,45 @@ </plugins> </build> + <profiles> + + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <build> + <plugins> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <configuration> + <reportPlugins> + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <reports> + <report>index</report> + <report>project-team</report> + <report>mailing-list</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</report> + <report>dependency-convergence</report> + <report>dependency-management</report> + </reports> + </plugin> + </reportPlugins> + </configuration> + </plugin> + </plugins> + </build> + + </profile> + + </profiles> + </project> Copied: trunk/pollen-votecounting/src/site/site_en.xml (from rev 3418, trunk/pollen-ui-struts2/src/site/site_en.xml) =================================================================== --- trunk/pollen-votecounting/src/site/site_en.xml (rev 0) +++ trunk/pollen-votecounting/src/site/site_en.xml 2012-06-05 07:32:19 UTC (rev 3421) @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<project name="${project.name}"> + +  + + <body> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}/index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="User"> + <item name="About" href="./index.html"/> + </menu> + + <menu name="Language"> + <item name="Français" href="index.html"/> + <item name="English" href="../index.html"/> + </menu> + + <menu ref="reports"/> + + <footer> + + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + + </body> +</project> + Copied: trunk/pollen-votecounting/src/site/site_fr.xml (from rev 3418, trunk/pollen-ui-struts2/src/site/site_fr.xml) =================================================================== --- trunk/pollen-votecounting/src/site/site_fr.xml (rev 0) +++ trunk/pollen-votecounting/src/site/site_fr.xml 2012-06-05 07:32:19 UTC (rev 3421) @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<project name="${project.name}"> + +  + + <body> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}/index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur"> + <item name="A propos" href="./index.html"/> + </menu> + + <menu name="Language"> + <item name="Français" href="index.html"/> + <item name="English" href="../index.html"/> + </menu> + + <menu ref="reports"/> + + <footer> + + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + + </body> + +</project> + Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-06-04 12:37:46 UTC (rev 3420) +++ trunk/pom.xml 2012-06-05 07:32:19 UTC (rev 3421) @@ -12,7 +12,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.3.2</version> + <version>3.3.3-SNAPSHOT</version> </parent> <groupId>org.chorem</groupId> @@ -191,6 +191,7 @@ <shiroVersion>1.2.0</shiroVersion> <slf4jVersion>1.6.4</slf4jVersion> <jettyVersion>${jettyPluginVersion}</jettyVersion> + <hibernateVersion>3.6.10.Final</hibernateVersion> <pollenI18nBundle>pollen-i18n</pollenI18nBundle>  @@ -222,7 +223,7 @@ <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> - <version>3.6.10.Final</version> + <version>${hibernateVersion}</version> </dependency> <dependency> @@ -460,6 +461,17 @@ <version>${nuitonI18nVersion}</version> </plugin> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils-maven-report-plugin</artifactId> + <version>${nuitonUtilsVersion}</version> + </plugin> + + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>${projectInfoReportsPluginVersion}</version> + </plugin> + </plugins> </pluginManagement> @@ -577,50 +589,62 @@ </property> </activation> - <reporting> + <build> <plugins> - -  <plugin> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>${projectInfoReportsPluginVersion}</version> - <reportSets> - <reportSet> - <reports> - <report>project-team</report> - <report>mailing-list</report> - <report>cim</report> - <report>issue-tracking</report> - <report>license</report> - <report>scm</report> - <report>dependency-convergence</report> - <report>dependency-management</report> - </reports> - </reportSet> - </reportSets> - </plugin> + <artifactId>maven-site-plugin</artifactId> + <inherited>false</inherited> + <configuration> + <reportPlugins> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils-maven-report-plugin</artifactId> + <reports> + <report>aggregate-application-config-report</report> + </reports> +  + <configuration> + <i18nBundleName>${pollenI18nBundle}</i18nBundleName> + </configuration> + </plugin> - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils-maven-report-plugin</artifactId> - <version>${nuitonUtilsVersion}</version> - <reportSets> - <reportSet> - <reports> - <report>aggregate-application-config-report</report> - </reports> - </reportSet> - </reportSets> - <configuration> - <i18nBundleName>${pollenI18nBundle}</i18nBundleName> + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <reports> + <report>project-team</report> + <report>mailing-list</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</report> + <report>dependency-convergence</report> + <report>dependency-management</report> + </reports> + </plugin> + </reportPlugins> </configuration> +  + <dependencies> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>${h2Version}</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>${hibernateVersion}</version> + </dependency> + </dependencies> </plugin> - </plugins> - </reporting> + </build> </profile>

1 0

r3420 - trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business
by tchemit＠users.chorem.org June 4, 2012

June 4, 2012

Author: tchemit Date: 2012-06-04 14:37:46 +0200 (Mon, 04 Jun 2012) New Revision: 3420 Url: http://chorem.org/repositories/revision/pollen/3420 Log: fix javadoc Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Context.java Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Context.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Context.java 2012-06-04 09:06:56 UTC (rev 3419) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Context.java 2012-06-04 12:37:46 UTC (rev 3420) @@ -72,7 +72,7 @@ } /** - * Renvoie un choix de la map + * Renvoie un choix de la map. * * @param idChoice : identifiant du choix * @return choix @@ -121,7 +121,7 @@ /** * Ajout d'un nouveau choix au contexte * - * @param idChoice : identifiant du choix + * @param choice identifiant du choix */ public void addChoice(PollChoiceDTO choice) { this.choices.add(new Choice(choice.getIdChoice(), choice.getName())); @@ -130,7 +130,7 @@ /** * Ajout d'un nouveau choix au contexte * - * @param idChoice : identifiant du choix + * @param choice identifiant du choix */ public void addHiddenChoice(PollChoiceDTO choice) { this.hiddenChoices.add(new Choice(choice.getIdChoice(), choice.getName())); @@ -139,8 +139,8 @@ /** * Ajout d'un groupe pour l'ensemble des choix du contexte * - * @param idGroup : identifiant du groupe - * @param weight : poids du groupe + * @param idGroup identifiant du groupe + * @param weight poids du groupe */ public void addGroup(String idGroup, double weight) { for (Choice choice : this.choices) { @@ -155,22 +155,24 @@ * Test si le choix est un résultat d'après le contexte A utiliser après * dépouillement sinon aucun résultat * - * @param choice : choix à tester - * @return true si le choix est un résultat, false sinon + * @param choice choix à tester + * @return {@code true} si le choix est un résultat, {@code false} sinon. */ private boolean isChoiceResult(Choice choice) { + boolean result = false; for (Choice res : results) { if (choice.getIdChoice().equals(res.getIdChoice())) { - return true; + result = true; + break; } } - return false; + return result; } /** * Execution de la méthode de dépouillement et calcul des choix résultats * - * @return liste de choix résultats + * @return la liste de choix résultats */ public boolean executeCounting() {

1 0

r3419 - trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl
by athimel＠users.chorem.org June 4, 2012

June 4, 2012

Author: athimel Date: 2012-06-04 11:06:56 +0200 (Mon, 04 Jun 2012) New Revision: 3419 Url: http://chorem.org/repositories/revision/pollen/3419 Log: May fail in multiple form submission Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-06-03 20:59:00 UTC (rev 3418) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-06-04 09:06:56 UTC (rev 3419) @@ -328,7 +328,7 @@ result.setDescription(poll.getDescription()); result.setEndDate(poll.getEndDate()); result.setEndChoiceDate(poll.getEndChoiceDate()); - result.setPollId(poll.getPollId()); + result.setPollId(poll.getPollId()); // TODO AThimel 04/06/2012 pollId coming from the JSP page ???? result.setPollType(poll.getPollType()); result.setMaxChoiceNb(poll.getMaxChoiceNb()); result.setPublicResults(poll.isPublicResults());

1 0

r3418 - in trunk: pollen-services/src/main/java/org/chorem/pollen/bean pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security pollen-ui-struts2/src/main/resources pollen-ui-struts2/src/main/resources/config pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user
by tchemit＠users.chorem.org June 3, 2012

June 3, 2012

Author: tchemit Date: 2012-06-03 22:59:00 +0200 (Sun, 03 Jun 2012) New Revision: 3418 Url: http://chorem.org/repositories/revision/pollen/3418 Log: refs #582: Make the resume page bookmarkeable reuse the AbstractPollUriIdAction action for attachPoll one Added: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResumePoll.java Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollUri.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollUriIdAction.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AttachPoll.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollCreatorRequired.java trunk/pollen-ui-struts2/src/main/resources/config/struts-poll.xml trunk/pollen-ui-struts2/src/main/resources/shiro.ini trunk/pollen-ui-struts2/src/main/resources/struts.xml trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollUri.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollUri.java 2012-06-03 19:26:50 UTC (rev 3417) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollUri.java 2012-06-03 20:59:00 UTC (rev 3418) @@ -25,6 +25,7 @@ import com.google.common.base.Preconditions; import org.apache.commons.lang3.StringUtils; +import org.chorem.pollen.business.persistence.Poll; import java.io.Serializable; Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java 2012-06-03 19:26:50 UTC (rev 3417) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java 2012-06-03 20:59:00 UTC (rev 3418) @@ -193,18 +193,18 @@ return pollType == PollType.GROUP; } - public String getPollVoteUrl() { - return getPollUrlService().getPollVoteUrl(poll, false).getUrl(); - } +// public String getPollVoteUrl() { +// return getPollUrlService().getPollVoteUrl(poll, false).getUrl(); +// } +// +// public String getPollModerateUrl() { +// return getPollUrlService().getPollVoteUrl(poll, true).getUrl(); +// } +// +// public String getPollEditUrl() { +// return getPollUrlService().getPollEditUrl(poll).getUrl(); +// } - public String getPollModerateUrl() { - return getPollUrlService().getPollVoteUrl(poll, true).getUrl(); - } - - public String getPollEditUrl() { - return getPollUrlService().getPollEditUrl(poll).getUrl(); - } - public int getSelectedTab() { int result = 0; return result; Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollUriIdAction.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollUriIdAction.java 2012-06-03 19:26:50 UTC (rev 3417) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollUriIdAction.java 2012-06-03 20:59:00 UTC (rev 3418) @@ -77,11 +77,11 @@ } public final String getPollId() { - return pollUri != null ? pollUri.getPollId() : null; + return pollUri == null ? null : pollUri.getPollId(); } public final String getAccountId() { - return pollUri != null ? pollUri.getAccountId() : null; + return pollUri == null ? null : pollUri.getAccountId(); } protected void preparePollUri(Map<String, String[]> parameters) { Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AttachPoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AttachPoll.java 2012-06-03 19:26:50 UTC (rev 3417) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AttachPoll.java 2012-06-03 20:59:00 UTC (rev 3418) @@ -24,12 +24,10 @@ import com.google.common.base.Preconditions; import org.apache.commons.lang3.StringUtils; -import org.chorem.pollen.bean.PollUri; import org.chorem.pollen.business.persistence.Poll; import org.chorem.pollen.business.persistence.UserAccount; import org.chorem.pollen.services.exceptions.PollNotFoundException; import org.chorem.pollen.ui.actions.PageSkin; -import org.chorem.pollen.ui.actions.PollenActionSupport; /** * To attach a anonymous poll to a connected user account. @@ -37,25 +35,10 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.4 */ -public class AttachPoll extends PollenActionSupport { +public class AttachPoll extends AbstractPollUriIdAction { private static final long serialVersionUID = 1L; - /** - * Id of the poll to attach to connected user account. - * - * @since 1.4 - */ - private PollUri pollUri; - - public void setPollUri(PollUri pollUri) { - this.pollUri = pollUri; - } - - public String getPollId() { - return pollUri == null ? null : pollUri.getPollId(); - } - @Override public PageSkin getSkin() { return PageSkin.EDITION; @@ -64,9 +47,9 @@ @Override public String execute() throws Exception { - Preconditions.checkNotNull(pollUri); + String pollId = getPollId(); - String pollId = pollUri.getPollId(); + Preconditions.checkNotNull(pollId); Poll poll = getPollService().getExistingPollByPollId(pollId); @@ -82,12 +65,11 @@ @Override public void validate() { - - if (pollUri == null || StringUtils.isEmpty(pollUri.getPollId())) { - addFieldError("pollUri", _("pollen.error.pollId.empty")); + if (StringUtils.isEmpty(getPollId())) { + addFieldError("uriId", _("pollen.error.pollId.empty")); } else { - String pollId = pollUri.getPollId(); + String pollId = getPollId(); try { @@ -99,12 +81,12 @@ UserAccount userAccount = poll.getCreator().getUserAccount(); if (userAccount != null) { - addFieldError("pollUri", + addFieldError("uriId", _("pollen.error.pollAlreadyAttached")); } } catch (PollNotFoundException e) { - addFieldError("pollUri", _("pollen.error.pollNotFound")); + addFieldError("uriId", _("pollen.error.pollNotFound")); } } Added: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResumePoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResumePoll.java (rev 0) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResumePoll.java 2012-06-03 20:59:00 UTC (rev 3418) @@ -0,0 +1,84 @@ +/* + * #%L + * Pollen :: UI (struts2) + * $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.ui.actions.poll; + +import com.google.common.base.Preconditions; +import org.chorem.pollen.business.persistence.Poll; +import org.chorem.pollen.common.PollType; +import org.chorem.pollen.ui.actions.PageSkin; + +/** + * Action to display all resume link for a given poll. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.4 + */ +public class ResumePoll extends AbstractPollUriIdAction { + + private static final long serialVersionUID = 1L; + + /** + * Loade poll. + * + * @since 1.4 + */ + private Poll poll; + + public Poll getPoll() { + return poll; + } + + @Override + public PageSkin getSkin() { + return PageSkin.EDITION; + } + + public String getPollVoteUrl() { + return getPollUrlService().getPollVoteUrl(poll, false).getUrl(); + } + + public String getPollModerateUrl() { + return getPollUrlService().getPollVoteUrl(poll, true).getUrl(); + } + + public String getPollEditUrl() { + return getPollUrlService().getPollEditUrl(poll).getUrl(); + } + + public boolean isFreePoll() { + PollType pollType = poll.getPollType(); + return pollType == PollType.FREE; + } + + @Override + public String execute() throws Exception { + + Preconditions.checkNotNull(getUriId()); + + String pollId = getUriId().getPollId(); + + poll = getPollService().getExistingPollByPollId(pollId); + + return SUCCESS; + } +} Property changes on: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResumePoll.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java 2012-06-03 19:26:50 UTC (rev 3417) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java 2012-06-03 20:59:00 UTC (rev 3418) @@ -38,6 +38,7 @@ import org.chorem.pollen.bean.ChoiceHelper; import org.chorem.pollen.bean.PollDateChoice; import org.chorem.pollen.bean.PollImageChoice; +import org.chorem.pollen.bean.PollUri; import org.chorem.pollen.business.persistence.Choice; import org.chorem.pollen.business.persistence.ChoiceImpl; import org.chorem.pollen.business.persistence.PersonToList; @@ -185,6 +186,10 @@ } } + public PollUri getUriId() { + return PollUri.newPollUri(poll.getAdminId()); + } + @Override public String input() { Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollCreatorRequired.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollCreatorRequired.java 2012-06-03 19:26:50 UTC (rev 3417) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollCreatorRequired.java 2012-06-03 20:59:00 UTC (rev 3418) @@ -44,7 +44,6 @@ adminFilter = new AdminUserRequired(); } - @Override protected boolean isAccessAllowed(ServletRequest request, ServletResponse response, @@ -54,7 +53,7 @@ if (adminFilter.isAccessAllowed(request, response, mappedValue)) { - // user is connected ans admin, so + // user is connected and admin, so access granted isAccessAllowed = true; } else { Modified: trunk/pollen-ui-struts2/src/main/resources/config/struts-poll.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/config/struts-poll.xml 2012-06-03 19:26:50 UTC (rev 3417) +++ trunk/pollen-ui-struts2/src/main/resources/config/struts-poll.xml 2012-06-03 20:59:00 UTC (rev 3418) @@ -33,6 +33,8 @@ <package name="poll" extends="default" namespace="/poll"> <result-types> + + <result-type name="redirectToVote" class="org.chorem.pollen.ui.results.PollenServletActionRedirectResult"> <param name="namespace">/poll</param> @@ -47,7 +49,8 @@ </action>  - <action name="display*" class="org.chorem.pollen.ui.actions.poll.Display{1}"> + <action name="display*" + class="org.chorem.pollen.ui.actions.poll.Display{1}"> <result>/WEB-INF/jsp/poll/display{1}.jsp</result> </action> @@ -59,8 +62,7 @@ </action>  - <action name="clone/*" - class="org.chorem.pollen.ui.actions.poll.LoadPoll"> + <action name="clone/*" class="org.chorem.pollen.ui.actions.poll.LoadPoll"> <param name="uriId">{1}</param> <param name="clone">true</param> <result>/WEB-INF/jsp/poll/create.jsp</result> @@ -69,6 +71,16 @@  <action name="save" class="org.chorem.pollen.ui.actions.poll.SavePoll"> <result name="input">/WEB-INF/jsp/poll/create.jsp</result> + <result type="pollenRedirectAction"> + <param name="namespace">/poll</param> + <param name="actionName">resume/${uriId}</param> + </result> + </action> + +  + <action name="resume/*" method="execute" + class="org.chorem.pollen.ui.actions.poll.ResumePoll"> + <param name="uriId">{1}</param> <result>/WEB-INF/jsp/poll/resume.jsp</result> </action> @@ -95,8 +107,7 @@ </action>  - <action name="close/*" - class="org.chorem.pollen.ui.actions.poll.ClosePoll"> + <action name="close/*" class="org.chorem.pollen.ui.actions.poll.ClosePoll"> <param name="uriId">{1}</param> <result type="redirect2"/> </action> Modified: trunk/pollen-ui-struts2/src/main/resources/shiro.ini =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/shiro.ini 2012-06-03 19:26:50 UTC (rev 3417) +++ trunk/pollen-ui-struts2/src/main/resources/shiro.ini 2012-06-03 20:59:00 UTC (rev 3418) @@ -50,4 +50,5 @@ # is pollCreator (can admin a poll) /poll/modification/**=poll,pollCreator /poll/clone/**=poll,pollCreator -/poll/resultLink/**=poll,pollCreator \ No newline at end of file +/poll/resultLink/**=poll,pollCreator +/poll/resume/**=poll,pollCreator \ No newline at end of file Modified: trunk/pollen-ui-struts2/src/main/resources/struts.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/struts.xml 2012-06-03 19:26:50 UTC (rev 3417) +++ trunk/pollen-ui-struts2/src/main/resources/struts.xml 2012-06-03 20:59:00 UTC (rev 3418) @@ -58,6 +58,9 @@ <param name="actionName">home</param> </result-type> + <result-type name="pollenRedirectAction" + class="org.chorem.pollen.ui.results.PollenServletActionRedirectResult"/> + <result-type name="redirect2" class="org.apache.struts2.dispatcher.ServletRedirectResult"> <param name="location">${redirectUrl}</param> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp 2012-06-03 19:26:50 UTC (rev 3417) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp 2012-06-03 20:59:00 UTC (rev 3418) @@ -87,7 +87,7 @@ <s:form namespace="/user" method="POST"> - <s:textfield key="pollUri" label='%{getText("pollen.common.pollId")}' + <s:textfield key="uriId" label='%{getText("pollen.common.pollId")}' required="true" size="80" value='%{pollId}' tooltip='%{getText("poll.help.pollId")}' tooltipIconPath="/img/tooltip.png"/>

1 0

r3417 - in trunk: pollen-services/src/main/java/org/chorem/pollen/bean 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/poll 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/decorators pollen-ui-stru
by tchemit＠users.chorem.org June 3, 2012

June 3, 2012

Author: tchemit Date: 2012-06-03 21:26:50 +0200 (Sun, 03 Jun 2012) New Revision: 3417 Url: http://chorem.org/repositories/revision/pollen/3417 Log: fixes #530: ajouter ou d?\195?\169placer un sondage sur un compte fixes #581: Add an edit link for creator or admin on vote and result page fixes #580: When changing lang, it should redirect to last page and not on home page. fixes #573: Liens pas clairs apr?\195?\168s cr?\195?\169ation de sondage - ajout javadocs Added: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AttachPoll.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ChangeLang.java trunk/pollen-ui-struts2/src/main/webapp/css/resume.css Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollUri.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollUrlService.java trunk/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties trunk/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractDisplayChoice.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AddComment.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ClosePoll.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteChoice.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteComment.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteVote.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java 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/resources/shiro.ini trunk/pollen-ui-struts2/src/main/resources/struts.xml trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/result.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/resultLink.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/resume.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollUri.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollUri.java 2012-06-03 15:40:54 UTC (rev 3416) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollUri.java 2012-06-03 19:26:50 UTC (rev 3417) @@ -92,4 +92,9 @@ } return result; } + + @Override + public String toString() { + return getUri(); + } } Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java 2012-06-03 15:40:54 UTC (rev 3416) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java 2012-06-03 19:26:50 UTC (rev 3417) @@ -143,7 +143,7 @@ subject = l_(locale, "pollen.email.createPoll.subject", pollTitle); content = l_(locale, "pollen.email.createPoll.content", - pollTitle, voteURL, moderateUrl, modifURL); + pollTitle, poll.getPollId(), voteURL, moderateUrl, modifURL); } else { subject = l_(locale, "pollen.email.createRestrictedPoll.subject", Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-06-03 15:40:54 UTC (rev 3416) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-06-03 19:26:50 UTC (rev 3417) @@ -774,6 +774,28 @@ commitTransaction("Could not close poll " + poll.getTitle()); } + public void attachPoll(Poll poll, UserAccount userAccount) { + + Preconditions.checkNotNull(poll); + Preconditions.checkNotNull(userAccount); + + // just link poll creator account to given user account + PollAccount creator = poll.getCreator(); + creator.setUserAccount(userAccount); + + // fill votingId from user account + if (StringUtils.isEmpty(creator.getVotingId())) { + creator.setVotingId(userAccount.getDisplayName()); + } + + // fill email from user account + if (StringUtils.isEmpty(creator.getEmail())) { + creator.setEmail(userAccount.getEmail()); + } + commitTransaction("Could not attach poll " + poll.getTitle() + + " to user account " + userAccount.getDisplayName()); + } + public Choice getNewChoice(ChoiceType choiceType) { Choice result; switch (choiceType) { Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollUrlService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollUrlService.java 2012-06-03 15:40:54 UTC (rev 3416) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollUrlService.java 2012-06-03 19:26:50 UTC (rev 3417) @@ -1,3 +1,25 @@ +/* + * #%L + * Pollen :: Services + * $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.services.impl; import com.google.common.base.Preconditions; Property changes on: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollUrlService.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties =================================================================== --- trunk/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties 2012-06-03 15:40:54 UTC (rev 3416) +++ trunk/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties 2012-06-03 19:26:50 UTC (rev 3417) @@ -11,7 +11,7 @@ pollen.common.numberVote-total-votes=Total votes pollen.common.unauthorized=unauthorized pollen.common.undefined=undefined -pollen.email.createPoll.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\nModerate votes page\: \n%s\nEdit page\: \n%s +pollen.email.createPoll.content=You had just created the new poll\: "%s" (id %s).\n\nYou can access to this poll by following the links below.\n\nVote page\: \n%s\nModerate votes page\: \n%s\nEdit page\: \n%s pollen.email.createPoll.subject=[Pollen] Poll creation (%s) pollen.email.createRestrictedPoll.content=You had just created the new poll\: "%s".\nYou can access to this poll by following the links below.\n\nModerate votes page\: \n%s\nEdit page\: \n%s pollen.email.createRestrictedPoll.subject=[Pollen] Restricted poll creation (%s) Modified: trunk/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties =================================================================== --- trunk/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties 2012-06-03 15:40:54 UTC (rev 3416) +++ trunk/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties 2012-06-03 19:26:50 UTC (rev 3417) @@ -11,7 +11,7 @@ pollen.common.numberVote-total-votes=Nombre total de votes pollen.common.unauthorized=Non autorisé pollen.common.undefined=Non défini -pollen.email.createPoll.content=Vous venez de créer le sondage "%1$s".\nVous pouvez y accéder en suivant les liens ci-dessous.\n\nPage de vote \: \n%2$s\nModération des votes \: \n%3$s\nPage de modification \: \n%4$s +pollen.email.createPoll.content=Vous venez de créer le sondage "%1$s" (identifiant %2$s).\n\nVous pouvez y accéder en suivant les liens ci-dessous.\n\nPage de vote \: \n%3$s\nModération des votes \: \n%4$s\nPage de modification \: \n%5$s pollen.email.createPoll.subject=[Pollen] Création d'un sondage (%1$s) pollen.email.createRestrictedPoll.content=Vous venez de créer le sondage "%s".\nVous pouvez y accéder en suivant les liens ci-dessous.\n\nModération des votes \: \n%s\nPage de modification \: \n%s pollen.email.createRestrictedPoll.subject=[Pollen] Création d'un sondage restreint (%s) Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractDisplayChoice.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractDisplayChoice.java 2012-06-03 15:40:54 UTC (rev 3416) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractDisplayChoice.java 2012-06-03 19:26:50 UTC (rev 3417) @@ -40,15 +40,25 @@ private static final long serialVersionUID = 1L; - /** Where to find dynamic data (says choices in this case). */ + /** + * Where to find dynamic data (says choices in this case). + * + * @since 1.3 + */ protected String tokenId; - /** Number of choice to display. */ + /** + * Number of choice to display. + * + * @since 1.3 + */ protected int choiceNumber; /** * Choice to display in ui (come from dynamic data if exists, or fresh * created one). + * + * @since 1.3 */ protected Choice choice; Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java 2012-06-03 15:40:54 UTC (rev 3416) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java 2012-06-03 19:26:50 UTC (rev 3417) @@ -62,30 +62,86 @@ /** Logger. */ private static final Log log = LogFactory.getLog(AbstractVoteAction.class); + /** + * Loaded poll. + * + * @since 1.3 + */ private Poll poll; + /** + * Is feed existfor this poll ? + * + * @since 1.3 + */ private boolean feedFileExisting; + /** + * Is user the poll's creator ? + * + * @since 1.3 + */ private boolean creatorUser; + /** + * Loaded poll account (from the pollUri). + * + * @since 1.3 + */ private PollAccount pollAccount; + //TODO-thcemit-2012-06-03 Do we use this ? nobody set it... so always false private boolean alreadyVoted; + /** + * Is votr allowed for current user? + * + * @since 1.3 + */ private boolean voteAllowed; + /** + * All votes for the poll. + * + * @since 1.3 + */ private List<Vote> votes; + /** + * Current vote to treat (for create/updatevote action). + * + * @since 1.3 + */ private Vote vote; + /** + * Comment author to display in UI. + * + * @since 1.3 + */ private String commentAuthor; // private String voteSizeMessage; + /** + * Results of the poll. + * + * @since 1.3 + */ private List<PollResult> results; + /** + * List of comments to display. + * + * @since 1.3 + */ private List<Comment> comments; + /** + * Injected parameters from request. + * + * @since 1.3 + */ private Map<String, String[]> parameters; @Override Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AddComment.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AddComment.java 2012-06-03 15:40:54 UTC (rev 3416) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AddComment.java 2012-06-03 19:26:50 UTC (rev 3417) @@ -83,7 +83,7 @@ // create the comment getPollCommentService().createComment(getPoll(), comment); - addFlashMessage(_("pollen.info.comment.added")); + addFlashMessage(_("pollen.information.comment.added")); return SUCCESS; } } Added: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AttachPoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AttachPoll.java (rev 0) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AttachPoll.java 2012-06-03 19:26:50 UTC (rev 3417) @@ -0,0 +1,112 @@ +/* + * #%L + * Pollen :: UI (struts2) + * $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.ui.actions.poll; + +import com.google.common.base.Preconditions; +import org.apache.commons.lang3.StringUtils; +import org.chorem.pollen.bean.PollUri; +import org.chorem.pollen.business.persistence.Poll; +import org.chorem.pollen.business.persistence.UserAccount; +import org.chorem.pollen.services.exceptions.PollNotFoundException; +import org.chorem.pollen.ui.actions.PageSkin; +import org.chorem.pollen.ui.actions.PollenActionSupport; + +/** + * To attach a anonymous poll to a connected user account. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.4 + */ +public class AttachPoll extends PollenActionSupport { + + private static final long serialVersionUID = 1L; + + /** + * Id of the poll to attach to connected user account. + * + * @since 1.4 + */ + private PollUri pollUri; + + public void setPollUri(PollUri pollUri) { + this.pollUri = pollUri; + } + + public String getPollId() { + return pollUri == null ? null : pollUri.getPollId(); + } + + @Override + public PageSkin getSkin() { + return PageSkin.EDITION; + } + + @Override + public String execute() throws Exception { + + Preconditions.checkNotNull(pollUri); + + String pollId = pollUri.getPollId(); + + Poll poll = getPollService().getExistingPollByPollId(pollId); + + UserAccount userAccount = getPollenSession().getUserAccount(); + + getPollService().attachPoll(poll, userAccount); + + addFlashMessage(_("pollen.information.poll.attached", poll.getTitle())); + + return SUCCESS; + } + + @Override + public void validate() { + + + if (pollUri == null || StringUtils.isEmpty(pollUri.getPollId())) { + addFieldError("pollUri", _("pollen.error.pollId.empty")); + } else { + + String pollId = pollUri.getPollId(); + + try { + + // check that poll exists + Poll poll = getPollService().getExistingPollByPollId(pollId); + + // check that poll is not yet attached to another user account + + UserAccount userAccount = poll.getCreator().getUserAccount(); + if (userAccount != null) { + + addFieldError("pollUri", + _("pollen.error.pollAlreadyAttached")); + } + } catch (PollNotFoundException e) { + + addFieldError("pollUri", _("pollen.error.pollNotFound")); + } + + } + } +} Property changes on: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AttachPoll.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ClosePoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ClosePoll.java 2012-06-03 15:40:54 UTC (rev 3416) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ClosePoll.java 2012-06-03 19:26:50 UTC (rev 3417) @@ -23,6 +23,8 @@ */ package org.chorem.pollen.ui.actions.poll; +import org.chorem.pollen.business.persistence.Poll; + /** * Closes an existing poll. * @@ -33,6 +35,11 @@ private static final long serialVersionUID = 1L; + /** + * Redirect url. + * + * @since 1.3 + */ protected String redirectUrl; public String getRedirectUrl() { @@ -46,11 +53,13 @@ @Override public String execute() throws Exception { + Poll poll = getPollService().getExistingPollByPollId(getPollId()); + getPollService().closePoll(getPollId(), getPollenUserAccount(), getAccountId()); - addFlashMessage(_("pollen.information.poll.closed")); + addFlashMessage(_("pollen.information.poll.closed", poll.getTitle())); return SUCCESS; } Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteChoice.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteChoice.java 2012-06-03 15:40:54 UTC (rev 3416) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteChoice.java 2012-06-03 19:26:50 UTC (rev 3417) @@ -50,7 +50,7 @@ getPollService().deleteChoice(pollId, choiceId); - addFlashMessage(_("pollen.info.choice.deleted")); + addFlashMessage(_("pollen.information.choice.deleted")); return SUCCESS; } } Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteComment.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteComment.java 2012-06-03 15:40:54 UTC (rev 3416) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteComment.java 2012-06-03 19:26:50 UTC (rev 3417) @@ -70,7 +70,7 @@ getPollCommentService().deleteComment(poll, commentId, reason); - addFlashMessage(_("pollen.info.comment.deleted")); + addFlashMessage(_("pollen.information.comment.deleted")); return SUCCESS; } } Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteVote.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteVote.java 2012-06-03 15:40:54 UTC (rev 3416) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteVote.java 2012-06-03 19:26:50 UTC (rev 3417) @@ -68,7 +68,7 @@ getVoteService().deleteVote(poll, voteId, reason); - addFlashMessage(_("pollen.info.vote.deleted")); + addFlashMessage(_("pollen.information.vote.deleted")); return SUCCESS; } } Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java 2012-06-03 15:40:54 UTC (rev 3416) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java 2012-06-03 19:26:50 UTC (rev 3417) @@ -38,7 +38,6 @@ import org.chorem.pollen.bean.PollResult; import org.chorem.pollen.bean.PollResultList; import org.chorem.pollen.business.persistence.Poll; -import org.chorem.pollen.business.persistence.PollAccount; import org.chorem.pollen.common.ChoiceType; import org.chorem.pollen.common.PollType; import org.chorem.pollen.common.VoteCountingType; @@ -67,26 +66,71 @@ /** Logger. */ private static final Log log = LogFactory.getLog(ResultForPoll.class); + /** + * Is result by group ? + * + * @since 1.3 + */ private Boolean byGroup; - protected boolean userAllowed; + /** + * Can user be on this page ? + * <p/> + * TODO-tchemit-2012-06-03 Security is managed by shiro, why doing it here again ? + * + * @since 1.3 + */ + private boolean userAllowed; /** + * Is user is poll(s creator ? + * + * @since 1.4 + */ + private boolean creatorUser; + + /** * Résultats du sondage. * <p/> * La map est indexée par les noms de choix. + * + * @since 1.3 */ private transient Multimap<String, String> choicesResults; - /** Résultats du sondage. */ + /** + * Résultats du sondage. + * + * @since 1.3 + */ private transient Multimap<String, String> subtitles; + /** + * Loaded poll. + * + * @since 1.3 + */ private Poll poll; + /** + * Poll results. + * + * @since 1.3 + */ private List<PollResult> results; + /** + * Top ranking results. + * + * @since 1.3 + */ private List<PollResult> topRanking; + /** + * Url helper (to build new url) + * + * @since 1.3.1 + */ @Inject(required = true) private UrlHelper urlHelper; @@ -103,6 +147,10 @@ return userAllowed; } + public boolean isCreatorUser() { + return creatorUser; + } + public List<PollResult> getResults() { return results; } @@ -159,37 +207,38 @@ poll = getPollService().getExistingPollByPollId(pollId); - if (poll == null) { - addFlashError(_("pollen.error.pollNotFound")); - } else { + if (byGroup == null) { - if (byGroup == null) { + // default byGroup value + byGroup = isGroupPoll(); + } - // default byGroup value - byGroup = isGroupPoll(); - } + String accountId = getAccountId(); - String accountId = getAccountId(); - if (poll.isPublicResults()) { - userAllowed = true; - } else if (StringUtils.isNotEmpty(accountId)) { + creatorUser = poll.getCreator().getAccountId().equals(accountId); - PollAccount creator = poll.getCreator(); - if (accountId.equals(creator.getAccountId())) { - userAllowed = true; - } - } + if (poll.isPublicResults()) { + userAllowed = true; + } else if (StringUtils.isNotEmpty(accountId)) { - if (!userAllowed) { - addFlashError(_("pollen.error.userNotAllowed")); + // create is allowed to be ther + userAllowed = creatorUser; - } else if (poll.isRunning(serviceContext.getCurrentTime())) { - addFlashWarning(_("pollen.information.pollRunning")); - loadResults(); +// PollAccount creator = poll.getCreator(); +// if (accountId.equals(creator.getAccountId())) { +// userAllowed = true; +// } + } - } else { - loadResults(); - } + if (!userAllowed) { + addFlashError(_("pollen.error.userNotAllowed")); + + } else if (poll.isRunning(serviceContext.getCurrentTime())) { + addFlashWarning(_("pollen.information.pollRunning")); + loadResults(); + + } else { + loadResults(); } return SUCCESS; Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java 2012-06-03 15:40:54 UTC (rev 3416) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java 2012-06-03 19:26:50 UTC (rev 3417) @@ -265,11 +265,11 @@ if (isEdit()) { getPollService().updatePoll(poll); - addFlashMessage(_("pollen.information.poll.updated")); + addFlashMessage(_("pollen.information.poll.updated", poll.getTitle())); } else { getPollService().createPoll(poll); - addFlashMessage(_("pollen.information.poll.created")); + addFlashMessage(_("pollen.information.poll.created", poll.getTitle())); } // remove all stuff from session Added: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ChangeLang.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ChangeLang.java (rev 0) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ChangeLang.java 2012-06-03 19:26:50 UTC (rev 3417) @@ -0,0 +1,67 @@ +/* + * #%L + * Pollen :: UI (struts2) + * $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.user; + +import org.chorem.pollen.ui.actions.PollenActionSupport; + +/** + * To change lang and redirect to current page. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.4 + */ +public class ChangeLang extends PollenActionSupport { + + private static final long serialVersionUID = 1L; + + /** + * Where to redirect after having chang lang. + * + * @since 1.4 + */ + protected String redirectUrl; + + public String getRedirectUrl() { + return redirectUrl; + } + + public void setRedirectUrl(String redirectUrl) { + this.redirectUrl = redirectUrl; + } + + @Override + public String execute() throws Exception { + String result; + if (redirectUrl == null || redirectUrl.contains("/security")) { + + // After security problem, redirect to home + result = Login.HOME; + + } else { + + // Stay on the same page identified by redirectUrl + result = SUCCESS; + } + return result; + } +} Property changes on: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ChangeLang.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java 2012-06-03 15:40:54 UTC (rev 3416) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java 2012-06-03 19:26:50 UTC (rev 3417) @@ -39,7 +39,7 @@ private static final long serialVersionUID = 1L; - private static final String HOME = "home"; + public static final String HOME = "home"; protected String login; Modified: trunk/pollen-ui-struts2/src/main/resources/config/struts-user.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/config/struts-user.xml 2012-06-03 15:40:54 UTC (rev 3416) +++ trunk/pollen-ui-struts2/src/main/resources/config/struts-user.xml 2012-06-03 19:26:50 UTC (rev 3417) @@ -32,6 +32,20 @@ <package name="user" extends="default" namespace="/user"> +  + <action name="changeLang" method="execute" + class="org.chorem.pollen.ui.actions.user.ChangeLang"> + + <result name="home" type="redirectToHome"/> + <result type="redirect2"/> + + <interceptor-ref name="i18nStack"/> +  + <interceptor-ref name="paramRemover"> + <param name="paramNames">request_locale</param> + </interceptor-ref> + </action> +  <action name="login" class="org.chorem.pollen.ui.actions.user.Login"> <result name="home" type="redirectToHome"/> @@ -134,6 +148,16 @@ <result type="redirect2"/> </action> +  + <action name="attachPoll" + class="org.chorem.pollen.ui.actions.poll.AttachPoll"> + <result name="input">/WEB-INF/jsp/user/createdList.jsp</result> + <result type="redirectAction"> + <param name="namespace">/user</param> + <param name="actionName">createdList</param> + </result> + </action> +  <action name="createdList" class="org.chorem.pollen.ui.actions.poll.CreatedList"> 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-06-03 15:40:54 UTC (rev 3416) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-06-03 19:26:50 UTC (rev 3417) @@ -1,10 +1,13 @@ email=E-mail +poll.help.attachPoll=To reattach a poll created anonymously to your user account. +poll.help.pollId=Poll id can be found at different place\:<br/><br/>- Inside the email send after poll creation (since version 1.4)<br/><br/>- On resume page after poll creation or modification (since version 1.4)<br/><br/>,- On any url to access the poll actions (administration, vote, result). pollen.action.addChoice=Add choice pollen.action.addComment=Add a comment pollen.action.addPersonListFromVotingList=Add voters from a favorite list pollen.action.addPersonToList=Add a voter pollen.action.addVotingList=Add a group pollen.action.addVotingListFromPersonList=Add a group from a favorite list +pollen.action.attachPoll=Attach poll pollen.action.backToFavoriteLists=Back to favorite lists pollen.action.cancel=Cancel pollen.action.clone=Clone poll @@ -21,7 +24,7 @@ pollen.action.deleteUser=Delete selected user pollen.action.deleteVote=Supprimer ce vote pollen.action.editFavoriteList=Edit a list -pollen.action.editPoll=Edit the pollLes deux mots de passe saisis non identiques +pollen.action.editPoll=Edit the poll pollen.action.editPollAccount=Edit selected member pollen.action.editUser=Edit selected user pollen.action.editVote=Modifier le vote @@ -98,6 +101,7 @@ pollen.common.personList=Voting lists pollen.common.personToList=Voter pollen.common.pollCreator=Creator +pollen.common.pollId=Poll id pollen.common.pollOption.anonymous=Anonymous pollen.common.pollOption.anonymous.help=Voting persons and their votes are anonymous pollen.common.pollOption.anonymousVoteAllowed=Anonymous vote allowed @@ -181,7 +185,9 @@ pollen.error.poll.votingList.weight.not.valid=The group's weight is not valid (must be greater than 0) pollen.error.pollAccount.not.found=Poll account not found pollen.error.pollAccount.votingId.required=Name mandatory -pollen.error.pollNotFound=The poll you want to count does not exist. +pollen.error.pollAlreadyAttached=The poll is already attached to another user account +pollen.error.pollId.empty=Poll id is mandatory +pollen.error.pollNotFound=The poll with given id does not exist. pollen.error.pollTabErrorFound=Some errors were found on this tab, please fix them to finalize the poll creation. pollen.error.user.alreadyVoted=Someone has already used the name %s to vote. pollen.error.user.bad.login.or.password=Login or password invalid. @@ -210,10 +216,9 @@ pollen.fieldset.userInformation.toDelete=User informations to delete pollen.fieldset.userInformation.toUpdate=User informations to update pollen.image.not.loaded=Image not loaded -pollen.info.choice.deleted=Choice deleted -pollen.info.comment.added=Comment added -pollen.info.comment.deleted=Comment deleted -pollen.info.vote.deleted=Vote deleted +pollen.information.choice.deleted=Choice deleted. +pollen.information.comment.added=Comment added. +pollen.information.comment.deleted=Comment deleted. pollen.information.confirmClonePoll=Confirm clone of poll\: pollen.information.confirmClosePoll=Confirm close of poll\: pollen.information.confirmDeleteFavoriteList=Confirm delete of favorite list\: @@ -228,13 +233,14 @@ pollen.information.lostPassword=You will receive a new password to the given email 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.closed=Poll closed -pollen.information.poll.created=Poll created +pollen.information.poll.attached=Poll '%s' attached to your user account. +pollen.information.poll.closed=Poll '%s' closed. +pollen.information.poll.created=Poll '%s' created. pollen.information.poll.form.voteStarted=Votes are started, some options can't be updated. -pollen.information.poll.updated=Poll modified -pollen.information.pollAccount.addedTofavoriteList=Member '%s was added to favorite list. -pollen.information.pollAccount.removedFromFavoriteList=Member %s was removed from favorite list. -pollen.information.pollAccount.updatedTofavoriteList=Member %s was updated in favorite list. +pollen.information.poll.updated=Poll '%s' modified. +pollen.information.pollAccount.addedTofavoriteList=Member '%s' was added to favorite list. +pollen.information.pollAccount.removedFromFavoriteList=Member '%s' was removed from favorite list. +pollen.information.pollAccount.updatedTofavoriteList=Member '%s' was updated in favorite list. pollen.information.pollChoiceRunning=Adding choices is allowed. pollen.information.pollClosed=This poll is closed. You can not vote anymore. pollen.information.pollFinished=This poll is finished. You can not vote anymore. @@ -244,15 +250,17 @@ pollen.information.user.deleted=User %s deleted. pollen.information.user.updated=User %s updated. pollen.information.vote.created=Vote saved -pollen.information.vote.createdWithUpdateUrl=Vote saved, you can modify it using this address \: <br/> <a href\="%1$s">%1$s</a> +pollen.information.vote.createdWithUpdateUrl=Vote saved, you can modify it using this address\: <br/> <a href\="%1$s">%1$s</a> pollen.information.vote.creatorUser=You are identified as the poll's creator. You can't vote with this URL. +pollen.information.vote.deleted=Vote deleted. pollen.information.your.are.loggued=You are logged. pollen.label.contact.administrator=Send an email to an administrator -pollen.label.pollEditPage=The link below leads to the page to modify your poll. Save it to be able to modify your poll later if you need it or to close it \: -pollen.label.pollModerateVotePage=The link below leads to the page to vote for your poll. This access is available only for you as poll's creator \: +pollen.label.pollEditPage=<strong>To modify your poll</strong>. Save it to be able to modify your poll later if you need it or to close it\: +pollen.label.pollModerateVotePage=<strong>To moderate your poll (you can't vote from this url)</strong>. Save it to be able to delete votes and comments\: pollen.label.pollRegisterPage=If you are a logged user, you can find these links on the page -pollen.label.pollResultPage=The link below leads to the page to count the votes. Save it to be able to count the vote later \: -pollen.label.pollVotePage=The link below leads to the page to vote for your poll. Save it and send it to the people that you want to vote \: +pollen.label.pollResultPage=The link below leads to the page to count the votes. Save it to be able to count the vote later\: +pollen.label.pollVotePage=<strong>To vote on your poll</strong>. Save it and send it to the people that you want to vote\: +pollen.legend.attachPoll=Attach an anonymous poll to your user account 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 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-06-03 15:40:54 UTC (rev 3416) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-06-03 19:26:50 UTC (rev 3417) @@ -1,10 +1,13 @@ email=E-mail +poll.help.attachPoll=Pour rattacher un sondage précedemment créé (sans être connecté) à son compte utilisateur. +poll.help.pollId=L'identifiant du sondage peut être retrouvé à différents endroits\:<br/><br/>- dans le courriel qui vous a été envoyé suite à la création du sondage (à partir de la version 1.4)<br/><br/>- sur la page de résumé du sondage après sa création ou modification (à partir de la version 1.4)<br/><br/>- Ou encore dans les urls d'accès au sondage (administration, vote, résultat). pollen.action.addChoice=Ajouter un choix pollen.action.addComment=Ajouter un commentaire pollen.action.addPersonListFromVotingList=Ajouter des votants à partir d'une liste de votants pollen.action.addPersonToList=Ajouter un votant pollen.action.addVotingList=Ajouter un groupe pollen.action.addVotingListFromPersonList=Ajouter un groupe à partir d'une liste de votants +pollen.action.attachPoll=Attacher le sondage pollen.action.backToFavoriteLists=Retour à la liste des favoris pollen.action.cancel=Annuler pollen.action.clone=Cloner le sondage @@ -98,6 +101,7 @@ pollen.common.personList=Liste de votants pollen.common.personToList=Votant pollen.common.pollCreator=Créateur +pollen.common.pollId=Identifiant du sondage pollen.common.pollOption.anonymous=Sondage anonyme pollen.common.pollOption.anonymous.help=Les votants ainsi que leurs votes sont anonymes pollen.common.pollOption.anonymousVoteAllowed=Autoriser le vote anonyme @@ -181,7 +185,9 @@ pollen.error.poll.votingList.weight.not.valid=Poids du groupe votant non valide (doit être une nombre supérieur à 0). pollen.error.pollAccount.not.found=Membre non trouvé pollen.error.pollAccount.votingId.required=Nom obliqatoire -pollen.error.pollNotFound=Le sondage que vous voulez dépouiller n'existe pas. +pollen.error.pollAlreadyAttached=Le sondage est déjà attaché à un autre compte utilisateur +pollen.error.pollId.empty=L'identifiant du sondage est obligatoire +pollen.error.pollNotFound=Il n'existe pas de sondage avec cet identifiant. pollen.error.pollTabErrorFound=Des erreurs ont été detectées dans cet onglet, veuillez les corriger pour valider la création du sondage. 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. @@ -210,10 +216,9 @@ pollen.fieldset.userInformation.toDelete=Informations de l'utilisateur à supprimer pollen.fieldset.userInformation.toUpdate=Informations de l'utilisateur à mettre à jour pollen.image.not.loaded=Image non chargée -pollen.info.choice.deleted=Choix supprimé -pollen.info.comment.added=Commentaire ajouté -pollen.info.comment.deleted=Commentaire supprimé -pollen.info.vote.deleted=Vote supprimé +pollen.information.choice.deleted=Choix supprimé. +pollen.information.comment.added=Commentaire ajouté. +pollen.information.comment.deleted=Commentaire supprimé. pollen.information.confirmClonePoll=Confirmer le clonage du sondage \: pollen.information.confirmClosePoll=Confirmer la fermeture du sondage \: pollen.information.confirmDeleteFavoriteList=Confirmer la suppression de la liste de votants \: @@ -228,10 +233,11 @@ 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.closed=Sondage clos -pollen.information.poll.created=Sondage créé +pollen.information.poll.attached=Sondage '%s' rattaché à votre compte. +pollen.information.poll.closed=Sondage '%s' clos. +pollen.information.poll.created=Sondage '%s' créé. pollen.information.poll.form.voteStarted=Les votes ont commencé, certaines options ne sont pas modifiables. -pollen.information.poll.updated=Sondage mise à jour +pollen.information.poll.updated=Sondage '%s' mise à jour. pollen.information.pollAccount.addedTofavoriteList=Le membre %s a été ajoutée à la liste des favoris. pollen.information.pollAccount.removedFromFavoriteList=Le membre %s a été supprimé de la liste des favoris. pollen.information.pollAccount.updatedTofavoriteList=Le membre %s a été mise à jour dans la liste des favoris. @@ -246,13 +252,15 @@ pollen.information.vote.created=Vote enregistré pollen.information.vote.createdWithUpdateUrl=Vote enregistré, vous pourrez le modifier à l'adresse suivante \: <br/> <a href\="%1$s">%1$s</a> pollen.information.vote.creatorUser=Vous êtes identifié comme le créateur du sondage. Vous ne pouvez pas voter avec cette URL. +pollen.information.vote.deleted=Vote supprimé. pollen.information.your.are.loggued=Vous êtes connecté. pollen.label.contact.administrator=Contacter un administrateur -pollen.label.pollEditPage=Le lien ci-dessous mène à la page de modification du sondage. Enregistrez-le pour pouvoir modifier votre sondage au besoin ou le clore \: -pollen.label.pollModerateVotePage=Le lien ci-dessous mène à la page de vote. Cet accès n'est valable que pour vous en tant que créateur du sondage \: +pollen.label.pollEditPage=<strong>Lien pour configurer le sondage</strong>. Enregistrez-le pour pouvoir modifier votre sondage au besoin ou le clore \: +pollen.label.pollModerateVotePage=<strong>Lien pour modérer le sondage (ce lien ne permet pas de voter)</strong>. Enregistrez-le pour pouvoir supprimer des votes et commentaires \: pollen.label.pollRegisterPage=Si vous êtes un utilisateur identifié, vous pouvez retrouver ces liens dans la page pollen.label.pollResultPage=Le lien ci-dessous mène à la page de dépouillement. Enregistrez-le pour pouvoir accéder au dépouillement plus tard \: -pollen.label.pollVotePage=Le lien ci-dessous mène à la page de vote. Enregistrez-le et envoyez-le à ceux que vous voulez voir voter \: +pollen.label.pollVotePage=<strong>Lien pour voter</strong>. Enregistrez-le et envoyez-le à ceux que vous voulez voir voter \: +pollen.legend.attachPoll=Attacher un sondage anonyme à votre compte 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 Modified: trunk/pollen-ui-struts2/src/main/resources/shiro.ini =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/shiro.ini 2012-06-03 15:40:54 UTC (rev 3416) +++ trunk/pollen-ui-struts2/src/main/resources/shiro.ini 2012-06-03 19:26:50 UTC (rev 3417) @@ -22,6 +22,7 @@ # anon urls /user/login=anon +/user/changeLang=anon /user/register**=anon /user/lostPassword**=anon Modified: trunk/pollen-ui-struts2/src/main/resources/struts.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/struts.xml 2012-06-03 15:40:54 UTC (rev 3416) +++ trunk/pollen-ui-struts2/src/main/resources/struts.xml 2012-06-03 19:26:50 UTC (rev 3417) @@ -135,19 +135,6 @@ <interceptor-ref name="basicStack"/> </action> -  - <action name="changeLang" - class="org.chorem.pollen.ui.actions.PollenActionSupport"> - - <result type="redirectToHome"/> - - <interceptor-ref name="i18nStack"/> -  - <interceptor-ref name="paramRemover"> - <param name="paramNames">request_locale</param> - </interceptor-ref> - </action> - </package> <package name="security" extends="default" namespace="/security"> 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-06-03 15:40:54 UTC (rev 3416) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2012-06-03 19:26:50 UTC (rev 3417) @@ -78,11 +78,13 @@ <img src="<s:url value='/img/contact.png' />" alt="Contact"/> </s:a> | <%=PollenActionSupport.getCurrentDateTime()%> | - <s:a action="changeLang" id="localeFr"> + <s:a action="changeLang" namespace="/user" id="localeFr"> <s:param name="request_locale">fr_FR</s:param> + <s:param name="redirectUrl" value="%{currentUrl}"/> <img src="<s:url value='/img/fr.png' />" alt="Français"/> - </s:a> | <s:a action="changeLang" id="localeEn"> + </s:a> | <s:a action="changeLang" namespace="/user" id="localeEn"> <s:param name="request_locale">en_GB</s:param> + <s:param name="redirectUrl" value="%{currentUrl}"/> <img src="<s:url value='/img/en.png' />" alt="English"/> </s:a> </div> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/result.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/result.jsp 2012-06-03 15:40:54 UTC (rev 3416) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/result.jsp 2012-06-03 19:26:50 UTC (rev 3417) @@ -29,15 +29,8 @@ <script type="text/javascript"> - <%--function displayNormalChartUrl(type) {--%> - <%--var url = "<s:url value='%{getNormalPollResultChartUrl(400, 300)}' escapeAmp='false'/>&type=" + type;--%> - <%--$('#normalChartImg').attr('src', url);--%> - <%--return false;--%> - <%--}--%> - function displayCharts(type) { $.each(chartUrls, function (key, value) { - console.info("display url [" + key + "] : " + value); var url = value + "&type=" + type; $('#' + key).attr("src", url); }); @@ -73,6 +66,13 @@ <fieldset> <legend><s:text name="pollen.common.aboutPoll"/></legend> <div style="float: right"> + <s:if test="creatorUser or userAdmin"> + <s:a namespace="/poll" action="modification/%{uriId}"> + <img src="<s:url value='/img/editSmall.png'/>" + title="<s:text name='pollen.action.editPoll'/>" + alt="<s:text name='pollen.action.editPoll'/>"/> + </s:a> + </s:if> <s:a namespace="/poll" action="votefor/%{uriId}"> <img src="<s:url value='/img/vote.png'/>" title="<s:text name="pollen.common.vote.return-help"/>" Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/resultLink.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/resultLink.jsp 2012-06-03 15:40:54 UTC (rev 3416) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/resultLink.jsp 2012-06-03 19:26:50 UTC (rev 3417) @@ -34,14 +34,13 @@ style="margin-right: 18px;"/> <s:text name='pollen.label.pollResultPage'/> <br/> - <s:set name="resultUrl" value="%{pollResultUrl}"/> - <s:a href="%{resultUrl}" cssStyle="margin-left:50px;"> - <s:property value="resultUrl"/> + <s:a href="%{pollResultUrl}" cssStyle="margin-left:50px;"> + <s:property value="%{pollResultUrl}"/> </s:a> </div> <div style="margin-top: 30px;"> <s:text name="pollen.label.pollRegisterPage"/> - <s:a namespace="/user" action="myPolls"> + <s:a namespace="/user" action="createdList"> <s:text name="pollen.common.myPolls"/> </s:a>. </div> \ No newline at end of file Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/resume.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/resume.jsp 2012-06-03 15:40:54 UTC (rev 3416) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/resume.jsp 2012-06-03 19:26:50 UTC (rev 3417) @@ -23,44 +23,49 @@ --%> <%@ page language="java" contentType="text/html" pageEncoding="utf-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> +<link rel="stylesheet" type="text/css" href="<s:url value='/css/resume.css'/>"/> + <h1 class="titleCreation"><s:property value="poll.title"/></h1> <h3><s:property value="poll.title"/> <s:text name="pollen.common.by"/> <s:property value="poll.creator.votingId"/></h3> +<div class="ui-widget-content ui-corner-all"> + + <s:label key="pollen.common.pollId" value="%{poll.pollId}"/> + <br/> +</div> + <s:if test="freePoll"> - <div style="margin-top: 10px;"> + <div class="ui-widget-content-green ui-corner-all"> <img src="<s:url value='/img/vote.png'/>" alt="<s:text name='pollen.common.voteAction'/>" style="margin-right: 18px;"/> - <s:property value="pollen.label.pollVotePage"/> + <s:text name="pollen.label.pollVotePage"/> <br/> - <s:set name="voteUrl" value="%{pollVoteUrl}"/> - <s:a href="%{voteUrl}" cssStyle="margin-left:50px;"> - <s:property value="voteUrl"/> + <s:a href="%{pollVoteUrl}" cssStyle="margin-left:50px;"> + <s:property value="%{pollVoteUrl}"/> </s:a> </div> </s:if> -<div style="margin-top: 10px;"> +<div class="ui-widget-content-yellow ui-corner-all"> <img src="<s:url value='/img/moderate.png'/>" alt="<s:text name='pollen.action.pollModerateVote'/>" style="margin-right: 20px;"/> <s:text name='pollen.label.pollModerateVotePage'/> <br/> - <s:set name="moderateUrl" value="%{pollModerateUrl}"/> - <s:a href="%{moderateUrl}" cssStyle="margin-left:50px;"> - <s:property value="moderateUrl"/> + <s:a href="%{pollModerateUrl}" cssStyle="margin-left:50px;"> + <s:property value="%{pollModerateUrl}"/> </s:a> </div> -<div style="margin-top: 10px;"> +<div class="ui-widget-content ui-corner-all"> <img src="<s:url value='/img/edit.png'/>" alt="<s:text name='pollen.common.editAction'/>" style="margin-right: 20px;"/> <s:text name='pollen.label.pollEditPage'/> <br/> - <s:set name="editUrl" value="%{pollEditUrl}"/> - <s:a href="%{editUrl}" cssStyle="margin-left:50px;"> - <s:property value="editUrl"/> + <s:a href="%{pollEditUrl}" cssStyle="margin-left:50px;"> + <s:property value="%{pollEditUrl}"/> </s:a> </div> <div style="margin-top: 30px;"> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-06-03 15:40:54 UTC (rev 3416) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-06-03 19:26:50 UTC (rev 3417) @@ -113,12 +113,18 @@ <fieldset> <legend><s:text name="pollen.common.aboutPoll"/></legend> <div style="float: right"> + <s:if test="creatorUser or userAdmin"> + <s:a namespace="/poll" action="modification/%{uriId}"> + <img src="<s:url value='/img/editSmall.png'/>" + title="<s:text name='pollen.action.editPoll'/>" + alt="<s:text name='pollen.action.editPoll'/>"/> + </s:a> + </s:if> <s:if test="poll.publicResults"> - <s:a namespace="/poll" action="results/%{uriId}"> <img src="<s:url value='/img/count.png'/>" - title="<s:text name="pollen.common.vote.results-help"/>" - alt="<s:text name="pollen.common.vote.results"/>"/> + title="<s:text name='pollen.common.vote.results-help'/>" + alt="<s:text name='pollen.common.vote.results'/>"/> </s:a> </s:if> <s:if test="feedFileExisting"> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp 2012-06-03 15:40:54 UTC (rev 3416) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp 2012-06-03 19:26:50 UTC (rev 3417) @@ -25,10 +25,25 @@ <%@ taglib prefix="s" uri="/struts-tags" %> <%@ taglib prefix="sjg" uri="/struts-jquery-grid-tags" %> +<link rel="stylesheet" type="text/css" href="<s:url value='/css/tipTip.css'/>"/> + +<style type="text/css"> + legend { + color: #727a7e; + font-weight: bold; + } +</style> +<script type="text/javascript" + src='<s:url value="/js/jquery.tipTip.minified.js"/>'></script> + <script type="text/javascript"> -var redirectUrl = '<s:url namespace="/user" action="createdList"/>'; + var redirectUrl = '<s:url namespace="/user" action="createdList"/>'; + $(function(){ + $('img[src$="tooltip.png"]').addClass('tooltip'); + $(".tooltip").tipTip(); + }); </script> -<%@include file="/WEB-INF/jsp/pollListHelper.jsp"%> +<%@include file="/WEB-INF/jsp/pollListHelper.jsp" %> <title><s:text name="pollen.title.pollsCreatedList"/></title> @@ -36,7 +51,8 @@ <h4><s:text name="pollen.title.pollsCreatedList.legend"/></h4> -<s:url id="loadUrl" action="getCreatedPolls" namespace="/json" escapeAmp="false"/> +<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" @@ -49,11 +65,34 @@ 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="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="200" sortable="false"/> </sjg:grid> + +<br/> +<fieldset> + <legend><s:text name="pollen.legend.attachPoll"/> + <img src="<s:url value='/img/tooltip.png'/>" + title="<s:text name='poll.help.attachPoll'/>" + alt="<s:text name='poll.help.attachPoll'/>"/> + </legend> + + <s:form namespace="/user" method="POST"> + + <s:textfield key="pollUri" label='%{getText("pollen.common.pollId")}' + required="true" size="80" value='%{pollId}' + tooltip='%{getText("poll.help.pollId")}' + tooltipIconPath="/img/tooltip.png"/> + + <br/> + <s:submit action="attachPoll" key="pollen.action.attachPoll"/> + </s:form> +</fieldset> Added: trunk/pollen-ui-struts2/src/main/webapp/css/resume.css =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/css/resume.css (rev 0) +++ trunk/pollen-ui-struts2/src/main/webapp/css/resume.css 2012-06-03 19:26:50 UTC (rev 3417) @@ -0,0 +1,33 @@ +/* + * #%L + * Pollen :: UI (struts2) + * $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% + */ +.ui-widget-content-green { border: 1px solid #aaaaaa; background: #b0f580 url(images/ui-bg_flat_75_b0f580_40x100.png) 50% 50% repeat-x; color: #222222; } +.ui-widget-content-green a { color: #222222; } + +.ui-widget-content-yellow { border: 1px solid #aaaaaa; background: #ffffaa url(images/ui-bg_flat_75_ffffaa_40x100.png) 50% 50% repeat-x; color: #222222; } +.ui-widget-content-yellow a { color: #222222; } + +.ui-corner-all { + margin-top: 10px; + padding: 10px; +} + Property changes on: trunk/pollen-ui-struts2/src/main/webapp/css/resume.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0