diff --git a/resources/assets/js/components/page-display.js b/resources/assets/js/components/page-display.js index fc360ff69..f51cb7f34 100644 --- a/resources/assets/js/components/page-display.js +++ b/resources/assets/js/components/page-display.js @@ -35,6 +35,7 @@ class PageDisplay { } setupPointer() { + if (document.getElementById('pointer') === null) return; // Set up pointer let $pointer = $('#pointer').detach(); let pointerShowing = false; diff --git a/resources/assets/sass/_pages.scss b/resources/assets/sass/_pages.scss index df6cda02d..ca146d890 100755 --- a/resources/assets/sass/_pages.scss +++ b/resources/assets/sass/_pages.scss @@ -40,6 +40,9 @@ margin: 0 auto; margin-top: $-xxl; overflow-wrap: break-word; + &.flex { + margin-top: $-m; + } .align-left { text-align: left; } diff --git a/resources/views/base.blade.php b/resources/views/base.blade.php index de208a3ae..8f6c2eb46 100644 --- a/resources/views/base.blade.php +++ b/resources/views/base.blade.php @@ -33,7 +33,7 @@ <header id="header"> <div class="container fluid"> <div class="row"> - <div class="col-sm-4" ng-non-bindable> + <div class="col-sm-4"> <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"> diff --git a/resources/views/books/create.blade.php b/resources/views/books/create.blade.php index a86cb3352..2d5e6c455 100644 --- a/resources/views/books/create.blade.php +++ b/resources/views/books/create.blade.php @@ -12,7 +12,7 @@ @section('body') -<div ng-non-bindable class="container small"> +<div class="container small"> <p> </p> <div class="card"> <h3>@icon('add') {{ trans('entities.books_create') }}</h3> diff --git a/resources/views/books/delete.blade.php b/resources/views/books/delete.blade.php index 7aeaf6fae..0ac98e895 100644 --- a/resources/views/books/delete.blade.php +++ b/resources/views/books/delete.blade.php @@ -8,7 +8,7 @@ @section('body') - <div class="container small" ng-non-bindable> + <div class="container small"> <p> </p> <div class="card"> <h3>@icon('delete') {{ trans('entities.books_delete') }}</h3> diff --git a/resources/views/books/edit.blade.php b/resources/views/books/edit.blade.php index 0f61512db..cb1ffc461 100644 --- a/resources/views/books/edit.blade.php +++ b/resources/views/books/edit.blade.php @@ -8,7 +8,7 @@ @section('body') - <div class="container small" ng-non-bindable> + <div class="container small"> <p> </p> <div class="card"> <h3>@icon('edit') {{ trans('entities.books_edit') }}</h3> diff --git a/resources/views/books/restrictions.blade.php b/resources/views/books/restrictions.blade.php index 88a3b2419..2a6eb0bea 100644 --- a/resources/views/books/restrictions.blade.php +++ b/resources/views/books/restrictions.blade.php @@ -8,7 +8,7 @@ @section('body') - <div class="container" ng-non-bindable> + <div class="container"> <p> </p> <div class="card"> <h3>@icon('lock') {{ trans('entities.books_permissions') }}</h3> diff --git a/resources/views/books/sort-box.blade.php b/resources/views/books/sort-box.blade.php index d79bbd95e..cff3c8984 100644 --- a/resources/views/books/sort-box.blade.php +++ b/resources/views/books/sort-box.blade.php @@ -1,4 +1,4 @@ -<div class="sort-box" data-type="book" data-id="{{ $book->id }}" ng-non-bindable> +<div class="sort-box" data-type="book" data-id="{{ $book->id }}"> <h3 class="text-book">@icon('book'){{ $book->name }}</h3> <ul class="sortable-page-list sort-list"> @foreach($bookChildren as $bookChild) diff --git a/resources/views/books/sort.blade.php b/resources/views/books/sort.blade.php index aa77dfcae..77e95448f 100644 --- a/resources/views/books/sort.blade.php +++ b/resources/views/books/sort.blade.php @@ -8,7 +8,7 @@ @section('body') - <div class="container" ng-non-bindable> + <div class="container"> <div class="row"> <div class="col-md-8"> diff --git a/resources/views/chapters/create.blade.php b/resources/views/chapters/create.blade.php index 9930da605..765756055 100644 --- a/resources/views/chapters/create.blade.php +++ b/resources/views/chapters/create.blade.php @@ -12,7 +12,7 @@ @section('body') - <div class="container small" ng-non-bindable> + <div class="container small"> <div class="card"> <h3>@icon('add') {{ trans('entities.chapters_create') }}</h3> <div class="body"> diff --git a/resources/views/chapters/delete.blade.php b/resources/views/chapters/delete.blade.php index 062849d29..727b4c9bb 100644 --- a/resources/views/chapters/delete.blade.php +++ b/resources/views/chapters/delete.blade.php @@ -8,7 +8,7 @@ @section('body') - <div class="container small" ng-non-bindable> + <div class="container small"> <p> </p> <div class="card"> <h3>@icon('delete') {{ trans('entities.chapters_delete') }}</h3> diff --git a/resources/views/chapters/edit.blade.php b/resources/views/chapters/edit.blade.php index c52f7bafe..04c5aa724 100644 --- a/resources/views/chapters/edit.blade.php +++ b/resources/views/chapters/edit.blade.php @@ -8,7 +8,7 @@ @section('body') - <div class="container small" ng-non-bindable> + <div class="container small"> <p> </p> <div class="card"> <h3>@icon('edit') {{ trans('entities.chapters_edit') }}</h3> diff --git a/resources/views/chapters/restrictions.blade.php b/resources/views/chapters/restrictions.blade.php index d892d30d5..70eb224ae 100644 --- a/resources/views/chapters/restrictions.blade.php +++ b/resources/views/chapters/restrictions.blade.php @@ -8,7 +8,7 @@ @section('body') - <div class="container" ng-non-bindable> + <div class="container"> <p> </p> <div class="card"> <h3>@icon('lock') {{ trans('entities.chapters_permissions') }}</h3> diff --git a/resources/views/comments/comments.blade.php b/resources/views/comments/comments.blade.php index 756e32ef4..5d3aafa10 100644 --- a/resources/views/comments/comments.blade.php +++ b/resources/views/comments/comments.blade.php @@ -1,4 +1,4 @@ -<div page-comments page-id="{{ $page->id }}" ng-non-bindable class="comments-list"> +<div page-comments page-id="{{ $page->id }}" class="comments-list"> <h5 comments-title class="float left">{{ trans_choice('entities.comment_count', count($page->comments), ['count' => count($page->comments)]) }}</h5> <div class="comment-container" comment-container> diff --git a/resources/views/common/home.blade.php b/resources/views/common/home.blade.php index 121d93f44..bbddb072d 100644 --- a/resources/views/common/home.blade.php +++ b/resources/views/common/home.blade.php @@ -10,7 +10,7 @@ @section('body') - <div class="container" ng-non-bindable> + <div class="container"> <div class="row"> <div class="col-sm-4"> diff --git a/resources/views/pages/delete.blade.php b/resources/views/pages/delete.blade.php index 6c84819ec..901ea182c 100644 --- a/resources/views/pages/delete.blade.php +++ b/resources/views/pages/delete.blade.php @@ -8,7 +8,7 @@ @section('body') - <div class="container small" ng-non-bindable> + <div class="container small"> <p> </p> <div class="card"> <h3>@icon('delete') {{ $page->draft ? trans('entities.pages_delete_draft') : trans('entities.pages_delete') }}</h3> diff --git a/resources/views/pages/guest-create.blade.php b/resources/views/pages/guest-create.blade.php index c5ad8ce70..2d059bf36 100644 --- a/resources/views/pages/guest-create.blade.php +++ b/resources/views/pages/guest-create.blade.php @@ -2,7 +2,7 @@ @section('content') - <div class="container small" ng-non-bindable> + <div class="container small"> <h1>{{ trans('entities.pages_new') }}</h1> <form action="{{ $parent->getUrl('/create-guest-page') }}" method="POST"> diff --git a/resources/views/pages/page-display.blade.php b/resources/views/pages/page-display.blade.php index 7a6d6ae3c..b3fdf11ec 100644 --- a/resources/views/pages/page-display.blade.php +++ b/resources/views/pages/page-display.blade.php @@ -1,4 +1,4 @@ -<div ng-non-bindable> +<div> <h1 class="break-text" v-pre id="bkmrk-page-title">{{$page->name}}</h1> diff --git a/resources/views/pages/restrictions.blade.php b/resources/views/pages/restrictions.blade.php index 03253a6b3..a7a1e18b7 100644 --- a/resources/views/pages/restrictions.blade.php +++ b/resources/views/pages/restrictions.blade.php @@ -7,7 +7,7 @@ @stop @section('body') - <div class="container" ng-non-bindable> + <div class="container"> <p> </p> <div class="card"> <h3>@icon('lock') {{ trans('entities.pages_permissions') }}</h3> diff --git a/resources/views/pages/revision.blade.php b/resources/views/pages/revision.blade.php index f9e8a22c4..ec6ca112e 100644 --- a/resources/views/pages/revision.blade.php +++ b/resources/views/pages/revision.blade.php @@ -11,7 +11,7 @@ @section('body') - <div class="container" ng-non-bindable> + <div class="container"> <div class="row"> <div class="col-md-9"> <div class="page-content"> diff --git a/resources/views/pages/revisions.blade.php b/resources/views/pages/revisions.blade.php index c09661206..d07dc6fcc 100644 --- a/resources/views/pages/revisions.blade.php +++ b/resources/views/pages/revisions.blade.php @@ -7,7 +7,7 @@ @stop @section('body') - <div class="container" ng-non-bindable> + <div class="container"> <p> </p> <div class="card"> diff --git a/resources/views/partials/_header-dropdown.blade.php b/resources/views/partials/_header-dropdown.blade.php index 5e9632c4e..176e00739 100644 --- a/resources/views/partials/_header-dropdown.blade.php +++ b/resources/views/partials/_header-dropdown.blade.php @@ -1,7 +1,7 @@ <div class="dropdown-container" dropdown> <span class="user-name" dropdown-toggle> <img class="avatar" src="{{$currentUser->getAvatar(30)}}" alt="{{ $currentUser->name }}"> - <span class="name" ng-non-bindable>{{ $currentUser->getShortName(9) }}</span> @icon('caret-down') + <span class="name">{{ $currentUser->getShortName(9) }}</span> @icon('caret-down') </span> <ul> <li> diff --git a/resources/views/partials/entity-list.blade.php b/resources/views/partials/entity-list.blade.php index 95ebfcd4f..c90b953ea 100644 --- a/resources/views/partials/entity-list.blade.php +++ b/resources/views/partials/entity-list.blade.php @@ -1,5 +1,5 @@ -<div class="entity-list @if(isset($style)){{ $style }}@endif" ng-non-bindable> +<div class="entity-list @if(isset($style)){{ $style }}@endif"> @if(count($entities) > 0) @foreach($entities as $index => $entity) @if($entity->isA('page')) diff --git a/resources/views/search/all.blade.php b/resources/views/search/all.blade.php index f24e83bc2..da9a169ee 100644 --- a/resources/views/search/all.blade.php +++ b/resources/views/search/all.blade.php @@ -10,7 +10,7 @@ @section('container-attrs') id="search-system" - ng-non-bindable="" + ="" @stop @section('sidebar') diff --git a/resources/views/search/entity-ajax-list.blade.php b/resources/views/search/entity-ajax-list.blade.php index 9a146506f..1e0b325f9 100644 --- a/resources/views/search/entity-ajax-list.blade.php +++ b/resources/views/search/entity-ajax-list.blade.php @@ -1,4 +1,4 @@ -<div class="entity-list @if(isset($style)){{ $style }}@endif" ng-non-bindable> +<div class="entity-list @if(isset($style)){{ $style }}@endif"> @if(count($entities) > 0) @foreach($entities as $index => $entity) @if($entity->isA('page')) diff --git a/resources/views/settings/roles/delete.blade.php b/resources/views/settings/roles/delete.blade.php index 7d7287277..6e447c379 100644 --- a/resources/views/settings/roles/delete.blade.php +++ b/resources/views/settings/roles/delete.blade.php @@ -5,7 +5,7 @@ @stop @section('body') - <div class="container small" ng-non-bindable> + <div class="container small"> <p> </p> <div class="card"> <h3>@icon('delete') {{ trans('settings.role_delete') }}</h3> diff --git a/resources/views/users/create.blade.php b/resources/views/users/create.blade.php index fc4e09a42..d42ca9f51 100644 --- a/resources/views/users/create.blade.php +++ b/resources/views/users/create.blade.php @@ -6,7 +6,7 @@ @section('body') - <div class="container small" ng-non-bindable> + <div class="container small"> <p> </p> <div class="card"> <h3>@icon('users-add') {{ trans('settings.users_add_new') }}</h3> diff --git a/resources/views/users/delete.blade.php b/resources/views/users/delete.blade.php index ce9e0442f..39cd12200 100644 --- a/resources/views/users/delete.blade.php +++ b/resources/views/users/delete.blade.php @@ -6,7 +6,7 @@ @section('body') - <div class="container small" ng-non-bindable> + <div class="container small"> <p> </p> <div class="card"> <h3>@icon('delete') {{ trans('settings.users_delete') }}</h3> diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php index b6f8f7345..c4b02f9b9 100644 --- a/resources/views/users/edit.blade.php +++ b/resources/views/users/edit.blade.php @@ -13,7 +13,7 @@ <div class="body"> <form action="{{ baseUrl("/settings/users/{$user->id}") }}" method="post"> <div class="row"> - <div class="col-sm-6" ng-non-bindable> + <div class="col-sm-6"> {!! csrf_field() !!} <input type="hidden" name="_method" value="put"> @include('users.forms.' . $authMethod, ['model' => $user]) diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php index 3c507e0f1..fd05a7a15 100644 --- a/resources/views/users/index.blade.php +++ b/resources/views/users/index.blade.php @@ -5,7 +5,7 @@ @stop @section('body') - <div class="container small" ng-non-bindable> + <div class="container small"> <p> </p> <div class="card"> <h3>@icon('users') {{ trans('settings.users') }}</h3> diff --git a/resources/views/users/profile.blade.php b/resources/views/users/profile.blade.php index cd6d4576e..bd63ce938 100644 --- a/resources/views/users/profile.blade.php +++ b/resources/views/users/profile.blade.php @@ -17,7 +17,7 @@ @section('body') - <div class="container small" ng-non-bindable> + <div class="container small"> <div class="padded-top large"></div>