From: Dan Brown Date: Sun, 10 Mar 2019 21:40:02 +0000 (+0000) Subject: Merge branch 'master' into 2019-design X-Git-Tag: v0.26.0~1^2~23^2~32 X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/5f2d226f09229566de24f0f6ff526eaf9ade9e1f Merge branch 'master' into 2019-design --- 5f2d226f09229566de24f0f6ff526eaf9ade9e1f diff --cc app/Http/Controllers/PageController.php index 7ebf26209,d95e02470..16a7d5a5e --- a/app/Http/Controllers/PageController.php +++ b/app/Http/Controllers/PageController.php @@@ -616,9 -643,9 +616,9 @@@ class PageController extends Controlle public function showCopy($bookSlug, $pageSlug) { $page = $this->pageRepo->getPageBySlug($pageSlug, $bookSlug); - $this->checkOwnablePermission('page-update', $page); + $this->checkOwnablePermission('page-view', $page); session()->flashInput(['name' => $page->name]); - return view('pages/copy', [ + return view('pages.copy', [ 'book' => $page->book, 'page' => $page ]); diff --cc resources/views/common/header.blade.php index f1661a146,000000000..89aa1078d mode 100644,000000..100644 --- a/resources/views/common/header.blade.php +++ b/resources/views/common/header.blade.php @@@ -1,73 -1,0 +1,73 @@@ + diff --cc resources/views/pages/show.blade.php index 8444155a6,db2f1462e..6858661c4 --- a/resources/views/pages/show.blade.php +++ b/resources/views/pages/show.blade.php @@@ -113,61 -117,36 +113,65 @@@ - @include('partials/book-tree', ['book' => $book, 'sidebarTree' => $sidebarTree]) - + @include('partials.book-tree', ['book' => $book, 'sidebarTree' => $sidebarTree]) @stop -@section('body-wrap-classes', 'flex-fill columns') +@section('right') +
+
Actions
-@section('body') - -
+
+ {{--Export--}} +
+
+ @icon('export') + {{ trans('entities.export') }} +
+ +
-
-
- @icon('link') @icon('include', ['style' => 'display:none;']) - - - - - @if(userCan('page-update', $page)) - @icon('edit') + {{--User Actions--}} + @if(userCan('page-update', $page)) + + @icon('edit') + {{ trans('common.edit') }} + ++ @endif ++ @if(userCanOnAny('page-create')) + + @icon('copy') + {{ trans('common.copy') }} + ++ @endif ++ @if(userCan('page-update', $page)) + @if(userCan('page-delete', $page)) + + @icon('folder') + {{ trans('common.move') }} + @endif -
+ + @icon('history') + {{ trans('entities.revisions') }} + + @endif + @if(userCan('restrictions-manage', $page)) + + @icon('lock') + {{ trans('entities.permissions') }} + + @endif + @if(userCan('page-delete', $page)) + + @icon('delete') + {{ trans('common.delete') }} + + @endif
- @include('pages/page-display')
- - @if ($commentsEnabled) -
- @include('comments/comments', ['page' => $page]) -
- @endif @stop diff --cc resources/views/users/edit.blade.php index 42fc2beb1,1b0514f9c..e6e66665f --- a/resources/views/users/edit.blade.php +++ b/resources/views/users/edit.blade.php @@@ -1,66 -1,60 +1,66 @@@ @extends('simple-layout') -@section('toolbar') - @include('settings/navbar', ['selected' => 'users']) -@stop - @section('body') -
-

 

-
-

@icon('edit') {{ $user->id === $currentUser->id ? trans('settings.users_edit_profile') : trans('settings.users_edit') }}

-
-
id}") }}" method="post"> -
-
- {!! csrf_field() !!} - - @include('users.forms.' . $authMethod, ['model' => $user]) -
-
-
- -

{{ trans('settings.users_avatar_desc') }}

+
+ @include('settings.navbar', ['selected' => 'users']) +
- @include('components.image-picker', [ - 'resizeHeight' => '512', - 'resizeWidth' => '512', - 'showRemove' => false, - 'defaultImage' => baseUrl('/user_avatar.png'), - 'currentImage' => $user->getAvatar(80), - 'currentId' => $user->image_id, - 'name' => 'image_id', - 'imageClass' => 'avatar large' - ]) -
-
- - - @foreach(trans('settings.language_select') as $lang => $label) - - @endforeach - -
+
+ @include('users.form', ['model' => $user, 'authMethod' => $authMethod]) + +
+
+ +

{{ trans('settings.users_avatar_desc') }}

+
+
+ @include('components.image-picker', [ + 'resizeHeight' => '512', + 'resizeWidth' => '512', + 'showRemove' => false, + 'defaultImage' => baseUrl('/user_avatar.png'), + 'currentImage' => $user->getAvatar(80), + 'currentId' => $user->image_id, + 'name' => 'image_id', + 'imageClass' => 'avatar large' + ])
-
- {{ trans('common.cancel') }} - @if($authMethod !== 'system') - id}/delete") }}" class="neg button">{{ trans('settings.users_delete') }} - @endif - + +
+
+ +

+ {{ trans('settings.users_preferred_language_desc') }} +

+
+
+ +
- -
+ +
+ +
+ {{ trans('common.cancel') }} + @if($authMethod !== 'system') + id}/delete") }}" class="button outline">{{ trans('settings.users_delete') }} + @endif + +
+
@if($currentUser->id === $user->id && count($activeSocialDrivers) > 0) @@@ -85,7 -82,10 +85,7 @@@
@endif - -
-


@include('components.image-manager', ['imageType' => 'user']) --@stop ++@stop