From 1cb2f69786c888b7637fd572e149e7d274ff81da Mon Sep 17 00:00:00 2001
From: Sam Ruby <rubys@intertwingly.net>
Date: Sun, 4 Oct 2026 20:23:44 -0400
Subject: [PATCH] Compile the PWA help and account settings through Herb

Rails main compiles HTML templates through Herb under the 8.2 framework
defaults, which Campfire loads. Herb rejects `case` and its first `when`
in a single ERB tag, so the three pwa/ partials failed to compile, and
`herb:check` rejects ERB output in attribute names, which the account
settings' switch used for `checked`. Give `case` its own tag and build
the switch with tag.input; both render the same under Erubi.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
(cherry picked from commit 244e77241bd2d9e973f5a8dcca0cf8230f81176a)
---
 app/views/accounts/edit.html.erb             |  7 +++----
 app/views/pwa/_browser_settings.html.erb     |  4 ++--
 app/views/pwa/_install_instructions.html.erb |  4 ++--
 app/views/pwa/_system_settings.html.erb      |  4 ++--
 test/controllers/accounts_controller_test.rb | 10 ++++++++++
 test/controllers/rooms_controller_test.rb    | 15 +++++++++++++++
 6 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/app/views/accounts/edit.html.erb b/app/views/accounts/edit.html.erb
index cfa750d..f2d1ae8 100644
--- a/app/views/accounts/edit.html.erb
+++ b/app/views/accounts/edit.html.erb
@@ -76,10 +76,9 @@
         <% end %>
 
         <label class="switch">
-          <input type="checkbox"
-                class="switch__input"
-                <%= "checked" if Current.account.settings.restrict_room_creation_to_administrators? %>
-                data-action="change->form#submit">
+          <%= tag.input type: "checkbox", class: "switch__input",
+                checked: Current.account.settings.restrict_room_creation_to_administrators?,
+                data: { action: "change->form#submit" } %>
           <span class="switch__btn round"></span>
           <span class="for-screen-reader">
             Must be admin to create new rooms
diff --git a/app/views/pwa/_browser_settings.html.erb b/app/views/pwa/_browser_settings.html.erb
index 70144f1..985f6f1 100644
--- a/app/views/pwa/_browser_settings.html.erb
+++ b/app/views/pwa/_browser_settings.html.erb
@@ -6,8 +6,8 @@
       <%= image_tag "disclosure.svg", aria: { hidden: "true" }, size: 10, class: "disclosure" %>
     </summary>
 
-    <% case
-      when platform.firefox? && platform.android? %>
+    <% case %>
+      <% when platform.firefox? && platform.android? %>
         <ol>
           <li>Tap <em><%= image_tag "lock.svg", alt: "the View site information button", size: 20 %></em> in the address bar.</li>
           <li>Tap <em>Notification</em> to change to <em>Allowed</em>.</li>
diff --git a/app/views/pwa/_install_instructions.html.erb b/app/views/pwa/_install_instructions.html.erb
index b82ddb2..fcfe889 100644
--- a/app/views/pwa/_install_instructions.html.erb
+++ b/app/views/pwa/_install_instructions.html.erb
@@ -6,8 +6,8 @@
       <%= image_tag "disclosure.svg", aria: { hidden: "true" }, size: 10, class: "disclosure" %>
     </summary>
 
-    <% case
-      when platform.edge? %>
+    <% case %>
+      <% when platform.edge? %>
         <ol>
           <li>Click <em><%= image_tag "external/install-edge.svg", alt: "the app available - install Campfire chat button", size: 16 %></em>in the address bar.</li>
           <li>Click <em>Install</em>.</li>
diff --git a/app/views/pwa/_system_settings.html.erb b/app/views/pwa/_system_settings.html.erb
index 6c6dc7b..3edccda 100644
--- a/app/views/pwa/_system_settings.html.erb
+++ b/app/views/pwa/_system_settings.html.erb
@@ -5,8 +5,8 @@
     <%= image_tag "disclosure.svg", aria: { hidden: "true" }, size: 10, class: "disclosure" %>
   </summary>
 
-  <% case
-    when platform.firefox? && platform.android? %>
+  <% case %>
+    <% when platform.firefox? && platform.android? %>
       <ol>
         <li>Tap the <em><%= image_tag "menu-dots-vertical.svg", alt: "More options", size: 16 %></em> menu button.</li>
         <li>Tap <em>Settings</em>.</li>
diff --git a/test/controllers/accounts_controller_test.rb b/test/controllers/accounts_controller_test.rb
index 8292c6f..8cbe222 100644
--- a/test/controllers/accounts_controller_test.rb
+++ b/test/controllers/accounts_controller_test.rb
@@ -10,6 +10,16 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest
     assert_response :ok
   end
 
+  test "edit shows whether room creation is restricted to administrators" do
+    get edit_account_url
+    assert_select "label.switch input.switch__input[type=checkbox]:not([checked])"
+
+    accounts(:signal).update!(settings: { restrict_room_creation_to_administrators: true })
+
+    get edit_account_url
+    assert_select "label.switch input.switch__input[type=checkbox][checked][data-action='change->form#submit']"
+  end
+
   test "edit groups administrators separately from members with a divider" do
     get edit_account_url
 
diff --git a/test/controllers/rooms_controller_test.rb b/test/controllers/rooms_controller_test.rb
index 62edf72..dfba3bb 100644
--- a/test/controllers/rooms_controller_test.rb
+++ b/test/controllers/rooms_controller_test.rb
@@ -15,6 +15,21 @@ class RoomsControllerTest < ActionDispatch::IntegrationTest
     assert_response :success
   end
 
+  test "show renders notification help for each platform" do
+    {
+      "Firefox on Android" => "Mozilla/5.0 (Android 14; Mobile; rv:131.0) Gecko/131.0 Firefox/131.0",
+      "Chrome on Android" => "Mozilla/5.0 (Linux; Android 14; Pixel 8) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/141.0.0.0 Mobile Safari/537.36",
+      "Firefox on desktop" => "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:131.0) Gecko/20100101 Firefox/131.0",
+      "Chrome on desktop" => "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/141.0.0.0 Safari/537.36",
+      "Safari on macOS" => "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Safari/605.1.15"
+    }.each do |platform, user_agent|
+      get room_url(users(:david).rooms.last), headers: { "User-Agent" => user_agent }
+
+      assert_response :success, platform
+      assert_select ".notifications-help ol", { minimum: 1 }, platform
+    end
+  end
+
   test "shows records the last room visited in a cookie" do
     get room_url(users(:david).rooms.last)
     assert response.cookies[:last_room] = users(:david).rooms.last.id