Merge branch 'master' into translations

[bookstack] / resources / views / pages / edit.blade.php

diff --git a/resources/views/pages/edit.blade.php b/resources/views/pages/edit.blade.php
index fee9782fdf62f1a3b0bfc03c7df2fbb78fe3a153..e1c0a169d6f4661f9a6205091594bd9c2429b287 100644 (file)
--- a/resources/views/pages/edit.blade.php
+++ b/resources/views/pages/edit.blade.php
@@ -1,20 +1,26 @@
 @extends('base')
 
 @section('head')
-    <script src="/bower/tinymce-dist/tinymce.jquery.min.js"></script>
-    <script src="/bower/dropzone/dist/min/dropzone.min.js"></script>
-    <script src="/js/image-manager.js"></script>
+    <script src="{{ baseUrl('/libs/tinymce/tinymce.min.js?ver=4.4.3') }}"></script>
 @stop
 
+@section('body-class', 'flexbox')
+
 @section('content')
 
-    <form action="{{$page->getUrl()}}" method="POST">
-        <input type="hidden" name="_method" value="PUT">
-        @include('pages/form', ['model' => $page])
-    </form>
+    <div class="flex-fill flex">
+        <form action="{{ $page->getUrl() }}" autocomplete="off" data-page-id="{{ $page->id }}" method="POST" class="flex flex-fill">
+            @if(!isset($isDraft))
+                <input type="hidden" name="_method" value="PUT">
+            @endif
+            @include('pages/form', ['model' => $page])
+            @include('pages/form-toolbox')
+        </form>
 
-@stop
 
-@section('bottom')
-    @include('pages/image-manager')
+    </div>
+    
+    @include('components.image-manager', ['imageType' => 'gallery', 'uploaded_to' => $page->id])
+    @include('components.entity-selector-popup')
+
 @stop
\ No newline at end of file