Fixed model extending mis-use

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

diff --git a/resources/views/pages/edit.blade.php b/resources/views/pages/edit.blade.php
index a536ad23ea4b2d3f33f453babf0707d0b30a5740..e1c0a169d6f4661f9a6205091594bd9c2429b287 100644 (file)
--- a/resources/views/pages/edit.blade.php
+++ b/resources/views/pages/edit.blade.php
@@ -1,7 +1,7 @@
 @extends('base')
 
 @section('head')
 @extends('base')
 
 @section('head')

-    <script src="/libs/tinymce/tinymce.min.js?ver=4.3.7"></script>
+    <script src="{{ baseUrl('/libs/tinymce/tinymce.min.js?ver=4.4.3') }}"></script>

 @stop
 
 @section('body-class', 'flexbox')
 @stop
 
 @section('body-class', 'flexbox')


@@ -9,26 +9,18 @@
 @section('content')
 
     <div class="flex-fill flex">
 @section('content')
 
     <div class="flex-fill flex">

-        <form action="{{$page->getUrl()}}" data-page-id="{{ $page->id }}" method="POST" class="flex flex-fill">
+        <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])
             @if(!isset($isDraft))
                 <input type="hidden" name="_method" value="PUT">
             @endif
             @include('pages/form', ['model' => $page])

+            @include('pages/form-toolbox')

         </form>
 
         </form>
 

-        <div class="floating-toolbox" ng-controller="PageAttributeController" page-id="{{ $page->id or 0 }}">
-            <form ng-submit="saveAttributes()">
-                <table>
-                    <tr ng-repeat="attribute in attributes">
-                        <td><input type="text" ng-model="attribute.name" ng-change="attributeChange(attribute)" ng-blur="attributeBlur(attribute)" placeholder="Attribute Name"></td>
-                        <td><input type="text" ng-model="attribute.value" ng-change="attributeChange(attribute)" ng-blur="attributeBlur(attribute)" placeholder="Value"></td>
-                    </tr>
-                </table>
-                <button class="button pos" type="submit">Save attributes</button>
-            </form>
-        </div>

 
     </div>
 
     </div>

-    @include('partials/image-manager', ['imageType' => 'gallery', 'uploaded_to' => $page->id])
+    
+    @include('components.image-manager', ['imageType' => 'gallery', 'uploaded_to' => $page->id])
+    @include('components.entity-selector-popup')

 
 @stop
\ No newline at end of file
 
 @stop
\ No newline at end of file