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 +- 2 files changed, 39 insertions(+), 17 deletions(-) (limited to 'web') 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 -- cgit v1.2.3