Fixed model extending mis-use

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

diff --git a/resources/views/pages/revisions.blade.php b/resources/views/pages/revisions.blade.php
index 24e91b3669f9a2b152252bda5c20cae3d16fa388..3b9812abdc6c31376f142c1e5ac95f71d9bbdd39 100644 (file)
--- a/resources/views/pages/revisions.blade.php
+++ b/resources/views/pages/revisions.blade.php
@@ -5,53 +5,55 @@
     <div class="faded-small toolbar">
         <div class="container">
             <div class="row">
     <div class="faded-small toolbar">
         <div class="container">
             <div class="row">

-                <div class="col-md-6 faded">
-                    <div class="breadcrumbs">
-                        <a href="{{$page->getUrl()}}" class="text-primary text-button"><i class="zmdi zmdi-arrow-left"></i>Back to page</a>
-                    </div>
-                </div>
-                <div class="col-md-6 faded">
+                <div class="col-sm-12 faded">
+                    @include('pages._breadcrumbs', ['page' => $page])

                 </div>
             </div>
         </div>
     </div>
 
                 </div>
             </div>
         </div>
     </div>
 

-
-    <div class="container medium" ng-non-bindable>
-        <h1>Page Revisions <span class="subheader">For "{{ $page->name }}"</span></h1>
+    <div class="container" ng-non-bindable>
+        <h1>{{ trans('entities.pages_revisions') }}</h1>

 
         @if(count($page->revisions) > 0)
 
             <table class="table">
                 <tr>
 
         @if(count($page->revisions) > 0)
 
             <table class="table">
                 <tr>

-                    <th width="30%">Name</th>
-                    <th colspan="2" width="10%">Created By</th>
-                    <th width="15%">Revision Date</th>
-                    <th width="20%">Summary</th>
-                    <th width="15%">Actions</th>
+                    <th width="23%">{{ trans('entities.pages_name') }}</th>
+                    <th colspan="2" width="8%">{{ trans('entities.pages_revisions_created_by') }}</th>
+                    <th width="15%">{{ trans('entities.pages_revisions_date') }}</th>
+                    <th width="25%">{{ trans('entities.pages_revisions_changelog') }}</th>
+                    <th width="20%">{{ trans('common.actions') }}</th>

                 </tr>
                 </tr>

-                @foreach($page->revisions as $revision)
+                @foreach($page->revisions as $index => $revision)

                     <tr>
                     <tr>

-                        <td>{{$revision->name}}</td>
+                        <td>{{ $revision->name }}</td>

                         <td style="line-height: 0;">
                             @if($revision->createdBy)
                         <td style="line-height: 0;">
                             @if($revision->createdBy)

-                                <img class="avatar" src="{{ $revision->createdBy->getAvatar(30) }}" alt="{{$revision->createdBy->name}}">
+                                <img class="avatar" src="{{ $revision->createdBy->getAvatar(30) }}" alt="{{ $revision->createdBy->name }}">

                             @endif
                         </td>
                             @endif
                         </td>

-                        <td> @if($revision->createdBy) {{$revision->createdBy->name}} @else Deleted User @endif</td>
-                        <td><small>{{$revision->created_at->format('jS F, Y H:i:s')}} <br> ({{$revision->created_at->diffForHumans()}})</small></td>
-                        <td>{{$revision->summary}}</td>
+                        <td> @if($revision->createdBy) {{ $revision->createdBy->name }} @else {{ trans('common.deleted_user') }} @endif</td>
+                        <td><small>{{ $revision->created_at->format('jS F, Y H:i:s') }} <br> ({{ $revision->created_at->diffForHumans() }})</small></td>
+                        <td>{{ $revision->summary }}</td>

                         <td>
                         <td>

-                            <a href="{{$revision->getUrl()}}" target="_blank">Preview</a>
+                            <a href="{{ $revision->getUrl('changes') }}" target="_blank">{{ trans('entities.pages_revisions_changes') }}</a>

                             <span class="text-muted">&nbsp;|&nbsp;</span>
                             <span class="text-muted">&nbsp;|&nbsp;</span>

-                            <a href="{{$revision->getUrl()}}/restore">Restore</a>
+
+                            @if ($index === 0)
+                                <a target="_blank" href="{{ $page->getUrl() }}"><i>{{ trans('entities.pages_revisions_current') }}</i></a>
+                            @else
+                                <a href="{{ $revision->getUrl() }}" target="_blank">{{ trans('entities.pages_revisions_preview') }}</a>
+                                <span class="text-muted">&nbsp;|&nbsp;</span>
+                                <a href="{{ $revision->getUrl('restore') }}">{{ trans('entities.pages_revisions_restore') }}</a>
+                            @endif

                         </td>
                     </tr>
                 @endforeach
             </table>
 
         @else
                         </td>
                     </tr>
                 @endforeach
             </table>
 
         @else

-            <p>This page has no revisions.</p>
+            <p>{{ trans('entities.pages_revisions_none') }}</p>

         @endif
 
     </div>
         @endif
 
     </div>