Footer: updating URLs

2 files changed, 21 insertions, 31 deletions

diff --git a/test/lib/link_checker.rb b/test/lib/link_checker.rb
index 15449144..36cb36c8 100644
--- a/test/lib/link_checker.rb
+++ b/test/lib/link_checker.rb
@@ -1,4 +1,6 @@
 
+SKIP = "mailto:"
+
 class LinkChecker
 end
 
@@ -12,7 +14,7 @@ describe LinkChecker do
       page = @agent.get($host)
       page.links.each do |link|
         puts link.href
-        if link.href !~ /static\/dbdoc\/Hippocampus/ and link.href !~ /glossary.html|sample_r|grits.eecs.utk.edu|correlationAnnotation.html/
+        if link.href !~ /#{SKIP}/ # /static\/dbdoc\/Hippocampus/ and link.href !~ /mailto:|glossary.html|sample_r|grits.eecs.utk.edu|correlationAnnotation.html/
            # Fetch link, program will crash with exception if link is broken
            linkpage = @agent.get(link.href)
           puts "Link to #{link.href} is valid, response code #{linkpage.code}"
@@ -34,7 +36,7 @@ describe LinkChecker do
       # Test every link on the page to check if it's broken or not
       page.links.each do |link|
         puts link.href
-        if link.href !~ /static\/dbdoc\/Hippocampus/ and link.href !~ /glossary.html|sample_r|grits.eecs.utk.edu|correlationAnnotation.html/
+        if link.href !~ /#{SKIP}/ # /static\/dbdoc\/Hippocampus/ and link.href !~ /mailto:|glossary.html|sample_r|grits.eecs.utk.edu|correlationAnnotation.html/
            # Fetch link, program will crash with exception if link is broken
            linkpage = @agent.get(link.href)
           puts "Link to #{link.href} is valid, response code #{linkpage.code}"
diff --git a/wqflask/wqflask/templates/base.html b/wqflask/wqflask/templates/base.html
index 7077a09e..7fe17259 100644
--- a/wqflask/wqflask/templates/base.html
+++ b/wqflask/wqflask/templates/base.html
@@ -101,32 +101,24 @@
     ================================================== -->
     <footer class="footer">
       <div class="container">
-        <p class="pull-right"><a href="#">Back to top</a></p>
 
-        <p>Launched in 1994 as
-        <A HREF="http://www.ncbi.nlm.nih.gov/pubmed?term=8043953">
-            The Portable Dictionary of the Mouse Genome</A> and in 2001 as WebQTL.
-        </p>
-        <p>Operated by
-            <A HREF="mailto:rwilliams@uthsc.edu">Rob Williams</A>,
-            <A HREF="mailto:lyan6@uthsc.edu">Lei Yan</A>,
-            <A HREF="mailto:zachary.a.sloan@gmail.com">Zachary Sloan</A>, and
-            <A HREF="mailto:acenteno@uthsc.edu">Arthur Centeno</A>.
-        </p>
         <p>
-            Designed and coded by Sam Ockman, Xiaodong Zhou,
-            Christian Fernandez,
-            Ning Liu, Rudi Alberts, Elissa Chesler, Jintao Wang, Kenneth Manly, Robert W. Williams,
-            and <A HREF="/credit.html">colleagues</A>.
-        </p>
 
-        <p>Built with <a href="http://twitter.github.com/bootstrap/">bootstrap</a>,
-            <a href="http://coffeescript.org/">coffeescript</a>,
-            <a href="http://flask.pocoo.org/">flask</a>,
-            <a href="http://en.wikipedia.org/wiki/Linux">linux</a>,
-            <a href="http://www.python.org/">python</a> and good intentions.
+GeneNetwork is a framework for web based genetics
+ launched in 1994 as
+        <a href="http://www.ncbi.nlm.nih.gov/pubmed?term=8043953">
+            The Portable Dictionary of the Mouse Genome</a> (previously <a href="https://www.ncbi.nlm.nih.gov/pubmed/15043217">WebQTL</a>).
+        </p>
+        <p>Operated by
+            <a href="mailto:rwilliams@uthsc.edu">Rob Williams</a>,
+            <a href="mailto:lyan6@uthsc.edu">Lei Yan</a>,
+            <a href="mailto:zachary.a.sloan@gmail.com">Zachary Sloan</a>, and
+            <a href="mailto:acenteno@uthsc.edu">Arthur Centeno</a>.
         </p>
-        <br />
+        <p>Published in
+          <a href="http://joss.theoj.org/papers/10.21105/joss.00025"><img src="https://camo.githubusercontent.com/846b750f582ae8f1d0b4f7e8fee78bed705c88ba/687474703a2f2f6a6f73732e7468656f6a2e6f72672f7061706572732f31302e32313130352f6a6f73732e30303032352f7374617475732e737667" alt="JOSS" data-canonical-src="http://joss.theoj.org/papers/10.21105/joss.00025/status.svg" style="max-width:100%;"></a>
+          </p>
+          <br />
         <p>GeneNetwork is supported by:</p>
         <UL>
             <LI>
@@ -140,23 +132,19 @@
             </li>
             <LI>
                 <a
-                   href="http://www.drugabuse.gov/about/organization/Genetics/geneexpression/index.html">NIDA</A>, <a class="smallsize"  href="http://www.nimh.nih.gov/">NIMH</A>
+                   href="https://www.drugabuse.gov/">NIDA</A>, <a class="smallsize"  href="http://www.nimh.nih.gov/">NIMH</A>
                    , and <a class="smallsize"  href="http://www.niaaa.nih.gov/">
                    NIAAA</A> (P20-DA 21131)
             </li>
             <LI>NCI <a  href="http://emice.nci.nih.gov/">MMHCC</A> (U01CA105417) and
-                <a  href="http://www.ncrr.nih.gov/">NCRR</A>
+                <a  href="https://en.wikipedia.org/wiki/National_Center_for_Research_Resources">NCRR</A>
                 <a  href="http://www.nbirn.net/TestBeds/Mouse/index.htm">BIRN</A>
                 (U24 RR021760)
             </li>
         </UL>
         <!--</p>-->
 
-        <ul class="footer-links">
-          <li><a href="http://listserv.uthsc.edu/mailman/listinfo/genenetwork-dev">Join the mailing list</a></li>
-          <!--<li><a href="#">Friend us on facebook</a></li>-->
-          <!--<li><a href="#">Follow us on twitter</a></li>-->
-        </ul>
+        Join the <a href="http://listserv.uthsc.edu/mailman/listinfo/genenetwork-dev">mailing list</a>
       </div>
     </footer>