From: Dan Brown <redacted>
Date: Sat, 9 Feb 2019 14:58:38 +0000 (+0000)
Subject: Merge branch 'master' into 2019-design
X-Git-Tag: v0.26.0~1^2~23^2~41
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/3286f29a61833327b5701b28db626d0a480b07f9

Merge branch 'master' into 2019-design
---

3286f29a61833327b5701b28db626d0a480b07f9
diff --cc resources/views/pages/revisions.blade.php
index 82fb47c96,990b4fca2..d3a55a2e6
--- a/resources/views/pages/revisions.blade.php
+++ b/resources/views/pages/revisions.blade.php
@@@ -1,76 -1,76 +1,76 @@@
  @extends('simple-layout')
  
 -@section('toolbar')
 -    <div class="col-sm-12 faded">
 -        @include('pages._breadcrumbs', ['page' => $page])
 -    </div>
 -@stop
 -
  @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-l">
 +            @include('partials.breadcrumbs', ['crumbs' => [
 +                $page->book,
 +                $page->chapter,
 +                $page,
 +                $page->getUrl('/revisions') => trans('entities.pages_revisions')
 +            ]])
 +        </div>
 +
 +        <div class="card content-wrap">
 +            <h1 class="list-heading">{{ trans('entities.pages_revisions') }}</h1>
 +            @if(count($page->revisions) > 0)
  
 -                    <table class="table">
 +                <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>
 -                            <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->formatLocalized('%e %B %Y %H:%M:%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>
 +                            <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><small>{{ $revision->created_at->formatLocalized('%e %B %Y %H:%M:%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>
  
  
 -                                    @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>
 +                                @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>
  
 -                @else
 -                    <p>{{ trans('entities.pages_revisions_none') }}</p>
 -                @endif
 -            </div>
 +            @else
 +                <p>{{ trans('entities.pages_revisions_none') }}</p>
 +            @endif
          </div>
  
      </div>