Reorganize the main menu templates
The filter folder wasn't a good spot for this menu code anymore
This commit is contained in:
Jorge Manrubia
@@ -1,2 +1,2 @@
|
||||
<%= turbo_stream.replace("filter-settings-save-toggle", partial: "filters/filter_toggle", locals: { filter: @filter }) %>
|
||||
<%= turbo_stream.replace("my-filters", partial: "filters/menu/custom", locals: { filters: @filters }) %>
|
||||
<%= turbo_stream.replace("my-filters", partial: "my/menus/custom", locals: { filters: @filters }) %>
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
<%= turbo_stream.replace("filter-settings-save-toggle", partial: "filters/filter_toggle", locals: { filter: @filter }) %>
|
||||
<%= turbo_stream.replace("my-filters", partial: "filters/menu/custom", locals: { filters: @filters }) %>
|
||||
<%= turbo_stream.replace("my-filters", partial: "my/menus/custom", locals: { filters: @filters }) %>
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
<%= collapsible_nav_section "Tags" do %>
|
||||
<%= render partial: "filters/menu/tags/tag", collection: user_filtering.tags, as: :tag %>
|
||||
<% end %>
|
||||
@@ -1,3 +0,0 @@
|
||||
<%= collapsible_nav_section "People" do %>
|
||||
<%= render partial: "filters/menu/users/user", collection: user_filtering.users, as: :user %>
|
||||
<% end %>
|
||||
@@ -5,7 +5,7 @@
|
||||
<body data-controller="local-time timezone-cookie turbo-navigation" data-action="turbo:morph@window->local-time#refreshAll turbo:before-visit@document->turbo-navigation#rememberLocation">
|
||||
<header class="header <%= @header_class %>" id="header">
|
||||
<a href="#main" class="header__skip-navigation btn" data-turbo="false">Skip to main content</a>
|
||||
<%= render "filters/menu" if Current.user %>
|
||||
<%= render "my/menus/menu" if Current.user %>
|
||||
<%= yield :header %>
|
||||
</header>
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<%= tag.button class:"fizzy-menu-trigger input input--select center flex-inline align-center txt-normal",
|
||||
data: {
|
||||
action: "click->dialog#open:stop keydown.j@document->hotkey#click keydown.meta+j@document->hotkey#click keydown.ctrl+j@document->hotkey#click",
|
||||
controller: "hotkey" } do %>
|
||||
action: "click->dialog#open:stop keydown.j@document->hotkey#click keydown.meta+j@document->hotkey#click keydown.ctrl+j@document->hotkey#click",
|
||||
controller: "hotkey" } do %>
|
||||
<span><%= image_tag "logo.png" %></span>
|
||||
<strong class="txt-medium overflow-ellipsis margin-none">BOXCAR</strong>
|
||||
<% end %>
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
<% # Using method: :get inside Turbo frame triggers some special Turbo handling where the script_name is lost %>
|
||||
<% if user_filtering.collections.any? %>
|
||||
<%= collapsible_nav_section "Boards" do %>
|
||||
<%= render partial: "filters/menu/collections/collection", collection: user_filtering.collections, as: :collection %>
|
||||
<%= render partial: "my/menus/collections/collection", collection: user_filtering.collections, as: :collection %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
@@ -1,6 +1,6 @@
|
||||
<%= collapsible_nav_section "Saved filters", id: "my-filters" do %>
|
||||
<%= form_with url: cards_path, method: :get, data: { controller: "form" } do |form| %>
|
||||
<%= render "filters/menu/custom/create" %>
|
||||
<%= render partial: "filters/menu/custom/filter", collection: filters, as: :filter %>
|
||||
<%= render "my/menus/custom/create" %>
|
||||
<%= render partial: "my/menus/custom/filter", collection: filters, as: :filter %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
@@ -1,5 +1,5 @@
|
||||
<nav data-controller="dialog" data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside" data-turbo-permanent>
|
||||
<%= render "filters/menu/button" %>
|
||||
<%= render "my/menus/button" %>
|
||||
|
||||
<%= tag.dialog class: "fizzy-menu filter popup popup--animated panel margin-block-start-half",
|
||||
data: {
|
||||
@@ -0,0 +1,3 @@
|
||||
<%= collapsible_nav_section "Tags" do %>
|
||||
<%= render partial: "my/menus/tags/tag", collection: user_filtering.tags, as: :tag %>
|
||||
<% end %>
|
||||
@@ -0,0 +1,3 @@
|
||||
<%= collapsible_nav_section "People" do %>
|
||||
<%= render partial: "my/menus/users/user", collection: user_filtering.users, as: :user %>
|
||||
<% end %>
|
||||
@@ -21,18 +21,18 @@
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<%= render "filters/menu/hotkeys" %>
|
||||
<%= render "my/menus/hotkeys" %>
|
||||
|
||||
<div class="margin-block-start-half txt-x-small txt-align-center txt-subtle">
|
||||
BOXCAR is designed, built, and backed by <strong class="txt-nowrap"><%= icon_tag "37signals" %> <a href="https://37signals.com" target="_blank" class="txt-subtle">37signals</a>.</strong>
|
||||
</div>
|
||||
|
||||
<%= render "filters/menu/custom", filters: @user_filtering.filters %>
|
||||
<%= render "filters/menu/collections", user_filtering: @user_filtering %>
|
||||
<%= render "filters/menu/tags", user_filtering: @user_filtering %>
|
||||
<%= render "filters/menu/users", user_filtering: @user_filtering %>
|
||||
<%= render "filters/menu/places", user_filtering: @user_filtering %>
|
||||
<%= render "filters/menu/accounts", user_filtering: @user_filtering %>
|
||||
<%= render "my/menus/custom", filters: @user_filtering.filters %>
|
||||
<%= render "my/menus/collections", user_filtering: @user_filtering %>
|
||||
<%= render "my/menus/tags", user_filtering: @user_filtering %>
|
||||
<%= render "my/menus/users", user_filtering: @user_filtering %>
|
||||
<%= render "my/menus/places", user_filtering: @user_filtering %>
|
||||
<%= render "my/menus/accounts", user_filtering: @user_filtering %>
|
||||
|
||||
<%= render "filters/menu/shortcut_notice" %>
|
||||
<%= render "my/menus/shortcut_notice" %>
|
||||
<% end %>
|
||||
|
||||
Reference in New Issue
Block a user