From 309d97cb7542212bf48d9f4f9dad57d83749859b Mon Sep 17 00:00:00 2001
From: Andy Heathershaw <andy@andysh.uk>
Date: Thu, 12 Jul 2018 06:09:28 +0100
Subject: [PATCH] #77: Minor improvements to meta-data update page

---
 app/Http/Controllers/Admin/DefaultController.php          | 3 ++-
 resources/lang/en/admin.php                               | 2 +-
 .../views/themes/base/admin/metadata_upgrade.blade.php    | 8 ++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/Admin/DefaultController.php b/app/Http/Controllers/Admin/DefaultController.php
index 9d75ae4..4f24f38 100644
--- a/app/Http/Controllers/Admin/DefaultController.php
+++ b/app/Http/Controllers/Admin/DefaultController.php
@@ -118,7 +118,8 @@ class DefaultController extends Controller
         $labelCount = Label::all()->count();
         $userCount = User::where('is_activated', true)->count();
 
-        $metadataUpgradeNeeded = Photo::min('metadata_version') < PhotoService::METADATA_VERSION;
+        $minMetadataVersion = Photo::min('metadata_version');
+        $metadataUpgradeNeeded = $minMetadataVersion > 0 && $minMetadataVersion < PhotoService::METADATA_VERSION;
 
         // Default to a supported function call to get the OS version
         $osVersion = sprintf('%s %s', php_uname('s'), php_uname('r'));
diff --git a/resources/lang/en/admin.php b/resources/lang/en/admin.php
index 117733b..f3d506f 100644
--- a/resources/lang/en/admin.php
+++ b/resources/lang/en/admin.php
@@ -141,7 +141,7 @@ return [
         'panel_header' => 'Manage'
     ],
     'metadata_upgrade' => [
-        'can_be_upgraded' => 'Metadata can be updated (version :version_from --&gt; :version_to)',
+        'can_be_upgraded' => 'Metadata can be updated (version :version_from &raquo; :version_to)',
         'confirm' => 'Are you sure you want to update the metadata of the :name album?',
         'intro' => 'Blue Twilight analyses your photos to capture metadata such as the camera and location used to capture the photo. Sometimes we capture more metadata than we have done previously, which requires your original photos to be re-analysed.',
         'intro_2' => 'This page shows you which of your albums contain photos that need to be re-analysed to get the latest metadata information.',
diff --git a/resources/views/themes/base/admin/metadata_upgrade.blade.php b/resources/views/themes/base/admin/metadata_upgrade.blade.php
index 6142b27..d08833f 100644
--- a/resources/views/themes/base/admin/metadata_upgrade.blade.php
+++ b/resources/views/themes/base/admin/metadata_upgrade.blade.php
@@ -16,11 +16,8 @@
                     <i class="fa fa-fw fa-info"></i> @lang('admin.metadata_upgrade.intro')
                 </div>
 
-                <p>@lang('admin.metadata_upgrade.intro_2')</p>
-                <p class="mb-4">@lang('admin.metadata_upgrade.intro_3')</p>
-
                 @if (count($albums) == 0)
-                    <div class="text-center">
+                    <div class="text-center mt-5">
                         <h4 class="text-danger"><b>@lang('admin.no_albums_title')</b></h4>
                         <p>@lang('admin.no_albums_text')</p>
                         <p style="margin-top: 40px;">
@@ -28,6 +25,9 @@
                         </p>
                     </div>
                 @else
+                    <p>@lang('admin.metadata_upgrade.intro_2')</p>
+                    <p class="mb-4">@lang('admin.metadata_upgrade.intro_3')</p>
+
                     <table class="table table-hover table-striped">
                         <tbody>
                             @foreach ($albums as $album)