diff options
Diffstat (limited to 'app/views/users')
| -rw-r--r-- | app/views/users/_user.html.erb | 18 | ||||
| -rw-r--r-- | app/views/users/edit.html.erb | 4 |
2 files changed, 11 insertions, 11 deletions
diff --git a/app/views/users/_user.html.erb b/app/views/users/_user.html.erb index be92ad1d..028ee02f 100644 --- a/app/views/users/_user.html.erb +++ b/app/views/users/_user.html.erb | |||
| @@ -27,17 +27,17 @@ | |||
| 27 | <span class="field_hint"><%= t(".no_roles") %></span> | 27 | <span class="field_hint"><%= t(".no_roles") %></span> |
| 28 | <% end %> | 28 | <% end %> |
| 29 | </td> | 29 | </td> |
| 30 | <td class="user_actions"> | 30 | <td class="actions"> |
| 31 | <div class="user_action_grid"> | 31 | <div class="action_grid"> |
| 32 | <span class="user_action"> | 32 | <span class="action_item"> |
| 33 | <%= link_to user_path(user), "aria-label" => t("admin.common.show"), | 33 | <%= link_to user_path(user), "aria-label" => t("admin.common.show"), |
| 34 | title: t("admin.common.show") do %> | 34 | title: t("admin.common.show") do %> |
| 35 | <%= icon("eye", library: "tabler", "aria-hidden": true) %> | 35 | <%= icon("eye", library: "tabler", "aria-hidden": true) %> |
| 36 | <% end %> | 36 | <% end %> |
| 37 | </span> | 37 | </span> |
| 38 | 38 | ||
| 39 | <span class="user_action"> | 39 | <span class="action_item"> |
| 40 | <% if current_user.admin? || current_user == user %> | 40 | <% if current_user.is_admin? || current_user == user %> |
| 41 | <%= link_to edit_user_path(user), "aria-label" => t("admin.common.edit"), | 41 | <%= link_to edit_user_path(user), "aria-label" => t("admin.common.edit"), |
| 42 | title: t("admin.common.edit") do %> | 42 | title: t("admin.common.edit") do %> |
| 43 | <%= icon("edit", library: "tabler", "aria-hidden": true) %> | 43 | <%= icon("edit", library: "tabler", "aria-hidden": true) %> |
| @@ -45,15 +45,15 @@ | |||
| 45 | <% end %> | 45 | <% end %> |
| 46 | </span> | 46 | </span> |
| 47 | 47 | ||
| 48 | <span class="user_action"> | 48 | <span class="action_item"> |
| 49 | <%= link_to admin_log_path(:user_id => user.id), | 49 | <%= link_to admin_log_path(:user_id => user.id), |
| 50 | "aria-label" => t(".action_log"), title: t(".action_log") do %> | 50 | "aria-label" => t(".action_log"), title: t(".action_log") do %> |
| 51 | <%= icon("history", library: "tabler", "aria-hidden": true) %> | 51 | <%= icon("history", library: "tabler", "aria-hidden": true) %> |
| 52 | <% end %> | 52 | <% end %> |
| 53 | </span> | 53 | </span> |
| 54 | 54 | ||
| 55 | <span class="user_action"> | 55 | <span class="action_item"> |
| 56 | <% if current_user.admin? && current_user != user %> | 56 | <% if current_user.is_admin? && current_user != user %> |
| 57 | <% if user.alumni? %> | 57 | <% if user.alumni? %> |
| 58 | <%= button_to reactivate_user_path(user), method: :put, | 58 | <%= button_to reactivate_user_path(user), method: :put, |
| 59 | form: { class: 'button_to state_changing' }, | 59 | form: { class: 'button_to state_changing' }, |
| @@ -71,7 +71,7 @@ | |||
| 71 | <% end %> | 71 | <% end %> |
| 72 | </span> | 72 | </span> |
| 73 | 73 | ||
| 74 | <span class="user_action"> | 74 | <span class="action_item"> |
| 75 | <% if current_user.redaktion? && !user.alumni? %> | 75 | <% if current_user.redaktion? && !user.alumni? %> |
| 76 | <% if user.redaktion? %> | 76 | <% if user.redaktion? %> |
| 77 | <% unless user == current_user %> | 77 | <% unless user == current_user %> |
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb index ad2e0891..1763394d 100644 --- a/app/views/users/edit.html.erb +++ b/app/views/users/edit.html.erb | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | <div class="layout_row_label"><%= t("users.labels.confirm") %></div> | 20 | <div class="layout_row_label"><%= t("users.labels.confirm") %></div> |
| 21 | <div class="layout_row_content"><%= f.password_field :password_confirmation, :autocomplete => "new-password" %></div> | 21 | <div class="layout_row_content"><%= f.password_field :password_confirmation, :autocomplete => "new-password" %></div> |
| 22 | 22 | ||
| 23 | <% if current_user.admin? %> | 23 | <% if current_user.is_admin? %> |
| 24 | <div class="layout_row_label"><%= t("users.labels.roles") %></div> | 24 | <div class="layout_row_label"><%= t("users.labels.roles") %></div> |
| 25 | <div class="layout_row_content"> | 25 | <div class="layout_row_content"> |
| 26 | <% User::ROLES.each do |role| %> | 26 | <% User::ROLES.each do |role| %> |
| @@ -62,7 +62,7 @@ | |||
| 62 | <% end %> | 62 | <% end %> |
| 63 | <% end %> | 63 | <% end %> |
| 64 | </div> | 64 | </div> |
| 65 | <% elsif current_user.admin? && @user.otp_enrolled? %> | 65 | <% elsif current_user.is_admin? && @user.otp_enrolled? %> |
| 66 | <div class="layout_row_label"><%= t(".second_factor") %></div> | 66 | <div class="layout_row_label"><%= t(".second_factor") %></div> |
| 67 | <div class="layout_row_content"> | 67 | <div class="layout_row_content"> |
| 68 | <%= t(".enabled") %> | 68 | <%= t(".enabled") %> |
