From 8cdf738bffc8e942c6179716d7b771751b91b929 Mon Sep 17 00:00:00 2001
From: Olivier Maury <Olivier.Maury@inrae.fr>
Date: Fri, 8 Mar 2024 13:00:08 +0100
Subject: [PATCH 1/2] =?UTF-8?q?Ajouter=20un=20ruban=20=C2=AB=20Version=20B?=
=?UTF-8?q?=C3=AAta=20=C2=BB.=20fixes=20#66?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../www/client/view/LayoutView.java | 10 +++++++++
.../agrometinfo/www/client/public/style.css | 21 +++++++++++++++++++
2 files changed, 31 insertions(+)
diff --git a/www-client/src/main/java/fr/agrometinfo/www/client/view/LayoutView.java b/www-client/src/main/java/fr/agrometinfo/www/client/view/LayoutView.java
index f69eb81..0b20040 100644
--- a/www-client/src/main/java/fr/agrometinfo/www/client/view/LayoutView.java
+++ b/www-client/src/main/java/fr/agrometinfo/www/client/view/LayoutView.java
@@ -44,6 +44,7 @@ import fr.agrometinfo.www.client.presenter.MapPresenter;
import fr.agrometinfo.www.client.presenter.RightPanelPresenter;
import fr.agrometinfo.www.client.ui.AgroclimAppsMenu;
import fr.agrometinfo.www.client.ui.DominoSelectBuilder;
+import fr.agrometinfo.www.client.util.ApplicationUtils;
import fr.agrometinfo.www.shared.dto.ChoiceDTO;
import fr.agrometinfo.www.shared.dto.FeatureLevel;
import fr.agrometinfo.www.shared.dto.IndicatorDTO;
@@ -224,6 +225,7 @@ public final class LayoutView extends AbstractBaseView<LayoutPresenter> implemen
layout.getRightPanel().css("agrometinfo-rightsidebar");
layout.getNavigationBar().css("agrometinfo-navbar");
+ initRibbon();
initTopBar();
initLeftPanel();
initFooter();
@@ -338,6 +340,14 @@ public final class LayoutView extends AbstractBaseView<LayoutPresenter> implemen
rightPanelPresenter.setContainer(layout.getRightPanel());
}
+ /**
+ * Init a ribbon with version.
+ */
+ private void initRibbon() {
+ final String version = ApplicationUtils.getVersion().replace("-SNAPSHOT", "…") + " β";
+ DomGlobal.document.body.append(Elements.span().css("ribbon").textContent(version).element());
+ }
+
private void initTopBar() {
GWT.log("LayoutView.initTopBar()");
diff --git a/www-client/src/main/resources/fr/agrometinfo/www/client/public/style.css b/www-client/src/main/resources/fr/agrometinfo/www/client/public/style.css
index 973afa9..10d45a2 100644
--- a/www-client/src/main/resources/fr/agrometinfo/www/client/public/style.css
+++ b/www-client/src/main/resources/fr/agrometinfo/www/client/public/style.css
@@ -182,6 +182,24 @@ details.card-details[open] > summary i {
background-color: white;
height: var(--logo-height);
}
+.ribbon {
+ color: white;
+ font-size: 12px;
+ font-weight: lighter;
+ text-align: center;
+ line-height: 25px;
+ letter-spacing: 1px;
+ width: 100px;
+ background: #78a22f;
+ position: fixed;
+ box-shadow: 0 0 3px rgba(0, 0, 0, 0.3);
+ top: 10px;
+ right: -30px;
+ left: auto;
+ transform: rotate(45deg);
+ -webkit-transform: rotate(45deg);
+ z-index: 5;
+}
#mapContainer .ol-attribution.ol-uncollapsible {
top: auto;
right: auto;
@@ -229,6 +247,9 @@ details.card-details[open] > summary i {
--logo-height: 50px;
}
@media screen and (max-width: 700px) {
+ .ribbon {
+ display: none;
+ }
:root {
--rightsidebar-padding: 1em;
--rightsidebar-width: 90%;
--
GitLab
From 3a80e4517a27101704cbd149830da3770dfd98b6 Mon Sep 17 00:00:00 2001
From: Olivier Maury <Olivier.Maury@inrae.fr>
Date: Fri, 8 Mar 2024 13:02:03 +0100
Subject: [PATCH 2/2] Empty-Commit
--
GitLab