diff options
| author | Pjotr Prins | 2016-10-09 09:44:35 +0000 |
|---|---|---|
| committer | Pjotr Prins | 2016-10-09 09:44:35 +0000 |
| commit | 134ced4a1a573b08f11902e5a49ac91cb7eb290d (patch) | |
| tree | 253a71616705a100c943d50adc33b90e9d96db64 | |
| parent | 2b1df54a13f0fa53c91ce23a4e9b7b9262983946 (diff) | |
| parent | 959817092e6e8897120df4c23988eb2a6a53a7ba (diff) | |
| download | genenetwork2-134ced4a1a573b08f11902e5a49ac91cb7eb290d.tar.gz | |
Merge branch 'testing' into twitter
| -rw-r--r-- | wqflask/wqflask/templates/base.html | 2 | ||||
| -rwxr-xr-x | wqflask/wqflask/templates/index_page_orig.html | 29 |
2 files changed, 15 insertions, 16 deletions
diff --git a/wqflask/wqflask/templates/base.html b/wqflask/wqflask/templates/base.html index c3826a90..946e6add 100644 --- a/wqflask/wqflask/templates/base.html +++ b/wqflask/wqflask/templates/base.html @@ -144,7 +144,7 @@ GeneNetwork is a framework for web based genetics </UL> <!--</p>--> - Join the <a href="http://listserv.uthsc.edu/mailman/listinfo/genenetwork-dev">mailing list</a> + Development and source code on <a href="https://github.com/genenetwork/">github</a> with <a href="https://github.com/genenetwork/genenetwork2/issues">issue tracker</a> and <a href="https://github.com/genenetwork/genenetwork2/blob/master/README.md">documentation</a>. Join the <a href="http://listserv.uthsc.edu/mailman/listinfo/genenetwork-dev">mailing list</a> and find us on <a href="https://webchat.freenode.net/">IRC</a> (#genenetwork channel). </div> </footer> diff --git a/wqflask/wqflask/templates/index_page_orig.html b/wqflask/wqflask/templates/index_page_orig.html index 8844609f..7b085573 100755 --- a/wqflask/wqflask/templates/index_page_orig.html +++ b/wqflask/wqflask/templates/index_page_orig.html @@ -212,29 +212,28 @@ <section id="websites"> <div class="page-header"> - <h1>Affiliates and mirrors</h1> + <h2>Links</h2> </div> - <h3>Websites affiliated with GeneNetwork</h3> + <h3>GeneNetwork v2:</h3> + <ul> + <li><a href="http://gn2.genenetwork.org/">Main</a> at UTHSC</li> + <li><a href="http://test-gn2.genenetwork.org/">Staging</a> at UTHSC</li> + </ul> + <h3>GeneNetwork v1:</h3> <ul> + <li><a href="http://www.genenetwork.org/">Main</a> at UTHSC</li> + <li><a href="http://genenetwork.helmholtz-hzi.de/">Germany</a> at the HZI</li> + <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> - <li>GeneNetwork 1 at <a href="http://ec2.genenetwork.org/">Amazon - Cloud (EC2)</a></li> - - <li>GeneNetwork 1 Source Code at <a href="http://sourceforge.net/projects/genenetwork/">SourceForge</a></li> - - <li>GeneNetwork 2 Source Code at <a href="https://github.com/genenetwork/genenetwork2">GitHub</a></li> - </ul> - <h3>GN1 Mirror and development sites</h3> - - <ul> - <li><a href="http://www.genenetwork.org/">Main GN1 site at UTHSC</a> (main site)</li> - <li><a href="http://genenetwork.helmholtz-hzi.de/">Germany at the HZI</a></li> - <li><a href="http://gn2.genenetwork.org/">Memphis at the U of M</a></li> </ul> |