From 1c5600e13df6a031b83d307f8e5b3e8beb2a61c1 Mon Sep 17 00:00:00 2001 From: Maxime Bouveron Date: Wed, 11 Oct 2023 17:34:18 +0200 Subject: [PATCH 1/2] Add show description switch --- public/locales/en/translation.json | 2 +- public/locales/fr/translation.json | 2 +- src/modules/RA/DataLayer/components/tabs/DefinitionTab.js | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json index b71a4d03..fe8bb8bb 100644 --- a/public/locales/en/translation.json +++ b/public/locales/en/translation.json @@ -343,7 +343,6 @@ "started": "Started at", "ended": "Ended at" }, - "status": "Status", "refresh": { "accepted": "Refresh accepted", "notAllowed": "Refresh not possible" @@ -391,6 +390,7 @@ "view": "View", "ordering": "Ordering", "description": "Description", + "show-description": "Display description in layers tree", "interactions": "Interactions", "all-data-available": " All available data", "error-required": "This field is required", diff --git a/public/locales/fr/translation.json b/public/locales/fr/translation.json index 011fa295..9fab9f57 100644 --- a/public/locales/fr/translation.json +++ b/public/locales/fr/translation.json @@ -395,7 +395,6 @@ "started": "Commencée à", "ended": "Finie à" }, - "status": "Statut", "refresh": { "accepted": "Actualisation acceptée", "notAllowed": "Actualisation impossible" @@ -443,6 +442,7 @@ "view": "Vue", "ordering": "Classement", "description": "Description", + "show-description": "Afficher la description dans l'arbre des couches", "interactions": "Interactions", "all-data-available": " Toutes les données disponibles", "error-required": "Ce champ est requis", diff --git a/src/modules/RA/DataLayer/components/tabs/DefinitionTab.js b/src/modules/RA/DataLayer/components/tabs/DefinitionTab.js index 6e95fd63..4c905273 100644 --- a/src/modules/RA/DataLayer/components/tabs/DefinitionTab.js +++ b/src/modules/RA/DataLayer/components/tabs/DefinitionTab.js @@ -97,6 +97,11 @@ const DefinitionTab = ({ onSwitch, external }) => { fullWidth /> + + ); From 1d9d096cf212f88b50a906b4cfe17a08f03272cc Mon Sep 17 00:00:00 2001 From: Maxime Bouveron Date: Wed, 18 Oct 2023 18:08:55 +0200 Subject: [PATCH 2/2] Change legend default color --- .../RA/DataLayer/components/tabs/LegendTab/LegendField.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/RA/DataLayer/components/tabs/LegendTab/LegendField.js b/src/modules/RA/DataLayer/components/tabs/LegendTab/LegendField.js index fc4427d1..067a6ccf 100644 --- a/src/modules/RA/DataLayer/components/tabs/LegendTab/LegendField.js +++ b/src/modules/RA/DataLayer/components/tabs/LegendTab/LegendField.js @@ -66,7 +66,7 @@ const LegendItemInput = ({ source, parentSource }) => {
shape !== 'icon'}> {translate('datalayer.form.legend.shape')} - + {({ input: { onChange, value } }) => ( )} @@ -76,7 +76,7 @@ const LegendItemInput = ({ source, parentSource }) => { {translate('datalayer.form.legend.stroke')} {({ input: { onChange, value } }) => ( - + )}