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

#68: Reworked the upload progress modal to use modal-footer correctly

Browse Source
This commit is contained in:
Andy Heathershaw 2018-07-12 23:18:40 +01:00
parent 393cc590c1
commit ab690b1e25
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
resources/views/themes/base/admin/show_album.blade.php
View File

@ -220,6 +220,9 @@
$('#upload-progress-modal').modal('hide'); $('#upload-progress-modal').modal('hide');
} }
}); });
appUpload.$watch('statusMessages', function($value) {
$('#upload-progress-modal').modal('handleUpdate');
})
}); });
</script> </script>
@endpush @endpush

10
resources/views/themes/base/partials/album_upload_tab.blade.php
View File

@ -82,23 +82,23 @@
<p v-text="currentStatus"></p> <p v-text="currentStatus"></p>
</div> </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"> <p v-if="!isUploadInProgress" class="text-danger" style="font-weight: bold">
<span v-text="imagesFailed"></span> @lang('admin.upload_file_number_failed') <span v-text="imagesFailed"></span> @lang('admin.upload_file_number_failed')
</p> </p>
<p v-if="imagesUploaded > 0" class="text-right"> <p v-if="imagesUploaded > 0" class="text-right">
@lang('admin.upload_file_failed_continue')<br /><br/> @lang('admin.upload_file_failed_continue')<br /><br/>
</p> </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"> <ul v-for="message in statusMessages">
<li v-bind:class="message.message_class" v-text="message.message_text"></li> <li v-bind:class="message.message_class" v-text="message.message_text"></li>
</ul> </ul>
</div> </div>
</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> </div>
</div> </div>