1 files changed, 30 insertions, 31 deletions
diff --git a/qc_app/templates/select_study.html b/qc_app/templates/select_study.html
index e474c50..648ad4c 100644
--- a/qc_app/templates/select_study.html
+++ b/qc_app/templates/select_study.html
@@ -10,34 +10,36 @@
 {%block contents%}
 <h2 class="heading">{{filename}}: select study</h2>
 
-<div class="two-column-with-separator">
+<div class="row">
   <form method="POST" action="{{url_for('dbinsert.select_dataset')}}"
 	id="select-platform-form" data-genechips="{{genechips_data}}"
 	class="two-col-sep-col1">
-    <legend>Select from existing study</legend>
+    <legend class="heading">Select from existing study</legend>
     {{hidden_fields(filename, filetype, species=species, genechipid=genechipid,
     totallines=totallines)}}
 
-    <fieldset>
-      <label for="study" class="form-col-1">study:</label>
-      <select id="study" name="studyid" class="form-col-2">
+    <div class="form-group">
+      <label class="form-label" for="study">study:</label>
+      <select id="study" name="studyid" class="form-control">
 	{%for study in studies:%}
 	<option value="{{study['Id']}}">{{study["Name"]}}</option>
 	{%endfor%}
       </select>
-    </fieldset>
+    </div>
 
-    <fieldset>
-      <input type="submit" value="submit selected study"
-	     class="btn btn-primary form-col-2"
-	     {%if studies | length == 0:%}
-	     disabled="disabled"
-	     {%endif%} />
-    </fieldset>
-  </form>
+    <button type="submit"
+	    class="btn btn-primary"
+	    {%if studies | length == 0:%}
+	    disabled="disabled"
+	    {%endif%} />submit selected study</button>
+</form>
+</div>
 
+<div class="row">
   <p class="two-col-sep-separator">OR</p>
+</div>
 
+<div class="row">
   <form method="POST" action="{{url_for('dbinsert.create_study')}}"
 	id="select-platform-form" data-genechips="{{genechips_data}}"
 	class="two-col-sep-col2">
@@ -50,22 +52,22 @@
     </ul>
     {%endif%}
     {%endwith%}
-    <legend>Create new study</legend>
+    <legend class="heading">Create new study</legend>
     {{hidden_fields(filename, filetype, species=species, genechipid=genechipid,
     totallines=totallines)}}
 
-    <fieldset>
-      <label for="studyname" class="form-col-1">name:</label>
-      <input type="text" id="studyname" name="studyname" class="form-col-2"
+    <div class="form-group">
+      <label class="form-label" for="studyname">name:</label>
+      <input type="text" id="studyname" name="studyname" class="form-control"
 	     required="required"
 	     {%if studyname:%}
 	     value="{{studyname}}"
 	     {%endif%} />
-    </fieldset>
+    </div>
 
-    <fieldset>
-      <label for="group" class="form-col-1">group:</label>
-      <select id="group" name="inbredsetid" class="form-col-2"
+    <div class="form-group">
+      <label class="form-label" for="group">group:</label>
+      <select id="group" name="inbredsetid" class="form-control"
 	      required="required">
 	<option value="">Select group</option>
 	{%for family in groups:%}
@@ -81,11 +83,11 @@
 	</optgroup>
 	{%endfor%}
       </select>
-    </fieldset>
+    </div>
 
-    <fieldset>
-      <label for="tissue" class="form-col-1">tissue:</label>
-      <select id="tissue" name="tissueid" class="form-col-2"
+    <div class="form-group">
+      <label class="form-label" for="tissue">tissue:</label>
+      <select id="tissue" name="tissueid" class="form-control"
 	      required="required">
 	<option value="">Select type</option>
 	{%for tissue in tissues:%}
@@ -97,12 +99,9 @@
 	</option>
 	{%endfor%}
       </select>
-    </fieldset>
+    </div>
 
-    <fieldset>
-      <input type="submit" value="create study"
-	     class="btn btn-primary form-col-2" />
-    </fieldset>
+    <button type="submit" class="btn btn-primary">create study</button>
   </form>
 </div>