Fixed model extending mis-use

[bookstack] / resources / views / pages / page-display.blade.php

diff --git a/resources/views/pages/page-display.blade.php b/resources/views/pages/page-display.blade.php
index df555da078ab49c0940832a9e792ae25833f8a18..cb7cae445bcafbe2b38b134bdc98c00607d23df7 100644 (file)
--- a/resources/views/pages/page-display.blade.php
+++ b/resources/views/pages/page-display.blade.php
@@ -1,22 +1,12 @@
 <div ng-non-bindable>
 
 <div ng-non-bindable>
 

-    <h1 id="bkmrk-page-title" class="float left">{{$page->name}}</h1>
-
-    @if(count($page->tags) > 0)
-        <div class="tag-display float right">
-            <div class="heading primary-background-light">Page Tags</div>
-            <table>
-                @foreach($page->tags as $tag)
-                    <tr class="tag">
-                        <td @if(!$tag->value) colspan="2" @endif> {{ $tag->name }}</td>
-                        @if($tag->value) <td class="tag-value">{{$tag->value}}</td> @endif
-                    </tr>
-                @endforeach
-            </table>
-        </div>
-    @endif
+    <h1 id="bkmrk-page-title">{{$page->name}}</h1>

 
     <div style="clear:left;"></div>
 
 
     <div style="clear:left;"></div>
 

-    {!! $page->html !!}
+    @if (isset($diff) && $diff)
+        {!! $diff !!}
+    @else
+        {!! isset($pageContent) ? $pageContent : $page->html !!}
+    @endif

 </div>
\ No newline at end of file
 </div>
\ No newline at end of file