Phenotype results with long descriptions/authors look much better now + added some links to index page

4 files changed, 31 insertions, 12 deletions

diff --git a/wqflask/wqflask/templates/base.html b/wqflask/wqflask/templates/base.html
index 2c1f67d4..21fc99d3 100644
--- a/wqflask/wqflask/templates/base.html
+++ b/wqflask/wqflask/templates/base.html
@@ -65,6 +65,8 @@
                             <a href="/help" class="dropdow-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Help <span class="caret"></a>
                             <ul class="dropdown-menu">
                               <li><a href="/news">News</a></li>
+                              <li><a href="http://genenetwork.org/faq.html">FAQ</a></li>
+                              <li><a href="http://genenetwork.org/glossary.html">Glossary of Term</a></li>
                               <li><a href="/references">References</a></li>
                               <li><a href="/policies">Policies</a></li>
                               <li><a href="/links">Links</a></li>
diff --git a/wqflask/wqflask/templates/gsearch_pheno.html b/wqflask/wqflask/templates/gsearch_pheno.html
index 2a0e5c0c..fd06b771 100644
--- a/wqflask/wqflask/templates/gsearch_pheno.html
+++ b/wqflask/wqflask/templates/gsearch_pheno.html
@@ -135,10 +135,10 @@
                       'width': "25%",
                       'data': null,
                       'render': function(data, type, row, meta) {
-			try {
+			                  try {
                             return decodeURIComponent(escape(data.description))
-			} catch {
-			    return escape(data.description)
+			                  } catch {
+			                      return data.description
                         }
                       }
                     },
@@ -146,7 +146,15 @@
                       'title': "Authors",
                       'type': "natural",
                       'width': "25%",
-                      'data': "authors"
+                      'data': null,
+                      'render': function(data, type, row, meta) {
+                        author_list = data.authors.split(",")
+                        if (author_list.length >= 6) {
+                          return author_list.slice(0, 6).join(",") + ", et al."
+                        } else{
+                          return data.authors
+                        }
+                      }
                     },
                     {
                       'title': "Year",
diff --git a/wqflask/wqflask/templates/index_page_orig.html b/wqflask/wqflask/templates/index_page_orig.html
index 4b95e7f9..79342452 100755
--- a/wqflask/wqflask/templates/index_page_orig.html
+++ b/wqflask/wqflask/templates/index_page_orig.html
@@ -246,6 +246,7 @@
                     <h3>GeneNetwork v1:</h3>
                     <ul>
                         <li><a href="http://www.genenetwork.org/">Main website</a> at UTHSC</li>
+                        <li><a href="http://artemis.uthsc.edu/">Time Machine</a>: Full GN versions from 2009 to 2016 (mm9)</li>
                         <li><a href="http://genenetwork.helmholtz-hzi.de/">Website</a> at the HZI (Germany)</li>
                         <li><a href="http://ec2.genenetwork.org/">Amazon
                             Cloud (EC2)</a></li>
diff --git a/wqflask/wqflask/templates/search_result_page.html b/wqflask/wqflask/templates/search_result_page.html
index bf434452..b31d2d00 100644
--- a/wqflask/wqflask/templates/search_result_page.html
+++ b/wqflask/wqflask/templates/search_result_page.html
@@ -119,7 +119,7 @@
           </form>
           <br />
 
-          <div id="table_container" style="width: 1200px;">
+          <div id="table_container">
             <table class="table-hover table-striped cell-border" id='trait_table' style="float: left;">
                 <tbody>
                  <td colspan="100%" align="center"><br><b><font size="15">Loading...</font></b><br></td>
@@ -321,21 +321,29 @@
                     {
                       'title': "Description",
                       'type': "natural",
-                      'width': "500px",
+                      'width': "25%",
                       'data': null,
                       'render': function(data, type, row, meta) {
-                        try {
-                          return decodeURIComponent(escape(data.description))
-                        } catch {
-                          return escape(data.description)
+			                  try {
+                            return decodeURIComponent(escape(data.description))
+			                  } catch {
+			                      return data.description
                         }
                       }
                     },
                     {
                       'title': "Authors",
                       'type': "natural",
-                      'width': "300px",
-                      'data': "authors"
+                      'width': "25%",
+                      'data': null,
+                      'render': function(data, type, row, meta) {
+                        author_list = data.authors.split(",")
+                        if (author_list.length >= 6) {
+                          return author_list.slice(0, 6).join(",") + ", et al."
+                        } else{
+                          return data.authors
+                        }
+                      }
                     },
                     {
                       'title': "Year",