From 4cc7ee25f11553b8d0a1386eabfbe99c75fd0e38 Mon Sep 17 00:00:00 2001 From: zsloan Date: Tue, 31 Mar 2015 19:15:47 +0000 Subject: Fixed some aesthetic issues on the main page and removed references to TemplatePage --- wqflask/wqflask/correlation/show_corr_results.py | 1 - .../wqflask/correlation_matrix/show_corr_matrix.py | 1 - wqflask/wqflask/dataSharing/SharingInfoPage.py | 4 +- wqflask/wqflask/show_trait/show_trait.py | 1 - .../wqflask/static/packages/bootstrap/css/docs.css | 13 +++-- wqflask/wqflask/templates/base.html | 15 +++-- wqflask/wqflask/templates/index_page.html | 66 ++++++++-------------- 7 files changed, 39 insertions(+), 62 deletions(-) (limited to 'wqflask') diff --git a/wqflask/wqflask/correlation/show_corr_results.py b/wqflask/wqflask/correlation/show_corr_results.py index ade2d242..aa37c29e 100755 --- a/wqflask/wqflask/correlation/show_corr_results.py +++ b/wqflask/wqflask/correlation/show_corr_results.py @@ -45,7 +45,6 @@ from utility.THCell import THCell from utility.TDCell import TDCell from base.trait import GeneralTrait from base import data_set -from base.templatePage import templatePage from utility import webqtlUtil, helper_functions, corr_result_helpers from dbFunction import webqtlDatabaseFunction import utility.webqtlUtil #this is for parallel computing only. diff --git a/wqflask/wqflask/correlation_matrix/show_corr_matrix.py b/wqflask/wqflask/correlation_matrix/show_corr_matrix.py index d734117e..e1df5b24 100755 --- a/wqflask/wqflask/correlation_matrix/show_corr_matrix.py +++ b/wqflask/wqflask/correlation_matrix/show_corr_matrix.py @@ -48,7 +48,6 @@ from utility.THCell import THCell from utility.TDCell import TDCell from base.trait import GeneralTrait from base import data_set -from base.templatePage import templatePage from utility import webqtlUtil, helper_functions, corr_result_helpers from dbFunction import webqtlDatabaseFunction import utility.webqtlUtil #this is for parallel computing only. diff --git a/wqflask/wqflask/dataSharing/SharingInfoPage.py b/wqflask/wqflask/dataSharing/SharingInfoPage.py index 7ad44440..c32eec50 100755 --- a/wqflask/wqflask/dataSharing/SharingInfoPage.py +++ b/wqflask/wqflask/dataSharing/SharingInfoPage.py @@ -32,7 +32,6 @@ import urlparse import flask -from base.templatePage import templatePage from base import webqtlConfig from dbFunction import webqtlDatabaseFunction import SharingBody @@ -42,10 +41,9 @@ import SharingInfo ######################################### # Sharing Info Page ######################################### -class SharingInfoPage(templatePage): +class SharingInfoPage(): def __init__(self, fd): - templatePage.__init__(self, fd) self.redirect_url = None # Set if you want a redirect print("fd is:", pf(fd.__dict__)) # Todo: Need a [0] in line below????d diff --git a/wqflask/wqflask/show_trait/show_trait.py b/wqflask/wqflask/show_trait/show_trait.py index 11fd2644..929f5abb 100755 --- a/wqflask/wqflask/show_trait/show_trait.py +++ b/wqflask/wqflask/show_trait/show_trait.py @@ -19,7 +19,6 @@ from utility import webqtlUtil, Plot, Bunch, helper_functions from base.trait import GeneralTrait from base import data_set from dbFunction import webqtlDatabaseFunction -from base.templatePage import templatePage from basicStatistics import BasicStatisticsFunctions from pprint import pformat as pf diff --git a/wqflask/wqflask/static/packages/bootstrap/css/docs.css b/wqflask/wqflask/static/packages/bootstrap/css/docs.css index b95c44ed..2d6a713c 100755 --- a/wqflask/wqflask/static/packages/bootstrap/css/docs.css +++ b/wqflask/wqflask/static/packages/bootstrap/css/docs.css @@ -25,25 +25,28 @@ h3 code { /* Tweak navbar brand link to be super sleek -------------------------------------------------- */ - +/* body > .navbar { font-size: 12px; font-weight: bold; } +*/ /* Change the docs' brand */ -body > .navbar .brand { - padding-right: 0; - padding-left: 0; + +body > .navbar .navbar-brand { + padding-right: 20px; + padding-left: 20px; margin-left: 20px; float: left; font-weight: bold; - color: #336699; + color: #ffffff; text-shadow: 0 1px 0 rgba(255,255,255,.1), 0 0 30px rgba(255,255,255,.125); -webkit-transition: all .2s linear; -moz-transition: all .2s linear; transition: all .2s linear; } + body > .navbar .brand:hover { text-decoration: none; text-shadow: 0 1px 0 rgba(255,255,255,.1), 0 0 30px rgba(255,255,255,.4); diff --git a/wqflask/wqflask/templates/base.html b/wqflask/wqflask/templates/base.html index 3d4e6d28..462a59a2 100755 --- a/wqflask/wqflask/templates/base.html +++ b/wqflask/wqflask/templates/base.html @@ -73,6 +73,13 @@
  • Search
    • +
  • + Collections + {% if g.user_session.user_ob %} + {{ g.user_session.user_ob.display_num_collections() }} + {% endif %} + +
  • Help
    • @@ -91,14 +98,6 @@
  • Environments
    • -
  • - Collections - {% if g.user_session.user_ob %} - {{ g.user_session.user_ob.display_num_collections() }} - {% endif %} - -
    • -
  • {% if g.user_session.logged_in %} Sign out diff --git a/wqflask/wqflask/templates/index_page.html b/wqflask/wqflask/templates/index_page.html index 538a6799..ba017bfb 100755 --- a/wqflask/wqflask/templates/index_page.html +++ b/wqflask/wqflask/templates/index_page.html @@ -29,19 +29,19 @@
    -
    +
    - +
    -
    +
    @@ -51,7 +51,7 @@
    -
    +
    @@ -60,7 +60,7 @@
    -
    +
    @@ -86,15 +86,15 @@
    - +
    -
    -

    Enter terms, genes, ID numbers in the - Search field
    - Use * or ? wildcards (Cyp*a?, - synap*)
    - Use quotes for terms such as "tyrosine - kinase"

    +
    + +
    +
    + Enter terms, genes, ID numbers in the Search field + Use * or ? wildcards (Cyp*a?, synap*) + Use quotes for terms such as "tyrosine kinase"
    @@ -103,10 +103,6 @@
    - -
    - -
    @@ -159,7 +155,7 @@
    -
    +