Skip to content

Commit 9371d65

Browse files
authored
Hotfix For sofia user accounts (#1144)
* chang icons and amber api url check * fix lint
1 parent 514b044 commit 9371d65

4 files changed

Lines changed: 9 additions & 9 deletions

File tree

app/views/partials/_login_prompt.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</h3>
77
</div>
88
<ul class="list-group list-group-flush">
9-
<% if Rails.application.config.x.amber_api_url.present? %>
9+
<% if Rails.application.config.x.amber_api_host.present? %>
1010
<li class="list-group-item">
1111
<p class="card-text mt-2">
1212
Log in met een <%= Rails.application.config.x.site_association %> account.

app/views/users/_edit_sofia_account_modal.html.erb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<% if @sofia_account && policy(@sofia_account).update_with_sofia_account? %>
1111
<div class="card mb-3">
1212
<div class="card-header py-2" type="button" data-bs-toggle="collapse" data-bs-target="#user-data-collapse" aria-expanded="false" aria-controls="user-data-collapse">
13-
<h5 class="mb-0 py-1">Gegevens <%= fa_icon 'caret-down', class: 'float-end me-1' %></h5>
13+
<h5 class="mb-0 py-1">Gegevens <i class="fas fa-caret-down float-end me-1"></i></h5>
1414
</div>
1515
<div class="collapse card-body" id="user-data-collapse">
1616
<%= simple_form_for @user, wrapper: :horizontal_form, url: update_with_sofia_account_user_path, method: :patch do |f| %>
@@ -38,7 +38,7 @@
3838

3939
<div class="card mb-3">
4040
<div class="card-header py-2" type="button" data-bs-toggle="collapse" data-bs-target="#password-collapse" aria-expanded="false" aria-controls="password-collapse">
41-
<h5 class="mb-0 py-1">Wachtwoord <%= fa_icon 'caret-down', class: 'float-end me-1' %></h5>
41+
<h5 class="mb-0 py-1">Wachtwoord <i class="fas fa-caret-down float-end me-1"></i></h5>
4242
</div>
4343
<div class="collapse card-body" id="password-collapse">
4444
<%= simple_form_for @sofia_account, wrapper: :horizontal_form, url: update_password_sofia_account_path(@sofia_account.id), method: :patch do |f| %>
@@ -52,7 +52,7 @@
5252

5353
<div class="card mb-3">
5454
<div class="card-header py-2" type="button" data-bs-toggle="collapse" data-bs-target="#otp-collapse" aria-expanded="false" aria-controls="otp-collapse">
55-
<h5 class="mb-0 py-1">Two-factor-authenticatie <%= fa_icon 'caret-down', class: 'float-end me-1' %></h5>
55+
<h5 class="mb-0 py-1">Two-factor-authenticatie <i class="fas fa-caret-down float-end me-1"></i></h5>
5656
</div>
5757
<div class="collapse card-body" id="otp-collapse">
5858
<p>
@@ -86,7 +86,7 @@
8686

8787
<ul>
8888
<li>
89-
<%= fa_icon 'android', class: 'me-1' %>
89+
<i class="fab fa-android me-1"></i>
9090
<a
9191
href='https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2'
9292
target='_blank'
@@ -95,7 +95,7 @@
9595
</a>
9696
</li>
9797
<li>
98-
<%= fa_icon 'apple', class: 'me-1' %>
98+
<i class="fab fa-apple me-1"></i>
9999
<a
100100
href='https://itunes.apple.com/us/app/authenticator/id766157276?mt=8'
101101
target='_blank'
@@ -104,7 +104,7 @@
104104
</a>
105105
</li>
106106
<li>
107-
<%= fa_icon 'windows', class: 'me-1' %>
107+
<i class="fab fa-windows me-1"></i>
108108
<a
109109
href='https://www.microsoft.com/en-us/store/p/microsoft-authenticator/9nblgggzmcj6'
110110
target='_blank'

app/views/users/index.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</div>
2525
<users-table :users="manual_users" class="mb-5"></users-table>
2626

27-
<% if Rails.application.config.x.amber_api_url.present? %>
27+
<% if Rails.application.config.x.amber_api_host.present? %>
2828
<div class="d-flex justify-content-between align-items-center">
2929
<h3><%= Rails.application.config.x.site_association %> gebruikers</h3>
3030
<% if policy(User).refresh_user_list? %>

app/views/users/show.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
</table>
7272
<% if @sofia_account && policy(@sofia_account).update_with_sofia_account? %>
7373
<button class="btn btn-sm btn-primary pull-right ms-2" data-bs-target="#edit_sofia_account_modal" data-bs-toggle="modal" role="button">
74-
<%= fa_icon 'sliders', class: 'me-1' %>
74+
<i class="fas fa-sliders-h me-1"></i>
7575
Instellingen
7676
</button>
7777
<% end %>

0 commit comments

Comments
 (0)