Зуев Егор / wiki.dev

Go to a project
Toggle navigation
Toggle navigation pinning
Dan Brown
a33deed2 1 parent 2e7345f4

Added user listing to role edit screen

Inline Side-by-side
Showing 2 changed files with 48 additions and 25 deletions
...@@ -25,3 +25,12 @@ table { ...@@ -25,3 +25,12 @@ table {
25 font-weight: 500; 25 font-weight: 500;
26 } 26 }
27 } 27 }
28 +
29 +table.list-table {
30 + margin: 0 -$-xs;
31 + td {
32 + border: 0;
33 + vertical-align: middle;
34 + padding: $-xs;
35 + }
36 +}
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -2,7 +2,9 @@ ...@@ -2,7 +2,9 @@
2 2
3 <div class="row"> 3 <div class="row">
4 4
5 - <div class="col-md-6"> 5 + <div class="col-md-9">
6 + <div class="row">
7 + <div class="col-md-5">
6 <h3>Role Details</h3> 8 <h3>Role Details</h3>
7 <div class="form-group"> 9 <div class="form-group">
8 <label for="name">Role Name</label> 10 <label for="name">Role Name</label>
...@@ -13,36 +15,18 @@ ...@@ -13,36 +15,18 @@
13 @include('form/text', ['name' => 'description']) 15 @include('form/text', ['name' => 'description'])
14 </div> 16 </div>
15 <h3>System Permissions</h3> 17 <h3>System Permissions</h3>
16 - <div class="row"> 18 + <label>@include('settings/roles/checkbox', ['permission' => 'users-manage']) Manage users</label>
17 - <div class="col-md-6"> 19 + <label>@include('settings/roles/checkbox', ['permission' => 'user-roles-manage']) Manage roles & role permissions</label>
18 - <label> @include('settings/roles/checkbox', ['permission' => 'users-manage']) Manage users</label>
19 - </div>
20 - <div class="col-md-6">
21 - <label>@include('settings/roles/checkbox', ['permission' => 'user-roles-manage']) Manage user roles</label>
22 - </div>
23 - </div>
24 - <hr class="even">
25 - <div class="row">
26 - <div class="col-md-6">
27 <label>@include('settings/roles/checkbox', ['permission' => 'restrictions-manage-all']) Manage all Book, Chapter & Page permissions</label> 20 <label>@include('settings/roles/checkbox', ['permission' => 'restrictions-manage-all']) Manage all Book, Chapter & Page permissions</label>
28 - </div>
29 - <div class="col-md-6">
30 <label>@include('settings/roles/checkbox', ['permission' => 'restrictions-manage-own']) Manage permissions on own Book, Chapter & Pages</label> 21 <label>@include('settings/roles/checkbox', ['permission' => 'restrictions-manage-own']) Manage permissions on own Book, Chapter & Pages</label>
31 - </div>
32 - </div>
33 - <hr class="even">
34 - <div class="form-group">
35 <label>@include('settings/roles/checkbox', ['permission' => 'settings-manage']) Manage app settings</label> 22 <label>@include('settings/roles/checkbox', ['permission' => 'settings-manage']) Manage app settings</label>
36 </div> 23 </div>
37 - <hr class="even">
38 -
39 - </div>
40 24
41 <div class="col-md-6"> 25 <div class="col-md-6">
42 26
43 <h3>Asset Permissions</h3> 27 <h3>Asset Permissions</h3>
44 <p> 28 <p>
45 - These permissions control default access to the assets within the system. <br> 29 + These permissions control default access to the assets within the system.
46 Permissions on Books, Chapters and Pages will override these permissions. 30 Permissions on Books, Chapters and Pages will override these permissions.
47 </p> 31 </p>
48 <table class="table"> 32 <table class="table">
...@@ -110,8 +94,38 @@ ...@@ -110,8 +94,38 @@
110 </tr> 94 </tr>
111 </table> 95 </table>
112 </div> 96 </div>
97 + </div>
98 + <a href="/settings/roles" class="button muted">Cancel</a>
99 + <button type="submit" class="button pos">Save Role</button>
100 + </div>
101 + <div class="col-md-3">
102 + <h3>Users in this role</h3>
113 103
114 -</div> 104 + @if(isset($role) && count($role->users) > 0)
105 + <table class="list-table">
106 + @foreach($role->users as $user)
107 + <tr>
108 + <td style="line-height: 0;"><img class="avatar small" src="{{$user->getAvatar(40)}}" alt="{{$user->name}}"></td>
109 + <td>
110 + @if(userCan('users-manage') || $currentUser->id == $user->id)
111 + <a href="/settings/users/{{$user->id}}">
112 + @endif
113 + {{ $user->name }}
114 + @if(userCan('users-manage') || $currentUser->id == $user->id)
115 + </a>
116 + @endif
117 + </td>
118 + </tr>
119 + @endforeach
120 + </table>
121 + @else
122 + <p class="text-muted">
123 + No users currently in this role.
124 + </p>
125 + @endif
126 +
127 + </div>
115 128
116 -<a href="/settings/roles" class="button muted">Cancel</a>
117 -<button type="submit" class="button pos">Save Role</button>
...\ No newline at end of file ...\ No newline at end of file
129 +
130 +
131 +</div>
...\ No newline at end of file ...\ No newline at end of file
......