From 3f8a26c6fb88757cd3f5646838c177e711fcab76 Mon Sep 17 00:00:00 2001 From: Matthias Andreas Benkard Date: Mon, 16 Mar 2020 11:13:54 +0100 Subject: Bookmarks: Add paging. Change-Id: Icd53dd04a74b94e1fa80f23703348070d598c413 --- .../resources/META-INF/resources/cms2/base.css | 34 +++++++++++- src/main/resources/application.properties | 1 + .../templates/benki/bookmarks/bookmarkList.html | 63 ++++++++++++++-------- 3 files changed, 75 insertions(+), 23 deletions(-) (limited to 'src/main/resources') diff --git a/src/main/resources/META-INF/resources/cms2/base.css b/src/main/resources/META-INF/resources/cms2/base.css index ec84ca9..61f447c 100644 --- a/src/main/resources/META-INF/resources/cms2/base.css +++ b/src/main/resources/META-INF/resources/cms2/base.css @@ -124,7 +124,18 @@ body > main { background-color: var(--main-bg-color); padding: 10px; border-left: 1px solid lightgray; - overflow: scroll; + overflow: auto; + + display: flex; + flex-direction: column; +} + +main > * { + margin-top: 0.5rem; +} + +main > *:first-child { + margin-top: 0; } body > footer { @@ -175,3 +186,24 @@ article.lazychat-message { #bookmark-submission textarea { min-width: calc(100% - 12em); } + +.paging { + display: flex; + flex-direction: row; + flex-wrap: wrap-reverse; +} + +.paging > .filler { + flex: 1; +} + +.paging > a { + flex-grow: 0; + flex-shrink: 1; + flex-basis: content; +} + +elix-expandable-section .expandable-section-title { + margin-top: 0; + margin-bottom: 0; +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 50423c0..b90cc9e 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -8,6 +8,7 @@ quarkus.log.level = INFO #quarkus.log.category."io.vertx.ext.jwt".level = FINEST mulkcms.tag-base = hub.benkard.de +mulkcms.bookmarks.default-max-results = 25 quarkus.datasource.driver = org.postgresql.Driver quarkus.datasource.max-size = 8 diff --git a/src/main/resources/templates/benki/bookmarks/bookmarkList.html b/src/main/resources/templates/benki/bookmarks/bookmarkList.html index 9b5025c..290cb26 100644 --- a/src/main/resources/templates/benki/bookmarks/bookmarkList.html +++ b/src/main/resources/templates/benki/bookmarks/bookmarkList.html @@ -1,5 +1,10 @@ {@java.util.List bookmarks} {@java.lang.Boolean authenticated} +{@java.lang.Boolean hasPreviousPage} +{@java.lang.Boolean hasNextPage} +{@java.lang.Integer previousCursor} +{@java.lang.Integer nextCursor} +{@java.lang.Integer pageSize} {#include base.html} @@ -9,40 +14,54 @@ {#head} -{/head} - -{#body} -{! #if authenticated !} +{/head} +{#body} + +{! #if authenticated !} -

+

{! /if !} -{#for bookmark in bookmarks} - {#with bookmark} -
-
-

{title}

-
- - {owner.firstName} {owner.lastName} -
-
- -
- {descriptionHtml.raw} -
-
- {/with} -{/for} +
+ {#if hasPreviousPage}⇠ previous page{/if} + + {#if hasNextPage}next page ⇢{/if} +
+ +
+ {#for bookmark in bookmarks} + {#with bookmark} +
+
+

{title}

+
+ + {owner.firstName} {owner.lastName} +
+
+ +
+ {descriptionHtml.raw} +
+
+ {/with} + {/for} +
+ +
+ {#if hasPreviousPage}⇠ previous page{/if} + + {#if hasNextPage}next page ⇢{/if} +
{/body} -- cgit v1.2.3