diff --git a/app/helpers/filters_helper.rb b/app/helpers/filters_helper.rb index 6c3f01725..e416a6b15 100644 --- a/app/helpers/filters_helper.rb +++ b/app/helpers/filters_helper.rb @@ -40,6 +40,10 @@ module FiltersHelper }, &block end + def filter_title(title) + tag.strong title, class: "popup__title", tabindex: (-1 if platform.mobile?), autofocus: platform.mobile? + end + def collapsible_nav_section(title, **properties, &block) tag.details class: "nav__section popup__section", data: { action: "toggle->nav-section-expander#toggle", nav_section_expander_target: "section", nav_section_expander_key_value: title.parameterize }, open: true, **properties do concat(tag.summary(class: "popup__section-title") do diff --git a/app/views/events/index/filter/_board.html.erb b/app/views/events/index/filter/_board.html.erb index aa09042f9..a9ce18724 100644 --- a/app/views/events/index/filter/_board.html.erb +++ b/app/views/events/index/filter/_board.html.erb @@ -16,7 +16,7 @@ <%= filter_dialog "Board…" do %> - <%= tag.strong "Board…", class: "popup__title", tabindex: (-1 if platform.mobile?), autofocus: platform.mobile? %> + <%= filter_title "Board…" %> <%= text_field_tag nil, nil, id: nil, placeholder: "Filter…", class: "input input--transparent txt-small font-weight-normal", autofocus: !platform.mobile?, type: "search", autocorrect: "off", autocomplete: "off", data: { "1p-ignore": "true", filter_target: "input", action: "input->filter#filter" } %> diff --git a/app/views/events/index/filter/_user.html.erb b/app/views/events/index/filter/_user.html.erb index d0f4dcaf8..cd372c2be 100644 --- a/app/views/events/index/filter/_user.html.erb +++ b/app/views/events/index/filter/_user.html.erb @@ -16,7 +16,7 @@ <%= filter_dialog "Person…" do %> - <%= tag.strong "Person…", class: "popup__title", tabindex: (-1 if platform.mobile?), autofocus: platform.mobile? %> + <%= filter_title "Person…" %> <%= text_field_tag nil, nil, id: nil, placeholder: "Filter…", class: "input input--transparent txt-small font-weight-normal", autofocus: !platform.mobile?, type: "search", autocorrect: "off", autocomplete: "off", data: { "1p-ignore": "true", filter_target: "input", action: "input->filter#filter" } %> diff --git a/app/views/filters/settings/_assignees.html.erb b/app/views/filters/settings/_assignees.html.erb index 31bfdd6b4..f5d4ba699 100644 --- a/app/views/filters/settings/_assignees.html.erb +++ b/app/views/filters/settings/_assignees.html.erb @@ -16,7 +16,7 @@ <%= filter_dialog "Assigned to…" do %> - <%= tag.strong "Assigned to…", class: "popup__title", tabindex: (-1 if platform.mobile?), autofocus: platform.mobile? %> + <%= filter_title "Assigned to…" %> <% if Current.account.users.active.many? %> <%= text_field_tag nil, nil, id: nil, placeholder: "Filter…", class: "input input--transparent txt-small", autofocus: !platform.mobile?, type: "search", autocorrect: "off", autocomplete: "off", data: { "1p-ignore": "true", filter_target: "input", action: "input->filter#filter" } %> diff --git a/app/views/filters/settings/_boards.html.erb b/app/views/filters/settings/_boards.html.erb index 8bab1c5aa..1991b48fa 100644 --- a/app/views/filters/settings/_boards.html.erb +++ b/app/views/filters/settings/_boards.html.erb @@ -17,7 +17,7 @@ <%= filter_dialog "Board…" do %> - <%= tag.strong "Board…", class: "popup__title", tabindex: (-1 if platform.mobile?), autofocus: platform.mobile? %> + <%= filter_title "Board…" %> <% if user_filtering.boards.many? %> <%= text_field_tag nil, nil, id: nil, placeholder: "Filter…", class: "input input--transparent txt-small", autofocus: !platform.mobile?, type: "search", autocorrect: "off", autocomplete: "off", data: { "1p-ignore": "true", filter_target: "input", action: "input->filter#filter" } %> diff --git a/app/views/filters/settings/_closers.html.erb b/app/views/filters/settings/_closers.html.erb index 03a1130df..0d17475c4 100644 --- a/app/views/filters/settings/_closers.html.erb +++ b/app/views/filters/settings/_closers.html.erb @@ -17,7 +17,7 @@ <%= filter_dialog "Closed by…" do %> - <%= tag.strong "Closed by…", class: "popup__title", tabindex: (-1 if platform.mobile?), autofocus: platform.mobile? %> + <%= filter_title "Closed by…" %> <% if user_filtering.users.many? %> <%= text_field_tag nil, nil, id: nil, placeholder: "Filter…", class: "input input--transparent txt-small", autofocus: !platform.mobile?, type: "search", autocorrect: "off", autocomplete: "off", data: { "1p-ignore": "true", filter_target: "input", action: "input->filter#filter" } %> diff --git a/app/views/filters/settings/_creators.html.erb b/app/views/filters/settings/_creators.html.erb index 3bab093b0..9ea872d78 100644 --- a/app/views/filters/settings/_creators.html.erb +++ b/app/views/filters/settings/_creators.html.erb @@ -17,7 +17,7 @@ <%= filter_dialog "Added by…" do %> - <%= tag.strong "Added by…", class: "popup__title", tabindex: (-1 if platform.mobile?), autofocus: platform.mobile? %> + <%= filter_title "Added by…" %> <% if user_filtering.users.many? %> <%= text_field_tag nil, nil, id: nil, placeholder: "Filter…", class: "input input--transparent txt-small", autofocus: !platform.mobile?, type: "search", autocorrect: "off", autocomplete: "off", data: { "1p-ignore": "true", filter_target: "input", action: "input->filter#filter" } %> diff --git a/app/views/filters/settings/_tags.html.erb b/app/views/filters/settings/_tags.html.erb index 1f81c6124..aa8989334 100644 --- a/app/views/filters/settings/_tags.html.erb +++ b/app/views/filters/settings/_tags.html.erb @@ -15,7 +15,7 @@ <%= filter_dialog "Tagged…" do %> - <%= tag.strong "Tagged…", class: "popup__title", tabindex: (-1 if platform.mobile?), autofocus: platform.mobile? %> + <%= filter_title "Tagged…" %> <% if user_filtering.tags.many? %> <%= text_field_tag nil, nil, id: nil, placeholder: "Filter…", class: "input input--transparent txt-small", autofocus: !platform.mobile?, type: "search", autocorrect: "off", autocomplete: "off", data: { "1p-ignore": "true", filter_target: "input", action: "input->filter#filter" } %>