X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/ffd6a1002e8ed40ba7b651391ee39c9ff6b2ea1f..refs/pull/3918/head:/resources/views/form/entity-permissions.blade.php

diff --git a/resources/views/form/entity-permissions.blade.php b/resources/views/form/entity-permissions.blade.php
index 2fd0a4a43..9bf309fb8 100644
--- a/resources/views/form/entity-permissions.blade.php
+++ b/resources/views/form/entity-permissions.blade.php
@@ -1,33 +1,74 @@
-<form component="entity-permissions" action="{{ $model->getUrl('/permissions') }}" method="POST">
+<?php
+  /** @var \BookStack\Auth\Permissions\PermissionFormData $data */
+?>
+<form component="entity-permissions"
+      option:entity-permissions:entity-type="{{ $model->getType() }}"
+      action="{{ $model->getUrl('/permissions') }}"
+      method="POST">
     {!! csrf_field() !!}
     <input type="hidden" name="_method" value="PUT">
 
-    <div class="grid half left-focus v-center">
+    <div class="grid half left-focus v-end gap-m wrap">
         <div>
-            <p class="mb-none mt-m">{{ trans('entities.permissions_intro') }}</p>
+            <h1 class="list-heading">{{ $title }}</h1>
+            <p class="text-muted mb-s">
+                {{ trans('entities.permissions_desc') }}
+
+                @if($model instanceof \BookStack\Entities\Models\Book)
+                    <br> {{ trans('entities.permissions_book_cascade') }}
+                @elseif($model instanceof \BookStack\Entities\Models\Chapter)
+                    <br> {{ trans('entities.permissions_chapter_cascade') }}
+                @endif
+            </p>
+
+            @if($model instanceof \BookStack\Entities\Models\Bookshelf)
+                <p class="text-warn">{{ trans('entities.shelves_permissions_cascade_warning') }}</p>
+            @endif
         </div>
-        <div>
-            <div class="form-group">
+        <div class="flex-container-row justify-flex-end">
+            <div class="form-group mb-m">
                 <label for="owner">{{ trans('entities.permissions_owner') }}</label>
                 @include('form.user-select', ['user' => $model->ownedBy, 'name' => 'owned_by'])
             </div>
         </div>
     </div>
 
-    @if($model instanceof \BookStack\Entities\Models\Bookshelf)
-        <p class="text-warn">{{ trans('entities.shelves_permissions_cascade_warning') }}</p>
-    @endif
+    <hr>
 
-    <div class="content-permissions mt-m mb-xl">
-        @foreach($data->rolesWithPermissions() as $role)
-            @include('form.entity-permissions-row', ['role' => $role, 'model' => $model])
+    <div refs="entity-permissions@role-container" class="item-list mt-m mb-m">
+        @foreach($data->permissionsWithRoles() as $permission)
+            @include('form.entity-permissions-row', [
+                'permission' => $permission,
+                'role' => $permission->role,
+                'entityType' => $model->getType(),
+                'inheriting' => false,
+            ])
         @endforeach
     </div>
 
-    <div class="content-permissions mt-m mb-xl">
-        @include('form.entity-permissions-row', ['role' => $data->everyoneElseRole(), 'model' => $model])
+    <div class="flex-container-row justify-flex-end mb-xl">
+        <div class="flex-container-row items-center gap-m">
+            <label for="role_select" class="m-none p-none"><span class="bold">{{ trans('entities.permissions_role_override') }}</span></label>
+            <select name="role_select" id="role_select" refs="entity-permissions@role-select">
+                <option value="">{{ trans('common.select') }}</option>
+                @foreach($data->rolesNotAssigned() as $role)
+                    <option value="{{ $role->id }}">{{ $role->display_name }}</option>
+                @endforeach
+            </select>
+        </div>
     </div>
 
+    <div class="item-list mt-m mb-xl">
+        @include('form.entity-permissions-row', [
+                'role' => $data->everyoneElseRole(),
+                'permission' => $data->everyoneElseEntityPermission(),
+                'entityType' => $model->getType(),
+                'inheriting' => !$model->permissions()->where('role_id', '=', 0)->exists(),
+            ])
+    </div>
+
+    <hr class="mb-m">
+
     <div class="text-right">
         <a href="{{ $model->getUrl() }}" class="button outline">{{ trans('common.cancel') }}</a>
         <button type="submit" class="button">{{ trans('entities.permissions_save') }}</button>