From d07502f70f9ef86f5537e9afe2a6d17246637b00 Mon Sep 17 00:00:00 2001 From: vincent Date: Thu, 13 Oct 2022 18:50:53 +0200 Subject: [PATCH 1/2] (ui) Fix nav-tabs --- app/frontend/src/stylesheets/app.nav.scss | 13 +++++++++++++ app/frontend/templates/admin/trainings/index.html | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/app/frontend/src/stylesheets/app.nav.scss b/app/frontend/src/stylesheets/app.nav.scss index 1ddef5cfd..519645f96 100644 --- a/app/frontend/src/stylesheets/app.nav.scss +++ b/app/frontend/src/stylesheets/app.nav.scss @@ -527,6 +527,19 @@ } } +.nav { + &.nav-tabs { + display: flex; + & > li { + flex: 1; + width: auto; + display: block; + float: none; + a { height: 100%; } + } + } +} + // overrides bootstrap .nav-justified > li, .nav-tabs.nav-justified > li { cursor: pointer; diff --git a/app/frontend/templates/admin/trainings/index.html b/app/frontend/templates/admin/trainings/index.html index 48cae7e1e..a809c83eb 100644 --- a/app/frontend/templates/admin/trainings/index.html +++ b/app/frontend/templates/admin/trainings/index.html @@ -5,13 +5,13 @@ -
+

{{ 'app.admin.trainings.trainings_monitoring' }}

-
+
{{ 'app.admin.trainings.plan_session' }} From ee81ed3434ca12dcf16cfbdb1144fc22f8b13053 Mon Sep 17 00:00:00 2001 From: vincent Date: Fri, 14 Oct 2022 09:10:44 +0200 Subject: [PATCH 2/2] (i18n) Text update --- config/locales/app.admin.de.yml | 4 ++-- config/locales/app.admin.en.yml | 4 ++-- config/locales/app.admin.es.yml | 4 ++-- config/locales/app.admin.fr.yml | 4 ++-- config/locales/app.admin.no.yml | 4 ++-- config/locales/app.admin.pt.yml | 4 ++-- config/locales/app.admin.zu.yml | 4 ++-- config/locales/app.shared.de.yml | 2 +- config/locales/app.shared.en.yml | 2 +- config/locales/app.shared.es.yml | 2 +- config/locales/app.shared.fr.yml | 2 +- config/locales/app.shared.no.yml | 2 +- config/locales/app.shared.pt.yml | 2 +- config/locales/app.shared.zu.yml | 2 +- 14 files changed, 21 insertions(+), 21 deletions(-) diff --git a/config/locales/app.admin.de.yml b/config/locales/app.admin.de.yml index 6afd002b4..1a8ddd0ad 100644 --- a/config/locales/app.admin.de.yml +++ b/config/locales/app.admin.de.yml @@ -2028,9 +2028,9 @@ de: product_files: "Document" product_files_info: "Information
Add documents related to this product. They will be presented in the product sheet, in a separate block. You can only upload PDF documents." add_product_file: "Add a document" - product_images: "Pictures of the product" + product_images: "Visuals of the product" product_images_info: "Advice
We advise you to use a square format, JPG or PNG. For JPG, please use white for the background colour. The main visual will be the first presented in the product sheet." - add_product_image: "Add an image" + add_product_image: "Add a visual" save: "Save" clone: "Clone" product_stock_form: diff --git a/config/locales/app.admin.en.yml b/config/locales/app.admin.en.yml index 1c90fb23b..d8c8bf33e 100644 --- a/config/locales/app.admin.en.yml +++ b/config/locales/app.admin.en.yml @@ -2028,9 +2028,9 @@ en: product_files: "Document" product_files_info: "Information
Add documents related to this product. They will be presented in the product sheet, in a separate block. You can only upload PDF documents." add_product_file: "Add a document" - product_images: "Pictures of the product" + product_images: "Visuals of the product" product_images_info: "Advice
We advise you to use a square format, JPG or PNG. For JPG, please use white for the background colour. The main visual will be the first presented in the product sheet." - add_product_image: "Add an image" + add_product_image: "Add a visual" save: "Save" clone: "Clone" product_stock_form: diff --git a/config/locales/app.admin.es.yml b/config/locales/app.admin.es.yml index 9e32c8968..38df5fc9f 100644 --- a/config/locales/app.admin.es.yml +++ b/config/locales/app.admin.es.yml @@ -2028,9 +2028,9 @@ es: product_files: "Document" product_files_info: "Information
Add documents related to this product. They will be presented in the product sheet, in a separate block. You can only upload PDF documents." add_product_file: "Add a document" - product_images: "Pictures of the product" + product_images: "Visuals of the product" product_images_info: "Advice
We advise you to use a square format, JPG or PNG. For JPG, please use white for the background colour. The main visual will be the first presented in the product sheet." - add_product_image: "Add an image" + add_product_image: "Add a visual" save: "Save" clone: "Clone" product_stock_form: diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index 179131cf6..3c6c8486c 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -2028,9 +2028,9 @@ fr: product_files: "Document" product_files_info: "Informations
Ajouter des documents liés à ce produit. Ils seront présentés dans la fiche produit, dans un bloc séparé. Vous ne pouvez télécharger que des documents PDF." add_product_file: "Ajouter un document" - product_images: "Photos du produit" + product_images: "Visuels du produit" product_images_info: "Conseil
Nous vous conseillons d'utiliser un format carré, JPG ou PNG. Pour le JPG, veuillez utiliser le blanc pour la couleur de fond. Le visuel principal sera le premier présenté dans la fiche produit." - add_product_image: "Ajouter une image" + add_product_image: "Ajouter un visuel" save: "Enregistrer" clone: "Cloner" product_stock_form: diff --git a/config/locales/app.admin.no.yml b/config/locales/app.admin.no.yml index c11cc589c..a0e33269d 100644 --- a/config/locales/app.admin.no.yml +++ b/config/locales/app.admin.no.yml @@ -2028,9 +2028,9 @@ product_files: "Document" product_files_info: "Information
Add documents related to this product. They will be presented in the product sheet, in a separate block. You can only upload PDF documents." add_product_file: "Add a document" - product_images: "Pictures of the product" + product_images: "Visuals of the product" product_images_info: "Advice
We advise you to use a square format, JPG or PNG. For JPG, please use white for the background colour. The main visual will be the first presented in the product sheet." - add_product_image: "Add an image" + add_product_image: "Add a visual" save: "Save" clone: "Clone" product_stock_form: diff --git a/config/locales/app.admin.pt.yml b/config/locales/app.admin.pt.yml index 995158431..041242685 100644 --- a/config/locales/app.admin.pt.yml +++ b/config/locales/app.admin.pt.yml @@ -2028,9 +2028,9 @@ pt: product_files: "Document" product_files_info: "Information
Add documents related to this product. They will be presented in the product sheet, in a separate block. You can only upload PDF documents." add_product_file: "Add a document" - product_images: "Pictures of the product" + product_images: "Visuals of the product" product_images_info: "Advice
We advise you to use a square format, JPG or PNG. For JPG, please use white for the background colour. The main visual will be the first presented in the product sheet." - add_product_image: "Add an image" + add_product_image: "Add a visual" save: "Save" clone: "Clone" product_stock_form: diff --git a/config/locales/app.admin.zu.yml b/config/locales/app.admin.zu.yml index a819c4f62..590580fc2 100644 --- a/config/locales/app.admin.zu.yml +++ b/config/locales/app.admin.zu.yml @@ -2028,9 +2028,9 @@ zu: product_files: "crwdns30990:0crwdne30990:0" product_files_info: "crwdns30992:0crwdne30992:0" add_product_file: "crwdns30994:0crwdne30994:0" - product_images: "crwdns30996:0crwdne30996:0" + product_images: "crwdns31202:0crwdne31202:0" product_images_info: "crwdns30998:0crwdne30998:0" - add_product_image: "crwdns31000:0crwdne31000:0" + add_product_image: "crwdns31204:0crwdne31204:0" save: "crwdns31002:0crwdne31002:0" clone: "crwdns31178:0crwdne31178:0" product_stock_form: diff --git a/config/locales/app.shared.de.yml b/config/locales/app.shared.de.yml index 22f3971e8..551b3aa37 100644 --- a/config/locales/app.shared.de.yml +++ b/config/locales/app.shared.de.yml @@ -559,7 +559,7 @@ de: form_image_upload: browse: "Browse" edit: "Edit" - main_image: "Main image" + main_image: "Main visual" store: order_item: total: "Total" diff --git a/config/locales/app.shared.en.yml b/config/locales/app.shared.en.yml index f3c0607af..5b693e267 100644 --- a/config/locales/app.shared.en.yml +++ b/config/locales/app.shared.en.yml @@ -559,7 +559,7 @@ en: form_image_upload: browse: "Browse" edit: "Edit" - main_image: "Main image" + main_image: "Main visual" store: order_item: total: "Total" diff --git a/config/locales/app.shared.es.yml b/config/locales/app.shared.es.yml index b940d08df..c6ed0eae9 100644 --- a/config/locales/app.shared.es.yml +++ b/config/locales/app.shared.es.yml @@ -559,7 +559,7 @@ es: form_image_upload: browse: "Browse" edit: "Edit" - main_image: "Main image" + main_image: "Main visual" store: order_item: total: "Total" diff --git a/config/locales/app.shared.fr.yml b/config/locales/app.shared.fr.yml index 205813f22..963aa0cc7 100644 --- a/config/locales/app.shared.fr.yml +++ b/config/locales/app.shared.fr.yml @@ -559,7 +559,7 @@ fr: form_image_upload: browse: "Parcourir" edit: "Modifier" - main_image: "Image principale" + main_image: "Visuel principal" store: order_item: total: "Total" diff --git a/config/locales/app.shared.no.yml b/config/locales/app.shared.no.yml index 875b20dbe..b658b6e81 100644 --- a/config/locales/app.shared.no.yml +++ b/config/locales/app.shared.no.yml @@ -559,7 +559,7 @@ form_image_upload: browse: "Browse" edit: "Edit" - main_image: "Main image" + main_image: "Main visual" store: order_item: total: "Total" diff --git a/config/locales/app.shared.pt.yml b/config/locales/app.shared.pt.yml index d69b24793..6c414b3ef 100644 --- a/config/locales/app.shared.pt.yml +++ b/config/locales/app.shared.pt.yml @@ -559,7 +559,7 @@ pt: form_image_upload: browse: "Browse" edit: "Edit" - main_image: "Main image" + main_image: "Main visual" store: order_item: total: "Total" diff --git a/config/locales/app.shared.zu.yml b/config/locales/app.shared.zu.yml index 5d494c692..eaf1c0cc7 100644 --- a/config/locales/app.shared.zu.yml +++ b/config/locales/app.shared.zu.yml @@ -559,7 +559,7 @@ zu: form_image_upload: browse: "crwdns30424:0crwdne30424:0" edit: "crwdns30426:0crwdne30426:0" - main_image: "crwdns30428:0crwdne30428:0" + main_image: "crwdns31206:0crwdne31206:0" store: order_item: total: "crwdns30430:0crwdne30430:0"