From: Dan Brown <redacted>
Date: Sun, 13 Jan 2019 14:10:27 +0000 (+0000)
Subject: Merge branch 'master' into 2019-design
X-Git-Tag: v0.26.0~1^2~23^2~50
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/163a57cf7080738accb8a25232125b1f1d659035

Merge branch 'master' into 2019-design
---

163a57cf7080738accb8a25232125b1f1d659035
diff --cc app/Http/Controllers/UserController.php
index 92dc3cdaa,cc5ada3f2..933b3d594
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@@ -277,11 -260,10 +281,11 @@@ class UserController extends Controlle
              $viewType = 'list';
          }
  
-         $user = $this->user->findOrFail($userId);
 -        $user = $this->user->findOrFail($id);
 -        setting()->putUser($user, 'books_view_type', $viewType);
++        $user = $this->userRepo->getById($id);
 +        $key = $listName . '_view_type';
 +        setting()->putUser($user, $key, $viewType);
  
 -        return redirect()->back(302, [], "/settings/users/$id");
 +        return redirect()->back(302, [], "/settings/users/$userId");
      }
  
      /**
diff --cc resources/lang/en/common.php
index 3e42c9feb,ac2edc621..1f71c3272
--- a/resources/lang/en/common.php
+++ b/resources/lang/en/common.php
@@@ -40,16 -37,7 +37,12 @@@ return 
      'remove' => 'Remove',
      'add' => 'Add',
  
-     /**
-      * Sort Options
-      */
++    // Sort Options
 +    'sort_name' => 'Name',
 +    'sort_created_at' => 'Created Date',
 +    'sort_updated_at' => 'Updated Date',
 +
-     /**
-      * Misc
-      */
+     // Misc
      'deleted_user' => 'Deleted User',
      'no_activity' => 'No activity to show',
      'no_items' => 'No items available',
@@@ -67,9 -53,7 +58,7 @@@
      'view_profile' => 'View Profile',
      'edit_profile' => 'Edit Profile',
  
-     /**
-      * Email Content
-      */
+     // Email Content
      'email_action_help' => 'If you’re having trouble clicking the ":actionText" button, copy and paste the URL below into your web browser:',
      'email_rights' => 'All rights reserved',
--];
++];
diff --cc resources/views/common/header.blade.php
index 7f309e21f,000000000..67aa67599
mode 100644,000000..100644
--- a/resources/views/common/header.blade.php
+++ b/resources/views/common/header.blade.php
@@@ -1,58 -1,0 +1,64 @@@
 +<header id="header" header-mobile-toggle>
 +    <div class="grid break-l mx-l">
 +        <div>
 +            <a href="{{ baseUrl('/') }}" class="logo">
 +                @if(setting('app-logo', '') !== 'none')
 +                    <img class="logo-image" src="{{ setting('app-logo', '') === '' ? baseUrl('/logo.png') : baseUrl(setting('app-logo', '')) }}" alt="Logo">
 +                @endif
 +                @if (setting('app-name-header'))
 +                    <span class="logo-text">{{ setting('app-name') }}</span>
 +                @endif
 +            </a>
 +            <div class="mobile-menu-toggle hide-over-l">@icon('more')</div>
 +        </div>
 +        <div class="header-search hide-under-l">
 +            <form action="{{ baseUrl('/search') }}" method="GET" class="search-box">
 +                <button id="header-search-box-button" type="submit">@icon('search') </button>
 +                <input id="header-search-box-input" type="text" name="term" tabindex="2" placeholder="{{ trans('common.search') }}" value="{{ isset($searchTerm) ? $searchTerm : '' }}">
 +            </form>
 +        </div>
 +        <div class="text-right">
 +            <div class="header-links">
 +                <div class="links text-center">
 +                    <a class="hide-over-l" href="{{ baseUrl('/search') }}">@icon('search'){{ trans('common.search') }}</a>
 +                    @if(userCan('bookshelf-view-all') || userCan('bookshelf-view-own'))
 +                        <a href="{{ baseUrl('/shelves') }}">@icon('bookshelf'){{ trans('entities.shelves') }}</a>
 +                    @endif
 +                    <a href="{{ baseUrl('/books') }}">@icon('book'){{ trans('entities.books') }}</a>
 +                    @if(signedInUser() && userCan('settings-manage'))
 +                        <a href="{{ baseUrl('/settings') }}">@icon('settings'){{ trans('settings.settings') }}</a>
 +                    @endif
++                    @if(signedInUser() && userCan('users-manage') && !userCan('settings-manage'))
++                        <a href="{{ baseUrl('/settings/users') }}">@icon('users'){{ trans('settings.users') }}</a>
++                    @endif
 +                    @if(!signedInUser())
-                         <a href="{{ baseUrl('/login') }}">@icon('login'){{ trans('auth.log_in') }}</a>
++                        @if(setting('registration-enabled', false))
++                            <a href="{{ baseUrl("/register") }}">@icon('new-user') {{ trans('auth.sign_up') }}</a>
++                        @endif
++                        <a href="{{ baseUrl('/login') }}">@icon('login') {{ trans('auth.log_in') }}</a>
 +                    @endif
 +                </div>
 +                @if(signedInUser())
 +                    <?php $currentUser = user(); ?>
 +                    <div class="dropdown-container" dropdown>
 +                        <span class="user-name hide-under-l" dropdown-toggle>
 +                            <img class="avatar" src="{{$currentUser->getAvatar(30)}}" alt="{{ $currentUser->name }}">
 +                            <span class="name">{{ $currentUser->getShortName(9) }}</span> @icon('caret-down')
 +                        </span>
 +                        <ul>
 +                            <li>
 +                                <a href="{{ baseUrl("/user/{$currentUser->id}") }}" class="text-primary">@icon('user'){{ trans('common.view_profile') }}</a>
 +                            </li>
 +                            <li>
 +                                <a href="{{ baseUrl("/settings/users/{$currentUser->id}") }}" class="text-primary">@icon('edit'){{ trans('common.edit_profile') }}</a>
 +                            </li>
 +                            <li>
 +                                <a href="{{ baseUrl('/logout') }}" class="text-neg">@icon('logout'){{ trans('auth.logout') }}</a>
 +                            </li>
 +                        </ul>
 +                    </div>
 +                @endif
 +            </div>
 +        </div>
 +    </div>
 +</header>
diff --cc resources/views/pages/show.blade.php
index 282ae21d2,afe007d45..f7f8e2cf2
--- a/resources/views/pages/show.blade.php
+++ b/resources/views/pages/show.blade.php
@@@ -111,57 -148,3 +111,59 @@@
        </div>
      @endif
  @stop
 +
 +@section('right')
 +    <div class="actions mb-xl">
 +        <h5>Actions</h5>
 +
 +        <div class="icon-list text-primary">
 +            {{--Export--}}
 +            <div dropdown class="dropdown-container block">
 +                <div dropdown-toggle class="icon-list-item">
 +                    <span class="icon">@icon('export')</span>
 +                    <span>{{ trans('entities.export') }}</span>
 +                </div>
 +                <ul class="wide">
 +                    <li><a href="{{ $page->getUrl('/export/html') }}" target="_blank">{{ trans('entities.export_html') }} <span class="text-muted float right">.html</span></a></li>
 +                    <li><a href="{{ $page->getUrl('/export/pdf') }}" target="_blank">{{ trans('entities.export_pdf') }} <span class="text-muted float right">.pdf</span></a></li>
 +                    <li><a href="{{ $page->getUrl('/export/plaintext') }}" target="_blank">{{ trans('entities.export_text') }} <span class="text-muted float right">.txt</span></a></li>
 +                </ul>
 +            </div>
 +
 +            {{--User Actions--}}
 +            @if(userCan('page-update', $page))
 +                <a href="{{ $page->getUrl('/edit') }}" class="icon-list-item">
 +                    <span class="icon">@icon('edit')</span>
 +                    <span>{{ trans('common.edit') }}</span>
 +                </a>
 +                <a href="{{ $page->getUrl('/copy') }}" class="icon-list-item">
 +                    <span class="icon">@icon('copy')</span>
 +                    <span>{{ trans('common.copy') }}</span>
 +                </a>
-                 <a href="{{ $page->getUrl('/move') }}" class="icon-list-item">
-                     <span class="icon">@icon('folder')</span>
-                     <span>{{ trans('common.move') }}</span>
-                 </a>
++                @if(userCan('page-delete', $page))
++	                <a href="{{ $page->getUrl('/move') }}" class="icon-list-item">
++	                    <span class="icon">@icon('folder')</span>
++	                    <span>{{ trans('common.move') }}</span>
++	                </a>
++                @endif
 +                <a href="{{ $page->getUrl('/revisions') }}" class="icon-list-item">
 +                    <span class="icon">@icon('history')</span>
 +                    <span>{{ trans('entities.revisions') }}</span>
 +                </a>
 +            @endif
 +            @if(userCan('restrictions-manage', $page))
 +                <a href="{{ $page->getUrl('/permissions') }}" class="icon-list-item">
 +                    <span class="icon">@icon('lock')</span>
 +                    <span>{{ trans('entities.permissions') }}</span>
 +                </a>
 +            @endif
 +            @if(userCan('page-delete', $page))
 +                <a href="{{ $page->getUrl('/delete') }}" class="icon-list-item">
 +                    <span class="icon">@icon('delete')</span>
 +                    <span>{{ trans('common.delete') }}</span>
 +                </a>
 +            @endif
 +        </div>
 +
 +    </div>
 +@stop