fixed admin users view

Author: shlag3n

app/views/lcms/engine/admin/users/_form.html.erb

@@ -1,19 +1,16 @@
-<div class="col-sm-3">
+<div class="col-sm-9">
   <% url = @user.persisted? ? lcms_engine.admin_user_path(@user) : lcms_engine.admin_users_path %>
   <%= simple_form_for @user, url: url, data: { turbo: false } do |f| %>
     <% if @user.persisted? %>
       <%= f.input :id, disabled: true %>
     <% end %>
-
     <%= f.input :name %>
     <%= f.input :email %>
     <%= f.input :role, collection: Lcms::Engine::User.roles.keys, include_blank: false %>
     <%= f.input :access_code, disabled: @user.persisted? %>
-
     <% if @user.persisted? %>
       <%= f.input :confirmed_at, disabled: true, as: :string %>
     <% end %>
-
     <%= f.button :submit, t('ui.save'), name: nil, class: 'btn btn-primary' %>
   <% end %>
 </div>

app/views/lcms/engine/admin/users/_search_form.html.erb

@@ -1,12 +1,9 @@
 <%= simple_form_for :query, url: lcms_engine.admin_users_path, html: { method: :get } do |f| %>
-  <div class='row align-bottom align-justify'>
-    <%= f.input :email, label: false, required: false, placeholder: 'Search by E-mail', wrapper_html: { class: 'o-admin-search-term' } %>
-    <%= f.input :access_code, label: false, required: false, placeholder: 'Enter Access Code', wrapper_html: { class: 'o-admin-search-term' } %>
-
-    <div class="row justify-content-center">
-      <div class="col-sm-1">
-        <%= f.button :submit, t('ui.search'), class: 'btn btn-warning', name: nil %>
-      </div>
+  <div class='row align-items-end'>
+    <%= f.input :email, label: false, required: false, placeholder: 'Search by E-mail', wrapper_html: { class: 'o-admin-search-term flex-grow-1 col-auto' } %>
+    <%= f.input :access_code, label: false, required: false, placeholder: 'Enter Access Code', wrapper_html: { class: 'o-admin-search-termflex-grow-1 col-auto' } %>
+    <div class="col-auto mb-3">
+      <%= f.button :submit, t('ui.search'), class: 'btn btn-warning', name: nil %>
     </div>
   </div>
 <% end %>

app/views/lcms/engine/admin/users/index.html.erb

@@ -1,50 +1,42 @@
 <% set_page_title 'Users' %>
-
 <div class="container-fluid">
   <h1 class="text-center"><%= t('.page_title') %></h1>
-
   <hr>
-
   <div class="row">
-    <div class="col-sm-9"><%= link_to t('.new_user'), lcms_engine.new_admin_user_path, class: 'btn btn-success' %></div>
-    <div class="col-sm-3"><%= render 'search_form' %></div>
-
+    <div class="col-12"><%= render 'search_form' %></div>
+    <div class="col-12"><%= link_to t('.new_user'), lcms_engine.new_admin_user_path, class: 'btn btn-success' %></div>
   </div>
-
   <hr>
-
   <div class="row">
     <table class="table">
       <tr>
-        <th><%= t('.id') %>
-        <th><%= t('.name') %>
-        <th><%= t('.email') %>
-        <th><%= t('.role') %>
-        <th><%= t('.access_code') %>
-        <th><%= t('.confirmed') %>
-        <th><%= t('.registration') %>
-        <th>
-        <th>
+        <th><%= t('.id') %></th>
+        <th><%= t('.name') %></th>
+        <th><%= t('.email') %></th>
+        <th><%= t('.role') %></th>
+        <th><%= t('.access_code') %></th>
+        <th><%= t('.confirmed') %></th>
+        <th><%= t('.registration') %></th>
+        <th></th>
+        <th></th>
       </tr>
-
       <% @users.each do |user| %>
         <% cache user do %>
           <tr id="user_<%= user.id %>">
-            <td><%= link_to user.id, lcms_engine.edit_admin_user_path(user) %>
-            <td><%= link_to user.name, lcms_engine.edit_admin_user_path(user) %>
-            <td><%= user.email %>
-            <td><%= user.role %>
-            <td><%= user.access_code.presence || '-' %>
-            <td><%= user.confirmed? ? 'YES' : 'NO' %>
-            <td class="u-txt--small"><%= user.created_at.to_s %>
-            <td><%= button_to t('.reset_password_btn'), lcms_engine.reset_password_admin_user_path(user), class: 'btn btn-warning', data: { confirm: t('ui.are_you_sure') }, form_class: 'inline', method: :post %>
-            <td><%= button_to t('ui.delete'), lcms_engine.admin_user_path(user), class: 'btn btn-danger', data: { confirm: t('ui.are_you_sure'), 'turbo-method': :delete }, form_class: 'inline', method: :delete %></td>
+            <td><%= link_to user.id, lcms_engine.edit_admin_user_path(user) %></td>
+            <td><%= link_to user.name, lcms_engine.edit_admin_user_path(user) %></td>
+            <td><%= user.email %></td>
+            <td><%= user.role %></td>
+            <td><%= user.access_code.presence || '-' %></td>
+            <td><%= user.confirmed? ? 'YES' : 'NO' %></td>
+            <td class="u-txt--small"><%= user.created_at.to_s %></td>
+            <td><%= button_to t('.reset_password_btn'), lcms_engine.reset_password_admin_user_path(user), class: 'btn btn-warning btn-sm', data: { confirm: t('ui.are_you_sure') }, form_class: 'inline', method: :post %></td>
+            <td><%= button_to t('ui.delete'), lcms_engine.admin_user_path(user), class: 'btn btn-danger btn-sm', data: { confirm: t('ui.are_you_sure'), 'turbo-method': :delete }, form_class: 'inline', method: :delete %></td>
           </tr>
         <% end %>
       <% end %>
     </table>
   </div>
-
   <div class="row">
     <%= will_paginate @users, list_classes: %w(pagination d-flex justify-content-center) %>
   </div>