1 files changed, 22 insertions, 29 deletions
diff --git a/uploader/templates/phenotypes/job-status.html b/uploader/templates/phenotypes/job-status.html
index 5f13876..0bbe8e0 100644
--- a/uploader/templates/phenotypes/job-status.html
+++ b/uploader/templates/phenotypes/job-status.html
@@ -2,7 +2,6 @@
 {%from "cli-output.html" import cli_output%}
 {%from "flash_messages.html" import flash_all_messages%}
 {%from "macro-table-pagination.html" import table_pagination%}
-{%from "phenotypes/macro-display-pheno-dataset-card.html" import display_pheno_dataset_card%}
 
 {%block extrameta%}
 {%if job and job.status not in ("success", "completed:success", "error", "completed:error")%}
@@ -14,27 +13,17 @@
 
 {%block pagetitle%}Phenotypes{%endblock%}
 
-{%block lvl4_breadcrumbs%}
-<li {%if activelink=="add-phenotypes"%}
-    class="breadcrumb-item active"
-    {%else%}
-    class="breadcrumb-item"
-    {%endif%}>
-  <a href="{{url_for('species.populations.phenotypes.add_phenotypes',
-           species_id=species.SpeciesId,
-           population_id=population.Id,
-           dataset_id=dataset.Id)}}">View Datasets</a>
-</li>
-{%endblock%}
-
 {%block contents%}
 
 {%if job%}
-<h4 class="subheading">Progress</h4>
 <div class="row">
+  <h2 class="heading">{{dataset.FullName}} ({{dataset.Name}})</h2>
+  <h3 class="subheading">upload progress</h3>
+</div>
+<div class="row" style="overflow:scroll;">
   <p><strong>Process Status:</strong> {{job.status}}</p>
   {%if metadata%}
-  <table class="table">
+  <table class="table table-responsive">
     <thead>
       <tr>
         <th>File</th>
@@ -56,32 +45,39 @@
     </tbody>
   </table>
   {%endif%}
+</div>
+
+<div class="row">
   {%if  job.status in ("completed:success", "success")%}
   <p>
     {%if errors | length == 0%}
-    <a href="#"
-       class="not-implemented btn btn-primary"
+    <a href="{{url_for('species.populations.phenotypes.review_job_data',
+           species_id=species.SpeciesId,
+           population_id=population.Id,
+           dataset_id=dataset.Id,
+           job_id=job_id)}}"
+       class="btn btn-primary"
        title="Continue to process data">Continue</a>
     {%else%}
     <span class="text-muted"
-       disabled="disabled"
-       style="border: solid 2px;border-radius: 5px;padding: 0.3em;">
+          disabled="disabled"
+          style="border: solid 2px;border-radius: 5px;padding: 0.3em;">
       Cannot continue due to errors. Please fix the errors first.
-    </a>
+    </span>
     {%endif%}
   </p>
   {%endif%}
 </div>
 
-<h4 class="subheading">Errors</h4>
-<div class="row" style="max-height: 20em; overflow: auto;">
+<h3 class="subheading">upload errors</h3>
+<div class="row" style="max-height: 20em; overflow: scroll;">
   {%if errors | length == 0 %}
   <p class="text-info">
     <span class="glyphicon glyphicon-info-sign"></span>
     No errors found so far
   </p>
   {%else%}
-  <table class="table">
+  <table class="table table-responsive">
     <thead style="position: sticky; top: 0; background: white;">
       <tr>
         <th>File</th>
@@ -89,6 +85,7 @@
         <th>Column</th>
         <th>Value</th>
         <th>Message</th>
+      </tr>
     </thead>
 
     <tbody style="font-size: 0.9em;">
@@ -97,7 +94,7 @@
         <td>{{error.filename}}</td>
         <td>{{error.rowtitle}}</td>
         <td>{{error.coltitle}}</td>
-        <td>{%if error.cellvalue | length > 25%}
+        <td>{%if error.cellvalue is not none and error.cellvalue | length > 25%}
           {{error.cellvalue[0:24]}}&hellip;
           {%else%}
           {{error.cellvalue}}
@@ -141,7 +138,3 @@
 </div>
 {%endif%}
 {%endblock%}
-
-{%block sidebarcontents%}
-{{display_pheno_dataset_card(species, population, dataset)}}
-{%endblock%}