From c2b92fd4f5d25b2dace597b950bde087dcd7faf2 Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Thu, 19 Jun 2025 20:42:11 -0500 Subject: [PATCH] DRY this up --- app/assets/stylesheets/popup.css | 6 ++++++ app/views/cards/assignments/new.html.erb | 2 +- app/views/cards/display/perma/_collection.html.erb | 2 +- app/views/cards/index/_closure_filter.html.erb | 2 +- app/views/cards/index/_collections_filter.html.erb | 2 +- app/views/cards/index/_header.html.erb | 12 ++++++------ app/views/cards/index/_workflow_filter.html.erb | 2 +- app/views/cards/show/_collections.html.erb | 2 +- app/views/cards/show/_header.html.erb | 8 ++++---- app/views/cards/taggings/new.html.erb | 2 +- app/views/events/_filter.html.erb | 10 +++++----- app/views/events/filter/_custom_collections.html.erb | 2 +- app/views/filters/_assignees.html.erb | 2 +- app/views/filters/_creators.html.erb | 2 +- app/views/filters/_indexed_by.html.erb | 2 +- app/views/filters/_stages.html.erb | 2 +- app/views/filters/_tags.html.erb | 2 +- 17 files changed, 34 insertions(+), 28 deletions(-) diff --git a/app/assets/stylesheets/popup.css b/app/assets/stylesheets/popup.css index 46a15941d..75ef7f5d3 100644 --- a/app/assets/stylesheets/popup.css +++ b/app/assets/stylesheets/popup.css @@ -122,6 +122,12 @@ } .popup__list { + display: flex; + flex-direction: column; + inline-size: 100%; + margin: 0; + max-inline-size: 100%; + padding: 0; row-gap: 2px; } diff --git a/app/views/cards/assignments/new.html.erb b/app/views/cards/assignments/new.html.erb index a5abad19c..9ab019cac 100644 --- a/app/views/cards/assignments/new.html.erb +++ b/app/views/cards/assignments/new.html.erb @@ -12,7 +12,7 @@ type: "search", autocorrect: "off", autocomplete: "off", data: { "1p-ignore": "true", filter_target: "input", action: "input->filter#filter" } %> <% end %> - <% end %> Tags -
+
<%= render partial: "events/filter/tag", collection: Tag.all.alphabetically, as: :tag %>
People -
+
<%= render partial: "events/filter/user", collection: User.active.alphabetically, as: :user %>
diff --git a/app/views/cards/taggings/new.html.erb b/app/views/cards/taggings/new.html.erb index ca0d0520b..2f4870998 100644 --- a/app/views/cards/taggings/new.html.erb +++ b/app/views/cards/taggings/new.html.erb @@ -13,7 +13,7 @@ autocomplete: "off", data: { filter_target: "input", action: "input->filter#filter" } %> <% end %> -
    +
      <% @tags.each do |tag| %>
    • <%= button_to card_taggings_path(@card, params: { tag_title: tag.title }), method: :post, diff --git a/app/views/events/_filter.html.erb b/app/views/events/_filter.html.erb index 7902655ed..a7d081afc 100644 --- a/app/views/events/_filter.html.erb +++ b/app/views/events/_filter.html.erb @@ -26,24 +26,24 @@ <%= render "events/filter/header" %> Collections - <%= form_with url: events_path, method: :get, class: "flex flex-column max-width popup__list full-width", + <%= form_with url: events_path, method: :get, class: "popup__list", data: { controller: "form" } do |form| %> <% if Current.user.collections.many? %> - +
        <%= render "events/filter/custom_collections" %> <%= render "events/filter/all_collections_option", form: form, filter: filter %> <%= render partial: "events/filter/collection_option", collection: Current.user.collections.alphabetically, as: :collection, locals: { form: form, filter: filter } %> -
      +
    <% end %> <% end %> Tags -
    +
    <%= render partial: "events/filter/tag", collection: Tag.all.alphabetically, as: :tag %>
    People -
    +
    <%= render partial: "events/filter/user", collection: User.active.alphabetically, as: :user %>
    diff --git a/app/views/events/filter/_custom_collections.html.erb b/app/views/events/filter/_custom_collections.html.erb index 591d6fdfa..26dad7da2 100644 --- a/app/views/events/filter/_custom_collections.html.erb +++ b/app/views/events/filter/_custom_collections.html.erb @@ -1,4 +1,4 @@ -
    +
    <% @filters.each do |filter| %>
    <%= link_to cards_path(**filter.as_params), class: "btn popup__new popup__item" do %> diff --git a/app/views/filters/_assignees.html.erb b/app/views/filters/_assignees.html.erb index eb2eca270..2b4d684ee 100644 --- a/app/views/filters/_assignees.html.erb +++ b/app/views/filters/_assignees.html.erb @@ -14,7 +14,7 @@ Assigned to… - <%= form_with url: cards_path, method: :get, class: "flex flex-column full-width popup__list", + <%= form_with url: cards_path, method: :get, class: "popup__list", data: { controller: "form" } do |form| %> <% filter.as_params.except(:assignee_ids, :assignment_status).each do |key, value| %> <%= filter_hidden_field_tag key, value %> diff --git a/app/views/filters/_creators.html.erb b/app/views/filters/_creators.html.erb index d6dbd31fa..5c9e48b83 100644 --- a/app/views/filters/_creators.html.erb +++ b/app/views/filters/_creators.html.erb @@ -15,7 +15,7 @@ aria-label="Added by…" aria-description="Added by…" data-dialog-target="dialog" data-action="turbo:before-cache@document->dialog#close"> Added by… - <%= form_with url: cards_path, method: :get, class: "flex flex-column full-width popup__list", + <%= form_with url: cards_path, method: :get, class: "popup__list", data: { controller: "form" } do |form| %> <% filter.as_params.except(:creator_ids).each do |key, value| %> <%= filter_hidden_field_tag key, value %> diff --git a/app/views/filters/_indexed_by.html.erb b/app/views/filters/_indexed_by.html.erb index b05f41557..bc87053b5 100644 --- a/app/views/filters/_indexed_by.html.erb +++ b/app/views/filters/_indexed_by.html.erb @@ -10,7 +10,7 @@ aria-label="Sort by…" aria-description="Sort by…" data-dialog-target="dialog" data-action="turbo:before-cache@document->dialog#close"> Sort by… - <%= form_with url: cards_path, method: :get, class: "flex flex-column full-width popup__list", + <%= form_with url: cards_path, method: :get, class: "popup__list", data: { controller: "form" } do |form| %> <% filter.as_params.except(:indexed_by).each do |key, value| %> <%= filter_hidden_field_tag key, value %> diff --git a/app/views/filters/_stages.html.erb b/app/views/filters/_stages.html.erb index d20e8fc86..db44cbd32 100644 --- a/app/views/filters/_stages.html.erb +++ b/app/views/filters/_stages.html.erb @@ -14,7 +14,7 @@ aria-label="In stage…" aria-description="In stage…" data-dialog-target="dialog" data-action="turbo:before-cache@document->dialog#close"> In stage… - <%= form_with url: cards_path, method: :get, class: "flex flex-column full-width popup__list", + <%= form_with url: cards_path, method: :get, class: "popup__list", data: { controller: "form" } do |form| %> <% filter.as_params.except(:stage_ids).each do |key, value| %> <%= filter_hidden_field_tag key, value %> diff --git a/app/views/filters/_tags.html.erb b/app/views/filters/_tags.html.erb index 3a9b35e6e..b3b964784 100644 --- a/app/views/filters/_tags.html.erb +++ b/app/views/filters/_tags.html.erb @@ -12,7 +12,7 @@ Tagged… - <%= form_with url: cards_path, method: :get, class: "flex flex-column full-width popup__list", + <%= form_with url: cards_path, method: :get, class: "popup__list", data: { controller: "form" } do |form| %> <% filter.as_params.except(:tag_ids).each do |key, value| %> <%= filter_hidden_field_tag key, value %>