From 47fdfa932d900ec9d235840ca17e06035f877fd3 Mon Sep 17 00:00:00 2001 From: Sam Ockman Date: Mon, 25 Jun 2012 02:22:33 -0400 Subject: Creating a new css file for use with flask --- web/css/general_flask.css | 244 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 244 insertions(+) create mode 100755 web/css/general_flask.css (limited to 'web/css') diff --git a/web/css/general_flask.css b/web/css/general_flask.css new file mode 100755 index 00000000..7a54e7b8 --- /dev/null +++ b/web/css/general_flask.css @@ -0,0 +1,244 @@ +@import url(import.css); + +body +{ + font-family : verdana, geneva, lucida, 'lucida grande', arial, helvetica; + font-weight : Normal; +} + +Blockquote { + margin : 14px 18px 14px 18px; +} + +/*Font size*/ +.fs10 {font-size : 10px} +.fs11 {font-size : 11px} +.fs12 {font-size : 12px} +.fs13 {font-size : 13px} +.fs14 {font-size : 14px} +.fs15 {font-size : 15px} +.fs16 {font-size : 16px} +.fs17 {font-size : 17px} + +/*Font Weight*/ +.fwb {font-weight : Bold} +.fwn {font-weight : Normal} + +/*Font Style*/ +.fsI {font-style : Italic} + +/*Font family*/ +.ffv {font-family : verdana, geneva, lucida, 'lucida grande', arial, helvetica;} +.ffl {font-family : lucida, verdana, 'lucida grande', helvetica, arial, geneva;} +.ffmono {font-family : "CourierNew", Courier, mono;} + +/*Color*/ +.cr {color : #f00} +.cg {color : #0f0} +.cdg {color : darkgreen} +.cb {color : #00f} +.c222 {color : #222} +.c999 {color : #999} +.c00d {color : #00d} +.cori {color : #CC9933} +.crb {color : royalblue} +.cw {color : #fff} +.cbl {color : #000000} +.cydull {color : #cfcf32} +.cdefault {color : #503A7D} + +/*backColor*/ +.cbr {background-color : #f00} +.cbg {background-color : #0f0} +.cbdg {background-color : darkgreen} +.cbb {background-color : #00f} +.cb222 {background-color : #222} +.cbg22t {background-color : #FF6} +.cbg22c {background-color : #5CB3FF} +.cbg2C {background-color : #1569C7} +.cbg22a {background-color : #F66} +.cbg22g {background-color : #CF9} +.cb00d {background-color : #00d} +.cb222 {background-color : #222} +.cbeee {background-color : #eee} +.cbori {background-color : #CC9933} +.cbrb {background-color : royalblue} +.cbdb {background-color : #2D2DB5} +.cbw {background-color : #fff} +.cbydull {background-color : #cfcf32} +.cbrdull {background-color : #c33232} +.cbgdull {background-color : #32c332} +.cbbdull {background-color : #1569C7} +.cbpdull {background-color : #c332c3} +.cbccc {background-color : #ccc} +.cbddf {background-color : #ddf} + +.nowrap {white-space: nowrap;} + +/*Table Cell*/ +.collap {border-collapse : collapse;} + +TH.header { + background-image: url(/images/bg.gif); + background-color: #4169E1; + cursor: pointer; + background-repeat: no-repeat; + background-position: center left; + padding-left: 20px; + margin-left: -1px; +} +TH.headerSortUp { + background-image: url(/images/desc.gif); + background-color: #4169E1; +} +TH.headerSortDown { + background-image: url(/images/asc.gif); + background-color: #4169E1; +} + +TD, P {color : #222222; font-size : 13px} +TD.b1 {border : 1px solid #999999; padding : 3px;} +TH.b1 {border : 1px solid #999999; padding : 3px;} +TD.bt1 {border-top : 1px solid #999999; padding : 3px;} +TD.bb1 {border-bottom : 1px solid #999999; padding : 3px;} + +.b2 {border : 2px solid royalblue; padding : 3px;} + +.bd1 {border : 1px dashed #999999; padding : 6px;} + +TD.outlier {background-color : yellow;} + +TR.alt td { + background: #e6e8fa; +} + +TR.over td { + background: #82CFFD; +} + +/*Table Row*/ +.toggleShowHide { color : #0000DD; cursor: pointer;} +.invisible {display: none;} + +/*Link*/ +A.font_black:link {color: #000000; text-decoration : None} +A.font_black:active {color: #000000; text-decoration : None} +A.font_black:hover {color: #000000; text-decoration : None} +A.font_black:visited {color: #000000; text-decoration : None} + +A {font-family : lucida, 'lucida grande', verdana, helvetica, arial, geneva; + font-weight : Bold; font-size : 13px; text-decoration : None} + +A:link, A:visited {color : #0000DD; text-decoration : None} + +A:active {color : #FF0000; text-decoration : None} + +A:hover {color : #FF0000; text-decoration : None} + +A.background_grey {background:#dddddd;padding:2;} + +A.non_bold {font-weight : Normal; color : #0000DD;} + +/*Border Style*/ +.solidBorder {border : 1px solid #CCCCCC; padding : 2px;} +.doubleBorder {border : double #AAAAAA; padding : 2px;} + +/*Title style*/ +.title {font-weight:Bold; color:#222222; font-size:16px} + +.subtitle {font-family : lucida, verdana, 'lucida grande', helvetica, arial, geneva; + font-weight:Bold; font-size:14px; color:#000082} + +.sectionheader {font-family : arial, verdana, 'lucida grande', helvetica, lucida, geneva; + font-weight:Bold; font-size:14px; vertical-align: middle; display:block; color:#000000; background-color:#DDDDDD; line-height:24px; height:24px;} + +/*drop shadow*/ +#v3 .wrap1 {background:url(/images/shadow/shadow.gif) right bottom no-repeat;} +#v3 .wrap2 {background:url(/images/shadow/corner_bl.gif) -12px 100% no-repeat;} +#v3 .wrap3 { + padding:0 9px 9px 0; + background:url(/images/shadow/corner_tr.gif) 100% -12px no-repeat;} + + +/*steal from google*/ + + .tabsTableBox { + width:100%; + border-spacing:0; + border-collapse:collapse; + margin-top:5px; + font-size:smaller; + text-align:center; + } + .tabsTableBox td { + padding-right:5px; + padding-left:5px; + padding-bottom:3px; + } + +/*For making the Custom Strain box in snpBrowser.py a default width, instead of looking weird always*/ +.customBoxWidth { + width: 143px; +} + .selectedBox { + border-top:1px solid #676767; + border-right:1px solid #676767; + border-left:1px solid #676767; + width:80; + font-weight:bolder; + color:#3366cc; + font-size:12px; + } + .unselectedBox { + background-color:#dddddd; + border-top:1px solid #aaaaaa; + width:80; + border-right:1px solid #aaaaaa; + border-left:1px solid #aaaaaa; + border-bottom:1px solid #676767; + font-size:12px; + } + + .spacerTabBox { + border-bottom:1px solid #676767; + width:5px; + } + + .emptyTabBox { + border-bottom:1px solid #676767; + } + +/*For font color of 'Get Any' and 'Combined' in the main page*/ +.searchtip +{ +color: #999999; +} + + +/*For font style and color of commands and keywords in the scriptable interface page*/ +.keywords +{ +font-family : "CourierNew", Courier, mono; +font-size : 15px; +color : #0000FF; +font-weight : Normal +} +/*For RIsample.html page*/ +.strains +{ +border:1px solid #999999; +border-top:1px solid #940; +border-bottom:1px solid #940; +padding:5; +background-color:#ddf; +font-family:verdana; +} +.values +{ +border:1px solid #999999; +border-top:1px solid #940; +border-bottom:1px solid #940; +padding:5; +background-color:#eee; +font-family:courier; +} -- cgit v1.2.3 From f94b7e23d1026fec0b778e1754e01c5050d20444 Mon Sep 17 00:00:00 2001 From: Sam Ockman Date: Mon, 25 Jun 2012 02:32:32 -0400 Subject: Modified css --- web/css/general_flask.css | 56 +++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'web/css') diff --git a/web/css/general_flask.css b/web/css/general_flask.css index 7a54e7b8..d0cffbc4 100755 --- a/web/css/general_flask.css +++ b/web/css/general_flask.css @@ -1,6 +1,6 @@ @import url(import.css); -body +body { font-family : verdana, geneva, lucida, 'lucida grande', arial, helvetica; font-weight : Normal; @@ -78,23 +78,23 @@ Blockquote { /*Table Cell*/ .collap {border-collapse : collapse;} -TH.header { +TH.header { background-image: url(/images/bg.gif); - background-color: #4169E1; - cursor: pointer; - background-repeat: no-repeat; - background-position: center left; - padding-left: 20px; - margin-left: -1px; -} -TH.headerSortUp { - background-image: url(/images/desc.gif); - background-color: #4169E1; -} -TH.headerSortDown { - background-image: url(/images/asc.gif); - background-color: #4169E1; -} + background-color: #4169E1; + cursor: pointer; + background-repeat: no-repeat; + background-position: center left; + padding-left: 20px; + margin-left: -1px; +} +TH.headerSortUp { + background-image: url(/images/desc.gif); + background-color: #4169E1; +} +TH.headerSortDown { + background-image: url(/images/asc.gif); + background-color: #4169E1; +} TD, P {color : #222222; font-size : 13px} TD.b1 {border : 1px solid #999999; padding : 3px;} @@ -106,7 +106,7 @@ TD.bb1 {border-bottom : 1px solid #999999; padding : 3px;} .bd1 {border : 1px dashed #999999; padding : 6px;} -TD.outlier {background-color : yellow;} +TR.outlier, TD.outlier {background-color : yellow;} TR.alt td { background: #e6e8fa; @@ -126,7 +126,7 @@ A.font_black:active {color: #000000; text-decoration : None} A.font_black:hover {color: #000000; text-decoration : None} A.font_black:visited {color: #000000; text-decoration : None} -A {font-family : lucida, 'lucida grande', verdana, helvetica, arial, geneva; +A {font-family : lucida, 'lucida grande', verdana, helvetica, arial, geneva; font-weight : Bold; font-size : 13px; text-decoration : None} A:link, A:visited {color : #0000DD; text-decoration : None} @@ -137,7 +137,7 @@ A:hover {color : #FF0000; text-decoration : None} A.background_grey {background:#dddddd;padding:2;} -A.non_bold {font-weight : Normal; color : #0000DD;} +A.non_bold {font-weight : Normal; color : #0000DD;} /*Border Style*/ .solidBorder {border : 1px solid #CCCCCC; padding : 2px;} @@ -146,10 +146,10 @@ A.non_bold {font-weight : Normal; color : #0000DD;} /*Title style*/ .title {font-weight:Bold; color:#222222; font-size:16px} -.subtitle {font-family : lucida, verdana, 'lucida grande', helvetica, arial, geneva; +.subtitle {font-family : lucida, verdana, 'lucida grande', helvetica, arial, geneva; font-weight:Bold; font-size:14px; color:#000082} - -.sectionheader {font-family : arial, verdana, 'lucida grande', helvetica, lucida, geneva; + +.sectionheader {font-family : arial, verdana, 'lucida grande', helvetica, lucida, geneva; font-weight:Bold; font-size:14px; vertical-align: middle; display:block; color:#000000; background-color:#DDDDDD; line-height:24px; height:24px;} /*drop shadow*/ @@ -174,7 +174,7 @@ A.non_bold {font-weight : Normal; color : #0000DD;} padding-right:5px; padding-left:5px; padding-bottom:3px; - } + } /*For making the Custom Strain box in snpBrowser.py a default width, instead of looking weird always*/ .customBoxWidth { @@ -186,7 +186,7 @@ A.non_bold {font-weight : Normal; color : #0000DD;} border-left:1px solid #676767; width:80; font-weight:bolder; - color:#3366cc; + color:#3366cc; font-size:12px; } .unselectedBox { @@ -198,16 +198,16 @@ A.non_bold {font-weight : Normal; color : #0000DD;} border-bottom:1px solid #676767; font-size:12px; } - + .spacerTabBox { border-bottom:1px solid #676767; width:5px; } - + .emptyTabBox { border-bottom:1px solid #676767; } - + /*For font color of 'Get Any' and 'Combined' in the main page*/ .searchtip { -- cgit v1.2.3 From f309b5144bfedc4aeaab0193f5be24a71737fc28 Mon Sep 17 00:00:00 2001 From: Zachary Sloan Date: Wed, 3 Oct 2012 16:02:34 -0500 Subject: Changed css classes used in trait data table and wrote coffeescript code that grabs the list of samples with an attribute value matching the value the user chose to exclude by. Added HTML5 data properties to table cells as data-column_name to use when excluding samples. --- web/css/general_flask.css | 54 +++++++++++++++------- .../collection/ExportSelectionDetailInfoPage.py | 2 +- wqflask/wqflask/show_trait/SampleList.py | 13 ------ wqflask/wqflask/show_trait/show_trait.py | 7 ++- .../static/new/javascript/show_trait.coffee | 38 +++++++++++---- .../wqflask/static/new/javascript/show_trait.js | 41 ++++++++++++++-- wqflask/wqflask/templates/search_result_page.html | 14 +++--- wqflask/wqflask/templates/show_trait.html | 43 +++++++++++------ wqflask/wqflask/views.py | 1 + 9 files changed, 146 insertions(+), 67 deletions(-) (limited to 'web/css') diff --git a/web/css/general_flask.css b/web/css/general_flask.css index d0cffbc4..d40fa267 100755 --- a/web/css/general_flask.css +++ b/web/css/general_flask.css @@ -10,6 +10,8 @@ Blockquote { margin : 14px 18px 14px 18px; } +/********** All this font size stuff, etc. needs to be replaced/removed ********** / + /*Font size*/ .fs10 {font-size : 10px} .fs11 {font-size : 11px} @@ -218,27 +220,47 @@ color: #999999; /*For font style and color of commands and keywords in the scriptable interface page*/ .keywords { -font-family : "CourierNew", Courier, mono; -font-size : 15px; -color : #0000FF; -font-weight : Normal + font-family : "CourierNew", Courier, mono; + font-size : 15px; + color : #0000FF; + font-weight : Normal } + /*For RIsample.html page*/ .strains { -border:1px solid #999999; -border-top:1px solid #940; -border-bottom:1px solid #940; -padding:5; -background-color:#ddf; -font-family:verdana; + border:1px solid #999999; + border-top:1px solid #940; + border-bottom:1px solid #940; + padding:5; + background-color:#ddf; + font-family:verdana; } + .values { -border:1px solid #999999; -border-top:1px solid #940; -border-bottom:1px solid #940; -padding:5; -background-color:#eee; -font-family:courier; + border:1px solid #999999; + border-top:1px solid #940; + border-bottom:1px solid #940; + padding:5; + background-color:#eee; + font-family:courier; } + +/*****************************************/ + +/* Standard table cell */ +.std_cell +{ + border : 1px solid #999999; + color : #222; + font-size : 13px; + padding : 3px; +} + +/*Input field used to enter sample values, SE, etc.*/ +.trait_value_input +{ + font-style : Italic +} + diff --git a/web/webqtl/collection/ExportSelectionDetailInfoPage.py b/web/webqtl/collection/ExportSelectionDetailInfoPage.py index a61b6f6e..7238c797 100755 --- a/web/webqtl/collection/ExportSelectionDetailInfoPage.py +++ b/web/webqtl/collection/ExportSelectionDetailInfoPage.py @@ -128,7 +128,7 @@ class ExportSelectionDetailInfoPage(templatePage): count = count + 1 except: pass - if count = 0: + if count == 0: mean = 0 else: mean = sum/count diff --git a/wqflask/wqflask/show_trait/SampleList.py b/wqflask/wqflask/show_trait/SampleList.py index d39559d3..df0dc61e 100644 --- a/wqflask/wqflask/show_trait/SampleList.py +++ b/wqflask/wqflask/show_trait/SampleList.py @@ -112,19 +112,6 @@ class SampleList(object): self.attributes[key].distinct_values.sort(key=natural_sort_key) - # exclude_menu = HT.Select(name="exclude_menu") - # dropdown_menus = [] #ZS: list of dropdown menus with the distinct values of each attribute (contained in DIVs so the style parameter can be edited and they can be hidden) - # for this_attr_name in attribute_names: - # exclude_menu.append((this_attr_name.capitalize(), this_attr_name)) - # attr_value_menu_div = HT.Div(style="display:none;", Class="attribute_values") #container used to show/hide dropdown menus - # attr_value_menu = HT.Select(name=this_attr_name) - # attr_value_menu.append(("None", "show_all")) - # for value in distinct_values: - # attr_value_menu.append((str(value[0]), value[0])) - # attr_value_menu_div.append(attr_value_menu) - # dropdown_menus.append(attr_value_menu_div) - - def get_extra_attribute_values(self, sample_name): attribute_values = {} diff --git a/wqflask/wqflask/show_trait/show_trait.py b/wqflask/wqflask/show_trait/show_trait.py index 9bad6154..d34ae9a6 100755 --- a/wqflask/wqflask/show_trait/show_trait.py +++ b/wqflask/wqflask/show_trait/show_trait.py @@ -161,7 +161,12 @@ class ShowTrait(templatePage): self.sample_group_types['primary_only'] = fd.RISet + " Only" self.sample_group_types['other_only'] = "Non-" + fd.RISet self.sample_group_types['all_cases'] = "All Cases" - js_data = dict(sample_groups = self.sample_group_types, + sample_lists = [] + for group in self.sample_groups: + sample_lists.append(group.sample_list) + print("sample_lists is:", pf(sample_lists)) + js_data = dict(sample_group_types = self.sample_group_types, + sample_lists = sample_lists, attribute_names = self.sample_groups[0].attributes) print("js_data:", pf(js_data)) self.js_data = js_data diff --git a/wqflask/wqflask/static/new/javascript/show_trait.coffee b/wqflask/wqflask/static/new/javascript/show_trait.coffee index a91e9681..e22f1c21 100644 --- a/wqflask/wqflask/static/new/javascript/show_trait.coffee +++ b/wqflask/wqflask/static/new/javascript/show_trait.coffee @@ -68,8 +68,8 @@ $ -> make_table = -> header = " " - console.log("js_data.sample_groups:", js_data.sample_groups) - for own key, value of js_data.sample_groups + console.log("js_data.sample_group_types:", js_data.sample_group_types) + for own key, value of js_data.sample_group_types console.log("aa key:", key) console.log("aa value:", value) the_id = process_id("column", key) @@ -107,8 +107,8 @@ $ -> console.log("rowing") row_line = """""" row_line += """#{ row.pretty }""" - console.log("box - js_data.sample_groups:", js_data.sample_groups) - for own key, value of js_data.sample_groups + console.log("box - js_data.sample_group_types:", js_data.sample_group_types) + for own key, value of js_data.sample_group_types console.log("apple key:", key) the_id = process_id(key, row.vn) console.log("the_id:", the_id) @@ -147,7 +147,7 @@ $ -> console.log("Should be now Hide Outliers") - #Calculate Correlations Code + ##Calculate Correlations Code on_corr_method_change = -> @@ -164,9 +164,9 @@ $ -> $('select[name=corr_method]').change(on_corr_method_change) - #End Calculate Correlations Code + ##End Calculate Correlations Code - #Populate Samples Attribute Values Code + ##Populate Samples Attribute Values Code create_value_dropdown = (value) -> return """""" @@ -187,9 +187,29 @@ $ -> populate_sample_attributes_values_dropdown() $('#exclude_menu').change(populate_sample_attributes_values_dropdown) + ##End Populate Samples Attribute Values Codess + + ##Block Samples By Attribute Value Code + block_by_attribute_value = -> + console.log("in beginning of bbav code") + attribute_name = $('#exclude_menu').val() + console.log("attribute_name is:", attribute_name) + exclude_by_value = $('#attribute_values').val() + console.log("exclude_by_value is:", exclude_by_value) + sample_lists = js_data['sample_lists'] + console.log("sample_lists is:", sample_lists) + for sample_list in sample_lists + for sample in sample_list + console.log("sample is:", sample) + if sample.extra_attributes[attribute_name] == exclude_by_value + console.log("is exclude_by_value") + sample_row = $('') + + + + $('#exclude_group').click(block_by_attribute_value) - - #End Populate Samples Attribute Values Code + ##End Block Samples By Attribute Value Code console.log("before registering show_hide_outliers") $('#show_hide_outliers').click(show_hide_outliers) diff --git a/wqflask/wqflask/static/new/javascript/show_trait.js b/wqflask/wqflask/static/new/javascript/show_trait.js index 039a5e04..65440427 100644 --- a/wqflask/wqflask/static/new/javascript/show_trait.js +++ b/wqflask/wqflask/static/new/javascript/show_trait.js @@ -11,7 +11,7 @@ }; $(function() { - var change_stats_value, create_value_dropdown, edit_data_change, hide_tabs, make_table, on_corr_method_change, populate_sample_attributes_values_dropdown, process_id, show_hide_outliers, stats_mdp_change, update_stat_values; + var block_by_attribute_value, change_stats_value, create_value_dropdown, edit_data_change, hide_tabs, make_table, on_corr_method_change, populate_sample_attributes_values_dropdown, process_id, show_hide_outliers, stats_mdp_change, update_stat_values; hide_tabs = function(start) { var x, _i, _results; _results = []; @@ -94,8 +94,8 @@ make_table = function() { var header, key, row, row_line, rows, table, the_id, the_rows, value, _i, _len, _ref, _ref1; header = " "; - console.log("js_data.sample_groups:", js_data.sample_groups); - _ref = js_data.sample_groups; + console.log("js_data.sample_group_types:", js_data.sample_group_types); + _ref = js_data.sample_group_types; for (key in _ref) { if (!__hasProp.call(_ref, key)) continue; value = _ref[key]; @@ -132,8 +132,8 @@ console.log("rowing"); row_line = ""; row_line += "" + row.pretty + ""; - console.log("box - js_data.sample_groups:", js_data.sample_groups); - _ref1 = js_data.sample_groups; + console.log("box - js_data.sample_group_types:", js_data.sample_group_types); + _ref1 = js_data.sample_group_types; for (key in _ref1) { if (!__hasProp.call(_ref1, key)) continue; value = _ref1[key]; @@ -222,6 +222,37 @@ }; populate_sample_attributes_values_dropdown(); $('#exclude_menu').change(populate_sample_attributes_values_dropdown); + block_by_attribute_value = function() { + var attribute_name, exclude_by_value, sample, sample_list, sample_lists, sample_row, _i, _len, _results; + console.log("in beginning of bbav code"); + attribute_name = $('#exclude_menu').val(); + console.log("attribute_name is:", attribute_name); + exclude_by_value = $('#attribute_values').val(); + console.log("exclude_by_value is:", exclude_by_value); + sample_lists = js_data['sample_lists']; + console.log("sample_lists is:", sample_lists); + _results = []; + for (_i = 0, _len = sample_lists.length; _i < _len; _i++) { + sample_list = sample_lists[_i]; + _results.push((function() { + var _j, _len1, _results1; + _results1 = []; + for (_j = 0, _len1 = sample_list.length; _j < _len1; _j++) { + sample = sample_list[_j]; + console.log("sample is:", sample); + if (sample.extra_attributes[attribute_name] === exclude_by_value) { + console.log("is exclude_by_value"); + _results1.push(sample_row = $('')); + } else { + _results1.push(void 0); + } + } + return _results1; + })()); + } + return _results; + }; + $('#exclude_group').click(block_by_attribute_value); console.log("before registering show_hide_outliers"); $('#show_hide_outliers').click(show_hide_outliers); console.log("after registering show_hide_outliers"); diff --git a/wqflask/wqflask/templates/search_result_page.html b/wqflask/wqflask/templates/search_result_page.html index 572f7fcc..c20efe40 100644 --- a/wqflask/wqflask/templates/search_result_page.html +++ b/wqflask/wqflask/templates/search_result_page.html @@ -171,9 +171,9 @@ {{ loop.index }} - + {# - #} - + {{ thisTrait.name.upper() }} @@ -182,11 +182,11 @@ {{ thisTrait.symbol }} - {{ thisTrait.description_display }} - {{ thisTrait.trait_location_repr }} - {{ thisTrait.mean }} - {{ thisTrait.LRS_score_repr }} - {{ thisTrait.LRS_location_repr }} + {{ thisTrait.description_display }} + {{ thisTrait.trait_location_repr }} + {{ thisTrait.mean }} + {{ thisTrait.LRS_score_repr }} + {{ thisTrait.LRS_location_repr }} {% endfor %} diff --git a/wqflask/wqflask/templates/show_trait.html b/wqflask/wqflask/templates/show_trait.html index 3d24e738..0ef86685 100644 --- a/wqflask/wqflask/templates/show_trait.html +++ b/wqflask/wqflask/templates/show_trait.html @@ -1238,7 +1238,7 @@ {% endif %} - +
  Options: @@ -1253,9 +1253,14 @@

-   Outliers highlighted in  yellow  can be hidden using - the Hide Outliers button,
-   and samples with no value (x) can be hidden by clicking Hide No Value .
+   Outliers highlighted in +  yellow  + can be hidden using + the Hide Outliers button, +
+   and samples with no value (x) can be hidden by clicking + Hide No Valuet. +

@@ -1280,36 +1285,44 @@ {% endif %} {% for attribute in sample_type.attributes|sort() %} - {{ sample_type.attributes[attribute].name }} + + {{ sample_type.attributes[attribute].name }} + {% endfor %} {% for sample in sample_type.sample_list %} - + {{ loop.index }} - + - - {{ sample.name }} + + + {{ sample.name }} + {# Todo: Add IDs #} - - + {% if sample_type.se_exists() %} - + ± {# Todo: Add IDs #} - - + @@ -1317,7 +1330,7 @@ {# Loop through each attribute type and input value #} {% for attribute in sample_type.attributes|sort() %} - + {{ sample.extra_attributes[sample_type.attributes[attribute].name] }} {% endfor %} diff --git a/wqflask/wqflask/views.py b/wqflask/wqflask/views.py index c38ecb47..82a08c71 100644 --- a/wqflask/wqflask/views.py +++ b/wqflask/wqflask/views.py @@ -94,6 +94,7 @@ def corr_compute_page(): # Todo: Can we simplify this? -Sam def sharing_info_page(): + """Info page displayed when the user clicks the "Info" button next to the dataset selection""" print("In sharing_info_page") fd = webqtlFormData.webqtlFormData(request.args) print("2Have fd") -- cgit v1.2.3