From a2f46fcb4df46929b20699889201a3c26b68955e Mon Sep 17 00:00:00 2001 From: Arnaud Levy <contact@arnaudlevy.com> Date: Mon, 28 Feb 2022 09:22:12 +0100 Subject: [PATCH] partners loca --- .../blocks/templates/gallery/_edit.html.erb | 2 +- .../organization_chart/_edit.html.erb | 2 +- .../blocks/templates/partners/_edit.html.erb | 21 ++++++++++--------- config/locales/communication/en.yml | 10 +++++++++ config/locales/communication/fr.yml | 12 ++++++++++- 5 files changed, 34 insertions(+), 13 deletions(-) diff --git a/app/views/admin/communication/blocks/templates/gallery/_edit.html.erb b/app/views/admin/communication/blocks/templates/gallery/_edit.html.erb index a609cdc0d..4b087faa9 100644 --- a/app/views/admin/communication/blocks/templates/gallery/_edit.html.erb +++ b/app/views/admin/communication/blocks/templates/gallery/_edit.html.erb @@ -7,7 +7,7 @@ <div v-for="(image, imageIndex) in data.elements" class="col-xxl-2 col-xl-3 col-6"> <div class="card"> <div class="card-header border-bottom"> - <a class="btn ps-0 imageHandle"> + <a class="btn ps-0 pt-0 imageHandle"> <i class="fa fa-bars handle"></i> </a> <div class="float-end"> diff --git a/app/views/admin/communication/blocks/templates/organization_chart/_edit.html.erb b/app/views/admin/communication/blocks/templates/organization_chart/_edit.html.erb index 9a078be39..403421a77 100644 --- a/app/views/admin/communication/blocks/templates/organization_chart/_edit.html.erb +++ b/app/views/admin/communication/blocks/templates/organization_chart/_edit.html.erb @@ -7,7 +7,7 @@ <div v-for="(person, index) in data.elements" class="list-group-item"> <div class="d-flex"> <div> - <a class="btn ps-0 dragHandle" title="<%= t '.drag_title' %>"> + <a class="btn ps-0 pt-0 dragHandle" title="<%= t '.drag_title' %>"> <i class="fa fa-bars handle"></i> </a> </div> diff --git a/app/views/admin/communication/blocks/templates/partners/_edit.html.erb b/app/views/admin/communication/blocks/templates/partners/_edit.html.erb index 317f29c06..886167fa5 100644 --- a/app/views/admin/communication/blocks/templates/partners/_edit.html.erb +++ b/app/views/admin/communication/blocks/templates/partners/_edit.html.erb @@ -1,13 +1,13 @@ <a class="<%= button_classes('mb-4') %>" v-on:click="data.elements.push({name: '', url: '', logo: {}})"> - Add partner + <%= t '.add_partner' %> </a> <draggable :list="data.elements" class="list-group" handle=".partnerHandle"> <div v-for="(partner, index) in data.elements" class="list-group-item"> <div class="d-flex"> <div> - <a class="btn ps-0 partnerHandle"> + <a class="btn ps-0 pt-0 partnerHandle"> <i class="fa fa-bars handle"></i> </a> </div> @@ -15,22 +15,22 @@ <div class="row"> <div class="col-lg-4"> <label class="form-label" - :for="'partner-' + index + '-name'">Name</label> + :for="'partner-' + index + '-name'"><%= t '.partner_name_label' %></label> <input class="form-control mb-2" type="text" v-model="partner.name" - placeholder="Type partner's name here" + placeholder="<%= t '.partner_name_placeholder' %>" :id="'partner-' + index + '-name'"> </div> <div class="col-lg-4"> <label class="form-label" :for="'partner-' + index + '-url'"> - Url <small>(starting with https:// )</small> + <%= t '.partner_url_label' %> </label> <input class="form-control mb-2" type="text" v-model="partner.url" - placeholder="Type partner's url here" + placeholder="<%= t '.partner_url_placeholder' %>" :id="'partner-' + index + '-url'"> </div> <div class="col-lg-4"> @@ -38,7 +38,7 @@ <%# TODO : create a uploader vue3 component %> <label class="form-label" :for="'partner-' + index + '-logo'"> - Logo + <%= t '.partner_logo_label' %> </label> <input class="form-control mb-2" type="file" @@ -49,12 +49,12 @@ <div v-if="partner.logo.id"> <img :src="getImageUrl(partner.logo)" class="img-fluid" - style="max-height: 100px" + style="max-height: 80px" /> <a class="btn btn-sm btn-danger ms-2" v-on:click="partner.logo={}"> - Remove <i class="fas fa-times"></i> + <%= t '.remove_logo' %> </a> </div> </div> @@ -62,7 +62,8 @@ </div> <div> <a class="btn btn-sm btn-danger ms-3" - v-on:click="data.elements.splice(data.elements.indexOf(partner), 1)"> + v-on:click="data.elements.splice(data.elements.indexOf(partner), 1)" + title="<%= t '.remove_partner' %>"> <i class="fas fa-times"></i> </a> </div> diff --git a/config/locales/communication/en.yml b/config/locales/communication/en.yml index a86927cdb..3662fc35f 100644 --- a/config/locales/communication/en.yml +++ b/config/locales/communication/en.yml @@ -118,6 +118,16 @@ en: role_placeholder: Enter person's role drag_title: Drag and drop to organize persons delete_title: Remove person + partners: + edit: + add_partner: Add partner + partner_name_label: Partner + partner_name_placeholder: Enter partner's name + partner_url_label: Website + partner_url_placeholder: https:// + partner_image_label: Logo + remove_logo: Remove logo + remove_partner: Remove partner communication: authors: one: Author diff --git a/config/locales/communication/fr.yml b/config/locales/communication/fr.yml index 2717f3840..c3694a97e 100644 --- a/config/locales/communication/fr.yml +++ b/config/locales/communication/fr.yml @@ -113,11 +113,21 @@ fr: edit: add_person: Ajouter une personne person_label: Personne - person_placeholder: Choisir le personne + person_placeholder: Choisir la personne role_label: Rôle role_placeholder: Indiquer le rôle de la personne drag_title: Glisser-déposer pour organiser les personnes delete_title: Enlever la personne + partners: + edit: + add_partner: Ajouter un partenaire + partner_name_label: Partenaire + partner_name_placeholder: Entrer le nom du partenaire + partner_url_label: Site Web + partner_url_placeholder: https:// + partner_image_label: Logo + remove_logo: Enlever le logo + remove_partner: Enlever le partenaire communication: authors: one: Auteur·rice -- GitLab