From 6a1664d2fdf5de86d1309d6a1ca4cbb87fc10642 Mon Sep 17 00:00:00 2001 From: Gaetan Craig-Riou Date: Mon, 25 Sep 2023 14:08:02 +0200 Subject: [PATCH] Refactor "What's this" tooltip --- app/views/admin/enterprises/form/_address.html.haml | 2 +- .../admin/enterprises/form/_business_details.html.haml | 2 +- app/views/admin/enterprises/form/_contact.html.haml | 4 ++-- app/views/admin/enterprises/form/_permalink.html.haml | 6 +++--- .../admin/enterprises/form/_primary_details.html.haml | 8 ++++---- app/views/admin/enterprises/form/_users.html.haml | 8 ++++---- app/views/admin/shared/_whats_this_tooltip.html.haml | 1 + 7 files changed, 16 insertions(+), 15 deletions(-) create mode 100644 app/views/admin/shared/_whats_this_tooltip.html.haml diff --git a/app/views/admin/enterprises/form/_address.html.haml b/app/views/admin/enterprises/form/_address.html.haml index 6ce9fd1411..9d76513a3d 100644 --- a/app/views/admin/enterprises/form/_address.html.haml +++ b/app/views/admin/enterprises/form/_address.html.haml @@ -41,7 +41,7 @@ = af.label :latitude, t(:latitude) \/ = af.label :longitude, t(:longitude) - = render partial: 'admin/shared/tooltip', locals: {tooltip_text: t('latitude_longitude_tip')} + = render partial: 'admin/shared/whats_this_tooltip', locals: {tooltip_text: t('latitude_longitude_tip')} .four.columns = af.text_field :latitude, { placeholder: t(:latitude_placeholder) } .four.columns.omega diff --git a/app/views/admin/enterprises/form/_business_details.html.haml b/app/views/admin/enterprises/form/_business_details.html.haml index d91d19924f..30bef3ba2f 100644 --- a/app/views/admin/enterprises/form/_business_details.html.haml +++ b/app/views/admin/enterprises/form/_business_details.html.haml @@ -80,7 +80,7 @@ %legend= t('.invoice_item_sorting_legend') .three.columns.alpha %label= t('.sort_items_by_supplier?') - = render partial: 'admin/shared/tooltip', locals: {tooltip_text: t('.sort_items_by_supplier_tip')} + = render partial: 'admin/shared/whats_this_tooltip', locals: {tooltip_text: t('.sort_items_by_supplier_tip')} .three.columns = f.radio_button :preferred_invoice_order_by_supplier, true = f.label :preffered_invoice_order_by_supplier, t('.enabled'), value: :true diff --git a/app/views/admin/enterprises/form/_contact.html.haml b/app/views/admin/enterprises/form/_contact.html.haml index f8c3e75a9c..63080f7992 100644 --- a/app/views/admin/enterprises/form/_contact.html.haml +++ b/app/views/admin/enterprises/form/_contact.html.haml @@ -6,7 +6,7 @@ .row .alpha.three.columns = f.label :email_address, t('.email_address') - = render partial: 'admin/shared/tooltip', locals: {tooltip_text: t('.email_address_tip')} + = render partial: 'admin/shared/whats_this_tooltip', locals: {tooltip_text: t('.email_address_tip')} .omega.eight.columns = f.text_field :email_address, { placeholder: t('.email_address_placeholder') } @@ -18,7 +18,7 @@ .row .alpha.three.columns = f.label :whatsapp_phone, t('.whatsapp_phone') - = render partial: 'admin/shared/tooltip', locals: {tooltip_text: t('.whatsapp_phone_tip')} + = render partial: 'admin/shared/whats_this_tooltip', locals: {tooltip_text: t('.whatsapp_phone_tip')} .omega.eight.columns = f.text_field :whatsapp_phone, { placeholder: t('.whatsapp_phone_placeholder') } diff --git a/app/views/admin/enterprises/form/_permalink.html.haml b/app/views/admin/enterprises/form/_permalink.html.haml index 28867e9392..5c2a43a7b0 100644 --- a/app/views/admin/enterprises/form/_permalink.html.haml +++ b/app/views/admin/enterprises/form/_permalink.html.haml @@ -3,7 +3,7 @@ .row .three.columns.alpha = label_tag :permalink, t('.permalink') - = render partial: 'admin/shared/tooltip', locals: {tooltip_text: t('.permalink_tip', link: main_app.root_url)} + = render partial: 'admin/shared/whats_this_tooltip', locals: {tooltip_text: t('.permalink_tip', link: main_app.root_url)} .eight.columns = text_field_tag "enterprise[permalink]", @enterprise.permalink, data: { action: "input->permalink#validate", "permalink-target": "permalinkField" } .two.columns.omega @@ -20,13 +20,13 @@ .row .three.columns.alpha %label= t('.link_to_front') - = render partial: 'admin/shared/tooltip', locals: {tooltip_text: t('.link_to_front_tip')} + = render partial: 'admin/shared/whats_this_tooltip', locals: {tooltip_text: t('.link_to_front_tip')} .eight.columns.omega - front_shop_path = "#{main_app.root_url}#{@enterprise.permalink}/shop" = link_to front_shop_path, front_shop_path , target: "_blank" .row .three.columns.alpha = label_tag :id, t('.ofn_uid') - = render partial: 'admin/shared/tooltip', locals: {tooltip_text: t('.ofn_uid_tip')} + = render partial: 'admin/shared/whats_this_tooltip', locals: {tooltip_text: t('.ofn_uid_tip')} .six.columns = @enterprise.id diff --git a/app/views/admin/enterprises/form/_primary_details.html.haml b/app/views/admin/enterprises/form/_primary_details.html.haml index e4269c8475..04609e9b58 100644 --- a/app/views/admin/enterprises/form/_primary_details.html.haml +++ b/app/views/admin/enterprises/form/_primary_details.html.haml @@ -8,13 +8,13 @@ .row .three.columns.alpha = f.label :group_ids, t('.groups') - = render partial: 'admin/shared/tooltip', locals: {tooltip_text: t('.groups_tip')} + = render partial: 'admin/shared/whats_this_tooltip', locals: {tooltip_text: t('.groups_tip')} .eight.columns.omega = f.collection_select :group_ids, @groups, :id, :name, {}, data: { controller: "tom-select", "tom-select-options-value": { plugins: ['remove_button'], maxItems: nil } }, class: "full-width", multiple: true, placeholder: t('.groups_placeholder') .row .three.columns.alpha %label= t('.primary_producer') - = render partial: 'admin/shared/tooltip', locals: {tooltip_text: t('.primary_producer_tip')} + = render partial: 'admin/shared/whats_this_tooltip', locals: {tooltip_text: t('.primary_producer_tip')} .five.columns.omega = f.check_box :is_primary_producer, data: { action: "change->primary-details#primaryProducerChanged" } = f.label :is_primary_producer, t('.producer') @@ -22,7 +22,7 @@ .row .three.columns.alpha = f.label :sells, t('.sells') - = render partial: 'admin/shared/tooltip', locals: {tooltip_text: t('.sells_tip')} + = render partial: 'admin/shared/whats_this_tooltip', locals: {tooltip_text: t('.sells_tip')} .two.columns = f.radio_button :sells, "none", 'ng-model' => 'Enterprise.sells', data: {action: "change->primary-details#enterpriseSellsChanged"} = f.label :sells, t('.none'), value: "none" @@ -37,7 +37,7 @@ .row .three.columns.alpha %label= t('.visible_in_search') - = render partial: 'admin/shared/tooltip', locals: {tooltip_text: t('.visible_in_search_tip')} + = render partial: 'admin/shared/whats_this_tooltip', locals: {tooltip_text: t('.visible_in_search_tip')} .two.columns = f.radio_button :visible, "public", 'ng-model' => 'Enterprise.visible' = f.label :visible, t('.visible'), value: 'public' diff --git a/app/views/admin/enterprises/form/_users.html.haml b/app/views/admin/enterprises/form/_users.html.haml index 2579b35369..8d33a27132 100644 --- a/app/views/admin/enterprises/form/_users.html.haml +++ b/app/views/admin/enterprises/form/_users.html.haml @@ -6,7 +6,7 @@ =f.label :owner_id, t('.owner') - if full_permissions %span.required * - = render partial: 'admin/shared/tooltip', locals: {tooltip_text: t('.owner_tip')} + = render partial: 'admin/shared/whats_this_tooltip', locals: {tooltip_text: t('.owner_tip')} .eight.columns.omega - if full_permissions = f.hidden_field :owner_id, class: "select2 fullwidth", 'user-select' => 'Enterprise.owner', 'ng-model' => 'Enterprise.owner' @@ -18,7 +18,7 @@ =f.label :user_ids, t('.notifications') - if full_permissions %span.required * - = render partial: 'admin/shared/tooltip', locals: {tooltip_text: t('.contact_tip')} + = render partial: 'admin/shared/whats_this_tooltip', locals: {tooltip_text: t('.contact_tip')} .eight.columns.omega - if full_permissions %select.select2.fullwidth{id: 'receives_notifications_dropdown', name: 'receives_notifications', ng: {model: 'receivesNotifications', init: "receivesNotifications = '#{@enterprise.contact.id}'"}} @@ -32,7 +32,7 @@ =f.label :user_ids, t('.managers') - if full_permissions %span.required * - = render partial: 'admin/shared/tooltip', locals: {tooltip_text: t('.managers_tip')} + = render partial: 'admin/shared/whats_this_tooltip', locals: {tooltip_text: t('.managers_tip')} .eight.columns.omega - if full_permissions %table.managers @@ -63,7 +63,7 @@ .three.columns.alpha %label = t('.invite_manager') - = render partial: 'admin/shared/tooltip', locals: {tooltip_text: t('.invite_manager_tip')} + = render partial: 'admin/shared/whats_this_tooltip', locals: {tooltip_text: t('.invite_manager_tip')} .eight.columns.omega .row %a.button{ "data-controller": "help-modal-link", "data-action": "click->help-modal-link#open", "data-help-modal-link-target-value": "invite-manager-modal" } diff --git a/app/views/admin/shared/_whats_this_tooltip.html.haml b/app/views/admin/shared/_whats_this_tooltip.html.haml new file mode 100644 index 0000000000..d63fa41768 --- /dev/null +++ b/app/views/admin/shared/_whats_this_tooltip.html.haml @@ -0,0 +1 @@ += render partial: 'admin/shared/tooltip', locals: {link_class: "" ,link: nil, link_text: t('admin.whats_this'), tooltip_text: tooltip_text}