ExportFormatter: Add book description and check for empty book and chapter descriptio...

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

diff --git a/resources/views/pages/revisions.blade.php b/resources/views/pages/revisions.blade.php
index 72017467ed133b41f945e72f12d8c59ab8151908..9f462e930ebb6e7e054a303a2664f807ada4948a 100644 (file)
--- a/resources/views/pages/revisions.blade.php
+++ b/resources/views/pages/revisions.blade.php
@@ -1,77 +1,53 @@
-@extends('simple-layout')
-
-@section('toolbar')
-    <div class="col-sm-12 faded">
-        @include('pages._breadcrumbs', ['page' => $page])
-    </div>
-@stop
+@extends('layouts.simple')

 
 @section('body')
     <div class="container">
 
 @section('body')
     <div class="container">

-        <p>&nbsp;</p>

 
 

-        <div class="card">
-            <h3>@icon('history') {{ trans('entities.pages_revisions') }}</h3>
-            <div class="body">
-                @if(count($page->revisions) > 0)
+        <div class="my-s">
+            @include('entities.breadcrumbs', ['crumbs' => [
+                $page->book,
+                $page->chapter,
+                $page,
+                $page->getUrl('/revisions') => [
+                    'text' => trans('entities.pages_revisions'),
+                    'icon' => 'history',
+                ]
+            ]])
+        </div>

 
 

-                    <table class="table">
-                        <tr>
-                            <th width="3%">{{ trans('entities.pages_revisions_number') }}</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>
-                        @foreach($page->revisions as $index => $revision)
-                            <tr>
-                                <td>{{ $revision->revision_number == 0 ? '' : $revision->revision_number }}</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 {{ 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 class="actions">
-                                    <a href="{{ $revision->getUrl('changes') }}" target="_blank">{{ trans('entities.pages_revisions_changes') }}</a>
-                                    <span class="text-muted">&nbsp;|&nbsp;</span>
+        <main class="card content-wrap">
+            <h1 class="list-heading">{{ trans('entities.pages_revisions') }}</h1>

 
 

+            <p class="text-muted">{{ trans('entities.pages_revisions_desc') }}</p>

 
 

-                                    @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>
-                                        <span class="text-muted">&nbsp;|&nbsp;</span>
-                                        <div dropdown class="dropdown-container">
-                                            <a dropdown-toggle>{{ trans('common.delete') }}</a>
-                                            <ul>
-                                                <li class="padded"><small class="text-muted">{{trans('entities.revision_delete_confirm')}}</small></li>
-                                                <li>
-                                                    <form action="{{ $revision->getUrl('/delete/') }}" method="POST">
-                                                        {!! csrf_field() !!}
-                                                        <input type="hidden" name="_method" value="DELETE">
-                                                        <button type="submit" class="text-button neg">@icon('delete'){{ trans('common.delete') }}</button>
-                                                    </form>
-                                                </li>
-                                            </ul>
-                                        </div>
-                                    @endif
-                                </td>
-                            </tr>
-                        @endforeach
-                    </table>
+            <div class="flex-container-row my-m items-center justify-space-between wrap gap-x-m gap-y-s">
+                {{ $revisions->links() }}
+                <div>
+                    @include('common.sort', $listOptions->getSortControlData())
+                </div>
+            </div>

 
 

-                @else
-                    <p>{{ trans('entities.pages_revisions_none') }}</p>
-                @endif
+            @if(count($revisions) > 0)
+                <div class="item-list">
+                    <div class="item-list-row flex-container-row items-center strong hide-under-l">
+                        <div class="flex fit-content min-width-xxxxs px-m py-xs">{{ trans('entities.pages_revisions_number') }}</div>
+                        <div class="flex-2 px-m py-xs">{{ trans('entities.pages_name') }} / {{ trans('entities.pages_revisions_editor') }}</div>
+                        <div class="flex-3 px-m py-xs">{{ trans('entities.pages_revisions_created_by') }} / {{ trans('entities.pages_revisions_date') }}</div>
+                        <div class="flex-2 px-m py-xs">{{ trans('entities.pages_revisions_changelog') }}</div>
+                        <div class="flex-2 px-m py-xs text-right">{{ trans('common.actions') }}</div>
+                    </div>
+                    @foreach($revisions as $index => $revision)
+                        @include('pages.parts.revisions-index-row', ['revision' => $revision, 'current' => $page->revision_count === $revision->revision_number])
+                    @endforeach
+                </div>
+            @else
+                <p>{{ trans('entities.pages_revisions_none') }}</p>
+            @endif
+
+            <div class="my-m">
+                {{ $revisions->links() }}

             </div>
             </div>

-        </div>
+        </main>

 
     </div>
 
 
     </div>