Зуев Егор / 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 124 additions and 101 deletions
...@@ -24,4 +24,13 @@ table { ...@@ -24,4 +24,13 @@ table {
24 background-color: #F8F8F8; 24 background-color: #F8F8F8;
25 font-weight: 500; 25 font-weight: 500;
26 } 26 }
27 +}
28 +
29 +table.list-table {
30 + margin: 0 -$-xs;
31 + td {
32 + border: 0;
33 + vertical-align: middle;
34 + padding: $-xs;
35 + }
27 } 36 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -2,116 +2,130 @@ ...@@ -2,116 +2,130 @@
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 - <h3>Role Details</h3>
7 - <div class="form-group">
8 - <label for="name">Role Name</label>
9 - @include('form/text', ['name' => 'display_name'])
10 - </div>
11 - <div class="form-group">
12 - <label for="name">Short Role Description</label>
13 - @include('form/text', ['name' => 'description'])
14 - </div>
15 - <h3>System Permissions</h3>
16 <div class="row"> 6 <div class="row">
17 - <div class="col-md-6"> 7 + <div class="col-md-5">
18 - <label> @include('settings/roles/checkbox', ['permission' => 'users-manage']) Manage users</label> 8 + <h3>Role Details</h3>
19 - </div> 9 + <div class="form-group">
20 - <div class="col-md-6"> 10 + <label for="name">Role Name</label>
21 - <label>@include('settings/roles/checkbox', ['permission' => 'user-roles-manage']) Manage user roles</label> 11 + @include('form/text', ['name' => 'display_name'])
22 - </div> 12 + </div>
23 - </div> 13 + <div class="form-group">
24 - <hr class="even"> 14 + <label for="name">Short Role Description</label>
25 - <div class="row"> 15 + @include('form/text', ['name' => 'description'])
26 - <div class="col-md-6"> 16 + </div>
17 + <h3>System Permissions</h3>
18 + <label>@include('settings/roles/checkbox', ['permission' => 'users-manage']) Manage users</label>
19 + <label>@include('settings/roles/checkbox', ['permission' => 'user-roles-manage']) Manage roles & role permissions</label>
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>
21 + <label>@include('settings/roles/checkbox', ['permission' => 'restrictions-manage-own']) Manage permissions on own Book, Chapter & Pages</label>
22 + <label>@include('settings/roles/checkbox', ['permission' => 'settings-manage']) Manage app settings</label>
28 </div> 23 </div>
24 +
29 <div class="col-md-6"> 25 <div class="col-md-6">
30 - <label>@include('settings/roles/checkbox', ['permission' => 'restrictions-manage-own']) Manage permissions on own Book, Chapter & Pages</label> 26 +
27 + <h3>Asset Permissions</h3>
28 + <p>
29 + These permissions control default access to the assets within the system.
30 + Permissions on Books, Chapters and Pages will override these permissions.
31 + </p>
32 + <table class="table">
33 + <tr>
34 + <th></th>
35 + <th>Create</th>
36 + <th>Edit</th>
37 + <th>Delete</th>
38 + </tr>
39 + <tr>
40 + <td>Books</td>
41 + <td>
42 + <label>@include('settings/roles/checkbox', ['permission' => 'book-create-all']) All</label>
43 + </td>
44 + <td>
45 + <label>@include('settings/roles/checkbox', ['permission' => 'book-update-own']) Own</label>
46 + <label>@include('settings/roles/checkbox', ['permission' => 'book-update-all']) All</label>
47 + </td>
48 + <td>
49 + <label>@include('settings/roles/checkbox', ['permission' => 'book-delete-own']) Own</label>
50 + <label>@include('settings/roles/checkbox', ['permission' => 'book-delete-all']) All</label>
51 + </td>
52 + </tr>
53 + <tr>
54 + <td>Chapters</td>
55 + <td>
56 + <label>@include('settings/roles/checkbox', ['permission' => 'chapter-create-own']) Own</label>
57 + <label>@include('settings/roles/checkbox', ['permission' => 'chapter-create-all']) All</label>
58 + </td>
59 + <td>
60 + <label>@include('settings/roles/checkbox', ['permission' => 'chapter-update-own']) Own</label>
61 + <label>@include('settings/roles/checkbox', ['permission' => 'chapter-update-all']) All</label>
62 + </td>
63 + <td>
64 + <label>@include('settings/roles/checkbox', ['permission' => 'chapter-delete-own']) Own</label>
65 + <label>@include('settings/roles/checkbox', ['permission' => 'chapter-delete-all']) All</label>
66 + </td>
67 + </tr>
68 + <tr>
69 + <td>Pages</td>
70 + <td>
71 + <label>@include('settings/roles/checkbox', ['permission' => 'page-create-own']) Own</label>
72 + <label>@include('settings/roles/checkbox', ['permission' => 'page-create-all']) All</label>
73 + </td>
74 + <td>
75 + <label>@include('settings/roles/checkbox', ['permission' => 'page-update-own']) Own</label>
76 + <label>@include('settings/roles/checkbox', ['permission' => 'page-update-all']) All</label>
77 + </td>
78 + <td>
79 + <label>@include('settings/roles/checkbox', ['permission' => 'page-delete-own']) Own</label>
80 + <label>@include('settings/roles/checkbox', ['permission' => 'page-delete-all']) All</label>
81 + </td>
82 + </tr>
83 + <tr>
84 + <td>Images</td>
85 + <td>@include('settings/roles/checkbox', ['permission' => 'image-create-all'])</td>
86 + <td>
87 + <label>@include('settings/roles/checkbox', ['permission' => 'image-update-own']) Own</label>
88 + <label>@include('settings/roles/checkbox', ['permission' => 'image-update-all']) All</label>
89 + </td>
90 + <td>
91 + <label>@include('settings/roles/checkbox', ['permission' => 'image-delete-own']) Own</label>
92 + <label>@include('settings/roles/checkbox', ['permission' => 'image-delete-all']) All</label>
93 + </td>
94 + </tr>
95 + </table>
31 </div> 96 </div>
32 </div> 97 </div>
33 - <hr class="even"> 98 + <a href="/settings/roles" class="button muted">Cancel</a>
34 - <div class="form-group"> 99 + <button type="submit" class="button pos">Save Role</button>
35 - <label>@include('settings/roles/checkbox', ['permission' => 'settings-manage']) Manage app settings</label>
36 - </div>
37 - <hr class="even">
38 -
39 </div> 100 </div>
101 + <div class="col-md-3">
102 + <h3>Users in this role</h3>
40 103
41 - <div class="col-md-6"> 104 + @if(isset($role) && count($role->users) > 0)
42 - 105 + <table class="list-table">
43 - <h3>Asset Permissions</h3> 106 + @foreach($role->users as $user)
44 - <p> 107 + <tr>
45 - These permissions control default access to the assets within the system. <br> 108 + <td style="line-height: 0;"><img class="avatar small" src="{{$user->getAvatar(40)}}" alt="{{$user->name}}"></td>
46 - Permissions on Books, Chapters and Pages will override these permissions. 109 + <td>
47 - </p> 110 + @if(userCan('users-manage') || $currentUser->id == $user->id)
48 - <table class="table"> 111 + <a href="/settings/users/{{$user->id}}">
49 - <tr> 112 + @endif
50 - <th></th> 113 + {{ $user->name }}
51 - <th>Create</th> 114 + @if(userCan('users-manage') || $currentUser->id == $user->id)
52 - <th>Edit</th> 115 + </a>
53 - <th>Delete</th> 116 + @endif
54 - </tr> 117 + </td>
55 - <tr> 118 + </tr>
56 - <td>Books</td> 119 + @endforeach
57 - <td>
58 - <label>@include('settings/roles/checkbox', ['permission' => 'book-create-all']) All</label>
59 - </td>
60 - <td>
61 - <label>@include('settings/roles/checkbox', ['permission' => 'book-update-own']) Own</label>
62 - <label>@include('settings/roles/checkbox', ['permission' => 'book-update-all']) All</label>
63 - </td>
64 - <td>
65 - <label>@include('settings/roles/checkbox', ['permission' => 'book-delete-own']) Own</label>
66 - <label>@include('settings/roles/checkbox', ['permission' => 'book-delete-all']) All</label>
67 - </td>
68 - </tr>
69 - <tr>
70 - <td>Chapters</td>
71 - <td>
72 - <label>@include('settings/roles/checkbox', ['permission' => 'chapter-create-own']) Own</label>
73 - <label>@include('settings/roles/checkbox', ['permission' => 'chapter-create-all']) All</label>
74 - </td>
75 - <td>
76 - <label>@include('settings/roles/checkbox', ['permission' => 'chapter-update-own']) Own</label>
77 - <label>@include('settings/roles/checkbox', ['permission' => 'chapter-update-all']) All</label>
78 - </td>
79 - <td>
80 - <label>@include('settings/roles/checkbox', ['permission' => 'chapter-delete-own']) Own</label>
81 - <label>@include('settings/roles/checkbox', ['permission' => 'chapter-delete-all']) All</label>
82 - </td>
83 - </tr>
84 - <tr>
85 - <td>Pages</td>
86 - <td>
87 - <label>@include('settings/roles/checkbox', ['permission' => 'page-create-own']) Own</label>
88 - <label>@include('settings/roles/checkbox', ['permission' => 'page-create-all']) All</label>
89 - </td>
90 - <td>
91 - <label>@include('settings/roles/checkbox', ['permission' => 'page-update-own']) Own</label>
92 - <label>@include('settings/roles/checkbox', ['permission' => 'page-update-all']) All</label>
93 - </td>
94 - <td>
95 - <label>@include('settings/roles/checkbox', ['permission' => 'page-delete-own']) Own</label>
96 - <label>@include('settings/roles/checkbox', ['permission' => 'page-delete-all']) All</label>
97 - </td>
98 - </tr>
99 - <tr>
100 - <td>Images</td>
101 - <td>@include('settings/roles/checkbox', ['permission' => 'image-create-all'])</td>
102 - <td>
103 - <label>@include('settings/roles/checkbox', ['permission' => 'image-update-own']) Own</label>
104 - <label>@include('settings/roles/checkbox', ['permission' => 'image-update-all']) All</label>
105 - </td>
106 - <td>
107 - <label>@include('settings/roles/checkbox', ['permission' => 'image-delete-own']) Own</label>
108 - <label>@include('settings/roles/checkbox', ['permission' => 'image-delete-all']) All</label>
109 - </td>
110 - </tr>
111 </table> 120 </table>
121 + @else
122 + <p class="text-muted">
123 + No users currently in this role.
124 + </p>
125 + @endif
126 +
112 </div> 127 </div>
113 128
114 -</div>
115 129
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
130 +
131 +</div>
...\ No newline at end of file ...\ No newline at end of file
......