[isis] branch master updated: ISIS-3109: some visual improvements with time-zone badge rendering

[ahuber]

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/master by this push:
     new cfe91482d1 ISIS-3109: some visual improvements with time-zone badge 
rendering
cfe91482d1 is described below

commit cfe91482d1891c5e9de70d34fe5602e90647c7e4
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Wed Aug 3 11:19:27 2022 +0200

    ISIS-3109: some visual improvements with time-zone badge rendering
---
 .../core/metamodel/valuesemantics/temporal/BadgeRenderer.java | 11 ++++++-----
 .../temporal/TemporalValueSemanticsProvider.java              |  6 ++++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git 
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuesemantics/temporal/BadgeRenderer.java
 
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuesemantics/temporal/BadgeRenderer.java
index ef662ae5a6..d3acb51b44 100644
--- 
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuesemantics/temporal/BadgeRenderer.java
+++ 
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuesemantics/temporal/BadgeRenderer.java
@@ -27,7 +27,7 @@ import java.util.function.Supplier;
  */
 public interface BadgeRenderer {
 
-    String render(String text, Supplier<String> tooltipProvider);
+    String render(String text, Supplier<String> faIconProvider, 
Supplier<String> tooltipProvider);
 
     // -- FACTORIES
 
@@ -35,20 +35,21 @@ public interface BadgeRenderer {
      * non-html, text only; ignoring tooltip
      */
     public static BadgeRenderer textual() {
-        return (text, tooltipProvider)->text;
+        return (text, faIconProvider, tooltipProvider)->text;
     }
 
     /**
      * Depends on presence of <i>Bootstrap</i>.
      */
     public static BadgeRenderer bootstrapBadgeWithTooltip() {
-        return (text, tooltipProvider)->String.format("<span "
-                + "class=\"badge bg-secondary\" "
+        return (text, faIconProvider, tooltipProvider)->String.format("<span "
+                + "class=\"badge bg-light\" "
                 + "data-bs-container=\"body\" "
                 + "data-bs-toggle=\"tooltip\" "
                 + "title=\"%s\">"
+                + "<i class=\"%s\"></i>"
                 + "%s"
-                + "</span>", tooltipProvider.get(), text);
+                + "</span>", tooltipProvider.get(), faIconProvider.get(), 
text);
     }
 
 }
diff --git 
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuesemantics/temporal/TemporalValueSemanticsProvider.java
 
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuesemantics/temporal/TemporalValueSemanticsProvider.java
index 2463d5b59e..13b416698c 100644
--- 
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuesemantics/temporal/TemporalValueSemanticsProvider.java
+++ 
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuesemantics/temporal/TemporalValueSemanticsProvider.java
@@ -234,8 +234,9 @@ implements TemporalValueSemantics<T> {
                         sb.append(' ');
 
                         sb.append(badgeRenderer.render(
-                                translate("local"),
-                                ()->translate("time instant")
+                                "", // no text
+                                ()->"fa-solid fa-user-clock",
+                                ()->translate("Instant")
                                     + ": "
                                     + 
temporalNoZoneRenderingFormat.format(time)
                                     + " "
@@ -254,6 +255,7 @@ implements TemporalValueSemantics<T> {
 
                         sb.append(badgeRenderer.render(
                                 temporalZoneOnlyRenderingFormat.format(time),
+                                ()->"fa-solid fa-globe",
                                 ()->translate("your local time")
                                     + ": "
                                     + 
temporalNoZoneRenderingFormat.format(asLocalTime)));