Infra-Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-10-01 01:36:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Standardised delete aesthetics regarding roles and users

Browse Source 
Also added user delete success message.
Fixes #114
This commit is contained in:
Dan Brown 2016-05-22 09:23:41 +01:00
parent 49621e7b15
commit 23ab1f0c81
3 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/UserController.php
View File

@ -200,11 +200,14 @@ class UserController extends Controller
}); });
$user = $this->userRepo->getById($id); $user = $this->userRepo->getById($id);
if ($this->userRepo->isOnlyAdmin($user)) { if ($this->userRepo->isOnlyAdmin($user)) {
session()->flash('error', 'You cannot delete the only admin'); session()->flash('error', 'You cannot delete the only admin');
return redirect($user->getEditUrl()); return redirect($user->getEditUrl());
} }
$this->userRepo->destroy($user); $this->userRepo->destroy($user);
session()->flash('success', 'User successfully removed');
return redirect('/settings/users'); return redirect('/settings/users');
} }

12
resources/views/settings/navbar.blade.php
View File

@ -3,9 +3,15 @@
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-md-12 setting-nav nav-tabs"> <div class="col-md-12 setting-nav nav-tabs">
<a href="/settings" @if($selected == 'settings') class="selected text-button" @endif><i class="zmdi zmdi-settings"></i>Settings</a> @if($currentUser->can('settings-manage'))
<a href="/settings/users" @if($selected == 'users') class="selected text-button" @endif><i class="zmdi zmdi-accounts"></i>Users</a> <a href="/settings" @if($selected == 'settings') class="selected text-button" @endif><i class="zmdi zmdi-settings"></i>Settings</a>
<a href="/settings/roles" @if($selected == 'roles') class="selected text-button" @endif><i class="zmdi zmdi-lock-open"></i>Roles</a> @endif
@if($currentUser->can('users-manage'))
<a href="/settings/users" @if($selected == 'users') class="selected text-button" @endif><i class="zmdi zmdi-accounts"></i>Users</a>
@endif
@if($currentUser->can('user-roles-manage'))
<a href="/settings/roles" @if($selected == 'roles') class="selected text-button" @endif><i class="zmdi zmdi-lock-open"></i>Roles</a>
@endif
</div> </div>
</div> </div>
</div> </div>

26
resources/views/users/edit.blade.php
View File

@ -3,33 +3,29 @@
@section('content') @section('content')
<div class="faded-small toolbar"> @include('settings/navbar', ['selected' => 'users'])
<div class="container">
<div class="row">
<div class="col-sm-6"></div>
<div class="col-sm-6 faded">
<div class="action-buttons">
<a href="/settings/users/{{$user->id}}/delete" class="text-neg text-button"><i class="zmdi zmdi-delete"></i>Delete User</a>
</div>
</div>
</div>
</div>
</div>
<div class="container small"> <div class="container small">
<form action="/settings/users/{{$user->id}}" method="post"> <form action="/settings/users/{{$user->id}}" method="post">
<div class="row"> <div class="row">
<div class="col-sm-8">
<h1>Edit {{ $user->id === $currentUser->id ? 'Profile' : 'User' }}</h1>
</div>
<div class="col-sm-4">
<p></p>
<a href="/settings/users/{{$user->id}}/delete" class="neg button float right">Delete User</a>
</div>
</div>
<div class="row">
<div class="col-md-6" ng-non-bindable> <div class="col-md-6" ng-non-bindable>
<h1>Edit {{ $user->id === $currentUser->id ? 'Profile' : 'User' }}</h1>
{!! csrf_field() !!} {!! csrf_field() !!}
<input type="hidden" name="_method" value="put"> <input type="hidden" name="_method" value="put">
@include('users.forms.' . $authMethod, ['model' => $user]) @include('users.forms.' . $authMethod, ['model' => $user])
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<h1>&nbsp;</h1>
<div class="form-group" id="logo-control"> <div class="form-group" id="logo-control">
<label for="user-avatar">User Avatar</label> <label for="user-avatar">User Avatar</label>
<p class="small">This image should be approx 256px square.</p> <p class="small">This image should be approx 256px square.</p>