aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--qc_app/templates/continue_from_create_dataset.html4
-rw-r--r--qc_app/templates/continue_from_create_study.html4
-rw-r--r--qc_app/templates/dbupdate_error.html2
-rw-r--r--qc_app/templates/errors_display.html2
-rw-r--r--qc_app/templates/final_confirmation.html2
-rw-r--r--qc_app/templates/index.html6
-rw-r--r--qc_app/templates/parse_results.html4
-rw-r--r--qc_app/templates/rqtl2/create-geno-dataset-success.html2
-rw-r--r--qc_app/templates/rqtl2/create-probe-dataset-success.html2
-rw-r--r--qc_app/templates/rqtl2/create-probe-study-success.html2
-rw-r--r--qc_app/templates/rqtl2/create-tissue-success.html4
-rw-r--r--qc_app/templates/rqtl2/index.html2
-rw-r--r--qc_app/templates/rqtl2/no-such-job.html2
-rw-r--r--qc_app/templates/rqtl2/rqtl2-qc-job-results.html2
-rw-r--r--qc_app/templates/rqtl2/rqtl2-qc-job-success.html2
-rw-r--r--qc_app/templates/rqtl2/select-geno-dataset.html4
-rw-r--r--qc_app/templates/rqtl2/select-population.html4
-rw-r--r--qc_app/templates/rqtl2/select-probeset-dataset.html4
-rw-r--r--qc_app/templates/rqtl2/select-probeset-study-id.html4
-rw-r--r--qc_app/templates/rqtl2/select-tissue.html4
-rw-r--r--qc_app/templates/rqtl2/summary-info.html2
-rw-r--r--qc_app/templates/rqtl2/upload-rqtl2-bundle-step-01.html2
-rw-r--r--qc_app/templates/rqtl2/upload-rqtl2-bundle-step-02.html2
-rw-r--r--qc_app/templates/samples/select-population.html4
-rw-r--r--qc_app/templates/samples/select-species.html2
-rw-r--r--qc_app/templates/samples/upload-samples.html2
-rw-r--r--qc_app/templates/select_dataset.html4
-rw-r--r--qc_app/templates/select_platform.html2
-rw-r--r--qc_app/templates/select_study.html4
29 files changed, 43 insertions, 43 deletions
diff --git a/qc_app/templates/continue_from_create_dataset.html b/qc_app/templates/continue_from_create_dataset.html
index 4358b11..f95f96f 100644
--- a/qc_app/templates/continue_from_create_dataset.html
+++ b/qc_app/templates/continue_from_create_dataset.html
@@ -32,7 +32,7 @@
<fieldset>
<input type="submit"
value="continue"
- class="btn btn-main form-col-2" />
+ class="btn btn-primary form-col-2" />
</fieldset>
</form>
@@ -49,7 +49,7 @@
<fieldset>
<input type="submit"
value="go back"
- class="btn btn-main form-col-2" />
+ class="btn btn-primary form-col-2" />
</fieldset>
</form>
</div>
diff --git a/qc_app/templates/continue_from_create_study.html b/qc_app/templates/continue_from_create_study.html
index 3684f57..7455fbc 100644
--- a/qc_app/templates/continue_from_create_study.html
+++ b/qc_app/templates/continue_from_create_study.html
@@ -32,7 +32,7 @@
<fieldset>
<input type="submit"
value="continue"
- class="btn btn-main form-col-2" />
+ class="btn btn-primary form-col-2" />
</fieldset>
</form>
@@ -49,7 +49,7 @@
<fieldset>
<input type="submit"
value="go back"
- class="btn btn-main form-col-2" />
+ class="btn btn-primary form-col-2" />
</fieldset>
</form>
</div>
diff --git a/qc_app/templates/dbupdate_error.html b/qc_app/templates/dbupdate_error.html
index 83e34fe..e1359d2 100644
--- a/qc_app/templates/dbupdate_error.html
+++ b/qc_app/templates/dbupdate_error.html
@@ -5,7 +5,7 @@
{%block contents%}
<h1 class="heading">database update error</h2>
-<p class="alert-error">
+<p class="alert-danger">
<strong>Database Update Error</strong>: {{error_message}}
</p>
diff --git a/qc_app/templates/errors_display.html b/qc_app/templates/errors_display.html
index f1e27a6..0ee5e85 100644
--- a/qc_app/templates/errors_display.html
+++ b/qc_app/templates/errors_display.html
@@ -3,7 +3,7 @@
{%if errors | length == 0 %}
<span {%if complete%}class="alert-success"{%endif%}>{{no_error_msg}}</span>
{%else %}
-<p class="alert-error">{{error_message}}</p>
+<p class="alert-danger">{{error_message}}</p>
<table class="reports-table">
<thead>
diff --git a/qc_app/templates/final_confirmation.html b/qc_app/templates/final_confirmation.html
index b08e1f5..0727fc8 100644
--- a/qc_app/templates/final_confirmation.html
+++ b/qc_app/templates/final_confirmation.html
@@ -40,7 +40,7 @@
filename, filetype, species=species, genechipid=genechipid,
studyid=studyid,datasetid=datasetid, totallines=totallines)}}
<fieldset>
- <input type="submit" class="btn btn-main" value="confirm" />
+ <input type="submit" class="btn btn-primary" value="confirm" />
</fieldset>
</form>
</div>
diff --git a/qc_app/templates/index.html b/qc_app/templates/index.html
index 6e98849..06d1e87 100644
--- a/qc_app/templates/index.html
+++ b/qc_app/templates/index.html
@@ -25,7 +25,7 @@
<a href={{url_for("upload.rqtl2.select_species")}}
title="Upload a zip bundle of R/qtl2 files">
- <button class="btn btn-main">upload R/qtl2 bundle</button></a>
+ <button class="btn btn-primary">upload R/qtl2 bundle</button></a>
</div>
<h2 class="heading">Expression Data</h2>
@@ -89,7 +89,7 @@
</fieldset>
<fieldset>
- <span id="no-file-error" class="alert-error" style="display: none;">
+ <span id="no-file-error" class="alert-danger" style="display: none;">
No file selected
</span>
<label for="file_upload" class="form-col-1">select file</label>
@@ -99,7 +99,7 @@
</fieldset>
<fieldset>
- <input type="submit" value="upload file" class="btn btn-main form-col-2" />
+ <input type="submit" value="upload file" class="btn btn-primary form-col-2" />
</fieldset>
</form>
diff --git a/qc_app/templates/parse_results.html b/qc_app/templates/parse_results.html
index d78bae6..e2bf7f0 100644
--- a/qc_app/templates/parse_results.html
+++ b/qc_app/templates/parse_results.html
@@ -15,14 +15,14 @@
{%if errors | length == 0 and not user_aborted %}
<form method="post" action="{{url_for('dbinsert.select_platform')}}">
<input type="hidden" name="job_id" value="{{job_id}}" />
- <input type="submit" value="update database" class="btn btn-main" />
+ <input type="submit" value="update database" class="btn btn-primary" />
</form>
{%endif%}
{%if errors | length > 0 or user_aborted %}
<br />
<a href="{{url_for('entry.upload_file')}}" title="Back to index page."
- class="btn btn-main">
+ class="btn btn-primary">
Go back
</a>
{%endif%}
diff --git a/qc_app/templates/rqtl2/create-geno-dataset-success.html b/qc_app/templates/rqtl2/create-geno-dataset-success.html
index 7feb8d8..4333612 100644
--- a/qc_app/templates/rqtl2/create-geno-dataset-success.html
+++ b/qc_app/templates/rqtl2/create-geno-dataset-success.html
@@ -50,7 +50,7 @@
<fieldset>
<input type="submit"
value="continue"
- class="btn btn-main form-col-2" />
+ class="btn btn-primary form-col-2" />
</fieldset>
</form>
diff --git a/qc_app/templates/rqtl2/create-probe-dataset-success.html b/qc_app/templates/rqtl2/create-probe-dataset-success.html
index 71ff7ac..57df449 100644
--- a/qc_app/templates/rqtl2/create-probe-dataset-success.html
+++ b/qc_app/templates/rqtl2/create-probe-dataset-success.html
@@ -54,7 +54,7 @@
<fieldset>
<input type="submit"
value="continue"
- class="btn btn-main form-col-2" />
+ class="btn btn-primary form-col-2" />
</fieldset>
</form>
diff --git a/qc_app/templates/rqtl2/create-probe-study-success.html b/qc_app/templates/rqtl2/create-probe-study-success.html
index 1b85d0c..5d3d123 100644
--- a/qc_app/templates/rqtl2/create-probe-study-success.html
+++ b/qc_app/templates/rqtl2/create-probe-study-success.html
@@ -46,7 +46,7 @@
<fieldset>
<input type="submit"
value="continue"
- class="btn btn-main form-col-2" />
+ class="btn btn-primary form-col-2" />
</fieldset>
</form>
diff --git a/qc_app/templates/rqtl2/create-tissue-success.html b/qc_app/templates/rqtl2/create-tissue-success.html
index ea05624..7ea0c65 100644
--- a/qc_app/templates/rqtl2/create-tissue-success.html
+++ b/qc_app/templates/rqtl2/create-tissue-success.html
@@ -71,7 +71,7 @@
<input type="submit"
value="continue"
- class="btn btn-main form-col-2" />
+ class="btn btn-primary form-col-2" />
</form>
<p style="display:inline;width:100%;grid-column:2/3;text-align:center;
@@ -96,7 +96,7 @@
<input type="submit"
value="select from existing tissues"
- class="btn btn-main form-col-2" />
+ class="btn btn-primary form-col-2" />
</form>
</div>
diff --git a/qc_app/templates/rqtl2/index.html b/qc_app/templates/rqtl2/index.html
index 24f19fa..45018e7 100644
--- a/qc_app/templates/rqtl2/index.html
+++ b/qc_app/templates/rqtl2/index.html
@@ -27,7 +27,7 @@
</fieldset>
<fieldset>
- <input type="submit" value="submit" class="btn btn-main form-col-2" />
+ <input type="submit" value="submit" class="btn btn-primary form-col-2" />
</fieldset>
</form>
diff --git a/qc_app/templates/rqtl2/no-such-job.html b/qc_app/templates/rqtl2/no-such-job.html
index b56980b..b17004f 100644
--- a/qc_app/templates/rqtl2/no-such-job.html
+++ b/qc_app/templates/rqtl2/no-such-job.html
@@ -8,6 +8,6 @@
<h2>R/qtl2 Upload: No Such Job</h2>
-<p class="alert-error">No job with ID {{jobid}} was found.</p>
+<p class="alert-danger">No job with ID {{jobid}} was found.</p>
{%endblock%}
diff --git a/qc_app/templates/rqtl2/rqtl2-qc-job-results.html b/qc_app/templates/rqtl2/rqtl2-qc-job-results.html
index 52a230a..35dc95a 100644
--- a/qc_app/templates/rqtl2/rqtl2-qc-job-results.html
+++ b/qc_app/templates/rqtl2/rqtl2-qc-job-results.html
@@ -59,7 +59,7 @@
</fieldset>
<fieldset>
- <input type="submit" value="continue" class="btn btn-main form-col-2" />
+ <input type="submit" value="continue" class="btn btn-primary form-col-2" />
</fieldset>
</form>
diff --git a/qc_app/templates/rqtl2/rqtl2-qc-job-success.html b/qc_app/templates/rqtl2/rqtl2-qc-job-success.html
index 396f241..d492898 100644
--- a/qc_app/templates/rqtl2/rqtl2-qc-job-success.html
+++ b/qc_app/templates/rqtl2/rqtl2-qc-job-success.html
@@ -30,7 +30,7 @@
value="{{rqtl2_bundle_file}}" />
<fieldset>
- <input type="submit" value="continue" class="btn btn-main form-col-2" />
+ <input type="submit" value="continue" class="btn btn-primary form-col-2" />
</fieldset>
</form>
diff --git a/qc_app/templates/rqtl2/select-geno-dataset.html b/qc_app/templates/rqtl2/select-geno-dataset.html
index 438cb3f..f092dbc 100644
--- a/qc_app/templates/rqtl2/select-geno-dataset.html
+++ b/qc_app/templates/rqtl2/select-geno-dataset.html
@@ -52,7 +52,7 @@
<fieldset>
<input type="submit"
value="select dataset"
- class="btn btn-main form-col-2" />
+ class="btn btn-primary form-col-2" />
</fieldset>
</form>
@@ -129,7 +129,7 @@
<fieldset>
<input type="submit"
value="create new dataset"
- class="btn btn-main form-col-2" />
+ class="btn btn-primary form-col-2" />
</fieldset>
</form>
diff --git a/qc_app/templates/rqtl2/select-population.html b/qc_app/templates/rqtl2/select-population.html
index 0f0ee18..1102805 100644
--- a/qc_app/templates/rqtl2/select-population.html
+++ b/qc_app/templates/rqtl2/select-population.html
@@ -43,7 +43,7 @@
<fieldset>
<input type="submit"
value="select population"
- class="btn btn-main form-col-2" />
+ class="btn btn-primary form-col-2" />
</fieldset>
</form>
@@ -117,7 +117,7 @@
<fieldset>
<input type="submit"
value="create grouping/population"
- class="btn btn-main form-col-2" />
+ class="btn btn-primary form-col-2" />
</fieldset>
</form>
diff --git a/qc_app/templates/rqtl2/select-probeset-dataset.html b/qc_app/templates/rqtl2/select-probeset-dataset.html
index 0b2a8f2..c5acb72 100644
--- a/qc_app/templates/rqtl2/select-probeset-dataset.html
+++ b/qc_app/templates/rqtl2/select-probeset-dataset.html
@@ -52,7 +52,7 @@
<fieldset>
<input type="submit"
value="select dataset"
- class="btn btn-main form-col-2" />
+ class="btn btn-primary form-col-2" />
</fieldset>
</form>
@@ -171,7 +171,7 @@
<fieldset>
<input type="submit"
value="create dataset"
- class="btn btn-main form-col-2" />
+ class="btn btn-primary form-col-2" />
</fieldset>
</form>
diff --git a/qc_app/templates/rqtl2/select-probeset-study-id.html b/qc_app/templates/rqtl2/select-probeset-study-id.html
index e9a5c13..c387514 100644
--- a/qc_app/templates/rqtl2/select-probeset-study-id.html
+++ b/qc_app/templates/rqtl2/select-probeset-study-id.html
@@ -49,7 +49,7 @@
<fieldset>
<input type="submit"
value="select study"
- class="btn btn-main form-col-2" />
+ class="btn btn-primary form-col-2" />
</fieldset>
</form>
@@ -126,7 +126,7 @@
<fieldset>
<input type="submit"
value="create study"
- class="btn btn-main form-col-2" />
+ class="btn btn-primary form-col-2" />
</fieldset>
</form>
diff --git a/qc_app/templates/rqtl2/select-tissue.html b/qc_app/templates/rqtl2/select-tissue.html
index 6f7d134..78d5afe 100644
--- a/qc_app/templates/rqtl2/select-tissue.html
+++ b/qc_app/templates/rqtl2/select-tissue.html
@@ -50,7 +50,7 @@
<fieldset>
<input type="submit"
value="use selected"
- class="btn btn-main form-col-2" />
+ class="btn btn-primary form-col-2" />
</fieldset>
</form>
@@ -105,7 +105,7 @@
<fieldset>
<input type="submit"
value="add new material"
- class="btn btn-main form-col-2" />
+ class="btn btn-primary form-col-2" />
</fieldset>
</form>
diff --git a/qc_app/templates/rqtl2/summary-info.html b/qc_app/templates/rqtl2/summary-info.html
index 9a9b6dd..8b05578 100644
--- a/qc_app/templates/rqtl2/summary-info.html
+++ b/qc_app/templates/rqtl2/summary-info.html
@@ -59,7 +59,7 @@
<fieldset>
<input type="submit"
value="continue"
- class="btn btn-main form-col-2" />
+ class="btn btn-primary form-col-2" />
</fieldset>
</form>
{%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 eaa68a9..cc7c92e 100644
--- a/qc_app/templates/rqtl2/upload-rqtl2-bundle-step-01.html
+++ b/qc_app/templates/rqtl2/upload-rqtl2-bundle-step-01.html
@@ -40,7 +40,7 @@
<fieldset>
<input type="submit"
value="upload R/qtl2 bundle"
- class="btn btn-main form-col-2" />
+ class="btn btn-primary form-col-2" />
</fieldset>
</form>
diff --git a/qc_app/templates/rqtl2/upload-rqtl2-bundle-step-02.html b/qc_app/templates/rqtl2/upload-rqtl2-bundle-step-02.html
index 8082abb..75f4a96 100644
--- a/qc_app/templates/rqtl2/upload-rqtl2-bundle-step-02.html
+++ b/qc_app/templates/rqtl2/upload-rqtl2-bundle-step-02.html
@@ -28,7 +28,7 @@
value="{{rqtl2_bundle_file}}" />
<fieldset>
- <input type="submit" value="continue" class="btn btn-main form-col-2" />
+ <input type="submit" value="continue" class="btn btn-primary form-col-2" />
</fieldset>
</form>
diff --git a/qc_app/templates/samples/select-population.html b/qc_app/templates/samples/select-population.html
index 4bb4cc1..5d78826 100644
--- a/qc_app/templates/samples/select-population.html
+++ b/qc_app/templates/samples/select-population.html
@@ -38,7 +38,7 @@
<fieldset>
<input type="submit"
value="select population"
- class="btn btn-main form-col-2" />
+ class="btn btn-primary form-col-2" />
</fieldset>
</form>
@@ -96,7 +96,7 @@
<fieldset>
<input type="submit"
value="create grouping/population"
- class="btn btn-main form-col-2" />
+ class="btn btn-primary form-col-2" />
</fieldset>
</form>
diff --git a/qc_app/templates/samples/select-species.html b/qc_app/templates/samples/select-species.html
index 6aa4781..44c0d4f 100644
--- a/qc_app/templates/samples/select-species.html
+++ b/qc_app/templates/samples/select-species.html
@@ -23,7 +23,7 @@
</fieldset>
<fieldset>
- <input type="submit" value="submit" class="btn btn-main form-col-2" />
+ <input type="submit" value="submit" class="btn btn-primary form-col-2" />
</fieldset>
</form>
{%endblock%}
diff --git a/qc_app/templates/samples/upload-samples.html b/qc_app/templates/samples/upload-samples.html
index d04df61..29b08f6 100644
--- a/qc_app/templates/samples/upload-samples.html
+++ b/qc_app/templates/samples/upload-samples.html
@@ -113,7 +113,7 @@
<fieldset>
<input type="submit"
value="upload samples file"
- class="btn btn-main form-col-2" />
+ class="btn btn-primary form-col-2" />
</fieldset>
</form>
diff --git a/qc_app/templates/select_dataset.html b/qc_app/templates/select_dataset.html
index 76f952d..3c9bd6b 100644
--- a/qc_app/templates/select_dataset.html
+++ b/qc_app/templates/select_dataset.html
@@ -33,7 +33,7 @@
</fieldset>
<fieldset>
- <input type="submit" class="btn btn-main form-col-2"
+ <input type="submit" class="btn btn-primary form-col-2"
value="update database"
{%if datasets | length == 0:%}
disabled="disabled"
@@ -155,7 +155,7 @@
<fieldset>
<input type="submit" value="create new dataset"
- class="btn btn-main form-col-2" />
+ class="btn btn-primary form-col-2" />
</fieldset>
</form>
diff --git a/qc_app/templates/select_platform.html b/qc_app/templates/select_platform.html
index 1d382e9..d69a970 100644
--- a/qc_app/templates/select_platform.html
+++ b/qc_app/templates/select_platform.html
@@ -53,7 +53,7 @@
</table>
<fieldset>
- <input type="submit" class="btn btn-main form-col-2"
+ <input type="submit" class="btn btn-primary form-col-2"
value="submit platform" />
</fieldset>
</form>
diff --git a/qc_app/templates/select_study.html b/qc_app/templates/select_study.html
index a653375..e474c50 100644
--- a/qc_app/templates/select_study.html
+++ b/qc_app/templates/select_study.html
@@ -29,7 +29,7 @@
<fieldset>
<input type="submit" value="submit selected study"
- class="btn btn-main form-col-2"
+ class="btn btn-primary form-col-2"
{%if studies | length == 0:%}
disabled="disabled"
{%endif%} />
@@ -101,7 +101,7 @@
<fieldset>
<input type="submit" value="create study"
- class="btn btn-main form-col-2" />
+ class="btn btn-primary form-col-2" />
</fieldset>
</form>
</div>