Page Attachments - Improved UI, Now initially complete

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

diff --git a/resources/views/pages/revisions.blade.php b/resources/views/pages/revisions.blade.php
index 74e66f5e21493160ce8e53c101e4daab3f69998a..720e34fea4efd76c4187e4f5b37b29e9b65e3a57 100644 (file)
--- a/resources/views/pages/revisions.blade.php
+++ b/resources/views/pages/revisions.blade.php
@@ -2,38 +2,64 @@
 
 @section('content')
 
 
 @section('content')
 

-    <div class="row faded-small">
-        <div class="col-md-6 faded">
-            <div class="breadcrumbs padded-horizontal">
-                <a href="{{$page->getUrl()}}" class="text-primary"><i class="zmdi zmdi-arrow-left"></i>Back to page</a>
+    <div class="faded-small toolbar">
+        <div class="container">
+            <div class="row">
+                <div class="col-sm-12 faded">
+                    <div class="breadcrumbs">
+                        <a href="{{ $page->book->getUrl() }}" class="text-book text-button"><i class="zmdi zmdi-book"></i>{{ $page->book->getShortName() }}</a>
+                        @if($page->hasChapter())
+                            <span class="sep">&raquo;</span>
+                            <a href="{{ $page->chapter->getUrl() }}" class="text-chapter text-button">
+                                <i class="zmdi zmdi-collection-bookmark"></i>
+                                {{ $page->chapter->getShortName() }}
+                            </a>
+                        @endif
+                        <span class="sep">&raquo;</span>
+                        <a href="{{ $page->getUrl() }}" class="text-page text-button"><i class="zmdi zmdi-file"></i>{{ $page->getShortName() }}</a>
+                    </div>
+                </div>

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

-        <div class="col-md-6 faded">
-        </div>

     </div>
 
     </div>
 

-    <div class="page-content">
+
+
+    <div class="container" ng-non-bindable>

         <h1>Page Revisions <span class="subheader">For "{{ $page->name }}"</span></h1>
 
         @if(count($page->revisions) > 0)
 
             <table class="table">
                 <tr>
         <h1>Page Revisions <span class="subheader">For "{{ $page->name }}"</span></h1>
 
         @if(count($page->revisions) > 0)
 
             <table class="table">
                 <tr>

-                    <th>Name</th>
-                    <th colspan="2">Created By</th>
-                    <th>Revision Date</th>
-                    <th>Actions</th>
+                    <th width="23%">Name</th>
+                    <th colspan="2" width="8%">Created By</th>
+                    <th width="15%">Revision Date</th>
+                    <th width="25%">Changelog</th>
+                    <th width="20%">Actions</th>

                 </tr>
                 </tr>

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

                     <tr>
                     <tr>

-                        <td>{{$revision->name}}</td>
-                        <td style="line-height: 0;"><img class="avatar" src="{{ $revision->createdBy->getAvatar(30) }}" alt="{{$revision->createdBy->name}}"></td>
-                        <td> {{$revision->createdBy->name}}</td>
-                        <td><small>{{$revision->created_at->format('jS F, Y H:i:s')}} ({{$revision->created_at->diffForHumans()}})</small></td>
+                        <td>{{ $revision->name }}</td>
+                        <td style="line-height: 0;">
+                            @if($revision->createdBy)
+                                <img class="avatar" src="{{ $revision->createdBy->getAvatar(30) }}" alt="{{ $revision->createdBy->name }}">
+                            @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>
                         <td>

-                            <a href="{{$revision->getUrl()}}" target="_blank">Preview</a>
+                            <a href="{{ $revision->getUrl('changes') }}" target="_blank">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>Current Version</i></a>
+                            @else
+                                <a href="{{ $revision->getUrl() }}" target="_blank">Preview</a>
+                                <span class="text-muted">&nbsp;|&nbsp;</span>
+                                <a href="{{ $revision->getUrl('restore') }}" target="_blank">Restore</a>
+                            @endif

                         </td>
                     </tr>
                 @endforeach
                         </td>
                     </tr>
                 @endforeach