Release 2.8.0

src/web/views/settings/users/list.hbs

@@ -14,7 +14,7 @@
         <input type="search" class="form-control" placeholder="Search users" aria-label="Search users" data-table-search />
       </div>
       {{#if (hasPermission currentUser 'users.create')}}
-        <a class="btn btn-primary btn-sm" href="/users/new">Add user</a>
+        <a class="btn btn-primary btn-sm" href="/settings/users/new">Add user</a>
       {{/if}}
     </div>
   </div>
@@ -25,6 +25,7 @@
         <th data-table-sort-key="user">User</th>
         <th data-table-sort-key="name">Name</th>
         <th data-table-sort-key="roles">Roles</th>
+        <th>Status</th>
         <th>Actions</th>
       </tr>
     </thead>
@@ -66,18 +67,25 @@
                 </div>
               </div>
             </td>
+            <td data-label="Status">
+              {{#if account_locked}}
+                <span class="badge text-bg-danger">Locked</span>
+              {{else}}
+                <span class="badge text-bg-success">Active</span>
+              {{/if}}
+            </td>
             <td data-label="Actions">
               {{#if (anyPermission ../currentUser 'users.create' 'users.update' 'users.delete')}}
                 <div class="actions users-row-actions">
                   {{#unless isCurrentUser}}
                     {{#if (hasPermission ../currentUser 'users.update')}}
-                      <a class="btn btn-sm btn-primary" href="/users/{{id}}/edit">Edit</a>
+                      <a class="btn btn-sm btn-primary" href="/settings/users/{{id}}/edit">Edit</a>
                     {{/if}}
                     {{#if (hasPermission ../currentUser 'users.create')}}
-                      <a class="btn btn-sm btn-secondary" href="/users/{{id}}/duplicate">Dupe</a>
+                      <a class="btn btn-sm btn-secondary" href="/settings/users/{{id}}/duplicate">Dupe</a>
                     {{/if}}
                     {{#if (hasPermission ../currentUser 'users.delete')}}
-                      <form method="post" action="/users/{{id}}/delete" class="inline-form" data-confirm-message="Delete {{username}}?">
+                        <form method="post" action="/settings/users/{{id}}/delete" class="inline-form" data-confirm-message="Delete {{username}}?">
                         <button type="submit" class="btn btn-sm btn-danger">Delete</button>
                       </form>
                     {{/if}}
@@ -92,10 +100,10 @@
           </tr>
         {{/each}}
       {{else}}
-        <tr data-table-search-empty-default><td colspan="4" class="empty">No users found.</td></tr>
+        <tr data-table-search-empty-default><td colspan="5" class="empty">No users found.</td></tr>
       {{/if}}
     </tbody>
   </table>
   </div>
-  {{> table-pagination pagination=pagination basePath="/users" alwaysShow=true}}
+  {{> table-pagination pagination=pagination basePath="/settings/users" alwaysShow=true}}
 </div>