kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-05-04 05:06:37 +00:00
Code Issues Projects Releases Wiki Activity

New code for updated import routine.

Browse Source
This commit is contained in:
James Cole
2018-05-01 20:47:38 +02:00
parent cd75224cdd
commit ccda71ff8e
16 changed files with 262 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
resources/lang/en_US/import.php
View File

@@ -180,6 +180,7 @@ return [
// index of import:
'general_index_title' => 'Import a file',
'general_index_intro' => 'Welcome to Firefly III\'s import routine. There are a few ways of importing data into Firefly III, displayed here as buttons.',
'bad_job_status' => 'You cannot access this page when the job is at this point. Sorry!',
// import provider strings (index):
'button_fake' => 'Fake an import',
@@ -217,7 +218,7 @@ return [
'do_config_quovo' => 'Configuration for imports from Quovo',
// job configuration:
'job_configuration_breadcrumb' => 'Configuration for job ":key"',
'job_configuration_breadcrumb' => 'Configuration for job ":key"',
// import index page:
'index_breadcrumb' => 'Index',

2
resources/views/import/fake/enter-artist.twig
View File

@@ -20,7 +20,7 @@
</div>
</div>
<form method="POST" action="{{ route('import.job.configuration.post', job.key) }}" accept-charset="UTF-8" class="form-horizontal" enctype="multipart/form-data">
<form method="POST" action="{{ route('import.job.configuration.post', importJob.key) }}" accept-charset="UTF-8" class="form-horizontal" enctype="multipart/form-data">
<input name="_token" type="hidden" value="{{ csrf_token() }}">
<div class="row">
<div class="col-lg-12">

2
resources/views/import/fake/enter-song.twig
View File

@@ -20,7 +20,7 @@
</div>
</div>
<form method="POST" action="{{ route('import.job.configuration.post', job.key) }}" accept-charset="UTF-8" class="form-horizontal" enctype="multipart/form-data">
<form method="POST" action="{{ route('import.job.configuration.post', importJob.key) }}" accept-charset="UTF-8" class="form-horizontal" enctype="multipart/form-data">
<input name="_token" type="hidden" value="{{ csrf_token() }}">
<div class="row">
<div class="col-lg-12">

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

@@ -170,7 +170,7 @@
var jobStatusUri = '{{ route('import.job.status.json', [importJob.key]) }}';
var jobStartUri = '{{ route('import.job.start', [importJob.key]) }}';
var jobConfigurationUri = '{{ route('import.job.configuration.index', [importJob.key]) }}';
// some useful translations.
{#var langImportTimeOutError = '(time out thing)';#}
@@ -178,7 +178,7 @@
{#var langImportMultiError = '{{ trans('import.status_errors_multi')|escape('js') }}';#}
{#var jobConfigureUri = '#}{#{{ route('import.configure', [job.key]) }}#}{#';#}
var token = '{{ csrf_token() }}';
var job = {{ job|json_encode|raw }};
</script>