From ab690b1e256f4c73549a601a8ccd7d59df784991 Mon Sep 17 00:00:00 2001
From: Andy Heathershaw <andy@andysh.uk>
Date: Thu, 12 Jul 2018 23:18:40 +0100
Subject: [PATCH] #68: Reworked the upload progress modal to use modal-footer
 correctly

---
 resources/views/themes/base/admin/show_album.blade.php |  3 +++
 .../themes/base/partials/album_upload_tab.blade.php    | 10 +++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/resources/views/themes/base/admin/show_album.blade.php b/resources/views/themes/base/admin/show_album.blade.php
index 1f45d5b..66a595f 100644
--- a/resources/views/themes/base/admin/show_album.blade.php
+++ b/resources/views/themes/base/admin/show_album.blade.php
@@ -220,6 +220,9 @@
                 $('#upload-progress-modal').modal('hide');
             }
         });
+        appUpload.$watch('statusMessages', function($value) {
+            $('#upload-progress-modal').modal('handleUpdate');
+        })
     });
 </script>
 @endpush
\ No newline at end of file
diff --git a/resources/views/themes/base/partials/album_upload_tab.blade.php b/resources/views/themes/base/partials/album_upload_tab.blade.php
index 1feb8b3..3b004fa 100644
--- a/resources/views/themes/base/partials/album_upload_tab.blade.php
+++ b/resources/views/themes/base/partials/album_upload_tab.blade.php
@@ -82,23 +82,23 @@
                         <p v-text="currentStatus"></p>
                     </div>
 
-                    <div v-if="statusMessages.length > 0">
+                    <div v-if="statusMessages.length > 0"style="max-height: 300px; overflow: scroll;">
                         <p v-if="!isUploadInProgress" class="text-danger" style="font-weight: bold">
                             <span v-text="imagesFailed"></span> @lang('admin.upload_file_number_failed')
                         </p>
                         <p v-if="imagesUploaded > 0" class="text-right">
                             @lang('admin.upload_file_failed_continue')<br /><br/>
                         </p>
-                        <p class="text-right">
-                            <button type="button" class="btn btn-secondary" data-dismiss="modal" v-if="!isUploadInProgress && imagesUploaded === 0">@lang('forms.close_action')</button>
-                            <a href="{{ route('albums.analyse', ['id' => $album->id, 'queue_token' => $queue_token]) }}" class="btn btn-primary" v-if="imagesUploaded > 0">@lang('forms.continue_action')</a>
-                        </p>
 
                         <ul v-for="message in statusMessages">
                             <li v-bind:class="message.message_class" v-text="message.message_text"></li>
                         </ul>
                     </div>
                 </div>
+                <div class="modal-footer" v-if="!isUploadInProgress">
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal" v-if="imagesUploaded === 0">@lang('forms.close_action')</button>
+                    <a href="{{ route('albums.analyse', ['id' => $album->id, 'queue_token' => $queue_token]) }}" class="btn btn-primary" v-if="imagesUploaded > 0">@lang('forms.continue_action')</a>
+                </div>
             </div>
         </div>
     </div>