From 33da000bbd5c2ff23c73dc68d975d2f66b480061 Mon Sep 17 00:00:00 2001
From: Frederick Muriuki Muriithi
Date: Fri, 14 Jun 2024 14:12:26 -0500
Subject: Fix minor UI bugs

---
 qc_app/templates/rqtl2/rqtl2-job-status.html            | 4 +---
 qc_app/templates/rqtl2/rqtl2-qc-job-error.html          | 8 +++-----
 qc_app/templates/rqtl2/rqtl2-qc-job-status.html         | 5 +----
 qc_app/templates/rqtl2/upload-rqtl2-bundle-step-01.html | 5 ++++-
 4 files changed, 9 insertions(+), 13 deletions(-)

(limited to 'qc_app/templates/rqtl2')

diff --git a/qc_app/templates/rqtl2/rqtl2-job-status.html b/qc_app/templates/rqtl2/rqtl2-job-status.html
index c6fd1f2..e896f88 100644
--- a/qc_app/templates/rqtl2/rqtl2-job-status.html
+++ b/qc_app/templates/rqtl2/rqtl2-job-status.html
@@ -14,9 +14,7 @@
 
 <h4>Log</h4>
 <div class="cli-output">
-  {%for msg in messages%}
-  {{msg}}<br />
-  {%endfor%}
+  <pre>{{"\n".join(messages)}}</pre>
 </div>
 
 {%endblock%}
diff --git a/qc_app/templates/rqtl2/rqtl2-qc-job-error.html b/qc_app/templates/rqtl2/rqtl2-qc-job-error.html
index 524282b..90e8887 100644
--- a/qc_app/templates/rqtl2/rqtl2-qc-job-error.html
+++ b/qc_app/templates/rqtl2/rqtl2-qc-job-error.html
@@ -4,7 +4,7 @@
 {%block title%}R/qtl2 bundle: QC Job Error{%endblock%}
 
 {%macro errors_table(tableid, errors)%}
-<table id="{{tableid}}" class="error-table">
+<table id="{{tableid}}" class="table error-table">
   <caption>{{caption}}</caption>
   <thead>
     <tr>
@@ -51,7 +51,7 @@
   <p>These files are listed in the bundle's control file, but do not actually
     exist in the bundle</p>
 </div>
-<table id="tbl-errors-missing-files" class="error-table">
+<table id="tbl-errors-missing-files" class="table error-table">
   <thead>
     <tr>
       <th>Control File Key</th>
@@ -114,9 +114,7 @@
 
 <h4>Log</h4>
 <div class="cli-output">
-  {%for msg in messages%}
-  {{msg}}<br />
-  {%endfor%}
+  <pre>{{"\n".join(messages)}}</pre>
 </div>
 
 {%endblock%}
diff --git a/qc_app/templates/rqtl2/rqtl2-qc-job-status.html b/qc_app/templates/rqtl2/rqtl2-qc-job-status.html
index 4bdc983..f4a6266 100644
--- a/qc_app/templates/rqtl2/rqtl2-qc-job-status.html
+++ b/qc_app/templates/rqtl2/rqtl2-qc-job-status.html
@@ -36,9 +36,6 @@
 
 <h4>Log</h4>
 <div class="cli-output">
-  {%for msg in messages%}
-  {{msg}}<br />
-  {%endfor%}
+  <pre>{{"\n".join(messages)}}</pre>
 </div>
-
 {%endblock%}
diff --git a/qc_app/templates/rqtl2/upload-rqtl2-bundle-step-01.html b/qc_app/templates/rqtl2/upload-rqtl2-bundle-step-01.html
index 3687b2f..fc87d5b 100644
--- a/qc_app/templates/rqtl2/upload-rqtl2-bundle-step-01.html
+++ b/qc_app/templates/rqtl2/upload-rqtl2-bundle-step-01.html
@@ -39,7 +39,10 @@
 	  R/qtl2 file format specifications</a> for more details.</p></span>
   </div>
 
-  <button type="submit" class="btn btn-primary">upload R/qtl2 bundle</button>
+  <button type="submit"
+          class="btn btn-primary"
+          data-toggle="modal"
+          data-target="#upload-progress-indicator">upload R/qtl2 bundle</button>
 </form>
 
 {%endblock%}
-- 
cgit v1.2.3