Author: fdesbois Date: 2010-03-09 18:33:42 +0100 (Tue, 09 Mar 2010) New Revision: 2918 Log: Add messages and change text to display 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/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 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:10:25 UTC (rev 2917) +++ 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) @@ -65,28 +65,37 @@ log.debug("indexes from : " + getStartIndex() + " to " + getEndIndex()); log.debug("last page : " + getLastPage()); } - writer.element("div", "class", "p-pager"); - if (hasPrevious()) { - int previousPage = currentPage - 1; - if (previousPage != getFirstPage()) { - writeLink(writer, getFirstPage(), "<<", "p-pager-first"); + // If firstPage and lastPage are the same, no need to use the pager + if (getFirstPage() == getLastPage()) { + writer.write(messages.format("nb-elements", nbTotalRows)); + } else { + if (hasPrevious()) { + int previousPage = currentPage - 1; + if (previousPage != getFirstPage()) { + writeLink(writer, getFirstPage(), "<<", "p-pager-first"); + writer.write(" "); + } + writeLink(writer, previousPage, "<", "p-pager-previous"); writer.write(" "); } - writeLink(writer, previousPage, "<", "p-pager-previous"); - writer.write(" "); - } - writer.element("strong"); - writer.write(getFirstValue() + " - " + getLastValue() + " " + - messages.get("over") + " " + nbTotalRows); - writer.end(); - if (hasNext()) { - int nextPage = currentPage + 1; - writer.write(" "); - writeLink(writer, nextPage, ">", "p-pager-next"); - if (nextPage != getLastPage()) { + // Text display for current page + writer.element("span", "title", + messages.format("rows-title", + getFirstValue(), getLastValue(), nbTotalRows)); + writer.element("strong"); + writer.write(messages.format("page", currentPage)); + writer.end(); + writer.end(); + + if (hasNext()) { + int nextPage = currentPage + 1; writer.write(" "); - writeLink(writer, getLastPage(), ">>", "p-pager-last"); + writeLink(writer, nextPage, ">", "p-pager-next"); + if (nextPage != getLastPage()) { + writer.write(" "); + writeLink(writer, getLastPage(), ">>", "p-pager-last"); + } } } writer.end(); @@ -109,7 +118,8 @@ String text, String style) { Link link = resources.createEventLink(EventConstants.ACTION, new Object[] {index}); - writer.element("a", "href", link, "class", style); + String title = messages.format("go-to", index); + writer.element("a", "href", link, "class", style, "title", title); writer.write(text); writer.end(); } 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:10:25 UTC (rev 2917) +++ 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) @@ -1 +1,4 @@ -over=over \ No newline at end of file +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:10:25 UTC (rev 2917) +++ 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) @@ -1 +1,4 @@ -over=sur +page=Page %d +go-to=Aller \u00E0 la page %d +nb-elements=%d lignes trouv\u00E9es +rows-title=Lignes %d - %d sur %d