Standardised delete aesthetics regarding roles and users
Also added user delete success message. Fixes #114
Showing
3 changed files
with
23 additions
and
18 deletions
| ... | @@ -200,11 +200,14 @@ class UserController extends Controller | ... | @@ -200,11 +200,14 @@ class UserController extends Controller |
| 200 | }); | 200 | }); |
| 201 | 201 | ||
| 202 | $user = $this->userRepo->getById($id); | 202 | $user = $this->userRepo->getById($id); |
| 203 | + | ||
| 203 | if ($this->userRepo->isOnlyAdmin($user)) { | 204 | if ($this->userRepo->isOnlyAdmin($user)) { |
| 204 | session()->flash('error', 'You cannot delete the only admin'); | 205 | session()->flash('error', 'You cannot delete the only admin'); |
| 205 | return redirect($user->getEditUrl()); | 206 | return redirect($user->getEditUrl()); |
| 206 | } | 207 | } |
| 208 | + | ||
| 207 | $this->userRepo->destroy($user); | 209 | $this->userRepo->destroy($user); |
| 210 | + session()->flash('success', 'User successfully removed'); | ||
| 208 | 211 | ||
| 209 | return redirect('/settings/users'); | 212 | return redirect('/settings/users'); |
| 210 | } | 213 | } | ... | ... |
| ... | @@ -3,9 +3,15 @@ | ... | @@ -3,9 +3,15 @@ |
| 3 | <div class="container"> | 3 | <div class="container"> |
| 4 | <div class="row"> | 4 | <div class="row"> |
| 5 | <div class="col-md-12 setting-nav nav-tabs"> | 5 | <div class="col-md-12 setting-nav nav-tabs"> |
| 6 | - <a href="/settings" @if($selected == 'settings') class="selected text-button" @endif><i class="zmdi zmdi-settings"></i>Settings</a> | 6 | + @if($currentUser->can('settings-manage')) |
| 7 | - <a href="/settings/users" @if($selected == 'users') class="selected text-button" @endif><i class="zmdi zmdi-accounts"></i>Users</a> | 7 | + <a href="/settings" @if($selected == 'settings') class="selected text-button" @endif><i class="zmdi zmdi-settings"></i>Settings</a> |
| 8 | - <a href="/settings/roles" @if($selected == 'roles') class="selected text-button" @endif><i class="zmdi zmdi-lock-open"></i>Roles</a> | 8 | + @endif |
| 9 | + @if($currentUser->can('users-manage')) | ||
| 10 | + <a href="/settings/users" @if($selected == 'users') class="selected text-button" @endif><i class="zmdi zmdi-accounts"></i>Users</a> | ||
| 11 | + @endif | ||
| 12 | + @if($currentUser->can('user-roles-manage')) | ||
| 13 | + <a href="/settings/roles" @if($selected == 'roles') class="selected text-button" @endif><i class="zmdi zmdi-lock-open"></i>Roles</a> | ||
| 14 | + @endif | ||
| 9 | </div> | 15 | </div> |
| 10 | </div> | 16 | </div> |
| 11 | </div> | 17 | </div> | ... | ... |
| ... | @@ -3,33 +3,29 @@ | ... | @@ -3,33 +3,29 @@ |
| 3 | 3 | ||
| 4 | @section('content') | 4 | @section('content') |
| 5 | 5 | ||
| 6 | - <div class="faded-small toolbar"> | 6 | + @include('settings/navbar', ['selected' => 'users']) |
| 7 | - <div class="container"> | ||
| 8 | - <div class="row"> | ||
| 9 | - <div class="col-sm-6"></div> | ||
| 10 | - <div class="col-sm-6 faded"> | ||
| 11 | - <div class="action-buttons"> | ||
| 12 | - <a href="/settings/users/{{$user->id}}/delete" class="text-neg text-button"><i class="zmdi zmdi-delete"></i>Delete User</a> | ||
| 13 | - </div> | ||
| 14 | - </div> | ||
| 15 | - </div> | ||
| 16 | - </div> | ||
| 17 | - </div> | ||
| 18 | 7 | ||
| 19 | 8 | ||
| 20 | 9 | ||
| 21 | <div class="container small"> | 10 | <div class="container small"> |
| 22 | <form action="/settings/users/{{$user->id}}" method="post"> | 11 | <form action="/settings/users/{{$user->id}}" method="post"> |
| 23 | - <div class="row"> | 12 | + <div class="row"> |
| 13 | + <div class="col-sm-8"> | ||
| 14 | + <h1>Edit {{ $user->id === $currentUser->id ? 'Profile' : 'User' }}</h1> | ||
| 15 | + </div> | ||
| 16 | + <div class="col-sm-4"> | ||
| 17 | + <p></p> | ||
| 18 | + <a href="/settings/users/{{$user->id}}/delete" class="neg button float right">Delete User</a> | ||
| 19 | + </div> | ||
| 20 | + </div> | ||
| 21 | + <div class="row"> | ||
| 24 | <div class="col-md-6" ng-non-bindable> | 22 | <div class="col-md-6" ng-non-bindable> |
| 25 | - <h1>Edit {{ $user->id === $currentUser->id ? 'Profile' : 'User' }}</h1> | ||
| 26 | {!! csrf_field() !!} | 23 | {!! csrf_field() !!} |
| 27 | <input type="hidden" name="_method" value="put"> | 24 | <input type="hidden" name="_method" value="put"> |
| 28 | @include('users.forms.' . $authMethod, ['model' => $user]) | 25 | @include('users.forms.' . $authMethod, ['model' => $user]) |
| 29 | 26 | ||
| 30 | </div> | 27 | </div> |
| 31 | <div class="col-md-6"> | 28 | <div class="col-md-6"> |
| 32 | - <h1> </h1> | ||
| 33 | <div class="form-group" id="logo-control"> | 29 | <div class="form-group" id="logo-control"> |
| 34 | <label for="user-avatar">User Avatar</label> | 30 | <label for="user-avatar">User Avatar</label> |
| 35 | <p class="small">This image should be approx 256px square.</p> | 31 | <p class="small">This image should be approx 256px square.</p> | ... | ... |
-
Please register or sign in to post a comment