kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-08 15:05:29 +00:00
Code Issues Projects Releases Wiki Activity

Import routine cleanup.

Browse Source
This commit is contained in:
James Cole
2017-06-24 06:57:24 +02:00
parent 445dbf8779
commit e525e673a8
33 changed files with 245 additions and 583 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
resources/views/import/status.twig
View File

@@ -11,33 +11,33 @@
<div class="col-lg-8 col-lg-offset-2 col-md-12 col-sm-12">
<div class="box box-primary">
<div class="box-header with-border">
<h3 class="box-title">{{ 'please_wait_for_status'|_ }}</h3>
<h3 class="box-title">{{ 'import_status_wait_title'|_ }}</h3>
</div>
<div class="box-body">
<p>
{{ 'box_will_refresh'|_ }}
{{ 'import_status_wait_text'|_ }}
</p>
</div>
</div>
</div>
</div>
{# Error display. Will be shown (duh) when something goes horribly wrong. #}
<div class="row errorbox" style="display:none;">
{# Fatal error display. Will be shown (duh) when something goes horribly wrong. #}
<div class="row fatal_error" style="display:none;">
<div class="col-lg-8 col-lg-offset-2 col-md-12 col-sm-12">
<div class="box box-danger">
<div class="box-header with-border">
<h3 class="box-title">{{ 'import_error_occurred'|_ }}</h3>
<h3 class="box-title">{{ 'import_status_fatal_title'|_ }}</h3>
</div>
<div class="box-body">
<p>
{{ 'import_error'|_ }}
{{ 'import_status_fatal_text'|_ }}
</p>
<p class="text-danger import_error_txt">
<p class="text-danger fatal_error_txt">
</p>
<p>
{{ 'import_error_further_instructions'|_ }}
{{ 'import_status_fatal_more'|_ }}
</p>
</div>
</div>
@@ -49,11 +49,11 @@
<div class="col-lg-8 col-lg-offset-2 col-md-12 col-sm-12">
<div class="box box-primary">
<div class="box-header with-border">
<h3 class="box-title">{{ 'import_complete'|_ }}</h3>
<h3 class="box-title">{{ 'import_status_ready_title'|_ }}</h3>
</div>
<div class="box-body">
<p>
{{ 'import_complete_text'|_ }}
{{ 'import_status_ready_text'|_ }}
</p>
<p>
<code>php artisan firefly:start-import {{ job.key }}</code>
@@ -61,17 +61,17 @@
<div class="row">
<div class="col-lg-4">
<a href="{{ route('import.download', [job.key]) }}" class="btn btn-default"><i
class="fa fa-fw fa-download"></i> {{ 'import_download_config'|_ }}</a>
class="fa fa-fw fa-download"></i> {{ 'import_status_ready_config'|_ }}</a>
</div>
<div class="col-lg-4">
<button class="btn btn-success start-job"><i class="fa fa-fw fa-gears"></i> {{ 'import_start_import'|_ }}</button>
<button class="btn btn-success start-job"><i class="fa fa-fw fa-gears"></i> {{ 'import_status_ready_start'|_ }}</button>
</div>
</div>
<p>
&nbsp;
</p>
<p class="text-info">
{{ 'import_share_configuration'|_ }}
{{ 'import_status_ready_share'|_ }}
</p>
</div>
</div>
@@ -83,7 +83,7 @@
<div class="col-lg-8 col-lg-offset-2 col-md-12 col-sm-12">
<div class="box box-primary">
<div class="box-header with-border">
<h3 class="box-title" id="import-status-title">{{ 'import_job_status'|_ }}</h3>
<h3 class="box-title" id="import-status-title">{{ 'import_status_running_title'|_ }}</h3>
</div>
<div class="box-body">
<div id="import-status-holder">
@@ -93,22 +93,23 @@
aria-valuemax="100" style="width: 100%;min-width:40px;">
</div>
</div>
<p id="import-status-txt">{{ 'import_status_ready_to_start'|_ }}</p>
<p id="import-status-txt">{{ 'import_status_running_placeholder'|_ }}</p>
</div>
</div>
</div>
</div>
</div>
{# displays the finished status of the import. #}
<div class="row status_finished statusbox" style="display:none;">
<div class="col-lg-8 col-lg-offset-2 col-md-12 col-sm-12">
<div class="box box-default">
<div class="box-header with-border">
<h3 class="box-title">{{ 'import_status_report'|_ }}</h3>
<h3 class="box-title">{{ 'import_status_finished_title'|_ }}</h3>
</div>
<div class="box-body">
<p id="import-status-intro">
{{ 'import_finished_report'|_ }}
{{ 'import_status_finished_text'|_ }}
</p>
<p id="import-status-more-info"></p>
</div>
@@ -121,11 +122,10 @@
<div class="col-lg-8 col-lg-offset-2 col-md-12 col-sm-12">
<div class="box box-danger">
<div class="box-header with-border">
<h3 class="box-title">{{ 'import_status_errors'|_ }}</h3>
<h3 class="box-title">{{ 'import_status_errors_title'|_ }}</h3>
</div>
<div class="box-body">
<p id="import-status-error-intro">
No errors detected.
</p>
<div id="import-status-error-list"></div>
</div>
@@ -229,11 +229,12 @@
<script type="text/javascript">
// some useful translations.
var langImportSingleError = '{{ 'import_error_single'|_|escape }}';
var langImportMultiError = '{{ 'import_error_multi'|_|escape }}';
var langImportFatalError = '{{ 'import_error_fatal'|_|escape }}';
var langImportTimeOutError = '{{ 'import_error_timeout'|_|escape }}';
var langImportFinished = '{{ 'import_finished_all'|_|escape }}';
var langImportSingleError = '{{ 'import_status_errors_single'|_|escape }}';
var langImportMultiError = '{{ 'import_status_errors_multi'|_|escape }}';
//var langImportFatalError = '{{ 'import_error_fatal'|_|escape }}';
//var langImportTimeOutError = '{{ 'import_error_timeout'|_|escape }}';
//var langImportFinished = '{{ 'import_finished_all'|_|escape }}';
var jobKey = '{{ job.key }}';