diff options
| author | zsloan | 2016-09-15 17:10:51 +0000 |
|---|---|---|
| committer | zsloan | 2016-09-27 12:09:11 +0200 |
| commit | 18cf0075003b70b2d97f9fe20794b8ed3f6e1233 (patch) | |
| tree | 8bc63737b49aa12ca2545a5813588bf68acb50a9 /wqflask | |
| parent | 55b332d6f03f20054902dabb7beeaaebef2139ac (diff) | |
| download | genenetwork2-18cf0075003b70b2d97f9fe20794b8ed3f6e1233.tar.gz | |
Conflict in wqflask/wqflask/templates/show_trait_mapping_tools.html
Diffstat (limited to 'wqflask')
| -rw-r--r-- | wqflask/wqflask/templates/show_trait_mapping_tools.html | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/wqflask/wqflask/templates/show_trait_mapping_tools.html b/wqflask/wqflask/templates/show_trait_mapping_tools.html index 3d9c2521..9c1101ca 100644 --- a/wqflask/wqflask/templates/show_trait_mapping_tools.html +++ b/wqflask/wqflask/templates/show_trait_mapping_tools.html @@ -32,6 +32,18 @@ {% if use_pylmm_rqtl and not use_plink_gemma and dataset.group.species != "human" %} <div class="tab-pane active" id="interval_mapping"> <div style="margin-top: 20px" class="form-horizontal"> + {% if genofiles and genofiles|length>0 %} + <div class="mapping_method_fields form-group"> + <label for="genofiles" class="col-xs-3 control-label">Geno File</label> + <div style="margin-left: 20px;" class="col-xs-4 controls"> + <select name="genofile" class="form-control"> + {% for item in genofiles %} + <option value="{{item[0]}}">{{item[1]}}</option> + {% endfor %} + </select> + </div> + </div> + {% endif %} <div class="mapping_method_fields form-group"> <label for="mapping_permutations" class="col-xs-3 control-label">Permutations</label> <div style="margin-left: 20px;" class="col-xs-4 controls"> @@ -90,8 +102,8 @@ <div class="mapping_method_fields form-group"> - <label style="text-align:left;" class="col-xs-12 control-label">Marker Regr.</label> - <div class="col-xs-12 controls"> + <label style="text-align:left;" class="col-xs-3 control-label">Marker<br>Regression</label> + <div style="margin-left: 20px;" class="col-xs-4 controls"> <label class="radio-inline"> <input type="radio" name="manhattan_plot_reaper" value="True"> Yes |