From 1962fcc2a2884a2233d9058ec3e7f13c8dd22cb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Fri, 11 Jan 2019 09:30:33 +0100 Subject: [PATCH] Hide locale selector for primary progress bars These progress bars don't have any translatable attributes. --- app/assets/javascripts/forms.js.coffee | 2 ++ .../shared/_common_globalize_locales.html.erb | 34 ++++++++++--------- .../admin/shared/_globalize_tabs.html.erb | 2 +- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/app/assets/javascripts/forms.js.coffee b/app/assets/javascripts/forms.js.coffee index 3562335a4..65fe1d719 100644 --- a/app/assets/javascripts/forms.js.coffee +++ b/app/assets/javascripts/forms.js.coffee @@ -37,8 +37,10 @@ App.Forms = if this.value == "primary" title_field.hide() + $("#globalize_locales").hide() else title_field.show() + $("#globalize_locales").show() $("[name='progress_bar[kind]']").change() diff --git a/app/views/admin/shared/_common_globalize_locales.html.erb b/app/views/admin/shared/_common_globalize_locales.html.erb index b4633cde2..7b7e82821 100644 --- a/app/views/admin/shared/_common_globalize_locales.html.erb +++ b/app/views/admin/shared/_common_globalize_locales.html.erb @@ -1,18 +1,20 @@ -<% I18n.available_locales.each do |locale| %> -
- <%= link_to t("admin.translations.remove_language"), "#", - id: "js_delete_#{locale}", - style: display_translation_style(resource, locale), - class: 'delete js-delete-language', - data: { locale: locale } %> +
+ <% I18n.available_locales.each do |locale| %> +
+ <%= link_to t("admin.translations.remove_language"), "#", + id: "js_delete_#{locale}", + style: display_translation_style(resource, locale), + class: 'delete js-delete-language', + data: { locale: locale } %> +
+ <% end %> + + <%= render "admin/shared/globalize_tabs", resource: resource, display_style: display_style %> + +
+ <%= select_tag :translation_locale, + options_for_locale_select, + prompt: t("admin.translations.add_language"), + class: "js-globalize-locale" %>
-<% end %> - -<%= render "admin/shared/globalize_tabs", resource: resource, display_style: display_style %> - -
- <%= select_tag :translation_locale, - options_for_locale_select, - prompt: t("admin.translations.add_language"), - class: "js-globalize-locale" %>
diff --git a/app/views/admin/shared/_globalize_tabs.html.erb b/app/views/admin/shared/_globalize_tabs.html.erb index 15ed0ff09..9b9fc81af 100644 --- a/app/views/admin/shared/_globalize_tabs.html.erb +++ b/app/views/admin/shared/_globalize_tabs.html.erb @@ -1,4 +1,4 @@ -
    +
      <% I18n.available_locales.each do |locale| %>
    • <%= link_to name_for_locale(locale), "#",