Merge remote-tracking branch 'origin/master'

Author: jpenren

src/main/java/org/thymeleaf/dialect/springdata/PaginationSortAttrProcessor.java

@@ -3,6 +3,7 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Sort;
 import org.thymeleaf.context.ITemplateContext;
+import org.thymeleaf.dialect.springdata.util.Expressions;
 import org.thymeleaf.dialect.springdata.util.PageUtils;
 import org.thymeleaf.dialect.springdata.util.Strings;
 import org.thymeleaf.engine.AttributeName;
@@ -25,7 +26,7 @@ public PaginationSortAttrProcessor(final String dialectPrefix) {
     protected void doProcess(ITemplateContext context, IProcessableElementTag tag, AttributeName attributeName,
             String attributeValue, IElementTagStructureHandler structureHandler) {
 
-        String attrValue = String.valueOf(attributeValue).trim();
+        String attrValue = String.valueOf(Expressions.evaluate(context, attributeValue)).trim();
         Page<?> page = PageUtils.findPage(context);
         String url = PageUtils.createSortUrl(context, attrValue);
 

src/main/resources/thymeleaf-spring-data-dialect/FullPaginationDecorator.properties

@@ -1,12 +1,12 @@
 #pagination {0}=class, {1}=firstPage, {2}=previousPage, {3}=links, {4}=nextPage, {5}=latestPage
 pagination=<ul class="{0}">{1}{2}{3}{4}{5}</ul>
-laquo=<li class="disabled"><span><span aria-hidden="true">&laquo;</span></span></li>
-laquo.link=<li><a href="{0}" aria-label="First"><span aria-hidden="true">&laquo;</span></a></li>
-previous.page=<li class="disabled"><span><span aria-hidden="true">&lsaquo;</span></span></li>
-previous.page.link=<li><a href="{0}" aria-label="Previous"><span aria-hidden="true">&lsaquo;</span></a></li>
-link=<li><a href="{0}">{1}</a></li>
-link.active=<li class="active"><span>{0}<span class="sr-only">(current)</span></span></li>
-next.page=<li class="disabled"><span><span aria-hidden="true">&rsaquo;</span></span></li>
-next.page.link=<li><a href="{0}" aria-label="Next"><span aria-hidden="true">&rsaquo;</span></a></li>
-raquo=<li class="disabled"><span><span aria-hidden="true">&raquo;</span></span></li>
-raquo.link=<li><a href="{0}" aria-label="Latest"><span aria-hidden="true">&raquo;</span></a></li>
+laquo=<li class="disabled page-item"><span class="page-link"><span aria-hidden="true">&laquo;</span></span></li>
+laquo.link=<li class="page-item"><a class="page-link" href="{0}" aria-label="First"><span aria-hidden="true">&laquo;</span></a></li>
+previous.page=<li class="disabled page-item"><span class="page-link"><span aria-hidden="true">&lsaquo;</span></span></li>
+previous.page.link=<li><a class="page-link" href="{0}" aria-label="Previous"><span aria-hidden="true">&lsaquo;</span></a></li>
+link=<li class="page-item"><a class="page-link" href="{0}">{1}</a></li>
+link.active=<li class="active page-item"><span class="page-link">{0}<span class="sr-only">(current)</span></span></li>
+next.page=<li class="disabled page-item"><span class="page-link"><span aria-hidden="true">&rsaquo;</span></span></li>
+next.page.link=<li class="page-item"><a class="page-link" href="{0}" aria-label="Next"><span aria-hidden="true">&rsaquo;</span></a></li>
+raquo=<li class="disabled page-item"><span class="page-link"><span aria-hidden="true">&raquo;</span></span></li>
+raquo.link=<li class="page-item"><a class="page-link" href="{0}" aria-label="Latest"><span aria-hidden="true">&raquo;</span></a></li>

src/main/resources/thymeleaf-spring-data-dialect/FullPaginationDecorator_de.properties

@@ -1,12 +1,12 @@
 #pagination {0}=class, {1}=firstPage, {2}=previousPage, {3}=links, {4}=nextPage, {5}=latestPage
 pagination=<ul class="{0}">{1}{2}{3}{4}{5}</ul>
-laquo=<li class="disabled"><span><span aria-hidden="true">&laquo;</span></span></li>
-laquo.link=<li><a href="{0}" aria-label="Erste Seite"><span aria-hidden="true">&laquo;</span></a></li>
-previous.page=<li class="disabled"><span><span aria-hidden="true">&lsaquo;</span></span></li>
-previous.page.link=<li><a href="{0}" aria-label="Vorherige Seite"><span aria-hidden="true">&lsaquo;</span></a></li>
-link=<li><a href="{0}">{1}</a></li>
-link.active=<li class="active"><span>{0}<span class="sr-only">(strom)</span></span></li>
-next.page=<li class="disabled"><span><span aria-hidden="true">&rsaquo;</span></span></li>
-next.page.link=<li><a href="{0}" aria-label="Nächste Seite"><span aria-hidden="true">&rsaquo;</span></a></li>
-raquo=<li class="disabled"><span><span aria-hidden="true">&raquo;</span></span></li>
-raquo.link=<li><a href="{0}" aria-label="Letzte Seite"><span aria-hidden="true">&raquo;</span></a></li>
+laquo=<li class="disabled page-item"><span class="page-link"><span aria-hidden="true">&laquo;</span></span></li>
+laquo.link=<li class="page-item"><a href="{0}"class="page-link" aria-label="Erste Seite"><span aria-hidden="true">&laquo;</span></a></li>
+previous.page=<li class="disabled page-item"><span class="page-link"><span aria-hidden="true">&lsaquo;</span></span></li>
+previous.page.link=<li class="page-item"><a href="{0}"class="page-link" aria-label="Vorherige Seite"><span aria-hidden="true">&lsaquo;</span></a></li>
+link=<li class="page-item"><a class="page-link" href="{0}">{1}</a></li>
+link.active=<li class="active"><span class="page-link">{0}<span class="sr-only">(strom)</span></span></li>
+next.page=<li class="disabled page-item"><span class="page-link"><span aria-hidden="true">&rsaquo;</span></span></li>
+next.page.link=<li class="page-item"><a href="{0}"class="page-link" aria-label="Nächste Seite"><span aria-hidden="true">&rsaquo;</span></a></li>
+raquo=<li class="disabled page-item"><span class="page-link"><span aria-hidden="true">&raquo;</span></span></li>
+raquo.link=<li class="page-item"><a href="{0}"class="page-link" aria-label="Letzte Seite"><span aria-hidden="true">&raquo;</span></a></li>

src/main/resources/thymeleaf-spring-data-dialect/FullPaginationDecorator_en.properties

@@ -1,12 +1,12 @@
 #pagination {0}=class, {1}=firstPage, {2}=previousPage, {3}=links, {4}=nextPage, {5}=latestPage
 pagination=<ul class="{0}">{1}{2}{3}{4}{5}</ul>
-laquo=<li class="disabled"><span><span aria-hidden="true">&laquo;</span></span></li>
-laquo.link=<li><a href="{0}" aria-label="First"><span aria-hidden="true">&laquo;</span></a></li>
-previous.page=<li class="disabled"><span><span aria-hidden="true">&lsaquo;</span></span></li>
-previous.page.link=<li><a href="{0}" aria-label="Previous"><span aria-hidden="true">&lsaquo;</span></a></li>
-link=<li><a href="{0}">{1}</a></li>
-link.active=<li class="active"><span>{0}<span class="sr-only">(current)</span></span></li>
-next.page=<li class="disabled"><span><span aria-hidden="true">&rsaquo;</span></span></li>
-next.page.link=<li><a href="{0}" aria-label="Next"><span aria-hidden="true">&rsaquo;</span></a></li>
-raquo=<li class="disabled"><span><span aria-hidden="true">&raquo;</span></span></li>
-raquo.link=<li><a href="{0}" aria-label="Latest"><span aria-hidden="true">&raquo;</span></a></li>
+laquo=<li class="disabled page-item"><span class="page-link"><span aria-hidden="true">&laquo;</span></span></li>
+laquo.link=<li class="page-item"><a class="page-link" href="{0}" aria-label="First"><span aria-hidden="true">&laquo;</span></a></li>
+previous.page=<li class="disabled page-item"><span class="page-link"><span aria-hidden="true">&lsaquo;</span></span></li>
+previous.page.link=<li><a class="page-link" href="{0}" aria-label="Previous"><span aria-hidden="true">&lsaquo;</span></a></li>
+link=<li class="page-item"><a class="page-link" href="{0}">{1}</a></li>
+link.active=<li class="active page-item"><span class="page-link">{0}<span class="sr-only">(current)</span></span></li>
+next.page=<li class="disabled page-item"><span class="page-link"><span aria-hidden="true">&rsaquo;</span></span></li>
+next.page.link=<li class="page-item"><a class="page-link" href="{0}" aria-label="Next"><span aria-hidden="true">&rsaquo;</span></a></li>
+raquo=<li class="disabled page-item"><span class="page-link"><span aria-hidden="true">&raquo;</span></span></li>
+raquo.link=<li class="page-item"><a class="page-link" href="{0}" aria-label="Latest"><span aria-hidden="true">&raquo;</span></a></li>

src/main/resources/thymeleaf-spring-data-dialect/FullPaginationDecorator_es.properties

@@ -1,12 +1,12 @@
 #pagination {0}=class, {1}=firstPage, {2}=previousPage, {3}=links, {4}=nextPage, {5}=latestPage
 pagination=<ul class="{0}">{1}{2}{3}{4}{5}</ul>
-laquo=<li class="disabled"><span><span aria-hidden="true">&laquo;</span></span></li>
-laquo.link=<li><a href="{0}" aria-label="Primera"><span aria-hidden="true">&laquo;</span></a></li>
-previous.page=<li class="disabled"><span><span aria-hidden="true">&lsaquo;</span></span></li>
-previous.page.link=<li><a href="{0}" aria-label="Anterior"><span aria-hidden="true">&lsaquo;</span></a></li>
-link=<li><a href="{0}">{1}</a></li>
-link.active=<li class="active"><span>{0}<span class="sr-only">(actual)</span></span></li>
-next.page=<li class="disabled"><span><span aria-hidden="true">&rsaquo;</span></span></li>
-next.page.link=<li><a href="{0}" aria-label="Siguiente"><span aria-hidden="true">&rsaquo;</span></a></li>
-raquo=<li class="disabled"><span><span aria-hidden="true">&raquo;</span></span></li>
-raquo.link=<li><a href="{0}" aria-label="Última"><span aria-hidden="true">&raquo;</span></a></li>
+laquo=<li class="disabled page-item"><span class="page-link"><span aria-hidden="true">&laquo;</span></span></li>
+laquo.link=<li class="page-item"><a href="{0}" class="page-link" aria-label="Primera"><span aria-hidden="true">&laquo;</span></a></li>
+previous.page=<li class="disabled page-item"><span class="page-link"><span aria-hidden="true">&lsaquo;</span></span></li>
+previous.page.link=<li class="page-item"><a href="{0}" class="page-link" aria-label="Anterior"><span aria-hidden="true">&lsaquo;</span></a></li>
+link=<li class="page-item"><a class="page-link" href="{0}">{1}</a></li>
+link.active=<li class="active page-item"><span class="page-link">{0}<span class="sr-only">(actual)</span></span></li>
+next.page=<li class="disabled page-item"><span class="page-link"><span aria-hidden="true">&rsaquo;</span></span></li>
+next.page.link=<li class="page-item"><a href="{0}" class="page-link" aria-label="Siguiente"><span aria-hidden="true">&rsaquo;</span></a></li>
+raquo=<li class="disabled page-item"><span class="page-link"><span aria-hidden="true">&raquo;</span></span></li>
+raquo.link=<li class="page-item"><a href="{0}" class="page-link" aria-label="Última"><span aria-hidden="true">&raquo;</span></a></li>

src/main/resources/thymeleaf-spring-data-dialect/FullPaginationDecorator_fr.properties

@@ -1,12 +1,12 @@
 #pagination {0}=class, {1}=firstPage, {2}=previousPage, {3}=links, {4}=nextPage, {5}=latestPage
 pagination=<ul class="{0}">{1}{2}{3}{4}{5}</ul>
-laquo=<li class="disabled"><span><span aria-hidden="true">&laquo;</span></span></li>
-laquo.link=<li><a href="{0}" aria-label="Première"><span aria-hidden="true">&laquo;</span></a></li>
-previous.page=<li class="disabled"><span><span aria-hidden="true">&lsaquo;</span></span></li>
-previous.page.link=<li><a href="{0}" aria-label="Précédent"><span aria-hidden="true">&lsaquo;</span></a></li>
-link=<li><a href="{0}">{1}</a></li>
-link.active=<li class="active"><span>{0}<span class="sr-only">(courant)</span></span></li>
-next.page=<li class="disabled"><span><span aria-hidden="true">&rsaquo;</span></span></li>
-next.page.link=<li><a href="{0}" aria-label="Prochain"><span aria-hidden="true">&rsaquo;</span></a></li>
-raquo=<li class="disabled"><span><span aria-hidden="true">&raquo;</span></span></li>
-raquo.link=<li><a href="{0}" aria-label="Dernier"><span aria-hidden="true">&raquo;</span></a></li>
+laquo=<li class="diabled page-item"><span class="page-link"><span aria-hidden="true">&laquo;</span></span></li>
+laquo.link=<li class="page-item"><a href="{0}" class="page-link" aria-label="Première"><span aria-hidden="true">&laquo;</span></a></li>
+previous.page=<li class="diabled page-item"><span class="page-link"><span aria-hidden="true">&lsaquo;</span></span></li>
+previous.page.link=<li class="page-item"><a href="{0}" class="page-link" aria-label="Précédent"><span aria-hidden="true">&lsaquo;</span></a></li>
+link=<li class="page-item"><a class="page-link" href="{0}">{1}</a></li>
+link.active=<li class="active page-item"><span class="page-link">{0}<span class="sr-only">(courant)</span></span></li>
+next.page=<li class="diabled page-item"><span class="page-link"><span aria-hidden="true">&rsaquo;</span></span></li>
+next.page.link=<li class="page-item"><a href="{0}" class="page-link" aria-label="Prochain"><span aria-hidden="true">&rsaquo;</span></a></li>
+raquo=<li class="diabled page-item"><span class="page-link"><span aria-hidden="true">&raquo;</span></span></li>
+raquo.link=<li class="page-item"><a href="{0}" class="page-link" aria-label="Dernier"><span aria-hidden="true">&raquo;</span></a></li>

src/main/resources/thymeleaf-spring-data-dialect/FullPaginationDecorator_gl_ES.properties

@@ -1,12 +1,12 @@
 #pagination {0}=class, {1}=firstPage, {2}=previousPage, {3}=links, {4}=nextPage, {5}=latestPage
 pagination=<ul class="{0}">{1}{2}{3}{4}{5}</ul>
-laquo=<li class="disabled"><span><span aria-hidden="true">&laquo;</span></span></li>
-laquo.link=<li><a href="{0}" aria-label="Primeira"><span aria-hidden="true">&laquo;</span></a></li>
-previous.page=<li class="disabled"><span><span aria-hidden="true">&lsaquo;</span></span></li>
-previous.page.link=<li><a href="{0}" aria-label="Anterior"><span aria-hidden="true">&lsaquo;</span></a></li>
-link=<li><a href="{0}">{1}</a></li>
-link.active=<li class="active"><span>{0}<span class="sr-only">(actual)</span></span></li>
-next.page=<li class="disabled"><span><span aria-hidden="true">&rsaquo;</span></span></li>
-next.page.link=<li><a href="{0}" aria-label="Seguinte"><span aria-hidden="true">&rsaquo;</span></a></li>
-raquo=<li class="disabled"><span><span aria-hidden="true">&raquo;</span></span></li>
-raquo.link=<li><a href="{0}" aria-label="Última"><span aria-hidden="true">&raquo;</span></a></li>
+laquo=<li class="disabled page-item"><span class="page-link"><span aria-hidden="true">&laquo;</span></span></li>
+laquo.link=<li class="page-item"><a href="{0}" class="page-link" aria-label="Primeira"><span aria-hidden="true">&laquo;</span></a></li>
+previous.page=<li class="disabled page-item"><span class="page-link"><span aria-hidden="true">&lsaquo;</span></span></li>
+previous.page.link=<li class="page-item"><a href="{0}" class="page-link" aria-label="Anterior"><span aria-hidden="true">&lsaquo;</span></a></li>
+link=<li class="page-item"><a class="page-link" href="{0}">{1}</a></li>
+link.active=<li class="active page-item"><span class="page-link">{0}<span class="sr-only">(actual)</span></span></li>
+next.page=<li class="disabled page-item"><span class="page-link"><span aria-hidden="true">&rsaquo;</span></span></li>
+next.page.link=<li class="page-item"><a href="{0}" class="page-link" aria-label="Seguinte"><span aria-hidden="true">&rsaquo;</span></a></li>
+raquo=<li class="disabled page-item"><span class="page-link"><span aria-hidden="true">&raquo;</span></span></li>
+raquo.link=<li class="page-item"><a href="{0}" class="page-link" aria-label="Última"><span aria-hidden="true">&raquo;</span></a></li>

src/main/resources/thymeleaf-spring-data-dialect/FullPaginationDecorator_it.properties

@@ -1,12 +1,12 @@
 #pagination {0}=class, {1}=firstPage, {2}=previousPage, {3}=links, {4}=nextPage, {5}=latestPage
 pagination=<ul class="{0}">{1}{2}{3}{4}{5}</ul>
-laquo=<li class="disabled"><span><span aria-hidden="true">&laquo;</span></span></li>
-laquo.link=<li><a href="{0}" aria-label="Prima"><span aria-hidden="true">&laquo;</span></a></li>
-previous.page=<li class="disabled"><span><span aria-hidden="true">&lsaquo;</span></span></li>
-previous.page.link=<li><a href="{0}" aria-label="Precedente"><span aria-hidden="true">&lsaquo;</span></a></li>
-link=<li><a href="{0}">{1}</a></li>
-link.active=<li class="active"><span>{0}<span class="sr-only">(corrente)</span></span></li>
-next.page=<li class="disabled"><span><span aria-hidden="true">&rsaquo;</span></span></li>
-next.page.link=<li><a href="{0}" aria-label="Prossimo"><span aria-hidden="true">&rsaquo;</span></a></li>
-raquo=<li class="disabled"><span><span aria-hidden="true">&raquo;</span></span></li>
-raquo.link=<li><a href="{0}" aria-label="Ultima"><span aria-hidden="true">&raquo;</span></a></li>
+laquo=<li class="disabled page-item"><span class="page-link"><span aria-hidden="true">&laquo;</span></span></li>
+laquo.link=<li class="page-item"><a href="{0}" class="page-link" aria-label="Prima"><span aria-hidden="true">&laquo;</span></a></li>
+previous.page=<li class="disabled page-item"><span class="page-link"><span aria-hidden="true">&lsaquo;</span></span></li>
+previous.page.link=<li class="page-item"><a href="{0}" class="page-link" aria-label="Precedente"><span aria-hidden="true">&lsaquo;</span></a></li>
+link=<li class="page-item"><a class="page-link" href="{0}">{1}</a></li>
+link.active=<li class="active page-item"><span class="page-link">{0}<span class="sr-only">(corrente)</span></span></li>
+next.page=<li class="disabled page-item"><span class="page-link"><span aria-hidden="true">&rsaquo;</span></span></li>
+next.page.link=<li class="page-item"><a href="{0}" class="page-link" aria-label="Prossimo"><span aria-hidden="true">&rsaquo;</span></a></li>
+raquo=<li class="disabled page-item"><span class="page-link"><span aria-hidden="true">&raquo;</span></span></li>
+raquo.link=<li class="page-item"><a href="{0}" class="page-link" aria-label="Ultima"><span aria-hidden="true">&raquo;</span></a></li>

src/main/resources/thymeleaf-spring-data-dialect/FullPaginationDecorator_pt.properties

@@ -1,12 +1,12 @@
 #pagination {0}=class, {1}=firstPage, {2}=previousPage, {3}=links, {4}=nextPage, {5}=latestPage
 pagination=<ul class="{0}">{1}{2}{3}{4}{5}</ul>
-laquo=<li class="disabled"><span><span aria-hidden="true">&laquo;</span></span></li>
-laquo.link=<li><a href="{0}" aria-label="Primeiro"><span aria-hidden="true">&laquo;</span></a></li>
-previous.page=<li class="disabled"><span><span aria-hidden="true">&lsaquo;</span></span></li>
-previous.page.link=<li><a href="{0}" aria-label="Anterior"><span aria-hidden="true">&lsaquo;</span></a></li>
-link=<li><a href="{0}">{1}</a></li>
-link.active=<li class="active"><span>{0}<span class="sr-only">(atual)</span></span></li>
-next.page=<li class="disabled"><span><span aria-hidden="true">&rsaquo;</span></span></li>
-next.page.link=<li><a href="{0}" aria-label="Próximo"><span aria-hidden="true">&rsaquo;</span></a></li>
-raquo=<li class="disabled"><span><span aria-hidden="true">&raquo;</span></span></li>
-raquo.link=<li><a href="{0}" aria-label="Última"><span aria-hidden="true">&raquo;</span></a></li>
+laquo=<li class="disabled page-item"><span class="page-link"><span aria-hidden="true">&laquo;</span></span></li>
+laquo.link=<li class="page-item"><a href="{0}" class="page-link" aria-label="Primeiro"><span aria-hidden="true">&laquo;</span></a></li>
+previous.page=<li class="disabled page-item"><span class="page-link"><span aria-hidden="true">&lsaquo;</span></span></li>
+previous.page.link=<li class="page-item"><a href="{0}" class="page-link" aria-label="Anterior"><span aria-hidden="true">&lsaquo;</span></a></li>
+link=<li class="page-item"><a class="page-link" href="{0}">{1}</a></li>
+link.active=<li class="active page-item"><span class="page-link">{0}<span class="sr-only">(atual)</span></span></li>
+next.page=<li class="disabled page-item"><span class="page-link"><span aria-hidden="true">&rsaquo;</span></span></li>
+next.page.link=<li class="page-item"><a href="{0}" class="page-link" aria-label="Próximo"><span aria-hidden="true">&rsaquo;</span></a></li>
+raquo=<li class="disabled page-item"><span class="page-link"><span aria-hidden="true">&raquo;</span></span></li>
+raquo.link=<li class="page-item"><a href="{0}" class="page-link" aria-label="Última"><span aria-hidden="true">&raquo;</span></a></li>