X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fcsv_import%2Fform.html;h=b146465a8bbba692c061b74106c9aa65218d35a9;hb=8a2d9daf01083e1271cf6118591bb2c242734261;hp=bc23d54c2eb849637eb74e346c7a30753905652b;hpb=f87763cd84d89aafc4c4110ba42d041b02ce4371;p=kivitendo-erp.git

diff --git a/templates/webpages/csv_import/form.html b/templates/webpages/csv_import/form.html
index bc23d54c2..b146465a8 100644
--- a/templates/webpages/csv_import/form.html
+++ b/templates/webpages/csv_import/form.html
@@ -45,6 +45,54 @@
 
   <hr>
 
+  <h2>[%- LxERP.t8('Help on column names') %]</h2>
+
+  <div class="help_toggle">
+   <a href="#" onClick="javascript:$('.help_toggle').toggle()">[% LxERP.t8("Show help text") %]</a>
+  </div>
+
+  <div class="help_toggle" style="display:none">
+   <p><a href="#" onClick="javascript:$('.help_toggle').toggle()">[% LxERP.t8("Hide help text") %]</a></p>
+
+   <table>
+    <tr class="listheading">
+     <th>[%- LxERP.t8('Column name') %]</th>
+     <th>[%- LxERP.t8('Meaning') %]</th>
+    </tr>
+
+    [%- FOREACH row = SELF.displayable_columns %]
+     <tr class="listrow[% loop.count % 2 %]">
+      <td>[%- HTML.escape(row.name) %]</td>
+      <td>[%- HTML.escape(row.description) %]</td>
+     </tr>
+    [%- END %]
+   </table>
+
+[%- IF SELF.type == 'contacts' %]
+   <p>
+    [%- LxERP.t8('At least one of the columns #1, customer, customernumber, vendor, vendornumber (depending on the target table) is required for matching the entry to an existing customer or vendor.', 'cp_cv_id') %]
+   </p>
+
+[%- ELSIF SELF.type == 'addresses' %]
+   <p>
+    [%- LxERP.t8('At least one of the columns #1, customer, customernumber, vendor, vendornumber (depending on the target table) is required for matching the entry to an existing customer or vendor.', 'trans_id') %]
+   </p>
+
+[%- ELSIF SELF.type == 'parts' %]
+   <p>
+    [%- LxERP.t8("If the article type is set to 'mixed' then a column called 'type' must be present.") %]
+    [% LxERP.t8("Type can be either 'part' or 'service'.") %]
+   </p>
+[%- END %]
+
+   <p>
+    [%- L.submit_tag('action_download_sample', LxERP.t8('Download sample file')) %]
+   </p>
+
+  </div>
+
+  <hr>
+
   <h2>[%- LxERP.t8('Settings') %]</h2>
 
   <table>
@@ -140,14 +188,19 @@
   </table>
 
   [% L.submit_tag('action_test', LxERP.t8('Test and preview')) %]
-  [% IF SELF.import_status && SELF.data.size %]
+  [% IF (SELF.import_status == 'tested') && SELF.num_importable %]
    [% L.submit_tag('action_import', LxERP.t8('Import')) %]
   [%- END %]
 
  </form>
 
  [%- IF SELF.import_status %]
-  [%- PROCESS 'csv_import/_data.html' %]
+  [%- IF SELF.errors %]
+   [%- PROCESS 'csv_import/_errors.html' %]
+  [%- END %]
+
+  [%- PROCESS 'csv_import/_result.html' %]
+  [%- PROCESS 'csv_import/_preview.html' %]
  [%- END %]
 
  <script type="text/javascript">