aboutsummaryrefslogtreecommitdiff
path: root/wqflask
diff options
context:
space:
mode:
authorzsloan2015-10-22 17:44:09 +0000
committerzsloan2015-10-22 17:44:09 +0000
commitac57b5320412217a9f97f02ab1bda63660c3bc72 (patch)
tree6832dbb297daf177d2b5ba449066b078cef32fad /wqflask
parente8667004745087b045b323ea44949bb6d58770dd (diff)
parent1048ff2b92d543a55f17d516c2c5984bc4fa95b5 (diff)
downloadgenenetwork2-ac57b5320412217a9f97f02ab1bda63660c3bc72.tar.gz
Merge branch 'master' of github.com:genenetwork/genenetwork2
Diffstat (limited to 'wqflask')
-rwxr-xr-xwqflask/wqflask/templates/index_page.html9
-rw-r--r--wqflask/wqflask/templates/wgcna_setup.html66
2 files changed, 51 insertions, 24 deletions
diff --git a/wqflask/wqflask/templates/index_page.html b/wqflask/wqflask/templates/index_page.html
index 6c630344..8b66a5b0 100755
--- a/wqflask/wqflask/templates/index_page.html
+++ b/wqflask/wqflask/templates/index_page.html
@@ -270,10 +270,13 @@
function pressed(e) {
// Has the enter key been pressed?
if ( (window.event ? event.keyCode : e.which) == 13) {
- // If it has been so, manually submit the <form>
- document.forms[1].submit();
+ // If enter key has been pressed and the search fields are non-empty
+ // manually submit the <form>
+ if( event.target.value != "" ) {
+ document.forms[1].submit();
+ }
}
}
</script>
-{% endblock %} \ No newline at end of file
+{% endblock %}
diff --git a/wqflask/wqflask/templates/wgcna_setup.html b/wqflask/wqflask/templates/wgcna_setup.html
index 49181938..8ab8c4a0 100644
--- a/wqflask/wqflask/templates/wgcna_setup.html
+++ b/wqflask/wqflask/templates/wgcna_setup.html
@@ -2,27 +2,51 @@
{% block title %}WCGNA analysis{% endblock %}
{% block content %} <!-- Start of body -->
-<form action="/wgcna_results" method="post">
- <div class="container">
-
- <h1>WGCNA analysis parameters</h1>
- {% if request.form['trait_list'].split(",")|length <= 4 %}
-
- <h2 style="color: #ff0000;">ERROR: Too few phenotypes as input</h2>
- Please make sure you select enough phenotypes / genes to perform WGCNA,
- your collection needs to contain at least 4 different phenotypes. You provided {{request.form['trait_list'].split(',')|length}} phenotypes as input
+<h1> WGCNA analysis parameters</h1>
+<div class="container">
+ {% if request.form['trait_list'].split(",")|length <= 4 %}
+ <div class="alert alert-danger" role="alert">
+ <span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span>
+ <span class="sr-only">Error:</span>
+ <h2>
+ Too few phenotypes as input
+ </h2>
+ Please make sure you select enough phenotypes / genes to perform WGCNA, your collection needs to contain at least 4 different phenotypes. You provided {{request.form['trait_list'].split(',')|length}} phenotypes as input
+ </div>
{% else %}
- <input type="hidden" name="trait_list" id="trait_list" value= "{{request.form['trait_list']}}">
- <table>
- <tr><td>Soft threshold:</td><td><input type="text" class="form-inline" name="SoftThresholds" id="SoftThresholds" value="1,2,3,4,5,6,7,8,9"></td></tr>
- <tr><td>Minimum module size:</td><td><input type="text" class="form-inline" name="MinModuleSize" id="MinModuleSize" value="30"></td></tr>
- <tr><td>TOMtype:</td><td><input type="text" class="form-inline" name="TOMtype" id="TOMtype" value="unsigned"></td></tr>
- <tr><td>mergeCutHeight:</td><td><input type="text" class="form-inline" name="mergeCutHeight" id="mergeCutHeight" value="0.25"></td></tr>
- </table>
- <input type="submit" class="btn btn-primary" value="Run WGCNA using these settings" />
- {% endif %}
- </div>
-</form>
+ <form action="/wgcna_results" method="post" class="form-horizontal">
+ <input type="hidden" name="trait_list" id="trait_list" value= "{{request.form['trait_list']}}">
+ <div class="form-group">
+ <label for="SoftThresholds"> Soft threshold: </label>
+ <div class="col-sm-10">
+ <input type="text" class="form-inline" name="SoftThresholds" id="SoftThresholds" value="1,2,3,4,5,6,7,8,9">
+ </div>
+ </div>
+ <div class="form-group">
+ <label for="MinModuleSize"> Minimum module size: </label>
+ <div class="col-sm-10">
+ <input type="text" class="form-inline" name="MinModuleSize" id="MinModuleSize" value="30">
+ </div>
+ </div>
+ <div class="form-group">
+ <label for="TOMtype"> TOMtype: </label>
+ <div class="col-sm-10">
+ <input type="text" class="form-inline" name="TOMtype" id="TOMtype" value="unsigned">
+ </div>
+ </div>
+ <div class="form-group">
+ <label for="mergeCutHeight"> mergeCutHeight: </label>
+ <div class="col-sm-10">
+ <input type="text" class="form-inline" name="mergeCutHeight" id="mergeCutHeight" value="0.25">
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-sm-10">
+ <input type="submit" class="btn btn-primary" value="Run WGCNA using these settings" />
+ </div>
+ </div>
+ </form>
+ {% endif %}
+</div>
{% endblock %}
-