aboutsummaryrefslogtreecommitdiff
path: root/bh20simplewebuploader
diff options
context:
space:
mode:
Diffstat (limited to 'bh20simplewebuploader')
-rw-r--r--bh20simplewebuploader/main.py8
-rw-r--r--bh20simplewebuploader/static/blog.css2
-rw-r--r--bh20simplewebuploader/static/main.css13
-rw-r--r--bh20simplewebuploader/templates/footer.html4
4 files changed, 22 insertions, 5 deletions
diff --git a/bh20simplewebuploader/main.py b/bh20simplewebuploader/main.py
index 206f884..2c360e1 100644
--- a/bh20simplewebuploader/main.py
+++ b/bh20simplewebuploader/main.py
@@ -459,7 +459,11 @@ def edit_button(url,text="Edit text!"):
return '<p class="editbutton"><a href="'+url+'">'+text+'<img src="static/image/edit.png"></a></p>'
def get_html_body(fn,source="https://github.com/arvados/bh20-seq-resource/tree/master/doc"):
- buf = edit_button(source)
+ """
+ This function gets the HTML generated from org-mode exports, strips
+ headers and footers and surrounds it with a blog section.
+ """
+ buf = '<section class="blog">'+edit_button(source)
in_body = False
begin_body = re.compile(r"<body>",re.IGNORECASE)
end_body = re.compile(r"(</body>|.*=\"postamble\")",re.IGNORECASE)
@@ -471,7 +475,7 @@ def get_html_body(fn,source="https://github.com/arvados/bh20-seq-resource/tree/m
buf += line
elif begin_body.match(line):
in_body = True
- buf += edit_button(source)
+ buf += edit_button(source)+'</section>'
return buf
@app.route('/download')
diff --git a/bh20simplewebuploader/static/blog.css b/bh20simplewebuploader/static/blog.css
index 3ee8c44..a9e83a4 100644
--- a/bh20simplewebuploader/static/blog.css
+++ b/bh20simplewebuploader/static/blog.css
@@ -7,7 +7,7 @@ h1,h2 { font-family: Lucida Sans Typewriter,Lucida Console,monaco,Bitstream Vera
h2 { color: black; }
h3,h4 { color: black; margin:0; }
code { color: darkblue; }
-body {font-family: Palatino, 'Palatino Linotype', serif; color:black; background-color:white; font-size: large }
+body {font-family: Palatino, 'Palatino Linotype', serif; color:black; background-color:white; font-size: large; padding: 10px; }
div.verbatim { margin: 30px; color: black; background-color: white; border-style:outset;
font-family: palatino font, monospace; font-size:80%; font-weight:bold; }
diff --git a/bh20simplewebuploader/static/main.css b/bh20simplewebuploader/static/main.css
index 6e651a4..2f547ad 100644
--- a/bh20simplewebuploader/static/main.css
+++ b/bh20simplewebuploader/static/main.css
@@ -8,7 +8,6 @@ body {
margin: 0;
}
-
h1, h2, h3, h4 {
font-family: 'Inter', sans-serif;
color: #008066;
@@ -186,6 +185,10 @@ span.dropt:hover {text-decoration: none; background: #ffffff; z-index: 6; }
text-align: left;
}
+.about a {
+ color: #008066;
+}
+
.about p {
// font-weight: 300;
color: #505050;
@@ -344,6 +347,14 @@ footer {
}
}
+.blog {
+ margin: 10px;
+}
+
+.blog h2 {
+ color: black;
+}
+
.blog-table {
display: table;
width: 100%;
diff --git a/bh20simplewebuploader/templates/footer.html b/bh20simplewebuploader/templates/footer.html
index f84cef5..26ea82a 100644
--- a/bh20simplewebuploader/templates/footer.html
+++ b/bh20simplewebuploader/templates/footer.html
@@ -42,7 +42,9 @@
<!-- Sponsors -->
<center>
- <small><a href="https://github.com/arvados/bh20-seq-resource">Source code</a> &middot; Powered by <a href="https://www.commonwl.org/">Common Workflow Language</a> &amp; <a href="https://arvados.org/">Arvados</a>; Made for <a href="https://github.com/virtual-biohackathons/covid-19-bh20">COVID-19-BH20</a>
+ <small>
+ COVID-19 PubSeq &middot;
+ <a href="https://github.com/arvados/bh20-seq-resource">Contribute</a> &middot; Powered by <a href="https://www.commonwl.org/">Common Workflow Language</a> &amp; <a href="https://arvados.org/">Arvados</a> &middot; Made for <a href="https://github.com/virtual-biohackathons/covid-19-bh20">COVID-19-BH20</a>
</small>
</center>
</div>