@geekity/cms 0.17.0 → 0.19.0

package/themes/default/README.md

@@ -26,6 +26,8 @@ themes/default/
     kicker.njk        the line above an entry naming its kind and date
     reply-context.njk the citation of what a reply answers
     citations.njk     the citation of what a like, repost or bookmark cites
+    cited-page.njk    the name and author both citations print
+    read.njk          what a read post read, and how far
     bio.njk           who an entry is by, as an h-card
     menu.njk          one named menu, as a nav of links
     feeds.njk         macros for the feed links in <head>
@@ -404,16 +406,49 @@ is an `h3` inside the form's section.
 `div.reply-context.cite.u-in-reply-to.h-cite`: a rule on the start side, a
 `p.cite-line` saying "In reply to" and the target's name, author and date as
 far as they are known, and its excerpt as a `blockquote.cite-quote.p-content`.
-An untitled reply prints it under the kicker; a titled reply prints it above
-its header. The same partial cites a reply in a feed.
+Where it goes depends on whether the post shows a title. An untitled reply
+opens on it, under the kicker and before its words. A titled reply prints its
+`header.post-header` first and the citation after it, before the `e-content`,
+so the page opens on its title rather than on a link. A listing follows the
+same rule: an untitled entry cites under its kicker, a titled one after its
+title and summary. The same partial cites a reply in a feed. The layouts own
+the placement; the partial owns only what the citation says, and it stays
+inside the `h-entry` wherever it is printed.
 
 **A like, a repost or a bookmark cites what it cites** (TASK-169) with
 `partials/citations.njk`, beside the reply context and drawn the same way: one
 `div.reply-context.cite.h-cite` per entry of `citations`, classed
 `u-repost-of`, `u-like-of` or `u-bookmark-of`, whose `p.cite-line` says
-Reposted, Liked or Bookmarked and links the target as its `u-url`. Its kicker
-and its hidden `h1` say Repost, Like or Bookmark. A listing cites each entry's
-from the same partial.
+Reposted, Liked or Bookmarked and links the target as its `u-url`. The link
+says the target's name, as the reply context does, with its author after it as
+a `p-author h-card`, when the target was read when the post was saved
+(TASK-244): its `h-entry` name, its oEmbed title, or its `<title>`. With only
+an author it says "a post", and with neither the bare URL. Its kicker
+and its hidden `h1` say Repost, Like or Bookmark. It is placed as the reply
+context is: at the top of an untitled post, after the header of a titled one.
+A listing cites each entry's from the same partial, by the same rule.
+
+**Both citations name the cited page** through `partials/cited-page.njk`, so
+they print its name and author by one rule. A name that already ends in " by "
+and the author's name, in any case, does not print the author again
+(TASK-247): SoundCloud titles a track "Flickermood by Forss" and names Forss
+as its author. The title link stops before " by ", and the words after it
+become the `p-author h-card`, so the line reads "Liked Flickermood by Forss"
+and a parser still reads the whole title as the `p-name`. A name that mentions
+its author anywhere else, such as "Rick Astley - Never Gonna Give You Up" by
+Rick Astley, keeps the author after it.
+
+**A read says what was read** (TASK-229) with `partials/read.njk`, a
+`p.read-line` at the top of the `e-content` that reads like indiebookclub's
+own: a `data.p-read-status` whose value is `to-read`, `reading` or `finished`
+and whose text is Want to read, Currently reading or Finished reading, then a
+`span.p-read-of.h-cite` with the title as a `cite.p-name` (linked as its
+`u-url` when the post gives one), the author as a `p-author`, and the
+identifier as a `data.p-uid` whose value is the `isbn:` or `doi:` uid. Its
+kicker and its hidden `h1` say Read. A listing prints each entry's from the
+same partial. The partial prints `read.line`, the same HTML the feeds and the
+federated Note open with (TASK-233); `read.status`, `read.statusLabel` and
+`read.of` are there for a theme that marks it up differently.
 
 The tags are printed under the words and inside the article, so that each link
 is a `p-category` of this entry, as one `p.post-categories` from
@@ -589,7 +624,8 @@ its kicker:
 **Only an article has a headline.** A note, which has no title, is printed
 whole as its `e-content`, and the date in its kicker is its `u-url`. A reply is
 a note that first cites what it answers with `partials/reply-context.njk`, and
-a reply with a title is an article that does. An article's categories are in
+a reply with a title is an article that cites it after its title and summary.
+A like, a repost and a bookmark place `partials/citations.njk` the same way. An article's categories are in
 its kicker; a note's are on its own page.
 
 The excerpt is the entry's `summary`, the very line the feeds publish, so a
@@ -1166,7 +1202,8 @@ A document — one post, one page, or one entry of a listing — adds:
 | `lang`                                      | The `lang` front matter as a canonical tag, such as `fr-CA`. Absent when it names none or no tag.                 |
 | `enclosure`                                 | The post's recording, parsed, with `player` (`audio` or `video`) and `transcript.captions`. Absent with none.     |
 | `photos`                                    | The post's photos, each `{ url, alt, html }`; `html` is the `img.u-photo`, responsive. Empty with none.           |
-| `citations`                                 | What it reposts, likes or bookmarks, each `{ property, url }` with `property` the mf2 name. Empty with none.      |
+| `citations`                                 | What it reposts, likes or bookmarks, each `{ property, url, context }`; `context` as `replyContext`, when known.  |
+| `read`                                      | A read post's `{ status, statusLabel, of, line }`; `of` is `{ name, author, uid, uidLabel, url }`.                |
 | `syndicateTo`                               | On a post's page, the syndication targets it selects, each `{ id, name, url }`. Empty with none.                  |
 | `syndication`                               | Its copies elsewhere, each `{ url, label }`: front matter `syndication`, and on its page the copies targets made. |
 | `author`                                    | Who wrote it, as a profile rather than a string. See [Bylines and author archives](#bylines-and-author-archives). |
@@ -1177,6 +1214,7 @@ A document — one post, one page, or one entry of a listing — adds:
 | `postsPage`                                 | The page carrying the listing, as `{ title, url }`, on the front page only. Absent when the site names none.      |
 | `archiveMonths`                             | Every published post as `{ month, posts }`, newest month first. Only on a page that says `archive: true`.         |
 | `webmention`                                | Where a webmention about this page is sent. Only on a rendered document, and only while the site takes them.      |
+| `noindex`                                   | `true` on an unlisted or unpublished page, which the base layout prints as a robots `noindex` meta. Else absent.  |
 | `conversation`                              | The replies, likes and boosts under the post. Only when there are any. See [The conversation](#the-conversation). |
 | everything else                             | Any front matter key the CMS does not model is on the context under its own name.                                 |
 

package/themes/default/layouts/base.njk

@@ -99,6 +99,8 @@
     <title>{% block title %}{% if pageTitle %}{{ pageTitle }} &middot; {% endif %}{{ site.title }}{% endblock %}</title>
     {% if metaDescription %}
     <meta name="description" content="{{ metaDescription }}">
+    {% endif %}{% if noindex %}
+    <meta name="robots" content="noindex">
     {% endif %}
     <link rel="canonical" href="{{ (page.url or "/") | absoluteUrl }}">
     <link rel="stylesheet" href="{{ "style.css" | asset }}">

package/themes/default/layouts/post.njk

@@ -5,8 +5,9 @@
 
   An article, and a reply with a title, has the only headline: the title as its
   `p-name` and the author's `description` under it as the deck, a
-  `p-summary`. A post with no title opens on its words, set larger. A reply
-  cites what it answers above its words, or above its header when it has one.
+  `p-summary`. A post with no title opens on its words, set larger. What a
+  reply answers, and what a like, repost or bookmark cites, opens a post with
+  no title and follows the header of one with a title, before its words.
   Then the Published line, the tags, a rule and the bio. The neighbouring posts,
   the conversation and the comment form follow the entry.
 
@@ -36,10 +37,6 @@
       hidden from sight. It is no `p-name`: a parser would take that as a
       title and read the note as an article. -#}
   {% if named %}
-  {#- A reply cites the post it answers, whose URL is also the link its
-      webmention points a receiver at. -#}
-  {% include "partials/reply-context.njk" %}
-  {% include "partials/citations.njk" %}
   <header class="post-header">
     {{ kicker.line(postType | capitalize, false, false, categories) }}
     <h1 class="p-name">{{ title }}</h1>
@@ -47,9 +44,11 @@
     <p class="post-deck p-summary">{{ description }}</p>
     {% endif %}
   </header>
+  {% include "partials/reply-context.njk" %}
+  {% include "partials/citations.njk" %}
   {% else %}
   <h1 class="screen-reader-text">
-    {{- postType | capitalize if postType in ["reply", "like", "repost", "bookmark"] else "Note" }}
+    {{- postType | capitalize if postType in ["reply", "like", "repost", "bookmark", "read"] else "Note" }}
     {%- if bioAuthor.name %} by {{ bioAuthor.name }}{% endif %}
     {%- if date %}, {{ date | date("readable", none, lang) }}{% endif -%}
   </h1>
@@ -67,6 +66,9 @@
   {% endif %}
 
   <section class="e-content">
+    {#- Inside the content, so a parser that reads only the content of a
+        read, as a webmention receiver does, has its sentence. -#}
+    {% include "partials/read.njk" %}
     {{ content | safe }}
     <p class="entry-meta">
       {#- The line opens with a link to each syndication target the post
@@ -89,6 +91,9 @@
       {%- if syndication.length %}
       {% if date or updated %} <span aria-hidden="true">·</span> {% endif %}<span class="small">Also on {% for copy in syndication %}<a class="u-syndication" href="{{ copy.url }}">{{ copy.label }}</a>{% if not loop.last %}, {% endif %}{% endfor %}</span>
       {%- endif -%}
+      {%- if location %}
+      {% if date or updated or syndication.length %} <span aria-hidden="true">·</span> {% endif %}<span class="small">{% include "partials/location.njk" %}</span>
+      {%- endif -%}
     </p>
   </section>
 

package/themes/default/partials/citations.njk

@@ -6,12 +6,21 @@
   webmention names links to it.
 
   Drawn as the same citation block as `reply-context.njk` (doc-9). An entry
-  includes it with `citations` on the context, a list of `{ property, url }`;
-  a feed sets it from the entry it is printing.
+  includes it with `citations` on the context, a list of `{ property, url,
+  context }`; a feed sets it from the entry it is printing.
+
+  `context` is what the target said about itself when the post was saved or
+  synced (TASK-244), only when it said something: its `name` and `author`,
+  printed through autoescaping like a reply's context. With a name, the name
+  is the link; with only an author, "a post" is; with neither, the bare URL.
 #}
+{% import "partials/cited-page.njk" as cited %}
 {% set citationVerbs = { "repost-of": "Reposted", "like-of": "Liked", "bookmark-of": "Bookmarked" } %}
 {% for citation in citations %}
+{% set citedPage = citation.context %}
 <div class="reply-context cite u-{{ citation.property }} h-cite">
-  <p class="cite-line small">{{ citationVerbs[citation.property] }} <a class="u-url" href="{{ citation.url }}">{{ citation.url }}</a></p>
+  <p class="cite-line small">{{ citationVerbs[citation.property] }}
+    {{- cited.page(citation.url, citedPage) -}}
+  </p>
 </div>
 {% endfor %}

package/themes/default/partials/cited-page.njk

@@ -0,0 +1,41 @@
+{#
+  What a citation says of the page it cites: its name and its author, the part
+  of the line after "In reply to", "Liked" and the rest. Shared by
+  `reply-context.njk` and `citations.njk` (TASK-247).
+
+    {% import "partials/cited-page.njk" as cited %}
+    {{ cited.page(inReplyTo, replyContext) }}
+
+  `url` is the cited page, always its `u-url`. `context` is what the page said
+  about itself, from the reply contexts file. With a name, the name is the
+  link; with only an author, "a post" is; with neither, the bare URL. The
+  author follows as an `h-card`.
+
+  A name that already ends in " by " and the author's name, matched without
+  regard to case (SoundCloud's oEmbed gives "Flickermood by Forss" by Forss),
+  is not followed by the author again. Its last words become the `h-card`,
+  printed as the title wrote them, and the whole name stays the `p-name`, so a
+  parser reads the same name and author either way.
+#}
+{% macro page(url, context) %}
+{%- set title = (context.name or "") | trim -%}
+{%- set author = (context.author.name or "") | trim if context.author else "" -%}
+{%- set cut = title.length - author.length - 4 -%}
+{%- set byline = title.slice(cut) if (author and cut > 0) else "" -%}
+{%- set named = byline and byline.slice(0, 4).toLowerCase() == " by " and byline.slice(4).toLowerCase() == author.toLowerCase() -%}
+{%- if named %} <span class="p-name"><a class="u-url" href="{{ url }}">{{ title.slice(0, cut) }}</a>{{ byline.slice(0, 4) }}{{ card(context.author, byline.slice(4)) }}</span>
+{%- else %}
+  {%- if context.name %} <a class="u-url p-name" href="{{ url }}">{{ context.name }}</a>
+  {%- elif context.author %} <a class="u-url" href="{{ url }}">a post</a>
+  {%- else %} <a class="u-url" href="{{ url }}">{{ url }}</a>
+  {%- endif %}
+  {%- if context.author %} by {{ card(context.author, context.author.name) }}{% endif %}
+{%- endif %}
+{%- endmacro %}
+
+{% macro card(author, name) -%}
+<span class="p-author h-card">
+  {%- if author.url %}<a class="u-url p-name" href="{{ author.url }}">{{ name }}</a>
+  {%- else %}<span class="p-name">{{ name }}</span>{% endif -%}
+</span>
+{%- endmacro %}

package/themes/default/partials/location.njk

@@ -0,0 +1,12 @@
+<span class="p-location {{ location.type }}">
+  {%- for word in location.words -%}
+    <span class="{{ word.property }}">{{ word.text }}</span>{% if not loop.last %}, {% endif %}
+  {%- endfor -%}
+  {%- if location.geo -%}
+    {%- if location.words.length -%}
+      <data class="p-latitude" value="{{ location.geo.latitude }}"></data><data class="p-longitude" value="{{ location.geo.longitude }}"></data>
+    {%- else -%}
+      <data class="p-latitude" value="{{ location.geo.latitude }}">{{ location.geo.latitude }}</data>, <data class="p-longitude" value="{{ location.geo.longitude }}">{{ location.geo.longitude }}</data>
+    {%- endif -%}
+  {%- endif -%}
+</span>

package/themes/default/partials/post-list.njk

@@ -8,9 +8,10 @@
   categories it is filed under in its kicker. A note, which has no title, is
   printed whole as its `e-content`, and its date in the kicker is the link to
   it. A reply is a note that first cites what it answers, and a reply with a
-  title is an article that does. Tags are deliberately not here: an entry's
-  tags belong under the entry, and a feed of twenty posts listing everyone's
-  would be a wall of links rather than a list of writing.
+  title is an article that cites it after its title and summary; a like, a
+  repost and a bookmark cite theirs the same way. Tags are deliberately not
+  here: an entry's tags belong under the entry, and a feed of twenty posts
+  listing everyone's would be a wall of links rather than a list of writing.
 
   `feedHeading` is the heading level, which belongs to the layout rather than
   to the list: a listing is a page of entries and heads each one at 2, and a
@@ -32,16 +33,19 @@
     {% else %}
     {{ kicker.line(post.postType | capitalize, post.date, post.url, [], post.label, lang=post.lang) }}
     {% endif %}
-    {#- What a reply answers, from the same partial an entry cites it with. -#}
+    {% set cited %}
     {% if post.inReplyTo %}
     {% set inReplyTo = post.inReplyTo %}
     {% set replyContext = post.replyContext %}
     {% set lang = post.lang %}
     {% include "partials/reply-context.njk" %}
     {% endif %}
-    {#- What it reposts, likes or bookmarks, from the partial an entry uses. -#}
     {% set citations = post.citations %}
     {% include "partials/citations.njk" %}
+    {% endset %}
+    {% if not post.named %}{{ cited | safe }}{% endif %}
+    {% set read = post.read %}
+    {% include "partials/read.njk" %}
     {% if post.photos.length %}
     {% set photos = post.photos %}
     {% include "partials/photos.njk" %}
@@ -60,6 +64,7 @@
       <p>{{ post.summary | truncate(280) }}</p>
     </div>
     {% endif %}
+    {{ cited | safe }}
     <p class="feed-more">
       <a href="{{ post.url | url }}" aria-label="Continue reading: {{ post.title }}">Continue reading<span aria-hidden="true"> &rarr;</span></a>
     </p>

package/themes/default/partials/read.njk

@@ -0,0 +1,5 @@
+{#
+  An entry includes it with `read` on the context; a listing sets it from the
+  entry it is printing. Nothing is printed for a post that read nothing.
+#}
+{% if read %}{{ read.line | safe }}{% endif %}

package/themes/default/partials/reply-context.njk

@@ -16,18 +16,11 @@
   written in `lang`, the language of the entry it sits in (TASK-189), so a
   listing sets `lang` from each entry as it sets `replyContext`.
 #}
+{% import "partials/cited-page.njk" as cited %}
 {% if inReplyTo %}
 <div class="reply-context cite u-in-reply-to h-cite">
   <p class="cite-line small">In reply to
-    {%- if replyContext.name %} <a class="u-url p-name" href="{{ inReplyTo }}">{{ replyContext.name }}</a>
-    {%- elif replyContext.author %} <a class="u-url" href="{{ inReplyTo }}">a post</a>
-    {%- else %} <a class="u-url" href="{{ inReplyTo }}">{{ inReplyTo }}</a>
-    {%- endif %}
-    {%- if replyContext.author %} by <span class="p-author h-card">
-      {%- if replyContext.author.url %}<a class="u-url p-name" href="{{ replyContext.author.url }}">{{ replyContext.author.name }}</a>
-      {%- else %}<span class="p-name">{{ replyContext.author.name }}</span>{% endif -%}
-    </span>
-    {%- endif %}
+    {{- cited.page(inReplyTo, replyContext) }}
     {%- if replyContext.published %}, <time class="dt-published" datetime="{{ replyContext.published | date("iso") }}">{{ replyContext.published | date("readable", none, lang) }}</time>
     {%- endif -%}
   </p>