Merge branch 'Copy-For-View-Only' of git://github.com/mark-james/BookStack into mark...

diff --cc app/Auth/Permissions/PermissionService.php
Simple merge

diff --cc app/Http/Controllers/PageController.php
Simple merge

diff --cc resources/views/pages/show.blade.php
index afe007d45fe057df7dc24f58065d40a1985b41a0,011158dfbfd84440e92cd73dc4129b69809a0d97..6f221edee92b37be1fa361dd582cac883cfb148c
--- 1/resources/views/pages/show.blade.php
--- 2/resources/views/pages/show.blade.php
+++ b/resources/views/pages/show.blade.php
@@@ -21,11 -21,11 +21,13 @@@
                  <div dropdown class="dropdown-container">
                      <a dropdown-toggle class="text-primary text-button">@icon('more') {{ trans('common.more') }}</a>
                      <ul>
-                         @if(userCan('page-update', $page))
+                         @if(userCanCreatePage())
                              <li><a href="{{ $page->getUrl('/copy') }}" class="text-primary" >@icon('copy'){{ trans('common.copy') }}</a></li>
-                             @if(userCan('page-delete', $page))
-                                 <li><a href="{{ $page->getUrl('/move') }}" class="text-primary" >@icon('folder'){{ trans('common.move') }}</a></li>
-                             @endif
+                         @endif
 -                        @if(userCan('page-update', $page))
++                        @if(userCan('page-delete', $page) && userCan('page-update, $page))
+                             <li><a href="{{ $page->getUrl('/move') }}" class="text-primary" >@icon('folder'){{ trans('common.move') }}</a></li>
++                        @endif
++                        @if(userCan('page-update', $page))
                              <li><a href="{{ $page->getUrl('/revisions') }}" class="text-primary">@icon('history'){{ trans('entities.revisions') }}</a></li>
                          @endif
                          @if(userCan('restrictions-manage', $page))