Separate related UI elements into separate rows.

1 files changed, 49 insertions, 32 deletions

diff --git a/uploader/templates/genotypes/list-genotypes.html b/uploader/templates/genotypes/list-genotypes.html
index bcc2597..226cc46 100644
--- a/uploader/templates/genotypes/list-genotypes.html
+++ b/uploader/templates/genotypes/list-genotypes.html
@@ -55,9 +55,11 @@
 
 <div class="row">
   <h2>Genotype Dataset</h2>
+</div>
 
-  {%if dataset is not none%}
+{%if dataset is not none%}
 
+<div class="row">
   <table class="table">
     <thead>
       <tr>
@@ -78,40 +80,54 @@
       </tr>
     </tbody>
   </table>
+</div>
 
-  <div class="row">
-    <h3 class="subsubheading">Genetic Markers</h3>
-
-    <table id="tbl-genetic-markers" class="table compact stripe cell-border"
-           data-genetic-markers='{{genetic_markers | tojson}}'>
-      <thead>
-        <tr>
-          <th title="">Index</th>
-          <th title="">Marker Name</th>
-          <th title="Chromosome">Chr</th>
-          <th title="Physical location of the marker in megabasepairs">
-            Location (Mb)</th>
-          <th title="">Source</th>
-          <th title="">Source2</th>
-      </thead>
-
-      <tbody>
-        {%for marker in markers%}
-        <tr>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-        </tr>
-        {%endfor%}
-      </tbody>
-    </table>
+<div class="row">
+  <h3>Genetic Markers</h3>
+
+  <div class="col">
+    <a href="#" class="btn btn-primary">upload genotypes</a>
   </div>
+</div>
+
+<div class="row">
+  <table id="tbl-genetic-markers" class="table compact stripe cell-border"
+         data-genetic-markers='{{genetic_markers | tojson}}'>
+    <thead>
+      <tr>
+        <th title="">Index</th>
+        <th title="">Marker Name</th>
+        <th title="Chromosome">Chr</th>
+        <th title="Physical location of the marker in megabasepairs">
+          Location (Mb)</th>
+        <th title="">Source</th>
+        <th title="">Source2</th>
+    </thead>
+
+    <tbody>
+      {%for marker in markers%}
+      <tr>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+      </tr>
+      {%endfor%}
+    </tbody>
+  </table>
+</div>
 
-  {%else%}
+<div class="row text-warning">
+  <h3>Assembly Details</h3>
 
+  <p>Maybe include the assembly details here if found to be necessary.</p>
+</div>
+
+{%else%}
+
+<div class="row">
   <p>
     Your genotype data will need to be under a dataset. Unfortunately there is
     currently no dataset defined for this population.
@@ -128,9 +144,10 @@
        title="Create a new genotype dataset for the '{{population.FullName}}' population for the '{{species.FullName}}' species."
        class="btn btn-primary">
       create new genotype dataset</a></p>
-  {%endif%}
 </div>
 
+{%endif%}
+
 <div class="row">
   <h2>Notes</h2>
   <div class="row text-danger">