diff options
| author | zsloan | 2017-01-03 16:26:24 +0000 |
|---|---|---|
| committer | zsloan | 2017-01-03 16:26:24 +0000 |
| commit | 2fe052c10bc1e6468da277a6afbb51468e447c47 (patch) | |
| tree | 7edc4154e7ec9e1ac907b24ca20e11c7292e4b62 | |
| parent | b88eb7fcbd24462efb34fd3e30bfb64483223935 (diff) | |
| download | genenetwork2-2fe052c10bc1e6468da277a6afbb51468e447c47.tar.gz | |
Fixed appearance of samples tables in show_trait to look like all the other tables
Disabled sorting for the first column (check box) of the samples tables
| -rw-r--r-- | wqflask/wqflask/static/new/javascript/histogram.js | 1 | ||||
| -rw-r--r-- | wqflask/wqflask/templates/show_trait.html | 12 | ||||
| -rw-r--r-- | wqflask/wqflask/templates/show_trait_edit_data.html | 16 |
3 files changed, 19 insertions, 10 deletions
diff --git a/wqflask/wqflask/static/new/javascript/histogram.js b/wqflask/wqflask/static/new/javascript/histogram.js index d26d0c03..f71080e8 100644 --- a/wqflask/wqflask/static/new/javascript/histogram.js +++ b/wqflask/wqflask/static/new/javascript/histogram.js @@ -103,7 +103,6 @@ Histogram.prototype.add_bars = function() { var bar, rect_width; - console.log("bar_width:", this.x_scale(this.histogram_data[0].dx)); bar = this.svg.selectAll(".bar").data(this.histogram_data).enter().append("g").attr("class", "bar").attr("transform", (function(_this) { return function(d) { return "translate(" + _this.x_scale(d.x) + "," + _this.y_scale(d.y) + ")"; diff --git a/wqflask/wqflask/templates/show_trait.html b/wqflask/wqflask/templates/show_trait.html index d76e8af8..d7e60b61 100644 --- a/wqflask/wqflask/templates/show_trait.html +++ b/wqflask/wqflask/templates/show_trait.html @@ -213,7 +213,12 @@ {% for attribute in sample_groups[0].attributes %} { "type": "natural" }{% if loop.index < sample_groups[0].attributes|length %},{% endif %} {% endfor %} - ], + ], + "columnDefs": [ { + "targets": 0, + "orderable": false + } ], + "order": [[1, "asc" ]], "sDom": "RZtr", "iDisplayLength": -1, "autoWidth": false, @@ -240,6 +245,11 @@ { "type": "natural" }{% if loop.index < sample_groups[0].attributes|length %},{% endif %} {% endfor %} ], + "columnDefs": [ { + "targets": 0, + "orderable": false + } ], + "order": [[1, "asc" ]], "sDom": "RZtr", "iDisplayLength": -1, "autoWidth": false, diff --git a/wqflask/wqflask/templates/show_trait_edit_data.html b/wqflask/wqflask/templates/show_trait_edit_data.html index ff5f0c87..a254d956 100644 --- a/wqflask/wqflask/templates/show_trait_edit_data.html +++ b/wqflask/wqflask/templates/show_trait_edit_data.html @@ -77,20 +77,20 @@ {% for sample_type in sample_groups %} <div class="sample_group" style="width:{{ trait_table_width }}%;"> <h3>{{ sample_type.header }}</h3> - <div id="table_container" style="background-color: #eeeeee; border: 1px solid black;"> + <div id="table_container"> <table class="table-hover table-striped" id="samples_{{ sample_type.sample_group_type }}" style="float: left;"> <thead> <tr> - <th style="background-color: #eeeeee;"></th> - <th style="background-color: #eeeeee;">Index</th> - <th style="background-color: #eeeeee;">Sample</th> - <th style="background-color: #eeeeee;">Value</th> + <th></th> + <th>Index</th> + <th>Sample</th> + <th>Value</th> {% if sample_type.se_exists() %} - <th style="background-color: #eeeeee;"> </th> - <th style="background-color: #eeeeee;">SE</th> + <th> </th> + <th>SE</th> {% endif %} {% for attribute in sample_type.attributes|sort() %} - <th style="background-color: #eeeeee;"> + <th> {{ sample_type.attributes[attribute].name }} </th> {% endfor %} |