Merge branch 'testing' of github.com:genenetwork/genenetwork2 into testing

8 files changed, 30 insertions, 7 deletions

diff --git a/wqflask/wqflask/markdown_routes.py b/wqflask/wqflask/markdown_routes.py
index 183f4caa..ebf75807 100644
--- a/wqflask/wqflask/markdown_routes.py
+++ b/wqflask/wqflask/markdown_routes.py
@@ -9,6 +9,7 @@ import sys
 
 from bs4 import BeautifulSoup
 
+from flask import send_from_directory
 from flask import Blueprint
 from flask import render_template
 
@@ -99,6 +100,13 @@ def environments():
             200)
 
 
+@environments_blueprint.route('/svg-dependency-graph')
+def svg_graph():
+    directory, file_name, _ = get_file_from_python_search_path(
+            "wqflask/dependency-graph.svg").partition("dependency-graph.svg")
+    return send_from_directory(directory, file_name)
+
+
 @links_blueprint.route("/")
 def links():
     return render_template(
@@ -109,7 +117,7 @@ def links():
 @policies_blueprint.route("/")
 def policies():
     return render_template(
-        "links.html",
+        "policies.html",
         rendered_markdown=render_markdown("general/policies/policies.md")), 200
 
 
diff --git a/wqflask/wqflask/static/new/css/markdown.css b/wqflask/wqflask/static/new/css/markdown.css
index 38d664e2..859fe7fc 100644
--- a/wqflask/wqflask/static/new/css/markdown.css
+++ b/wqflask/wqflask/static/new/css/markdown.css
@@ -62,7 +62,8 @@
 }
 
 .graph-legend,
-#guix-graph {
+#guix-graph,
+#guix-svg-graph{
     width: 90%;
     margin: 10px auto;
 }
@@ -71,6 +72,10 @@
     border: solid 2px black;
 }
 
+#guix-svg-graph img {
+    width: 100%;
+}
+
 #markdown table {
     width: 100%;
 }
diff --git a/wqflask/wqflask/templates/environment.html b/wqflask/wqflask/templates/environment.html
index 5fe01dad..89e805ce 100644
--- a/wqflask/wqflask/templates/environment.html
+++ b/wqflask/wqflask/templates/environment.html
@@ -21,6 +21,16 @@
 </div>
 
 <div id="guix-graph"></div>
+
+<!-- Display the svg graph -->
+
+<div id="guix-svg-graph">
+    <h1>The dependency graph is shown below</h1>
+
+    <p>To explore this image SVG you may want to open it in new browser page and zoom in. Or use an SVG viewing application.</p>
+
+    <img alt="Dependency graph of the tools needed to build python3-genenetwork2" src="{{url_for('environments_blueprint.svg_graph')}}"/>
+</div>
 {% endif %}
 
 {% endblock %}
diff --git a/wqflask/wqflask/templates/facilities.html b/wqflask/wqflask/templates/facilities.html
index a022b657..56b127f9 100644
--- a/wqflask/wqflask/templates/facilities.html
+++ b/wqflask/wqflask/templates/facilities.html
@@ -10,7 +10,7 @@
 
  <div class="github-btn-container">
     <div class="github-btn">
-        <a href="https://github.com/genenetwork/gn-docs">
+        <a href="https://github.com/genenetwork/gn-docs/blob/master/general/help/facilities.md">
             Edit Text
             <img src="/static/images/edit.png">
         </a>
diff --git a/wqflask/wqflask/templates/glossary.html b/wqflask/wqflask/templates/glossary.html
index 752c4b12..aaee7c5a 100644
--- a/wqflask/wqflask/templates/glossary.html
+++ b/wqflask/wqflask/templates/glossary.html
@@ -10,7 +10,7 @@
 
 <div class="github-btn-container">
     <div class="github-btn">
-        <a href="https://github.com/genenetwork/gn-docs">
+        <a href="https://github.com/genenetwork/gn-docs/blob/master/general/glossary/glossary.md">
             Edit Text
             <img src="/static/images/edit.png">
         </a>
diff --git a/wqflask/wqflask/templates/links.html b/wqflask/wqflask/templates/links.html
index 072e8429..6e91adae 100644
--- a/wqflask/wqflask/templates/links.html
+++ b/wqflask/wqflask/templates/links.html
@@ -10,7 +10,7 @@
 
 <div class="github-btn-container">
     <div class="github-btn ">
-        <a href="https://github.com/genenetwork/gn-docs">
+        <a href="https://github.com/genenetwork/gn-docs/blob/master/general/links/links.md">
             Edit Text
             <img src="/static/images/edit.png">
         </a>
diff --git a/wqflask/wqflask/templates/policies.html b/wqflask/wqflask/templates/policies.html
index 4e0985d3..e36c9e08 100644
--- a/wqflask/wqflask/templates/policies.html
+++ b/wqflask/wqflask/templates/policies.html
@@ -10,7 +10,7 @@
 
  <div class="github-btn-container">
     <div class="github-btn ">
-        <a href="https://github.com/genenetwork/gn-docs">
+        <a href="https://github.com/genenetwork/gn-docs/blob/master/general/policies/policies.md">
             Edit Text
             <img src="/static/images/edit.png">
         </a>
diff --git a/wqflask/wqflask/templates/references.html b/wqflask/wqflask/templates/references.html
index f723a1e8..04e60361 100644
--- a/wqflask/wqflask/templates/references.html
+++ b/wqflask/wqflask/templates/references.html
@@ -6,7 +6,7 @@
 {% block content %}
 <div class="github-btn-container">
     <div class="github-btn">
-        <a href="https://github.com/genenetwork/gn-docs">
+        <a href="https://github.com/genenetwork/gn-docs/blob/master/general/references/references.md">
             Edit Text
             <img src="/static/images/edit.png">
         </a>