aheathershaw
/
blue-twilight
1
0
Fork 0
Code Issues 32 Pull Requests Releases 15 Wiki Activity

Merge branch 'master' into feature/19-user-profile-screen

This commit is contained in:
Andy Heathershaw 2018-08-07 09:19:44 +01:00
parent 4f91863f75 f3e52ac5b5
commit 95a1298233
7 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Helpers/ConfigHelper.php
View File

@ -23,8 +23,17 @@ class ConfigHelper
return [
'Y-m-d - H:i',
'd/m/Y - H:i',
'd-m-Y - H:i',
'd.m.Y - H:i',
'd/M/Y - H:i',
'd-M-Y - H:i',
'm/d/Y - H:i',
'm-d-Y - H:i',
'm.d.Y - H:i',
'jS F Y - H:i',
'jS M. Y - H:i',
'F jS Y - H:i',
'M. jS Y - H:i'
];
}

9
resources/views/themes/base/admin/edit_album.blade.php
View File

@ -57,11 +57,10 @@
<div id="change-parent-warning" class="alert alert-warning" style="display: none;">
@lang('admin.edit_album_change_parent_warning')
<div class="mt-3">
<label class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input" name="preserve_url_redirect" checked="checked">
<span class="custom-control-indicator"></span>
<span class="custom-control-description">@lang('admin.edit_album_change_parent_add_alias')</span>
<div class="mt-3 form-check">
<input type="checkbox" class="form-check-input" id="preserve-url-redirect" name="preserve_url_redirect" checked="checked">
<label class="form-check-label" for="preserve-url-redirect">
<strong>@lang('admin.edit_album_change_parent_add_alias')</strong>
</label>
</div>
</div>

10
resources/views/themes/base/gallery/album_default.blade.php
View File

@ -41,11 +41,11 @@
</div>
</div>
@endforeach
</div>
<div class="row" style="margin-top: 15px;">
<div class="col text-center">
{{ $photos->links() }}
</div>
<div class="row" style="margin-top: 15px;">
<div class="col text-center">
{{ $photos->links() }}
</div>
</div>
@ -57,7 +57,7 @@
<div class="row">
@foreach ($child_albums as $childAlbum)
<div class="col-sm-4 col-md-3 text-left" style="max-width: 250px;">
<div class="col-6 col-sm-4 col-md-3 text-left" style="max-width: 250px;">
<div class="card mb-3">
<img class="card-img-top" src="{{ $childAlbum->thumbnailUrl('preview') }}" style="max-height: 120px;"/>
<div class="card-body">

4
resources/views/themes/base/gallery/album_empty.blade.php
View File

@ -27,12 +27,12 @@
<img src="{{ asset('themes/base/images/smartphone-photo.jpg') }}" class="img-fluid rounded" style="display: inline;" />
@else
<h2><small class="text-muted">@lang('gallery.other_albums_heading', ['album_name' => $album->name])</small></h2>
<h2 class="mt-4"><small class="text-muted">@lang('gallery.other_albums_heading', ['album_name' => $album->name])</small></h2>
<p class="mb-4">@lang('gallery.other_albums_description_empty', ['album_name' => $album->name])</p>
<div class="row">
@foreach ($child_albums as $childAlbum)
<div class="col-sm-4 col-md-3 text-left" style="max-width: 250px;">
<div class="col-6 col-sm-4 col-md-3 text-left" style="max-width: 250px;">
<div class="card mb-3">
<img class="card-img-top" src="{{ $childAlbum->thumbnailUrl('preview') }}" style="max-height: 120px;"/>
<div class="card-body">

2
resources/views/themes/base/gallery/album_slideshow.blade.php
View File

@ -64,7 +64,7 @@
<div class="row">
@foreach ($child_albums as $childAlbum)
<div class="col-sm-4 col-md-3 text-left" style="max-width: 250px;">
<div class="col-6 col-sm-4 col-md-3 text-left" style="max-width: 250px;">
<div class="card mb-3">
<img class="card-img-top" src="{{ $childAlbum->thumbnailUrl('preview') }}" style="max-height: 120px;"/>
<div class="card-body">

5
resources/views/themes/base/gallery/photo.blade.php
View File

@ -81,6 +81,11 @@
</tr>
@endif
<tr>
<td class="metadata_name">@lang('gallery.date_uploaded')</td>
<td class="metadata_value">{{ date(UserConfig::get('date_format'), strtotime($photo->created_at)) }}</td>
</tr>
@if (!empty($photo->camera_make))
<tr>
<td class="metadata_name">@lang('gallery.camera_make')</td>

2
resources/views/themes/base/partials/pager_links.blade.php
View File

@ -1,5 +1,5 @@
@if ($paginator->hasPages())
<ul class="pagination">
<ul class="pagination justify-content-center">
{{-- Previous Page Link --}}
@if ($paginator->onFirstPage())
<li class="page-item disabled"><span class="page-link">&laquo;</span></li>