aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzsloan2019-05-06 12:02:49 -0500
committerzsloan2019-05-06 12:02:49 -0500
commit3afaa7cfad3ffa3d0bb033dd1b984d3443a65fa0 (patch)
tree0e40ab39c2b6d598fd33e5acd8ef8873c468f3d8
parent545f557e973b1ebd6a83a637d6ed52e2325b8c0f (diff)
downloadgenenetwork2-3afaa7cfad3ffa3d0bb033dd1b984d3443a65fa0.tar.gz
Removed some unused imports of htmlgen
Fixed a bug that sometimes occurred in search results Changed order of items on index page
-rw-r--r--wqflask/base/trait.py2
-rw-r--r--wqflask/utility/webqtlUtil.py2
-rw-r--r--wqflask/wqflask/comparison_bar_chart/comparison_bar_chart.py1
-rw-r--r--wqflask/wqflask/correlation/show_corr_results.py1
-rw-r--r--wqflask/wqflask/correlation_matrix/show_corr_matrix.py1
-rw-r--r--wqflask/wqflask/heatmap/heatmap.py1
-rw-r--r--wqflask/wqflask/network_graph/network_graph.py1
-rw-r--r--wqflask/wqflask/search_results.py2
-rw-r--r--wqflask/wqflask/snp_browser/snp_browser.py6
-rwxr-xr-xwqflask/wqflask/templates/index_page_orig.html41
10 files changed, 22 insertions, 36 deletions
diff --git a/wqflask/base/trait.py b/wqflask/base/trait.py
index 0689e950..6fecf725 100644
--- a/wqflask/base/trait.py
+++ b/wqflask/base/trait.py
@@ -4,8 +4,6 @@ import string
import resource
import codecs
-from htmlgen import HTMLgen2 as HT
-
import redis
Redis = redis.StrictRedis()
diff --git a/wqflask/utility/webqtlUtil.py b/wqflask/utility/webqtlUtil.py
index 83fa90b7..67a476e3 100644
--- a/wqflask/utility/webqtlUtil.py
+++ b/wqflask/utility/webqtlUtil.py
@@ -30,8 +30,6 @@ import re
import math
from math import *
-from htmlgen import HTMLgen2 as HT
-
from base import webqtlConfig
# NL, 07/27/2010. moved from webqtlForm.py
diff --git a/wqflask/wqflask/comparison_bar_chart/comparison_bar_chart.py b/wqflask/wqflask/comparison_bar_chart/comparison_bar_chart.py
index b9e6f450..21eb1493 100644
--- a/wqflask/wqflask/comparison_bar_chart/comparison_bar_chart.py
+++ b/wqflask/wqflask/comparison_bar_chart/comparison_bar_chart.py
@@ -35,7 +35,6 @@ import resource
from pprint import pformat as pf
-from htmlgen import HTMLgen2 as HT
import reaper
from base.trait import GeneralTrait
diff --git a/wqflask/wqflask/correlation/show_corr_results.py b/wqflask/wqflask/correlation/show_corr_results.py
index 031c7a16..1aa7945d 100644
--- a/wqflask/wqflask/correlation/show_corr_results.py
+++ b/wqflask/wqflask/correlation/show_corr_results.py
@@ -37,7 +37,6 @@ import numpy
from pprint import pformat as pf
-from htmlgen import HTMLgen2 as HT
import reaper
from base import webqtlConfig
diff --git a/wqflask/wqflask/correlation_matrix/show_corr_matrix.py b/wqflask/wqflask/correlation_matrix/show_corr_matrix.py
index 5a1f464b..09213d1f 100644
--- a/wqflask/wqflask/correlation_matrix/show_corr_matrix.py
+++ b/wqflask/wqflask/correlation_matrix/show_corr_matrix.py
@@ -41,7 +41,6 @@ import rpy2.robjects as robjects
from pprint import pformat as pf
-from htmlgen import HTMLgen2 as HT
import reaper
import redis
diff --git a/wqflask/wqflask/heatmap/heatmap.py b/wqflask/wqflask/heatmap/heatmap.py
index 1bdf252b..9d33961c 100644
--- a/wqflask/wqflask/heatmap/heatmap.py
+++ b/wqflask/wqflask/heatmap/heatmap.py
@@ -18,7 +18,6 @@ import numpy as np
from pprint import pformat as pf
-from htmlgen import HTMLgen2 as HT
import reaper
from base.trait import GeneralTrait
diff --git a/wqflask/wqflask/network_graph/network_graph.py b/wqflask/wqflask/network_graph/network_graph.py
index 63273a29..a332db46 100644
--- a/wqflask/wqflask/network_graph/network_graph.py
+++ b/wqflask/wqflask/network_graph/network_graph.py
@@ -40,7 +40,6 @@ import rpy2.robjects as robjects
from pprint import pformat as pf
-from htmlgen import HTMLgen2 as HT
import reaper
from utility.THCell import THCell
diff --git a/wqflask/wqflask/search_results.py b/wqflask/wqflask/search_results.py
index 4a224de6..2c8e07dd 100644
--- a/wqflask/wqflask/search_results.py
+++ b/wqflask/wqflask/search_results.py
@@ -116,7 +116,7 @@ views.py).
trait_dict['location'] = this_trait.location_repr
trait_dict['mean'] = "N/A"
trait_dict['additive'] = "N/A"
- if this_trait.mean != "":
+ if this_trait.mean != "" and this_trait.mean != None:
trait_dict['mean'] = '%.3f' % this_trait.mean
trait_dict['lrs_score'] = this_trait.LRS_score_repr
trait_dict['lrs_location'] = this_trait.LRS_location_repr
diff --git a/wqflask/wqflask/snp_browser/snp_browser.py b/wqflask/wqflask/snp_browser/snp_browser.py
index 1e28add8..360e6b28 100644
--- a/wqflask/wqflask/snp_browser/snp_browser.py
+++ b/wqflask/wqflask/snp_browser/snp_browser.py
@@ -2,8 +2,6 @@ from __future__ import absolute_import, print_function, division
from flask import Flask, g, url_for
-from htmlgen import HTMLgen2 as HT
-
import string
import piddle as pid
@@ -639,8 +637,8 @@ class SnpBrowser(object):
x_scale = plot_width/(self.end_mb - self.start_mb)
- #draw clickable image map
- #gifmap = HT.Map
+ #draw clickable image map at some point
+
n_click = 80.0
click_step = plot_width/n_click
click_mb_step = (self.end_mb - self.start_mb)/n_click
diff --git a/wqflask/wqflask/templates/index_page_orig.html b/wqflask/wqflask/templates/index_page_orig.html
index e32b1c82..4bf1e85f 100755
--- a/wqflask/wqflask/templates/index_page_orig.html
+++ b/wqflask/wqflask/templates/index_page_orig.html
@@ -176,24 +176,33 @@
</div>
<div style="padding-left:120px" class="col-xs-4" style="width: 600px !important;">
+ <section id="affiliates">
+ <div class="page-header">
+ <h1>Affiliates</h1>
+ <ul>
+ <li><a href="http://ucscbrowser.genenetwork.org/">Genome browser</a> at UTHSC</li>
+ <li><a href="http://galaxy.genenetwork.org/">Galaxy</a> at UTHSC</li>
+ </ul>
+ </div>
+ </section>
<section id="websites">
<div class="page-header">
<h1>Github</h1>
+ <ul>
+ <li><a href="https://github.com/genenetwork/genenetwork2">GN2 Source Code</a></li>
+ <li><a href="https://github.com/genenetwork/gn-docs/wiki">GN2 Document Wiki</a></li>
+ <li><a href="https://github.com/genenetwork/sysmaintenance">System Maintenance Code</a></li>
+ <li><a href="https://github.com/genenetwork/genenetwork">GN1 Source Code</a></li>
+ </ul>
</div>
- <ul>
- <li><a href="https://github.com/genenetwork/genenetwork2">GN2 Source Code</a></li>
- <li><a href="https://github.com/genenetwork/gn-docs/wiki">GN2 Document Wiki</a></li>
- <li><a href="https://github.com/genenetwork/sysmaintenance">System Maintenance Code</a></li>
- <li><a href="https://github.com/genenetwork/genenetwork">GN1 Source Code</a></li>
- </ul>
</section>
<section id="news-section">
<div class="page-header">
<h1>News</h1>
- </div>
- <div id="tweets"></div>
- <div align="right">
- <a href="https://twitter.com/GeneNetwork2">more news items...</a>
+ <div id="tweets"></div>
+ <div align="right">
+ <a href="https://twitter.com/GeneNetwork2">more news items...</a>
+ </div>
</div>
<!--
<section id="tour-info">
@@ -240,18 +249,6 @@
<li><a href="http://ec2.genenetwork.org/">Amazon
Cloud (EC2)</a></li>
</ul>
- <h3>Affiliates</h3>
- <ul>
- <li><a href="http://ucscbrowser.genenetwork.org/">Genome
- browser</a> at UTHSC</li>
-
- <li><a href="http://galaxy.genenetwork.org/">Galaxy</a> at
- UTHSC</li>
-
- </ul>
-
-
-
</section>
<!--<section id="getting-started">