about summary refs log tree commit diff
path: root/bh20simplewebuploader
diff options
context:
space:
mode:
Diffstat (limited to 'bh20simplewebuploader')
-rw-r--r--bh20simplewebuploader/main.py9
-rw-r--r--bh20simplewebuploader/templates/blog.html15
-rw-r--r--bh20simplewebuploader/templates/blurb.html10
-rw-r--r--bh20simplewebuploader/templates/footer.html18
4 files changed, 36 insertions, 16 deletions
diff --git a/bh20simplewebuploader/main.py b/bh20simplewebuploader/main.py
index f7e45fb..4f14d10 100644
--- a/bh20simplewebuploader/main.py
+++ b/bh20simplewebuploader/main.py
@@ -441,9 +441,14 @@ def download_page():
 def demo_page():
     return render_template('demo.html',menu='DEMO')
 
-@app.route('/blog')
+@app.route('/blog',methods=['GET'])
 def blog_page():
-    return render_template('blog.html',menu='BLOG')
+    blog_content = request.args.get('id') # e.g. using-covid-19-pubseq-part3
+    buf = None;
+    if blog_content:
+        buf = get_html_body('doc/blog/'+blog_content+'.html')
+    return render_template('blog.html',menu='BLOG',embed=buf)
+
 
 @app.route('/about')
 def about_page():
diff --git a/bh20simplewebuploader/templates/blog.html b/bh20simplewebuploader/templates/blog.html
index 835e019..8cb6ce0 100644
--- a/bh20simplewebuploader/templates/blog.html
+++ b/bh20simplewebuploader/templates/blog.html
@@ -4,10 +4,19 @@
   <body>
     {% include 'banner.html' %}
     {% include 'menu.html' %}
+    {% include 'blurb.html' %}
 
-    <h1>BLOG Entries</h1>
+    {% if embed %}
+    {{ embed|safe }}
+    <hr>
 
-    <i>Note that this is work in progress (WIP)</i>
+    <p>
+      Other blog entries:
+    </p>
+
+    {% else %}
+    <h2>BLOG Entries:</h2>
+    {% endif %}
 
     <section class="blog-entries">
       <div class="blog-table">
@@ -31,7 +40,7 @@
           </div>
           <div class="blog-table-row">
             <div class="blog-table-cell">
-              <a href="https://github.com/arvados/bh20-seq-resource/blob/master/doc/blog/using-covid-19-pubseq-part3.org">Submitting a sequence</a>
+              <a href="/blog?id=using-covid-19-pubseq-part3">Submitting a sequence</a>
             </div>
             <div class="blog-table-cell">
               We submit a sequence to the database
diff --git a/bh20simplewebuploader/templates/blurb.html b/bh20simplewebuploader/templates/blurb.html
new file mode 100644
index 0000000..7bfe2ab
--- /dev/null
+++ b/bh20simplewebuploader/templates/blurb.html
@@ -0,0 +1,10 @@
+<p>
+  This is the COVID-19 Public Sequence Resource (COVID-19 PubSeq) for
+  SARS-CoV-2 virus sequences. COVID-19 PubSeq is a repository for
+  sequences with a low barrier to entry for uploading sequence data
+  using best practices. I.e., data published with a creative commons
+  CC0 or CC-4.0 license with metadata using state-of-the art standards
+  and, perhaps most importantly, providing standardised workflows that
+  get triggered on upload, so that results are immediately available
+  in standardised data formats.
+</p>
diff --git a/bh20simplewebuploader/templates/footer.html b/bh20simplewebuploader/templates/footer.html
index e72d1c5..e3923a7 100644
--- a/bh20simplewebuploader/templates/footer.html
+++ b/bh20simplewebuploader/templates/footer.html
@@ -4,19 +4,15 @@
   <div class="about">
     <div>
       <h1>ABOUT</h1>
+      {% include 'blurb.html' %}
       <p>
-        This a public repository created at the COVID-19 BioHackathon
-        that has a low barrier to entry for uploading sequence data using
-        best practices. I.e., data is published with a creative commons
-        4.0 (CC-4.0) license with metadata using state-of-the art
-        standards and, perhaps most importantly, providing standardized
-        workflows that get triggered on upload, so that results are
-        immediately available in standardized data formats. The repository
-        will be maintained and expanded for the duration of the
-        pandemic. To contribute data simply upload it! To contribute code
-        and/or workflows see
+         The repository will be maintained and expanded for the
+        duration of the pandemic. To contribute data simply upload it!
+        To contribute code and/or workflows see
         the <a href="https://github.com/arvados/bh20-seq-resource">project
-          repository</a>. For more information see the <a href="https://github.com/arvados/bh20-seq-resource/blob/master/paper/paper.md">paper</a> (WIP).
+        repository</a>. For more information see
+        the <a href="/about">FAQ</a> and
+        the <a href="https://github.com/arvados/bh20-seq-resource/blob/master/paper/paper.md">paper</a>
       </p>
 
     </div>