From 96cab107810b3a3ac8c804335e14c00b93e9061d Mon Sep 17 00:00:00 2001
From: Sam Ockman
Date: Wed, 6 Jun 2012 01:54:06 -0400
Subject: Going to try and be a bit more object oriented

---
 wqflask/wqflask/show_trait/DataEditingPage.py          | 10 +++++-----
 wqflask/wqflask/templates/trait_data_and_analysis.html |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/wqflask/wqflask/show_trait/DataEditingPage.py b/wqflask/wqflask/show_trait/DataEditingPage.py
index 439797c5..1aef0349 100755
--- a/wqflask/wqflask/show_trait/DataEditingPage.py
+++ b/wqflask/wqflask/show_trait/DataEditingPage.py
@@ -350,7 +350,7 @@ class DataEditingPage(templatePage):
                 alias = string.replace(thisTrait.alias, ";", " ")
                 alias = string.join(string.split(alias), ", ")
                 thisTrait.alias_fmt = alias
-     
+
 
             #XZ: Description
             if thisTrait.description:
@@ -364,11 +364,11 @@ class DataEditingPage(templatePage):
 
             #XZ: deal with Chr and Mb
             if thisTrait.chr and thisTrait.mb:
-                tSpan = HT.Span('Chr %s @ %s Mb'  % (thisTrait.chr,thisTrait.mb),Class="fs13")
-            elif (thisTrait.chr):
-                tSpan = HT.Span('Chr %s @ Unknown position' % (thisTrait.chr), Class="fs13")
+                thisTrait.location = 'Chr %s @ %s Mb'  % (thisTrait.chr,thisTrait.mb)
+            elif thisTrait.chr:
+                thisTrait.location = 'Chr %s @ Unknown position' % (thisTrait.chr)
             else:
-                tSpan = HT.Span('Not available', Class="fs13")
+                thisTrait.location = 'Not available'
 
             ##XZ: deal with direction
             #if thisTrait.strand_probe == '+':
diff --git a/wqflask/wqflask/templates/trait_data_and_analysis.html b/wqflask/wqflask/templates/trait_data_and_analysis.html
index fb2e373c..0eb1e012 100644
--- a/wqflask/wqflask/templates/trait_data_and_analysis.html
+++ b/wqflask/wqflask/templates/trait_data_and_analysis.html
@@ -68,7 +68,7 @@
 
                     <td valign="top" width="10"></td>
 
-                    <td valign="top"><span class="fs13">Chr 18 @ 81.163175 Mb on the minus strand<br></span></td>
+                    <td valign="top"><span class="fs13">{{ thisTrait.location }}<br></span></td>
                   </tr>
 
                   <tr>
-- 
cgit v1.2.3