diff --git a/src/main/resources/templates/search/search.ftl b/src/main/resources/templates/search/search.ftl index 9f2dfa6ff6dda639c7615ba2894e4d1d7b1f7e51..f962e9df4e2441328d5c32a0cf2ea07207b02914 100644 --- a/src/main/resources/templates/search/search.ftl +++ b/src/main/resources/templates/search/search.ftl @@ -29,7 +29,7 @@ <input type="hidden" name="page" id="inputPageNumber" value="${page.getNumber()}"/> </form> - <@searchMacros.pagination page/> + <@searchMacros.pagination page "top"/> <div class="row search-container"> <div class="col s12"> @@ -77,6 +77,8 @@ </#if> </div> </div> + + <@searchMacros.pagination page "bottom"/> </@header.content> </div> </main> diff --git a/src/main/resources/templates/search/searchMacros.ftl b/src/main/resources/templates/search/searchMacros.ftl index e3ae3030d665e09af620a3fb0e43d8dfff712c7e..86378617149e0dff70980979f4541034b2c271b9 100644 --- a/src/main/resources/templates/search/searchMacros.ftl +++ b/src/main/resources/templates/search/searchMacros.ftl @@ -58,8 +58,8 @@ </div> </#macro> -<#macro pagination page> - <div class="row"> +<#macro pagination page position> + <div class="row pagination-position-${position}"> <div class="col s12 center-align"> <#if page.getTotalPages() gt 0> <ul class="pagination"> diff --git a/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/SearchTest.java b/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/SearchTest.java index e64b6e2f7e3803702e87aabfa933e42daaade27d..17eb2e0514cbe48c96d05f2be007ce0af41fe0c5 100644 --- a/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/SearchTest.java +++ b/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/SearchTest.java @@ -80,7 +80,7 @@ class SearchTest extends SeleniumTestBase void pagination() { // === PAGE 1 === - List<WebElement> pages = driver.findElements(By.cssSelector(".pagination li")); + List<WebElement> pages = driver.findElements(By.cssSelector(".pagination-position-top .pagination li")); assertThat(pages.size()).isEqualTo(5); assertThat(pages.get(0).getAttribute("class")).contains("disabled"); @@ -97,7 +97,7 @@ class SearchTest extends SeleniumTestBase // === PAGE 1 === pages.get(3).click(); - pages = driver.findElements(By.cssSelector(".pagination li")); + pages = driver.findElements(By.cssSelector(".pagination-position-top .pagination li")); assertThat(pages.size()).isEqualTo(5); // previous button should be enabled