Allow choice between the two UI options

Allow the user to switch between using the R/qtl2 file format or
uploading the individual files.

2 files changed, 15 insertions, 1 deletions

diff --git a/uploader/templates/phenotypes/add-phenotypes-raw-files.html b/uploader/templates/phenotypes/add-phenotypes-raw-files.html
index a39ace8..ef0895d 100644
--- a/uploader/templates/phenotypes/add-phenotypes-raw-files.html
+++ b/uploader/templates/phenotypes/add-phenotypes-raw-files.html
@@ -21,7 +21,15 @@
 {%endblock%}
 
 {%block frm_add_phenotypes_documentation%}
-<p>Provide all the files requested below. &hellip; document this better &hellip;</p>
+<p>This page will allow you to upload all the separate files that make up your
+  phenotypes. Here, you will have to upload each separate file individually. If
+  you want instead to upload all your files as a single ZIP file,
+  <a href="{{url_for('species.populations.phenotypes.add_phenotypes',
+           species_id=species.SpeciesId,
+           population_id=population.Id,
+           dataset_id=dataset.Id,
+           use_bundle=true)}}"
+     title="">click here</a>.</p>
 {%endblock%}
 
 {%block frm_add_phenotypes_elements%}
diff --git a/uploader/templates/phenotypes/add-phenotypes-with-rqtl2-bundle.html b/uploader/templates/phenotypes/add-phenotypes-with-rqtl2-bundle.html
index 2bd5fab..a1953df 100644
--- a/uploader/templates/phenotypes/add-phenotypes-with-rqtl2-bundle.html
+++ b/uploader/templates/phenotypes/add-phenotypes-with-rqtl2-bundle.html
@@ -37,6 +37,12 @@
       <p>Select the zip file bundle containing information on the phenotypes you
         wish to upload, then click the "Upload Phenotypes" button below to
         upload the data.</p>
+      <p>If you wish to upload the files individually instead,
+        <a href="{{url_for('species.populations.phenotypes.add_phenotypes',
+           species_id=species.SpeciesId,
+           population_id=population.Id,
+           dataset_id=dataset.Id)}}"
+           title="">click here</a>.</p>
       <p>See the <a href="#section-file-formats">File Formats</a> section below
         to get an understanding of what is expected of the bundle files you
         upload.</p>