scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 14:45:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7669 from rekonder/aj_SCI_10828

Browse source 
Fix disclaimer modal for sso [SCI-10828]
This commit is contained in:
ajugo 2024-07-01 10:22:11 +02:00 committed by GitHub
parent a2efba009a aaf1adafc0
commit 37302250d7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/users/login_disclaimer.js
View file

@ -14,6 +14,8 @@
initDisclaimer('.log-in-button', '#new_user');
initDisclaimer('.btn-okta', '#oktaForm');
initDisclaimer('.btn-azure-ad', '.azureAdForm');
initDisclaimer('.btn-openid-connect', '#openidConnectForm');
initDisclaimer('.btn-saml', '#samlForm');
initDisclaimer('.sign-up-button', '#sign-up-form');
initDisclaimer('.forgot-password-submit', '#forgot-password-form');
initDisclaimer('.invitation-submit', '#invitation-form');

10
app/assets/stylesheets/themes/scinote.scss
View file

@ -385,21 +385,11 @@ mark,.mark {
.azure-sign-in-actions {
margin-bottom: 10px;
margin-top: 10px;
.btn-azure-ad {
background-color: $office-ms-word;
color: $color-white;
}
}
.okta-sign-in-actions {
margin-bottom: 10px;
margin-top: 10px;
.btn-okta {
background-color: #00297a;
color: $color-white;
}
}
.navbar-secondary {

2
app/views/users/shared/_azure_sign_in_links.html.erb
View file

@ -1,7 +1,7 @@
<% ApplicationSettings.instance.values['azure_ad_apps'].select { |v| v['enable_sign_in'] }.each do |config| %>
<div class="form-group">
<%= form_tag user_customazureactivedirectory_omniauth_authorize_path(provider: config['provider_name']), method: :post, class: "azureAdForm" do %>
<%= submit_tag config['sign_in_label'] || t('devise.sessions.new.azure_ad_submit'), class: 'btn btn-primary' %>
<%= submit_tag config['sign_in_label'] || t('devise.sessions.new.azure_ad_submit'), class: 'btn btn-primary btn-azure-ad' %>
<% end %>
</div>
<% end %>

10
app/views/users/shared/_links.html.erb
View file

@ -31,7 +31,7 @@
<%- if sso_enabled? && okta_enabled? %>
<div class="okta-sign-in-actions">
<%= form_tag user_okta_omniauth_authorize_path, method: :post, id: 'oktaForm' do %>
<%= submit_tag t('devise.okta.sign_in_label'), class: 'btn btn-primary' %>
<%= submit_tag t('devise.okta.sign_in_label'), class: 'btn btn-primary btn-okta' %>
<% end %>
</div>
<% end %>
@ -50,16 +50,16 @@
<%- if sso_enabled? && openid_connect_enabled? %>
<div class="azure-sign-in-actions">
<%= form_tag user_openid_connect_omniauth_authorize_path, method: :post do %>
<%= submit_tag t('devise.sessions.new.openid_connect_submit'), class: 'btn btn-primary' %>
<%= form_tag user_openid_connect_omniauth_authorize_path, method: :post, id: 'openidConnectForm' do %>
<%= submit_tag t('devise.sessions.new.openid_connect_submit'), class: 'btn btn-primary btn-openid-connect' %>
<% end %>
</div>
<% end %>
<% if sso_enabled? && saml_enabled? %>
<div class="azure-sign-in-actions">
<%= form_tag user_saml_omniauth_authorize_path, method: :post do %>
<%= submit_tag t('devise.sessions.new.saml_submit'), class: 'btn btn-primary' %>
<%= form_tag user_saml_omniauth_authorize_path, method: :post, id: 'samlForm' do %>
<%= submit_tag t('devise.sessions.new.saml_submit'), class: 'btn btn-primary btn-saml' %>
<% end %>
</div>
<% end %>