diff options
| author | zsloan | 2021-11-18 13:40:35 -0600 |
|---|---|---|
| committer | GitHub | 2021-11-18 13:40:35 -0600 |
| commit | 4ee20fba021cc28400c4f43e616f58143b24ceb2 (patch) | |
| tree | a04a284446eb8e02144e3746b5533a976e28966c | |
| parent | 4d90b467aa10fa4814caaf5151a580f0116721f3 (diff) | |
| parent | a0b4fda475041c4f6d6a2fa35db1a93e90768c39 (diff) | |
| download | genenetwork2-4ee20fba021cc28400c4f43e616f58143b24ceb2.tar.gz | |
Merge pull request #635 from acenteno/testing
Testing
| -rw-r--r-- | wqflask/wqflask/templates/base.html | 4 | ||||
| -rwxr-xr-x | wqflask/wqflask/templates/index_page.html | 12 |
2 files changed, 6 insertions, 10 deletions
diff --git a/wqflask/wqflask/templates/base.html b/wqflask/wqflask/templates/base.html index e037246a..c17409d0 100644 --- a/wqflask/wqflask/templates/base.html +++ b/wqflask/wqflask/templates/base.html @@ -93,11 +93,7 @@ <li><a href="https://systems-genetics.org/">Systems Genetics PheWAS</a></li> <li><a href="http://ucscbrowser.genenetwork.org/">Genome Browser</a></li> <li><a href="http://power.genenetwork.org">BXD Power Calculator</a></li> -<<<<<<< HEAD - <li><a href="http://notebook.genenetwork.org/">Jupyter Notebook Launcher</a></li> -======= <li><a href="{{url_for('jupyter_notebooks.launcher')}}">Jupyter Notebooks</a></li> ->>>>>>> dea1afa01025026a0754de60615b974a5cb3fd24 <li><a href="http://datafiles.genenetwork.org">Interplanetary File System</a></li> </ul> </li> diff --git a/wqflask/wqflask/templates/index_page.html b/wqflask/wqflask/templates/index_page.html index cfb1bed4..3e2f424d 100755 --- a/wqflask/wqflask/templates/index_page.html +++ b/wqflask/wqflask/templates/index_page.html @@ -203,23 +203,23 @@ <div class="uk-container">--> <div class="uk-grid-match uk-child-width-1-3@m" uk-grid> <div> - <strong><a class="uk-link-text" href="http://gn2-arthur.genenetwork.org/tutorials">Webinars & Courses</a></strong> + <strong><a class="uk-link-text" href="/tutorials">Webinars & Courses</a></strong> <p>In-person courses, live webinars and webinar recordings <p> <!--<span uk-icon="icon: laptop; ratio: 2"></span>--> - <a href="http://gn2-arthur.genenetwork.org/tutorials" class="uk-icon-link" uk-icon="laptop" ratio="2"></a></p> + <a href="/tutorials" class="uk-icon-link" uk-icon="laptop" ratio="2"></a></p> </div> <div> - <strong><a class="uk-link-text" href="http://gn2-arthur.genenetwork.org/tutorials#service-three">Tutorials</a></strong> + <strong><a class="uk-link-text" href="/tutorials">Tutorials</a></strong> <p>Tutorials: Training materials in HTML, PDF and video formats - <p><a href="http://gn2-arthur.genenetwork.org/tutorials" class="uk-icon-link" uk-icon="file-text" ratio="2"></a></p> + <p><a href="/tutorials" class="uk-icon-link" uk-icon="file-text" ratio="2"></a></p> </div> <div> - <strong><a class="uk-link-text" href="http://gn2-arthur.genenetwork.org/tutorials#service-four">Documentation</a></strong> + <strong><a class="uk-link-text" href="/tutorials">Documentation</a></strong> <p>Online manuals, handbooks, fact sheets and FAQs - <p><a href="http://gn2-arthur.genenetwork.org/tutorials" class="uk-icon-link" uk-icon="album" ratio="2"></a></p> + <p><a href="/tutorials" class="uk-icon-link" uk-icon="album" ratio="2"></a></p> </div> </div> |