Comments: Updated reply-to and general styling

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

diff --git a/resources/views/pages/revisions.blade.php b/resources/views/pages/revisions.blade.php
index 720e34fea4efd76c4187e4f5b37b29e9b65e3a57..9f462e930ebb6e7e054a303a2664f807ada4948a 100644 (file)
--- a/resources/views/pages/revisions.blade.php
+++ b/resources/views/pages/revisions.blade.php
@@ -1,73 +1,53 @@
-@extends('base')
-
-@section('content')
-
-    <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>
+@extends('layouts.simple')
+
+@section('body')
+    <div class="container">
+
+        <div class="my-s">
+            @include('entities.breadcrumbs', ['crumbs' => [
+                $page->book,
+                $page->chapter,
+                $page,
+                $page->getUrl('/revisions') => [
+                    'text' => trans('entities.pages_revisions'),
+                    'icon' => 'history',
+                ]
+            ]])
         </div>
-    </div>
-
 
+        <main class="card content-wrap">
+            <h1 class="list-heading">{{ trans('entities.pages_revisions') }}</h1>
 
-    <div class="container" ng-non-bindable>
-        <h1>Page Revisions <span class="subheader">For "{{ $page->name }}"</span></h1>
+            <p class="text-muted">{{ trans('entities.pages_revisions_desc') }}</p>
 
-        @if(count($page->revisions) > 0)
-
-            <table class="table">
-                <tr>
-                    <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>
-                @foreach($page->revisions as $index => $revision)
-                    <tr>
-                        <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>
-                            <a href="{{ $revision->getUrl('changes') }}" target="_blank">Changes</a>
-                            <span class="text-muted">&nbsp;|&nbsp;</span>
+            <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>
 
-                            @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
-            </table>
+            @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
 
-        @else
-            <p>This page has no revisions.</p>
-        @endif
+            <div class="my-m">
+                {{ $revisions->links() }}
+            </div>
+        </main>
 
     </div>