Skip to content

HOLD: Move New button into navbar as Create dropdown #1316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
maebeale wants to merge 2 commits into
base: main
Choose a base branch
from
Open

HOLD: Move New button into navbar as Create dropdown #1316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
154e941
Move New button into navbar as Create dropdown
maebeale Mar 3, 2026
670685c
Move mobile Create dropdown to top bar next to user nav
maebeale Mar 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 79 additions & 6 deletions app/views/shared/_navbar.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,7 @@
</div>

<div class="hidden grow md:ml-6 md:block content-center">
<div class="flex justify-between">
<%= render "shared/navbar_menu" %>
<% if user_signed_in? %>
<%= render "shared/navbar_new_button" %>
<% end %>
</div>
<%= render "shared/navbar_menu" %>
</div>
</div>

Expand All @@ -71,6 +66,84 @@
<% end %>

<div class="absolute inset-y-0 right-0 flex items-center pr-2 md:static md:inset-auto md:ml-6 md:pr-0">
<% if user_signed_in? %>
<div class="relative md:hidden mr-2" data-controller="dropdown">
<button
type="button"
class="flex items-center gap-1 rounded-md px-3 py-1 text-sm font-medium cursor-pointer
text-gray-300 hover:bg-white/5 hover:text-white"
data-action="dropdown#toggle"
data-dropdown-payload-param='[{"mobile-create-menu":"hidden"}]'>
<span class="text-base font-bold text-blue-400">+</span>
<span>Create</span>
</button>

<div
id="mobile-create-menu"
class="hidden absolute right-0 mt-2 w-60 rounded-md bg-white py-1 shadow-lg outline outline-black/5"
data-dropdown-target="content">

<%= link_to new_workshop_variation_idea_path,
class: "flex items-center gap-2 px-4 py-2 text-sm text-gray-700 hover:bg-gray-100" do %>
<i class="fas fa-layer-group"></i>
<span class="whitespace-nowrap">New workshop variation idea</span>
<% end %>

<% if allowed_to?(:new?, WorkshopIdea) %>
<div class="admin-only bg-blue-100">
<%= link_to new_workshop_idea_path,
class: "flex items-center gap-2 px-4 py-2 text-sm text-gray-700 hover:bg-gray-100" do %>
<i class="fas fa-lightbulb"></i>
<span>New workshop idea</span>
<% end %>
</div>
<% end %>

<%= link_to new_workshop_log_path,
class: "flex items-center gap-2 px-4 py-2 text-sm text-gray-700 hover:bg-gray-100" do %>
<i class="fas fa-clipboard-list"></i>
<span>New workshop log</span>
<% end %>

<%= link_to new_story_idea_path,
class: "flex items-center gap-2 px-4 py-2 text-sm text-gray-700 hover:bg-gray-100" do %>
<i class="fas fa-book-open"></i>
<span>New story idea</span>
<% end %>

<% if allowed_to?(:new?, Story) %>
<div class="admin-only bg-blue-100">
<%= link_to new_story_path,
class: "flex items-center gap-2 px-4 py-2 text-sm text-gray-700 hover:bg-gray-100" do %>
<i class="fas fa-book"></i>
<span>New story</span>
<% end %>
</div>
<% end %>

<% if allowed_to?(:new?, WorkshopVariation) %>
<div class="admin-only bg-blue-100">
<%= link_to new_workshop_variation_path,
class: "flex items-center gap-2 px-4 py-2 text-sm text-gray-700 hover:bg-gray-100" do %>
<i class="fas fa-swatchbook"></i>
<span>New workshop variation</span>
<% end %>
</div>
<% end %>

<% if allowed_to?(:new?, Workshop) %>
<div class="admin-only bg-blue-100">
<%= link_to new_workshop_path,
class: "flex items-center gap-2 px-4 py-2 text-sm text-gray-700 hover:bg-gray-100" do %>
<i class="fas fa-chalkboard-teacher"></i>
<span>New workshop</span>
<% end %>
</div>
<% end %>
</div>
</div>
<% end %>

<!-- Profile dropdown -->
<% if current_user %>
<%= render "shared/navbar_user" %>
Expand Down
79 changes: 79 additions & 0 deletions app/views/shared/_navbar_menu.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,85 @@
</div>
</div>

<% if user_signed_in? %>
<!-- CREATE -->
<div class="relative" data-controller="dropdown">
<button
type="button"
id="create_button"
class="flex items-center gap-1 rounded-md px-3 py-2 text-lg font-medium cursor-pointer
text-gray-300 hover:bg-white/5 hover:text-white"
data-action="dropdown#toggle"
data-dropdown-payload-param='[{"create_menu":"hidden"}]'>
Create
</button>

<div
id="create_menu"
class="hidden absolute left-0 mt-2 w-60 rounded-md bg-white py-1 shadow-lg outline outline-black/5"
data-dropdown-target="content">

<%= link_to new_workshop_variation_idea_path,
class: "flex items-center gap-2 px-4 py-2 text-sm text-gray-700 hover:bg-gray-100" do %>
<i class="fas fa-layer-group"></i>
<span class="whitespace-nowrap">New workshop variation idea</span>
<% end %>

<% if allowed_to?(:new?, WorkshopIdea) %>
<div class="admin-only bg-blue-100">
<%= link_to new_workshop_idea_path,
class: "flex items-center gap-2 px-4 py-2 text-sm text-gray-700 hover:bg-gray-100" do %>
<i class="fas fa-lightbulb"></i>
<span>New workshop idea</span>
<% end %>
</div>
<% end %>

<%= link_to new_workshop_log_path,
class: "flex items-center gap-2 px-4 py-2 text-sm text-gray-700 hover:bg-gray-100" do %>
<i class="fas fa-clipboard-list"></i>
<span>New workshop log</span>
<% end %>

<%= link_to new_story_idea_path,
class: "flex items-center gap-2 px-4 py-2 text-sm text-gray-700 hover:bg-gray-100" do %>
<i class="fas fa-book-open"></i>
<span>New story idea</span>
<% end %>

<% if allowed_to?(:new?, Story) %>
<div class="admin-only bg-blue-100">
<%= link_to new_story_path,
class: "flex items-center gap-2 px-4 py-2 text-sm text-gray-700 hover:bg-gray-100" do %>
<i class="fas fa-book"></i>
<span>New story</span>
<% end %>
</div>
<% end %>

<% if allowed_to?(:new?, WorkshopVariation) %>
<div class="admin-only bg-blue-100">
<%= link_to new_workshop_variation_path,
class: "flex items-center gap-2 px-4 py-2 text-sm text-gray-700 hover:bg-gray-100" do %>
<i class="fas fa-swatchbook"></i>
<span>New workshop variation</span>
<% end %>
</div>
<% end %>

<% if allowed_to?(:new?, Workshop) %>
<div class="admin-only bg-blue-100">
<%= link_to new_workshop_path,
class: "flex items-center gap-2 px-4 py-2 text-sm text-gray-700 hover:bg-gray-100" do %>
<i class="fas fa-chalkboard-teacher"></i>
<span>New workshop</span>
<% end %>
</div>
<% end %>
</div>
</div>
<% end %>

<!-- HELP -->
<div class="relative" data-controller="dropdown">
<button
Expand Down
83 changes: 0 additions & 83 deletions app/views/shared/_navbar_menu_mobile.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@
<span>FAQs</span>
<% end %>


<%= link_to contact_us_path, class: "flex items-center px-4 py-2 text-sm text-white
hover:text-gray-700 hover:bg-gray-100 w-full space-x-2" do %>
<i class="fas fa-envelope"></i>
Expand All @@ -119,87 +118,5 @@
</div>
</div>

<!-- New -->
<% if user_signed_in? %>
<div data-controller="dropdown">
<button
class="mobile-section flex justify-between w-full"
data-action="dropdown#toggle"
data-dropdown-payload-param='[{"mobile-new":"hidden"}]'>
New
<i class="fas fa-chevron-down" data-dropdown-target="arrow"></i>
</button>

<div id="mobile-new"
class="hidden flex flex-col pl-4 mt-1 mb-3 space-y-2"
data-dropdown-target="content">
<%= link_to new_workshop_variation_idea_path,
class: "flex items-center px-4 py-2 text-sm text-white
hover:text-gray-700 hover:bg-gray-100 w-full space-x-2" do %>
<i class="fas fa-layer-group"></i>
<span class="whitespace-nowrap">New workshop variation idea</span>
<% end %>

<% if allowed_to?(:new?, WorkshopIdea) %>
<div class="admin-only bg-blue-100">
<%= link_to new_workshop_idea_path,
class: "flex items-center px-4 py-2 text-sm text-white
hover:text-gray-700 hover:bg-gray-100 w-full space-x-2" do %>
<i class="fas fa-lightbulb"></i>
<span>New workshop idea</span>
<% end %>
</div>
<% end %>

<%= link_to new_workshop_log_path,
class: "flex items-center px-4 py-2 text-sm text-white
hover:text-gray-700 hover:bg-gray-100 w-full space-x-2" do %>
<i class="fas fa-clipboard-list"></i>
<span>New workshop log</span>
<% end %>

<%= link_to new_story_idea_path,
class: "flex items-center px-4 py-2 text-sm text-white
hover:text-gray-700 hover:bg-gray-100 w-full space-x-2" do %>
<i class="fas fa-book-open"></i>
<span>New story idea</span>
<% end %>

<% if allowed_to?(:new?, Story) %>
<div class="admin-only bg-blue-100">
<%= link_to new_story_path,
class: "flex items-center px-4 py-2 text-sm text-white
hover:text-gray-700 hover:bg-gray-100 w-full space-x-2" do %>
<i class="fas fa-book"></i>
<span>New story</span>
<% end %>
</div>
<% end %>

<% if allowed_to?(:new?, WorkshopVariation) %>
<div class="admin-only bg-blue-100">
<%= link_to new_workshop_variation_path,
class: "flex items-center px-4 py-2 text-sm text-white
hover:text-gray-700 hover:bg-gray-100 w-full space-x-2" do %>
<i class="fas fa-swatchbook"></i>
<span>New workshop variation</span>
<% end %>
</div>
<% end %>

<% if allowed_to?(:new?, Workshop) %>
<div class="admin-only bg-blue-100">
<%= link_to new_workshop_path,
class: "flex items-center px-4 py-2 text-sm text-white
hover:text-gray-700 hover:bg-gray-100 w-full space-x-2" do %>
<i class="fas fa-chalkboard-teacher"></i>
<span>New workshop</span>
<% end %>
</div>
<% end %>
</div>
</div>
<% end %>

</div>
</div>