diff --git a/app/assets/javascripts/banners.js.coffee b/app/assets/javascripts/banners.js.coffee index af4d4ada9..b136d19a0 100644 --- a/app/assets/javascripts/banners.js.coffee +++ b/app/assets/javascripts/banners.js.coffee @@ -7,13 +7,11 @@ App.Banners = $(selector).removeClass($(selector).attr("class"), true) .addClass(style, true) - update_background_color: (selector, text_selector, background_color) -> + update_background_color: (selector, background_color) -> $(selector).css("background-color", background_color) - $(text_selector).val(background_color) - update_font_color: (selector, text_selector, font_color) -> + update_font_color: (selector, font_color) -> $(selector).css("color", font_color) - $(text_selector).val(font_color) initialize: -> $("[data-js-banner-title]").on @@ -24,20 +22,11 @@ App.Banners = change: -> App.Banners.update_banner("#js-banner-description", $(this).val()) - $("#banner_background_color_picker").on + $("[name='banner[background_color]']").on change: -> - App.Banners.update_background_color("#js-banner-background", "#banner_background_color", $(this).val()) + App.Banners.update_background_color("#js-banner-background", $(this).val()) - $("#banner_background_color").on + $("[name='banner[font_color]']").on change: -> - App.Banners.update_background_color("#js-banner-background", "#banner_background_color_picker", $(this).val()) - - $("#banner_font_color_picker").on - change: -> - App.Banners.update_font_color("#js-banner-title", "#banner_font_color", $(this).val()) - App.Banners.update_font_color("#js-banner-description", "#banner_font_color", $(this).val()) - - $("#banner_font_color").on - change: -> - App.Banners.update_font_color("#js-banner-title", "#banner_font_color_picker", $(this).val()) - App.Banners.update_font_color("#js-banner-description", "#banner_font_color_picker", $(this).val()) + App.Banners.update_font_color("#js-banner-title", $(this).val()) + App.Banners.update_font_color("#js-banner-description", $(this).val()) diff --git a/app/assets/javascripts/forms.js.coffee b/app/assets/javascripts/forms.js.coffee index 2735b4830..34ea71916 100644 --- a/app/assets/javascripts/forms.js.coffee +++ b/app/assets/javascripts/forms.js.coffee @@ -26,9 +26,11 @@ App.Forms = synchronizeInputs: -> progress_bar = "[name='progress_bar[percentage]']" process_background = "[name='legislation_process[background_color]']" - process_font = "[name='legislation_process[font_color]']" + process_font = ", [name='legislation_process[font_color]']" + processes = process_background + process_font + banners = "[name='banner[background_color]'], [name='banner[font_color]']" - inputs = $("#{progress_bar}, #{process_background}, #{process_font}") + inputs = $("#{progress_bar}, #{processes}, #{banners}") inputs.on input: -> $("[name='#{this.name}']").val($(this).val()) diff --git a/app/helpers/banners_helper.rb b/app/helpers/banners_helper.rb index 3e78764a9..20f7ab93d 100644 --- a/app/helpers/banners_helper.rb +++ b/app/helpers/banners_helper.rb @@ -4,4 +4,20 @@ module BannersHelper @banners.present? && @banners.count > 0 end + def banner_default_bg_color + "#e7f2fc" + end + + def banner_default_font_color + "#222222" + end + + def banner_bg_color_or_default + @banner.background_color.present? ? @banner.background_color : banner_default_bg_color + end + + def banner_font_color_or_default + @banner.font_color.present? ? @banner.font_color : banner_default_font_color + end + end diff --git a/app/views/admin/banners/_form.html.erb b/app/views/admin/banners/_form.html.erb index 322bd17f4..5c878139e 100644 --- a/app/views/admin/banners/_form.html.erb +++ b/app/views/admin/banners/_form.html.erb @@ -64,15 +64,32 @@
-
- <%= f.label :sections, t("admin.banners.banner.background_color") %> - <%= color_field(:banner, :background_color, id: 'banner_background_color_picker') %> - <%= f.text_field :background_color, label: false %> +
+ <%= f.label :background_color, nil, for: "background_color_input" %> +

<%= t("admin.shared.color_help") %>

+
+
+ <%= f.text_field :background_color, label: false, type: :color, + value: banner_bg_color_or_default %> +
+
+ <%= f.text_field :background_color, label: false, id: "background_color_input" %> +
+
-
- <%= f.label :sections, t("admin.banners.banner.font_color") %> - <%= color_field(:banner, :font_color, id: 'banner_font_color_picker') %> - <%= f.text_field :font_color, label: false %> + +
+ <%= f.label :font_color, nil, for: "font_color_input" %> +

<%= t("admin.shared.color_help") %>

+
+
+ <%= f.text_field :font_color, label: false, type: :color, + value: banner_font_color_or_default %> +
+
+ <%= f.text_field :font_color, label: false, id: "font_color_input" %> +
+
@@ -80,11 +97,15 @@
<%= f.submit(class: "button expanded", value: t("admin.banners.edit.form.submit_button")) %>
-
- <% end %> diff --git a/app/views/admin/legislation/processes/_form.html.erb b/app/views/admin/legislation/processes/_form.html.erb index d5bdbaef5..7fbc5798f 100644 --- a/app/views/admin/legislation/processes/_form.html.erb +++ b/app/views/admin/legislation/processes/_form.html.erb @@ -193,7 +193,7 @@
<%= f.label :background_color, nil, for: "background_color_input" %> -

<%= t("admin.legislation.processes.form.color_help") %>

+

<%= t("admin.shared.color_help") %>

<%= f.text_field :background_color, label: false, type: :color, @@ -207,7 +207,7 @@
<%= f.label :font_color, nil, for: "font_color_input" %> -

<%= t("admin.legislation.processes.form.color_help") %>

+

<%= t("admin.shared.color_help") %>

<%= f.text_field :font_color, label: false, type: :color, value: font_color_or_default %> diff --git a/app/views/shared/_banner.html.erb b/app/views/shared/_banner.html.erb index eff05b46f..3a632b20b 100644 --- a/app/views/shared/_banner.html.erb +++ b/app/views/shared/_banner.html.erb @@ -1,7 +1,7 @@ <% banner = @banners.sample %> -