Documenting exports and REST API

2 files changed, 7 insertions, 26 deletions

diff --git a/bh20simplewebuploader/main.py b/bh20simplewebuploader/main.py
index 029c2e3..c306749 100644
--- a/bh20simplewebuploader/main.py
+++ b/bh20simplewebuploader/main.py
@@ -632,7 +632,8 @@ def validated_page():
 
 @app.route('/export')
 def export_page():
-    return render_template('export.html',menu='EXPORT')
+    buf = get_html_body('doc/web/export.html',"https://github.com/arvados/bh20-seq-resource/blob/master/doc/web/export.org")
+    return render_template('export.html',menu='EXPORT',embed=buf)
 
 @app.route('/demo')
 def demo_page():
@@ -641,7 +642,7 @@ def demo_page():
 @app.route('/apidoc')
 def apidoc_page():
     buf = get_html_body('test/rest-api.html',"https://github.com/arvados/bh20-seq-resource/blob/master/test/rest-api.org")
-    return render_template('blog.html',menu='BLOG',embed=buf)
+    return render_template('blog.html',menu='BLOG',embed=buf,blog=True)
 
 @app.route('/blog',methods=['GET'])
 def blog_page():
diff --git a/bh20simplewebuploader/templates/export.html b/bh20simplewebuploader/templates/export.html
index aaceac9..3588e57 100644
--- a/bh20simplewebuploader/templates/export.html
+++ b/bh20simplewebuploader/templates/export.html
@@ -5,30 +5,10 @@
     {% include 'banner.html' %}
     {% include 'menu.html' %}
 
-    <h1>Export Data</h1>
-    <section class="blog">
-
-    COVID-19 PubSeq allows for exporting forms and data for other
-    services.
-
-    <h2>SPARQL</h2>
-
-    <p>
-      First of all, PubSeq exports a SPARQL endpoint
-      <a href="http://sparql.genenetwork.org/sparql/">here</a> that allows
-      you do do any query on the data. See this
-      <a href="/blog?id=using-covid-19-pubseq-part1">document</a> for
-      examples.
-    </p>
-
-    <h2>Export EBI/ENA Forms</h2>
-
-    <p>
-      Uploading data to EBI/ENA with PubSeq is described
-      <a href="/blog?id=using-covid-19-pubseq-part6">here</a>. To
-      export, first search for an uploaded entry through its
-      identifier:
-    </p>
+
+    {% if embed %}
+    {{ embed|safe }}
+    {% endif %}
 
     <div class="search">
       <input id="search-input" type="search" placeholder="e.g. MT326090.1" required>