From 4575bac725711c3630c73de561aa81f37feb10a7 Mon Sep 17 00:00:00 2001 From: Andy Heathershaw Date: Mon, 6 Aug 2018 17:00:43 +0100 Subject: [PATCH 1/5] #89: Added additional date formats --- app/Helpers/ConfigHelper.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/Helpers/ConfigHelper.php b/app/Helpers/ConfigHelper.php index 4272bcb..22c808c 100644 --- a/app/Helpers/ConfigHelper.php +++ b/app/Helpers/ConfigHelper.php @@ -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' ]; } From 372cc0839fbfc86686ca77ea757d8b663cf36c6a Mon Sep 17 00:00:00 2001 From: Andy Heathershaw Date: Mon, 6 Aug 2018 17:02:51 +0100 Subject: [PATCH 2/5] #90: Date created is now displayed on the individual photo page --- resources/views/themes/base/gallery/photo.blade.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/resources/views/themes/base/gallery/photo.blade.php b/resources/views/themes/base/gallery/photo.blade.php index 2cc23eb..e380356 100644 --- a/resources/views/themes/base/gallery/photo.blade.php +++ b/resources/views/themes/base/gallery/photo.blade.php @@ -81,6 +81,11 @@ @endif + + @lang('gallery.date_uploaded') + {{ date(UserConfig::get('date_format'), strtotime($photo->created_at)) }} + + @if (!empty($photo->camera_make)) @lang('gallery.camera_make') From bdfb3067dcf2dab08a961eca5db64fbe6e70d63c Mon Sep 17 00:00:00 2001 From: Andy Heathershaw Date: Mon, 6 Aug 2018 17:06:59 +0100 Subject: [PATCH 3/5] #90: Added language string (mistakenly committed to user profile branch) --- resources/lang/en/gallery.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/en/gallery.php b/resources/lang/en/gallery.php index 4681e4b..c8991e6 100644 --- a/resources/lang/en/gallery.php +++ b/resources/lang/en/gallery.php @@ -14,6 +14,7 @@ return [ 'camera_software' => 'Camera software:', 'child_albums' => 'more album|more albums', 'date_taken' => 'Date taken:', + 'date_uploaded' => 'Date uploaded:', 'file_name' => 'File name:', 'focal_length' => 'Focal length:', 'focal_length_units' => ':valuemm', From cff66e72d61b58c64516f4a6e3ba2d6a793db4eb Mon Sep 17 00:00:00 2001 From: Andy Heathershaw Date: Tue, 7 Aug 2018 09:03:47 +0100 Subject: [PATCH 4/5] #94: Child albums now display as 6 and 6 columns on mobile (xs) devices. Pager links are also centered. --- .../views/themes/base/gallery/album_default.blade.php | 10 +++++----- .../views/themes/base/gallery/album_empty.blade.php | 4 ++-- .../themes/base/gallery/album_slideshow.blade.php | 2 +- .../views/themes/base/partials/pager_links.blade.php | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/resources/views/themes/base/gallery/album_default.blade.php b/resources/views/themes/base/gallery/album_default.blade.php index 8dfd0b7..4096111 100644 --- a/resources/views/themes/base/gallery/album_default.blade.php +++ b/resources/views/themes/base/gallery/album_default.blade.php @@ -41,11 +41,11 @@ @endforeach + -
-
- {{ $photos->links() }} -
+
+
+ {{ $photos->links() }}
@@ -57,7 +57,7 @@
@foreach ($child_albums as $childAlbum) -
+
diff --git a/resources/views/themes/base/gallery/album_empty.blade.php b/resources/views/themes/base/gallery/album_empty.blade.php index 9000feb..f497fba 100644 --- a/resources/views/themes/base/gallery/album_empty.blade.php +++ b/resources/views/themes/base/gallery/album_empty.blade.php @@ -27,12 +27,12 @@ @else -

@lang('gallery.other_albums_heading', ['album_name' => $album->name])

+

@lang('gallery.other_albums_heading', ['album_name' => $album->name])

@lang('gallery.other_albums_description_empty', ['album_name' => $album->name])

@foreach ($child_albums as $childAlbum) -
+
diff --git a/resources/views/themes/base/gallery/album_slideshow.blade.php b/resources/views/themes/base/gallery/album_slideshow.blade.php index b9dae1e..adc8646 100644 --- a/resources/views/themes/base/gallery/album_slideshow.blade.php +++ b/resources/views/themes/base/gallery/album_slideshow.blade.php @@ -64,7 +64,7 @@
@foreach ($child_albums as $childAlbum) -
+
diff --git a/resources/views/themes/base/partials/pager_links.blade.php b/resources/views/themes/base/partials/pager_links.blade.php index 3f98455..a2f6587 100644 --- a/resources/views/themes/base/partials/pager_links.blade.php +++ b/resources/views/themes/base/partials/pager_links.blade.php @@ -1,5 +1,5 @@ @if ($paginator->hasPages()) -
    +
      {{-- Previous Page Link --}} @if ($paginator->onFirstPage())
    • «
      • From 6e4eaf35ddb1ff8ceb2cf6adf2ba6c127044bdcc Mon Sep 17 00:00:00 2001 From: Andy Heathershaw Date: Tue, 7 Aug 2018 09:15:06 +0100 Subject: [PATCH 5/5] #93: Updated mark-up of "add album redirect" checkbox to BS4 --- resources/views/themes/base/admin/edit_album.blade.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/resources/views/themes/base/admin/edit_album.blade.php b/resources/views/themes/base/admin/edit_album.blade.php index 0262909..1018524 100644 --- a/resources/views/themes/base/admin/edit_album.blade.php +++ b/resources/views/themes/base/admin/edit_album.blade.php @@ -57,11 +57,10 @@