From 154e9419fd121f8266b330ab8b1b64c902abe1a6 Mon Sep 17 00:00:00 2001
From: maebeale <maebeale@users.noreply.github.com>
Date: Tue, 3 Mar 2026 07:46:36 -0500
Subject: [PATCH 1/2] Move New button into navbar as Create dropdown

The standalone "New" button is replaced with a "Create" dropdown
that sits alongside the other nav items (Curriculum, Community,
Create, Help), giving it a consistent look and placement.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 app/views/shared/_navbar.html.erb             |  7 +-
 app/views/shared/_navbar_menu.html.erb        | 79 ++++++++++++++++++
 app/views/shared/_navbar_menu_mobile.html.erb | 83 +++++++++----------
 3 files changed, 121 insertions(+), 48 deletions(-)

diff --git a/app/views/shared/_navbar.html.erb b/app/views/shared/_navbar.html.erb
index 5428fb550..dbbe1e1a8 100644
--- a/app/views/shared/_navbar.html.erb
+++ b/app/views/shared/_navbar.html.erb
@@ -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>
 
diff --git a/app/views/shared/_navbar_menu.html.erb b/app/views/shared/_navbar_menu.html.erb
index a1721b231..ec6dd6433 100644
--- a/app/views/shared/_navbar_menu.html.erb
+++ b/app/views/shared/_navbar_menu.html.erb
@@ -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
diff --git a/app/views/shared/_navbar_menu_mobile.html.erb b/app/views/shared/_navbar_menu_mobile.html.erb
index c6f0fecfa..7b0edff52 100644
--- a/app/views/shared/_navbar_menu_mobile.html.erb
+++ b/app/views/shared/_navbar_menu_mobile.html.erb
@@ -79,54 +79,14 @@
       </div>
     </div>
 
-    <!-- Help -->
-    <div data-controller="dropdown">
-      <button
-        class="mobile-section flex justify-between w-full"
-        data-action="dropdown#toggle"
-        data-dropdown-payload-param='[{"mobile-help":"hidden"}]'>
-        Help
-        <i class="fas fa-chevron-down" data-dropdown-target="arrow"></i>
-      </button>
-
-      <div id="mobile-help"
-           class="hidden flex flex-col pl-4 mt-1 mb-3 space-y-2"
-           data-dropdown-target="content">
-        <%= link_to faqs_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-question-circle"></i>
-          <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>
-          <span>Contact us</span>
-        <% end %>
-
-        <%= link_to tutorials_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-circle-play"></i>
-          <span><%= Tutorial.model_name.human(count: 2) %></span>
-        <% end %>
-
-        <%= link_to "https://www.awbw.org", target: "_blank", 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-globe"></i>
-          <span>Public website</span>
-        <% end %>
-      </div>
-    </div>
-
-    <!-- New -->
+    <!-- Create -->
     <% 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
+        Create
         <i class="fas fa-chevron-down" data-dropdown-target="arrow"></i>
       </button>
 
@@ -201,5 +161,44 @@
     </div>
     <% end %>
 
+    <!-- Help -->
+    <div data-controller="dropdown">
+      <button
+        class="mobile-section flex justify-between w-full"
+        data-action="dropdown#toggle"
+        data-dropdown-payload-param='[{"mobile-help":"hidden"}]'>
+        Help
+        <i class="fas fa-chevron-down" data-dropdown-target="arrow"></i>
+      </button>
+
+      <div id="mobile-help"
+           class="hidden flex flex-col pl-4 mt-1 mb-3 space-y-2"
+           data-dropdown-target="content">
+        <%= link_to faqs_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-question-circle"></i>
+          <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>
+          <span>Contact us</span>
+        <% end %>
+
+        <%= link_to tutorials_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-circle-play"></i>
+          <span><%= Tutorial.model_name.human(count: 2) %></span>
+        <% end %>
+
+        <%= link_to "https://www.awbw.org", target: "_blank", 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-globe"></i>
+          <span>Public website</span>
+        <% end %>
+      </div>
+    </div>
+
   </div>
 </div>

From 670685c72a74c4bab4da028c335988979ace1418 Mon Sep 17 00:00:00 2001
From: maebeale <maebeale@users.noreply.github.com>
Date: Tue, 3 Mar 2026 07:48:26 -0500
Subject: [PATCH 2/2] Move mobile Create dropdown to top bar next to user nav
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Instead of burying Create in the hamburger menu, show it as a
compact dropdown button in the mobile top bar to the left of the
user avatar — matching its original placement as the New button.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 app/views/shared/_navbar.html.erb             | 78 ++++++++++++++++++
 app/views/shared/_navbar_menu_mobile.html.erb | 82 -------------------
 2 files changed, 78 insertions(+), 82 deletions(-)

diff --git a/app/views/shared/_navbar.html.erb b/app/views/shared/_navbar.html.erb
index dbbe1e1a8..a63ecf314 100644
--- a/app/views/shared/_navbar.html.erb
+++ b/app/views/shared/_navbar.html.erb
@@ -66,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" %>
diff --git a/app/views/shared/_navbar_menu_mobile.html.erb b/app/views/shared/_navbar_menu_mobile.html.erb
index 7b0edff52..22700c1e0 100644
--- a/app/views/shared/_navbar_menu_mobile.html.erb
+++ b/app/views/shared/_navbar_menu_mobile.html.erb
@@ -79,88 +79,6 @@
       </div>
     </div>
 
-    <!-- Create -->
-    <% 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"}]'>
-        Create
-        <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 %>
-
     <!-- Help -->
     <div data-controller="dropdown">
       <button