diff --git a/app/assets/images/collection.svg b/app/assets/images/collection.svg
index 5d6249839..cdbe7d4da 100644
--- a/app/assets/images/collection.svg
+++ b/app/assets/images/collection.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/assets/stylesheets/events.css b/app/assets/stylesheets/events.css
index 28d6b7c80..42d129125 100644
--- a/app/assets/stylesheets/events.css
+++ b/app/assets/stylesheets/events.css
@@ -97,6 +97,17 @@
position: absolute;
}
+ .events__filter-select {
+ font-weight: inherit;
+ text-decoration: underline;
+
+ @media (any-hover: hover) {
+ &:hover {
+ --btn-color: var(--color-link);
+ }
+ }
+ }
+
.events__day {
position: relative;
diff --git a/app/helpers/pagination_helper.rb b/app/helpers/pagination_helper.rb
index ee665e98a..6c67400c7 100644
--- a/app/helpers/pagination_helper.rb
+++ b/app/helpers/pagination_helper.rb
@@ -54,8 +54,8 @@ module PaginationHelper
def day_timeline_pagination_link(day_timeline, filter)
if day_timeline.next_day
- link_to "Load more...", events_days_path(day: day_timeline.next_day.strftime("%Y-%m-%d"), **filter.as_params),
- data: { frame: day_timeline_pagination_frame_id_for(day_timeline.next_day), pagination_target: "paginationLink" }
+ link_to "Load more…", events_days_path(day: day_timeline.next_day.strftime("%Y-%m-%d"), **filter.as_params),
+ class: "txt-reversed", data: { frame: day_timeline_pagination_frame_id_for(day_timeline.next_day), pagination_target: "paginationLink" }
end
end
diff --git a/app/javascript/controllers/filter_settings_controller.js b/app/javascript/controllers/filter_settings_controller.js
index 7a207da80..6be549e5c 100644
--- a/app/javascript/controllers/filter_settings_controller.js
+++ b/app/javascript/controllers/filter_settings_controller.js
@@ -5,7 +5,7 @@ import { post } from "@rails/request.js"
export default class extends Controller {
static classes = ["filtersSet"]
static targets = ["field", "form"]
- static values = { refreshUrl: String, noFilteringUrl: String }
+ static values = { refreshUrl: String, noFilteringUrl: String, cardsUrl: String }
initialize() {
this.debouncedToggle = debounce(this.#toggle.bind(this), 50)
@@ -31,6 +31,12 @@ export default class extends Controller {
this.debouncedToggle()
}
+ submitToGenericCardsView() {
+ this.formTarget.action = this.cardsUrlValue
+ this.formTarget.dataset.turboFrame = "top"
+ this.formTarget.requestSubmit()
+ }
+
#toggle() {
this.element.classList.toggle(this.filtersSetClass, this.#hasFiltersSet)
}
diff --git a/app/javascript/controllers/multi_selection_combobox_controller.js b/app/javascript/controllers/multi_selection_combobox_controller.js
index 70a853b2b..80d7f0826 100644
--- a/app/javascript/controllers/multi_selection_combobox_controller.js
+++ b/app/javascript/controllers/multi_selection_combobox_controller.js
@@ -82,15 +82,14 @@ export default class extends Controller {
#clearHiddenFields() {
this.element.querySelectorAll('input[type="hidden"]').forEach(field => {
- if (field !== this.hiddenField) {
- field.remove()
- }
+ field.remove()
})
}
#addHiddenFields() {
this.#selectedValues().forEach(value => {
- const [field] = this.hiddenFieldTemplateTarget.content.cloneNode(true).children
+ const [ field ] = this.hiddenFieldTemplateTarget.content.cloneNode(true).children
+ field.removeAttribute("id")
field.value = value
this.element.appendChild(field)
})
diff --git a/app/models/card.rb b/app/models/card.rb
index 9175d6b96..c837c781a 100644
--- a/app/models/card.rb
+++ b/app/models/card.rb
@@ -22,7 +22,6 @@ class Card < ApplicationRecord
case index
when "stalled" then stalled
when "postponing_soon" then postponing_soon
- when "falling_back_soon" then falling_back_soon
when "closed" then closed.recently_closed_first
when "golden" then golden
when "draft" then drafted
diff --git a/app/models/filter/fields.rb b/app/models/filter/fields.rb
index fc11752fc..027ae8ac6 100644
--- a/app/models/filter/fields.rb
+++ b/app/models/filter/fields.rb
@@ -1,7 +1,7 @@
module Filter::Fields
extend ActiveSupport::Concern
- INDEXES = %w[ all stalled postponing_soon falling_back_soon golden draft ]
+ INDEXES = %w[ all stalled postponing_soon golden draft ]
SORTED_BY = %w[ newest oldest latest ]
delegate :default_value?, to: :class
diff --git a/app/models/user/filtering.rb b/app/models/user/filtering.rb
index 9f321bbed..6e00ecbc1 100644
--- a/app/models/user/filtering.rb
+++ b/app/models/user/filtering.rb
@@ -67,6 +67,10 @@ class User::Filtering
filter.closers.any?
end
+ def show_collections?
+ filter.collections.any?
+ end
+
def enable_collection_filtering(&block)
@collection_filtering_route_resolver = block
end
diff --git a/app/views/events/event/_layout.html.erb b/app/views/events/event/_layout.html.erb
index 63f8e696d..69a1560e6 100644
--- a/app/views/events/event/_layout.html.erb
+++ b/app/views/events/event/_layout.html.erb
@@ -1,9 +1,11 @@
<%= link_to event.notifiable_target,
class: "event event--#{ event.action } #{ "golden-effect" if event.card.golden? } center-block flex flex-column full-width align-start justify-start position-relative",
- style: "--card-color: #{ card.closed? ? "var(--color-card-complete)" : card.color };", target: "_top",
- data: { related_element_target: "related",
- related_element_group_value: card.id,
- action: "mouseover->related-element#highlight mouseout->related-element#unhighlight" } do %>
+ style: "--card-color: #{ card.closed? ? "var(--color-card-complete)" : card.color };",
+ target: "_top",
+ data: {
+ related_element_target: "related",
+ related_element_group_value: card.id,
+ action: "mouseover->related-element#highlight mouseout->related-element#unhighlight" } do %>