From bffbed4a3a62a7f1a3a589ec34ed857067b5442a Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 13 Apr 2022 17:12:07 +0200 Subject: [PATCH] Make descriptions more generic. --- resources/views/import/003-upload/index.twig | 16 +++++------ .../views/import/004-configure/index.twig | 27 +++++++++---------- resources/views/import/005-roles/index.twig | 4 +-- resources/views/index.twig | 9 +++---- 4 files changed, 27 insertions(+), 29 deletions(-) diff --git a/resources/views/import/003-upload/index.twig b/resources/views/import/003-upload/index.twig index 39d0dc98..68973e50 100644 --- a/resources/views/import/003-upload/index.twig +++ b/resources/views/import/003-upload/index.twig @@ -39,18 +39,18 @@ enctype="multipart/form-data"> - {# CSV FILE #} - {% if 'csv' == flow %} + {# importable FILE #} + {% if 'file' == flow %}
- +
- {% if errors.has('csv_file') %} + class="form-control{% if errors.has('importable_file') %} is-invalid{% endif %}" + id="importable_file" name="importable_file" + placeholder="Importable file"/> + {% if errors.has('importable_file') %}
- {{ errors.first('csv_file') }} + {{ errors.first('importable_file') }}
{% endif %}
diff --git a/resources/views/import/004-configure/index.twig b/resources/views/import/004-configure/index.twig index b7289ab7..3a66876d 100644 --- a/resources/views/import/004-configure/index.twig +++ b/resources/views/import/004-configure/index.twig @@ -52,9 +52,9 @@ {{ subTitle }}
- {% if 'csv' == flow %} + {% if 'file' == flow %}

- CSV files come in many shapes and forms. Some of the most important settings are below. + Importable files come in many shapes and forms. Some of the most important settings are below. They apply to all lines in the file. If you would like some support, check out the documentation for this page. @@ -172,7 +172,7 @@ {% endif %} - {% if 'csv' == flow %} + {% if 'file' == flow %}

File options
Headers
@@ -185,8 +185,7 @@ Yes
- Select this checkbox when your CSV file has headers on the first line of - the CSV file. + Select this checkbox when your importable file is a CSV-like file and has headers on the first line of the file.
@@ -203,14 +202,14 @@ Yes
- Try to convert your CSV file to UTF-8. May lead to weird characters. + Try to convert your file to UTF-8. May lead to weird characters.
- +
- Select the field separator of our CSV file. This is almost always a comma. + If your file is a CSV file, select the field separator of the file. This is almost always a comma.
@@ -247,7 +246,7 @@ on this page. Don't stop playing with this setting until 1984-09-17 matches what you see in your - CSV file. + importable file. @@ -427,7 +426,7 @@

- {% if 'csv' == flow %} + {% if 'file' == flow %}
@@ -437,13 +436,13 @@ type="checkbox" value="1" id="ignore_duplicate_lines" name="ignore_duplicate_lines" aria-describedby="duplicateHelp">
Whatever method you choose ahead, it's smart to make the importer ignore any - duplicated lines in your import. + duplicated lines or entries in your importable file.
@@ -477,7 +476,7 @@ - {% if 'csv' == flow %} + {% if 'file' == flow %}
@@ -488,7 +487,7 @@ aria-describedby="unique_column_index_help"> This field is only relevant for the "identifier-based" detection option. - Indicate which column contains the unique identifier. Start counting from + Indicate which column / field contains the unique identifier. Start counting from zero!
diff --git a/resources/views/import/005-roles/index.twig b/resources/views/import/005-roles/index.twig index 8645c5d2..591f78a0 100644 --- a/resources/views/import/005-roles/index.twig +++ b/resources/views/import/005-roles/index.twig @@ -14,10 +14,10 @@

- Set up the the meaning of each column in your file. + Set up the meaning of each column in your file.

- Each column in your CSV file has a role, it contains a specific type of content. + Each column in your importable file has a role, it contains a specific type of content. By configuring these roles here, you tell the importer how to approach and treat the data in each column. Read diff --git a/resources/views/index.twig b/resources/views/index.twig index d416a397..560aefb6 100644 --- a/resources/views/index.twig +++ b/resources/views/index.twig @@ -73,11 +73,11 @@

- Import from CSV file + Import from file
- +
@@ -137,14 +137,13 @@ var tokenPageUrl = '{{ route('token.index') }}'; $.getJSON(url).done(function (data) { if ('OK' === data.result) { - $('#csv_button').removeClass('disabled').text('Import CSV file').removeAttr('disabled'); + $('#file_button').removeClass('disabled').text('Import file').removeAttr('disabled'); } else { $('#importers').hide(); $('#error_explain').show(); $('#firefly_expl').hide(); $('#error_txt').text(data.message); - // window.location = tokenPageUrl; } }).fail(function () { $('#importers').hide();