Fixed comment count update error

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

diff --git a/resources/views/pages/revisions.blade.php b/resources/views/pages/revisions.blade.php
index 926affffc3824d969518ae57383ed19a53726b00..fb9e891bbcf8c34f918cc2a03cc1621fb655ce3c 100644 (file)
--- a/resources/views/pages/revisions.blade.php
+++ b/resources/views/pages/revisions.blade.php
@@ -1,70 +1,111 @@
-@extends('base')
+@extends('layouts.simple')

 
 

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

 
 

-    <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 class="my-s">
+            @include('entities.breadcrumbs', ['crumbs' => [
+                $page->book,
+                $page->chapter,
+                $page,
+                $page->getUrl('/revisions') => [
+                    'text' => trans('entities.pages_revisions'),
+                    'icon' => 'history',
+                ]
+            ]])

         </div>
         </div>

-    </div>
-
-
-
-    <div class="container" ng-non-bindable>
-        <h1>Page Revisions <span class="subheader">For "{{ $page->name }}"</span></h1>

 
 

-        @if(count($page->revisions) > 0)
+        <main class="card content-wrap">
+            <h1 class="list-heading">{{ trans('entities.pages_revisions') }}</h1>
+            @if(count($page->revisions) > 0)

 
 

-            <table class="table">
-                <tr>
-                    <th width="25%">Name</th>
-                    <th colspan="2" width="10%">Created By</th>
-                    <th width="15%">Revision Date</th>
-                    <th width="25%">Changelog</th>
-                    <th width="15%">Actions</th>
-                </tr>
-                @foreach($page->revisions as $index => $revision)
+                <table class="table">

                     <tr>
                     <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>
-                        @if ($index !== 0)
+                        <th width="40">{{ trans('entities.pages_revisions_number') }}</th>
+                        <th>
+                            {{ trans('entities.pages_name') }} / {{ trans('entities.pages_revisions_editor') }}
+                        </th>
+                        <th colspan="2">{{ trans('entities.pages_revisions_created_by') }} / {{ trans('entities.pages_revisions_date') }}</th>
+                        <th>{{ trans('entities.pages_revisions_changelog') }}</th>
+                        <th class="text-right">{{ trans('common.actions') }}</th>
+                    </tr>
+                    @foreach($page->revisions as $index => $revision)
+                        <tr>
+                            <td>{{ $revision->revision_number == 0 ? '' : $revision->revision_number }}</td>

                             <td>
                             <td>

-                                <a href="{{ $revision->getUrl() }}" target="_blank">Preview</a>
+                                {{ $revision->name }}
+                                <br>
+                                <small class="text-muted">({{ $revision->markdown ? 'Markdown' : 'WYSIWYG' }})</small>
+                            </td>
+                            <td style="line-height: 0;" width="30">
+                                @if($revision->createdBy)
+                                    <img class="avatar" src="{{ $revision->createdBy->getAvatar(30) }}" alt="{{ $revision->createdBy->name }}">
+                                @endif
+                            </td>
+                            <td width="260">
+                                @if($revision->createdBy) {{ $revision->createdBy->name }} @else {{ trans('common.deleted_user') }} @endif
+                                    <br>
+                                <div class="text-muted">
+                                    <small>{{ $revision->created_at->formatLocalized('%e %B %Y %H:%M:%S') }}</small>
+                                    <small>({{ $revision->created_at->diffForHumans() }})</small>
+                                </div>
+                            </td>
+                            <td>
+                                {{ $revision->summary }}
+                            </td>
+                            <td class="actions text-small text-right">
+                                <a href="{{ $revision->getUrl('changes') }}" target="_blank" rel="noopener">{{ 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" rel="noopener" href="{{ $page->getUrl() }}"><i>{{ trans('entities.pages_revisions_current') }}</i></a>
+                                @else
+                                    <a href="{{ $revision->getUrl() }}" target="_blank" rel="noopener">{{ trans('entities.pages_revisions_preview') }}</a>
+                                    <span class="text-muted">&nbsp;|&nbsp;</span>
+                                    <div component="dropdown" class="dropdown-container">
+                                        <a refs="dropdown@toggle" href="#" aria-haspopup="true" aria-expanded="false">{{ trans('entities.pages_revisions_restore') }}</a>
+                                        <ul refs="dropdown@menu" class="dropdown-menu" role="menu">
+                                            <li class="px-m py-s"><small class="text-muted">{{trans('entities.revision_restore_confirm')}}</small></li>
+                                            <li>
+                                                <form action="{{ $revision->getUrl('/restore') }}" method="POST">
+                                                    {!! csrf_field() !!}
+                                                    <input type="hidden" name="_method" value="PUT">
+                                                    <button type="submit" class="text-primary icon-item">
+                                                        @icon('history')
+                                                        <div>{{ trans('entities.pages_revisions_restore') }}</div>
+                                                    </button>
+                                                </form>
+                                            </li>
+                                        </ul>
+                                    </div>
+                                    <span class="text-muted">&nbsp;|&nbsp;</span>
+                                    <div component="dropdown" class="dropdown-container">
+                                        <a refs="dropdown@toggle" href="#" aria-haspopup="true" aria-expanded="false">{{ trans('common.delete') }}</a>
+                                        <ul refs="dropdown@menu" class="dropdown-menu" role="menu">
+                                            <li class="px-m py-s"><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-neg icon-item">
+                                                        @icon('delete')
+                                                        <div>{{ trans('common.delete') }}</div>
+                                                    </button>
+                                                </form>
+                                            </li>
+                                        </ul>
+                                    </div>
+                                @endif

                             </td>
                             </td>

-                        @else
-                            <td><a target="_blank" href="{{ $page->getUrl() }}"><i>Current Version</i></a></td>
-                        @endif
-                    </tr>
-                @endforeach
-            </table>
+                        </tr>
+                    @endforeach
+                </table>

 
 

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

 
     </div>
 
 
     </div>