test multi-line metadata entries

add opengraph metadata to pages, via Markdown meta
make splash images look better on small devices
2021-01-17 23:58:57 -06:00 · 2021-01-17 23:02:14 -06:00 · 2020-12-14 16:26:08 -06:00 · 2020-12-14 16:25:35 -06:00
8 changed files with 111 additions and 4 deletions
--- a/incorporealcms/lib.py
+++ b/incorporealcms/lib.py
@@ -0,0 +1,7 @@
+"""Miscellaneous helper functions and whatnot."""
+from flask import current_app as app
+
+
+def get_meta_str(key):
+    """Provide the page's metadata for the specified key, or '' if unset."""
+    return " ".join(app.config['md'].Meta.get(key)) if app.config['md'].Meta.get(key) else ""
--- a/incorporealcms/pages.py
+++ b/incorporealcms/pages.py
@@ -8,6 +8,8 @@ from flask import current_app as app
 from flask import make_response, redirect, render_template, request
 from tzlocal import get_localzone

+from incorporealcms.lib import get_meta_str
+
 logger = logging.getLogger(__name__)

 bp = Blueprint('pages', __name__, url_prefix='/')
@@ -34,8 +36,9 @@ def display_page(path):
    else:
        content = Markup(app.config['md'].convert(entry))
        logger.debug("file metadata: %s", app.config['md'].Meta)
-        title = " ".join(app.config['md'].Meta.get('title')) if app.config['md'].Meta.get('title') else ""
-        return render('base.html', title=title, content=content, navs=parent_navs,
+
+        return render('base.html', title=get_meta_str('title'), description=get_meta_str('description'),
+                      image=get_meta_str('image'), base_url=request.base_url, content=content, navs=parent_navs,
                      mtime=mtime.strftime('%Y-%m-%d %H:%M:%S %Z'))


--- a/incorporealcms/static/css/dark.css
+++ b/incorporealcms/static/css/dark.css
@@ -50,3 +50,12 @@ blockquote {
    background-color: rgba(120, 120, 120, 0.3);
    border: 1px solid #222;
 }
+
+figure {
+    background: #222;
+    border: 1px solid #333;
+}
+
+figcaption {
+    color: #BBB;
+}
--- a/incorporealcms/static/css/light.css
+++ b/incorporealcms/static/css/light.css
@@ -50,3 +50,12 @@ blockquote {
    background-color: rgba(120, 120, 120, 0.1);
    border: 1px solid #CCC;
 }
+
+figure {
+    background: #EFEFEF;
+    border: 1px solid #CCCCCC;
+}
+
+figcaption {
+    color: #777777;
+}
--- a/incorporealcms/static/css/style.css
+++ b/incorporealcms/static/css/style.css
@@ -109,9 +109,67 @@ blockquote {
 }

 .splash {
+    margin-top: 1em;
+    margin-bottom: 1em;
    text-align: center;
 }

-.img-50 {
-    max-width: 50%;
+.splash img {
+    max-width: 100%;
+}
+
+.img-50 {
+    max-width: 50% !important;
+}
+
+/* For screens with width smaller than 400px */
+.figure-left .figure-right {
+    max-width: 95%;
+    float: none;
+    margin-left: 10px;
+    margin-right: 10px;
+}
+
+/* For larger screens */
+@media only screen and (min-width: 400px) {
+    .figure-left {
+        float: left;
+        margin-top: 0;
+        margin-left: 0;
+    }
+
+    .figure-right {
+        float: right;
+        margin-top: 0;
+        margin-right: 0;
+    }
+}
+
+figure {
+    max-width: 400px;
+    padding: 5px;
+    margin: 10px;
+    margin-top: 0;
+    margin-bottom: 5px;
+}
+
+figure img {
+    max-width: 100%;
+    height: auto;
+}
+
+figcaption {
+    font-family: "Times New Roman", serif;
+    color: #777777;
+    text-align: center;
+    font-style: italic;
+    line-height: 1.3em;
+    margin-top: 5px;
+}
+
+.thumbnail-image {
+    width: 150px;
+    height: auto;
+    margin: 5px;
+    display: inline;
 }
--- a/incorporealcms/templates/base.html
+++ b/incorporealcms/templates/base.html
@@ -1,9 +1,15 @@
 <!doctype html>
 <title>{{ title }}{% if title %} - {% endif %}{{ config.TITLE_SUFFIX }}</title>
+{% if title %}<meta property="og:title" content="{{ title }}">{% endif %}
+{% if description %}<meta property="og:description" content="{{ description }}">{% endif %}
+{% if image %}<meta property="og:image" content="{{ image }}">{% endif %}
+<meta property="og:url" content="{{ base_url }}">
+<meta name="twitter:card" content="summary_large_image">
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <link rel="stylesheet" href="{{ url_for('static', filename='css/style.css') }}">
 <link rel="stylesheet" href="{{ url_for('static', filename=user_style) }}">
 <link rel="icon" href="{{ url_for('static', filename='img/favicon.png') }}">
+
 <section class="site-wrap">
    <section class="styles">
        <a href="?style=dark">[dark]</a>
--- a/tests/functional_tests.py
+++ b/tests/functional_tests.py
@@ -30,6 +30,15 @@ def test_page_without_title_metadata(client):
    assert b'<h1>this page doesn\'t have a title!</h1>' in response.data


+def test_page_with_card_metadata(client):
+    """Test that a page with opengraph metadata."""
+    response = client.get('/more-metadata')
+    assert response.status_code == 200
+    assert b'<meta property="og:title" content="title for the page">' in response.data
+    assert b'<meta property="og:description" content="description of this page made even longer">' in response.data
+    assert b'<meta property="og:image" content="http://buh.com/test.img">' in response.data
+
+
 def test_page_has_modified_timestamp(client):
    """Test that pages have modified timestamps in them."""
    response = client.get('/')
--- a/tests/instance/pages/more-metadata.md
+++ b/tests/instance/pages/more-metadata.md
@@ -0,0 +1,6 @@
+Title:          title for the page
+Description:    description of this page
+                made even longer
+Image:          http://buh.com/test.img
+
+hello
Author	SHA1	Message	Date
Brian S. Stephan	8a6f4d6b45	test multi-line metadata entries	2021-01-17 23:58:57 -06:00
Brian S. Stephan	c25fefa9e3	add opengraph metadata to pages, via Markdown meta	2021-01-17 23:02:14 -06:00
Brian S. Stephan	b0795999fe	make splash images look better on small devices	2020-12-14 16:26:08 -06:00
Brian S. Stephan	aaced9d0e1	add polycephaly-style figure support this is really pushing my patience for CSS, but I've always thought this looked nice, so I'm going to try to retain it	2020-12-14 16:25:35 -06:00