Author: fdesbois Date: 2010-03-09 18:45:10 +0100 (Tue, 09 Mar 2010) New Revision: 2919 Log: Add parameter "noPagerText" to personalize text when no pager is needed Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Pager.java branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Pager_en.properties branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Pager_fr.properties branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/VoteForPoll_en.properties branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/VoteForPoll_fr.properties branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/webapp/poll/VoteForPoll.tml Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Pager.java =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Pager.java 2010-03-09 17:33:42 UTC (rev 2918) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Pager.java 2010-03-09 17:45:10 UTC (rev 2919) @@ -1,6 +1,7 @@ package org.chorem.pollen.ui.components; +import org.apache.tapestry5.BindingConstants; import org.apache.tapestry5.ComponentResources; import org.apache.tapestry5.EventConstants; import org.apache.tapestry5.Link; @@ -46,6 +47,9 @@ @Parameter(required = true) private int nbRowsPerPage; + @Parameter(defaultPrefix = BindingConstants.LITERAL) + private String noPagerText; + @Inject private ComponentResources resources; @@ -68,7 +72,7 @@ writer.element("div", "class", "p-pager"); // If firstPage and lastPage are the same, no need to use the pager if (getFirstPage() == getLastPage()) { - writer.write(messages.format("nb-elements", nbTotalRows)); + writer.write(noPagerText); } else { if (hasPrevious()) { int previousPage = currentPage - 1; Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java 2010-03-09 17:33:42 UTC (rev 2918) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java 2010-03-09 17:45:10 UTC (rev 2919) @@ -1185,6 +1185,10 @@ conf.getProperty(Configuration.PROP_NB_VOTES_PER_PAGE)); } + public String getNoPagerText() { + return messages.format("vote-noPagerText", poll.getNbVotes()); + } + /** * Retrieve votes of the current poll from business module. * The votes are ordered by creation date, only the ones to display are Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Pager_en.properties =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Pager_en.properties 2010-03-09 17:33:42 UTC (rev 2918) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Pager_en.properties 2010-03-09 17:45:10 UTC (rev 2919) @@ -1,4 +1,3 @@ page=Page %d go-to=Go to page %d -nb-elements=%d rows found rows-title=Rows %d - %d over %d \ No newline at end of file Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Pager_fr.properties =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Pager_fr.properties 2010-03-09 17:33:42 UTC (rev 2918) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Pager_fr.properties 2010-03-09 17:45:10 UTC (rev 2919) @@ -1,4 +1,3 @@ page=Page %d go-to=Aller \u00E0 la page %d -nb-elements=%d lignes trouv\u00E9es rows-title=Lignes %d - %d sur %d Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/VoteForPoll_en.properties =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/VoteForPoll_en.properties 2010-03-09 17:33:42 UTC (rev 2918) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/VoteForPoll_en.properties 2010-03-09 17:45:10 UTC (rev 2919) @@ -20,6 +20,7 @@ anonymousVote-label=Anonymous vote submitVote=Vote vote-success=Your vote has been correctly saved. +vote-noPagerText=%d existing votes. #choices addChoice=Adding a choice Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/VoteForPoll_fr.properties =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/VoteForPoll_fr.properties 2010-03-09 17:33:42 UTC (rev 2918) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/VoteForPoll_fr.properties 2010-03-09 17:45:10 UTC (rev 2919) @@ -20,6 +20,7 @@ anonymousVote-label=Vote anonyme submitVote=Voter vote-success=Votre vote a bien \u00E9t\u00E9 enregistr\u00E9 +vote-noPagerText=%d votes existants. #choices addChoice=Ajout d'un choix Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/webapp/poll/VoteForPoll.tml =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/webapp/poll/VoteForPoll.tml 2010-03-09 17:33:42 UTC (rev 2918) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/webapp/poll/VoteForPoll.tml 2010-03-09 17:45:10 UTC (rev 2919) @@ -50,7 +50,8 @@ <p>${voteSizeMessage}</p> <t:feedback t:id="voteFeedback"/> <p:else> - <t:pager t:nbRowsPerPage="nbVotesPerPage" t:nbTotalRows="poll.nbVotes" t:currentPage="page"/> + <t:pager t:nbRowsPerPage="nbVotesPerPage" t:nbTotalRows="poll.nbVotes" + t:currentPage="page" t:noPagerText="prop:noPagerText"/> </p:else> </t:if> <t:form t:id="voteForm" t:zone="pollZone">