From 369e698b0761a0c0abb460e92d680ae441374422 Mon Sep 17 00:00:00 2001 From: Matthias Andreas Benkard Date: Sun, 26 Apr 2020 13:14:21 +0200 Subject: KB54 Group posts by date, use floating to make style sheet even more compact. Change-Id: I41346eb51481d4c2c4e7066373fba5b7073e3e4f --- .../eu/mulk/mulkcms2/benki/posts/PostResource.java | 31 +++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) (limited to 'src/main/java/eu') diff --git a/src/main/java/eu/mulk/mulkcms2/benki/posts/PostResource.java b/src/main/java/eu/mulk/mulkcms2/benki/posts/PostResource.java index 92e2f4e..1fa7a26 100644 --- a/src/main/java/eu/mulk/mulkcms2/benki/posts/PostResource.java +++ b/src/main/java/eu/mulk/mulkcms2/benki/posts/PostResource.java @@ -61,11 +61,18 @@ public abstract class PostResource { private static final Logger log = Logger.getLogger(PostResource.class); - private static final DateTimeFormatter htmlDateFormatter = DateTimeFormatter.ISO_OFFSET_DATE_TIME; + private static final DateTimeFormatter htmlDateTimeFormatter = + DateTimeFormatter.ISO_OFFSET_DATE_TIME; - private static final DateTimeFormatter humanDateFormatter = + private static final DateTimeFormatter humanDateTimeFormatter = DateTimeFormatter.ofLocalizedDateTime(FormatStyle.LONG, FormatStyle.SHORT); + private static final DateTimeFormatter htmlDateFormatter = + DateTimeFormatter.ISO_LOCAL_DATE; + + private static final DateTimeFormatter humanDateFormatter = + DateTimeFormatter.ofLocalizedDate(FormatStyle.LONG); + private static final int pageKeyBytes = 32; protected static final JsonProvider jsonProvider = JsonProvider.provider(); @@ -331,12 +338,30 @@ public abstract class PostResource { if (x == null) { return null; } - return humanDateFormatter.format(x); + return humanDateTimeFormatter.format(x); } @TemplateExtension @CheckForNull static String htmlDateTime(@CheckForNull TemporalAccessor x) { + if (x == null) { + return null; + } + return htmlDateTimeFormatter.format(x); + } + + @TemplateExtension + @CheckForNull + static String humanDate(@CheckForNull TemporalAccessor x) { + if (x == null) { + return null; + } + return humanDateFormatter.format(x); + } + + @TemplateExtension + @CheckForNull + static String htmlDate(@CheckForNull TemporalAccessor x) { if (x == null) { return null; } -- cgit v1.2.3