aboutsummaryrefslogtreecommitdiff
path: root/wqflask
diff options
context:
space:
mode:
authorzsloan2015-03-24 16:26:31 +0000
committerzsloan2015-03-24 16:26:31 +0000
commit669f57d0d8322777c7a69f82a7bb9360290d03e6 (patch)
treefbe22b7b33687bc99ddb99f3adf4c650b0d91290 /wqflask
parent3ceb64255d771a2be78193b5c641c9c42778d4fd (diff)
downloadgenenetwork2-669f57d0d8322777c7a69f82a7bb9360290d03e6.tar.gz
Updates to the templates
Diffstat (limited to 'wqflask')
-rw-r--r--wqflask/wqflask/templates/pair_scan_results.html91
-rwxr-xr-xwqflask/wqflask/templates/show_trait_calculate_correlations.html2
-rwxr-xr-xwqflask/wqflask/templates/show_trait_mapping_tools.html67
3 files changed, 128 insertions, 32 deletions
diff --git a/wqflask/wqflask/templates/pair_scan_results.html b/wqflask/wqflask/templates/pair_scan_results.html
new file mode 100644
index 00000000..a0041e11
--- /dev/null
+++ b/wqflask/wqflask/templates/pair_scan_results.html
@@ -0,0 +1,91 @@
+{% extends "base.html" %}
+{% block title %}Interval Mapping{% endblock %}
+{% block css %}
+<!-- <link rel="stylesheet" type="text/css" href="/static/new/css/interval_mapping.css" />-->
+ <link rel="stylesheet" type="text/css" href="/static/new/packages/DataTables/css/jquery.dataTables.css" />
+ <link rel="stylesheet" type="text/css" href="/static/packages/DT_bootstrap/DT_bootstrap.css" />
+ <link rel="stylesheet" type="text/css" href="/static/packages/TableTools/media/css/TableTools.css" />
+ <link rel="stylesheet" type="text/css" href="/static/new/css/d3-tip.min.css" />
+ <link rel="stylesheet" type="text/css" href="/static/new/css/panelutil.css" />
+{% endblock %}
+{% block content %} <!-- Start of body -->
+
+ {{ header("Mapping",
+ '{}: {}'.format(this_trait.name, this_trait.description_fmt)) }}
+
+ <div class="container">
+ <div>
+ <h2>
+ Pair Scan
+ </h2>
+ </div>
+ <div id="chart_container">
+ <div class="pair_scan_figure" id="pair_scan_figure">
+ <img src="/images/{{ pair_scan_filename }}.png">
+ </div>
+ </div>
+ <div>
+ <h2>
+ Results
+ </h2>
+ </div>
+ </div>
+
+ <!-- End of body -->
+
+{% endblock %}
+
+{% block js %}
+ <script>
+ js_data = {{ js_data | safe }}
+ </script>
+
+ <!--[if lt IE 9]>
+<!-- <script language="javascript" type="text/javascript" src="/static/packages/jqplot/excanvas.js"></script>-->
+ <![endif]-->
+ <script language="javascript" type="text/javascript" src="http://d3js.org/d3.v3.min.js"></script>
+ <script language="javascript" type="text/javascript" src="/static/new/js_external/d3-tip.min.js"></script>
+<!-- <script language="javascript" type="text/javascript" src="/static/new/packages/jsPDF/jspdf.js"></script>
+ <script language="javascript" type="text/javascript" src="/static/new/packages/jsPDF/libs/FileSaver.js/FileSaver.js"></script>
+ <script language="javascript" type="text/javascript" src="/static/new/packages/jsPDF/libs/Blob.js/BlobBuilder.js"></script>
+ <script language="javascript" type="text/javascript" src="/static/new/packages/jsPDF/jspdf.plugin.standard_fonts_metrics.js"></script>
+ <script language="javascript" type="text/javascript" src="/static/new/packages/jsPDF/jspdf.plugin.from_html.js"></script>-->
+ <script language="javascript" type="text/javascript" src="/static/new/javascript/panelutil.js"></script>
+ <script language="javascript" type="text/javascript" src="/static/new/javascript/chr_lod_chart.js"></script>
+<!-- <script language="javascript" type="text/javascript" src="/static/new/javascript/manhattan_plot.js"></script>-->
+ <script language="javascript" type="text/javascript" src="/static/new/javascript/lod_chart.js"></script>
+ <script language="javascript" type="text/javascript" src="/static/new/javascript/create_lodchart.js"></script>
+ <script language="javascript" type="text/javascript" src="/static/new/packages/DataTables/js/jquery.js"></script>
+ <script language="javascript" type="text/javascript" src="/static/new/packages/DataTables/js/jquery.dataTables.min.js"></script>
+ <script language="javascript" type="text/javascript" src="/static/new/packages/DataTables/js/dataTables.scientific.js"></script>
+ <script language="javascript" type="text/javascript" src="/static/packages/DT_bootstrap/DT_bootstrap.js"></script>
+ <script language="javascript" type="text/javascript" src="/static/packages/TableTools/media/js/TableTools.min.js"></script>
+ <script language="javascript" type="text/javascript" src="/static/packages/underscore/underscore-min.js"></script>
+
+ <script type="text/javascript" charset="utf-8">
+ $(document).ready( function () {
+ console.time("Creating table");
+ $('#qtl_results').dataTable( {
+ //"sDom": "<<'span3'l><'span3'T><'span4'f>'row-fluid'r>t<'row-fluid'<'span6'i><'span6'p>>",
+ "sDom": "lTftipr",
+ "oTableTools": {
+ "aButtons": [
+ "copy",
+ "print",
+ {
+ "sExtends": "collection",
+ "sButtonText": 'Save <span class="caret" />',
+ "aButtons": [ "csv", "xls", "pdf" ]
+ }
+ ],
+ "sSwfPath": "/static/packages/TableTools/media/swf/copy_csv_xls_pdf.swf"
+ },
+ "iDisplayLength": 50,
+ "bLengthChange": true,
+ "bDeferRender": true,
+ "bSortClasses": false
+ } );
+ console.timeEnd("Creating table");
+ });
+ </script>
+{% endblock %} \ No newline at end of file
diff --git a/wqflask/wqflask/templates/show_trait_calculate_correlations.html b/wqflask/wqflask/templates/show_trait_calculate_correlations.html
index 63bbd7b6..f02d1705 100755
--- a/wqflask/wqflask/templates/show_trait_calculate_correlations.html
+++ b/wqflask/wqflask/templates/show_trait_calculate_correlations.html
@@ -2,7 +2,7 @@
<div style="padding: 20px" class="form-horizontal">
<div class="form-group">
- <label for="corr_method" class="col-xs-1 control-label">Method</label>
+ <label for="corr_type" class="col-xs-1 control-label">Method</label>
<div class="col-xs-2 controls">
<select name="corr_type" class="form-control">
<option value="sample">Sample r</option>
diff --git a/wqflask/wqflask/templates/show_trait_mapping_tools.html b/wqflask/wqflask/templates/show_trait_mapping_tools.html
index 7794fab5..426a5c5d 100755
--- a/wqflask/wqflask/templates/show_trait_mapping_tools.html
+++ b/wqflask/wqflask/templates/show_trait_mapping_tools.html
@@ -140,63 +140,68 @@
<label for="control_for" class="col-xs-2 control-label">Control&nbsp;for</label>
<div style="margin-left: 20px;" class="col-xs-4 controls">
{% if dataset.type == 'ProbeSet' and this_trait.locus_chr != "" %}
- <input name="control_rqtl_geno" value="{{ nearest_marker1+","+nearest_marker2 }}" type="text" />
+ <input name="control_rqtl_geno" value="{{ nearest_marker1+","+nearest_marker2 }}" type="text" style="width: 160px;" class="form-control" />
{% else %}
- <input name="control_rqtl_geno" value="" type="text" />
+ <input name="control_rqtl_geno" value="" type="text" class="form-control" />
{% endif %}
</div>
</div>
<div class="mapping_method_fields form-group">
- <label style="text-align:left;" class="col-xs-12 control-label">Manhattan Plot</label>
+ <label for="mapmethod_rqtl_geno" style="text-align:left;" class="col-xs-2 control-label">Method</label>
+ <div class="col-xs-4 controls">
+ <select name="mapmethod_rqtl_geno" class="form-control">
+ <option value="em">em</option>
+ <option value="imp">imp</option>
+ <option value="hk">hk</option>
+ <option value="ehk">ehk</option>
+ <option value="mr">mr</option>
+ <option value="mr-imp">mr-imp</option>
+ <option value="mr-argmax">mr-argmax</option>
+ </select>
+ </div>
+ </div>
+
+ <div class="mapping_method_fields form-group">
+ <label for="mapmodel_rqtl_geno" style="text-align:left;" class="col-xs-2 control-label">Model</label>
+ <div class="col-xs-4 controls">
+ <select name="mapmodel_rqtl_geno" class="form-control">
+ <option value="normal">normal</option>
+ <option value="binary">binary</option>
+ <option value="2part">2part</option>
+ <option value="np">np</option>
+ </select>
+ </div>
+ </div>
+
+ <div class="mapping_method_fields form-group">
+ <label style="text-align:left;" class="col-xs-12 control-label">Pair Scan</label>
<div class="col-xs-12 controls">
<label class="radio-inline">
- <input type="radio" name="manhattan_plot_rqtl" value="true">
+ <input type="radio" name="pair_scan" value="true">
Yes
</label>
<label class="radio-inline">
- <input type="radio" name="manhattan_plot_rqtl" value="false" checked="">
+ <input type="radio" name="pair_scan" value="false" checked="">
No
</label>
</div>
</div>
<div class="mapping_method_fields form-group">
- <label style="text-align:left;" class="col-xs-12 control-label">Method</label>
- <select name="mapmethod_rqtl_geno">
- <option value="em">em</option>
- <option value="imp">imp</option>
- <option value="hk">hk</option>
- <option value="ehk">ehk</option>
- <option value="mr">mr</option>
- <option value="mr-imp">mr-imp</option>
- <option value="mr-argmax">mr-argmax</option>
- </select>
- </div>
-
- <div class="mapping_method_fields form-group">
- <label style="text-align:left;" class="col-xs-12 control-label">Model</label>
- <select name="mapmodel_rqtl_geno">
- <option value="normal">normal</option>
- <option value="binary">binary</option>
- <option value="2part">2part</option>
- <option value="np">np</option>
- </select>
- </div>
-
- <div class="mapping_method_fields form-group">
- <label style="text-align:left;" class="col-xs-12 control-label">Pair Scan</label>
+ <label style="text-align:left;" class="col-xs-12 control-label">Manhattan Plot</label>
<div class="col-xs-12 controls">
<label class="radio-inline">
- <input type="radio" name="pair_scan" value="true">
+ <input type="radio" name="manhattan_plot_rqtl" value="true">
Yes
</label>
<label class="radio-inline">
- <input type="radio" name="pair_scan" value="false" checked="">
+ <input type="radio" name="manhattan_plot_rqtl" value="false" checked="">
No
</label>
</div>
</div>
+
<div class="form-group">
<div style="padding-left:15px;" class="controls">
<button id="rqtl_geno_compute" class="btn submit_special btn-primary" data-url="/marker_regression" title="Compute Marker Regression">