Skip to content

Restore submit_tag for AA 3.x login button styling #8

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

Merged
Fivell merged 3 commits into from
Jun 2, 2026
Merged

Restore submit_tag for AA 3.x login button styling #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e05ec67
Restore submit_tag for AA 3.x login button styling
Fivell Jun 2, 2026
9d40c68
Lock AA v3 login button to <input type=submit> via spec
Fivell Jun 2, 2026
c77a23b
Apply the same v3 view fix to the install-generator template
Fivell Jun 2, 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
12 changes: 7 additions & 5 deletions app/views/active_admin/devise/sessions/new.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,12 @@
<div id="login">
<h2><%= active_admin_application.site_title(self) %></h2>

<%= button_to ActiveAdmin::Oidc.config.login_button_label,
"/admin/auth/oidc",
method: :post,
class: "activeadmin-oidc-login-button",
data: { turbo: false } %>
<%= form_tag "/admin/auth/oidc",
method: :post,
class: "activeadmin-oidc-login-form formtastic",
data: { turbo: false } do %>
<%= submit_tag ActiveAdmin::Oidc.config.login_button_label,
class: "activeadmin-oidc-login-button" %>
<% end %>
</div>
<% end %>
12 changes: 7 additions & 5 deletions lib/generators/active_admin/oidc/install/templates/sessions_new.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
<div id="login">
<h2><%%= active_admin_application.site_title(self) %></h2>

<%%= button_to ActiveAdmin::Oidc.config.login_button_label,
"/admin/auth/oidc",
method: :post,
class: "activeadmin-oidc-login-button",
data: { turbo: false } %>
<%%= form_tag "/admin/auth/oidc",
method: :post,
class: "activeadmin-oidc-login-form formtastic",
data: { turbo: false } do %>
<%%= submit_tag ActiveAdmin::Oidc.config.login_button_label,
class: "activeadmin-oidc-login-button" %>
<%% end %>
</div>
14 changes: 14 additions & 0 deletions spec/requests/login_page_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,18 @@

expect(response.body).to include(ActiveAdmin::Oidc::Configuration::DEFAULT_LOGIN_BUTTON_LABEL)
end

# Regression: AA v3's formtastic stylesheet targets
# `#login input[type="submit"]`, so a <button type="submit"> stays
# unstyled (defaults to the dark browser/AA button). Switching to
# button_to in the AA v3 branch silently regresses the themed blue
# SSO button to a dark default. Lock the v3 view to submit_tag.
it "renders the SSO button as an <input type=submit> on AA v3" do
skip "AA v4+ branch uses button_to with Tailwind classes" if ActiveAdmin::Oidc.aa_v4?

get "/admin/login"

expect(response.body).to match(/<input[^>]+type="submit"[^>]+value="[^"]*SSO[^"]*"/)
expect(response.body).not_to match(/<button[^>]+type="submit"/)
end
end
Loading