@geekity/cms 0.11.0 → 0.13.0

package/themes/default/partials/conversation.njk

@@ -42,7 +42,7 @@
 {% macro group(items, label, kind, icon, source=false) %}
 {% if items.length %}
 <div class="reaction-group {{ kind }}">
-  <h2 class="reaction-title">{{ label }} ({{ items.length }})</h2>
+  <h2 class="reaction-title">{{ label }} <span class="reaction-count">{{ items.length }}</span></h2>
   <div class="facepile">
     {%- for item in items %}{{ face(item, icon, (item.url or item.author.url) if source else (item.author.url or item.url)) }}{% endfor %}
   </div>
@@ -61,6 +61,8 @@
       <div class="comment-author vcard p-author h-card">
         {%- if reply.author.avatar %}
         <img class="avatar u-photo" src="{{ reply.author.avatar }}" alt="" width="40" height="40" loading="lazy">
+        {%- else %}
+        <span class="comment-avatar-empty" aria-hidden="true">{{ reply.author.name | first | upper }}</span>
         {%- endif %}
         <b class="fn p-name">{% if reply.author.url %}<a class="url u-url" href="{{ reply.author.url }}" rel="nofollow ugc noopener noreferrer">{{ reply.author.name }}</a>{% else %}{{ reply.author.name }}{% endif %}</b>
       </div>
@@ -70,6 +72,11 @@
         {%- else %}
         <time class="dt-published" datetime="{{ reply.published | date("iso") }}">{{ reply.published | date }}</time>
         {%- endif %}
+        {%- if reply.source == "webmention" %}
+        <span class="comment-source">via webmention</span>
+        {%- elif reply.source == "activitypub" %}
+        <span class="comment-source">via the fediverse</span>
+        {%- endif %}
       </div>
     </footer>
     <div class="comment-content e-content">
@@ -111,8 +118,11 @@
 
 {#
   And the thread. The title counts the whole of it rather than the top level,
-  which is what `counts.replies` is, and names the post the way the source
-  theme does.
+  which is what `counts.replies` is. It does not quote the post's title: the
+  post is the page it sits under, and a note has no title to quote (TASK-186).
+  The count goes through `plural` with "en" because the words are English: a
+  theme that translates them drops the "en" and gives the forms its language
+  has, so the site's locale picks between them.
 
   "Comments are closed." is printed under a post that has been answered and is
   no longer taking comments. That a post is closed is what the absence of
@@ -123,7 +133,7 @@
 {% if conversation.replies.length %}
 <div id="comments" class="comments-area">
   <h2 class="comments-title">
-    {%- if conversation.counts.replies == 1 %}One comment{% else %}{{ conversation.counts.replies }} comments{% endif %} on &ldquo;<span>{{ title }}</span>&rdquo;
+    {{- conversation.counts.replies | plural({ one: "One reply", other: "# replies" }, "en") -}}
   </h2>
 
   <ol class="comment-list">

package/themes/default/partials/jsonld.njk

@@ -42,9 +42,6 @@
 {% for link in siteAuthor.links %}{% set _ = sameAs.push(link.href) %}{% endfor %}
 {% if personUrl %}{% set _ = sameAs.push(personUrl) %}{% endif %}
 {% set address = { "@type": "PostalAddress", "addressLocality": siteAuthor.location } if siteAuthor.location else "" %}
-{#- An author archive is the only page that is about a person: a listing whose
-    `author` is whose page this is. -#}
-{% set isProfilePage = pagination and author.url and url and (author.url in url) %}
 {% set entryType = "BlogPosting" if type == "post" else "Article" %}
 {% set nodes = [] %}
 {% set website %}
@@ -67,6 +64,9 @@
         "query-input": "required name=search_term_string"
       }) }}
       {{- member("publisher", person) }}
+      {#- What the site is about, on the homepage of a solo author blog
+          (TASK-180): the site's author, and nobody on any other site. #}
+      {{- member("about", { "@id": (soloAuthor.url | absoluteUrl) + "#person" } if atRoot and soloAuthor.url else "") }}
     }{% endset %}
 {% set _ = nodes.push(website) %}
 {% if personId %}
@@ -84,7 +84,7 @@
     }{% endset %}
 {% set _ = nodes.push(profile) %}
 {% endif %}
-{% if isProfilePage %}
+{% if isAuthorArchive %}
 {% set profilePage %}
     {
       "@type": "ProfilePage"
@@ -110,6 +110,21 @@
     }{% endset %}
 {% set _ = nodes.push(entry) %}
 {% endif %}
+{#- Where the page sits, from the trail `layouts/base.njk` builds and the
+    visible breadcrumb prints (TASK-150). -#}
+{% if breadcrumbs.length %}
+{% set trail = [] %}
+{% for crumb in breadcrumbs %}
+{% set _ = trail.push({ "@type": "ListItem", "position": loop.index, "name": crumb.name, "item": crumb.url | absoluteUrl }) %}
+{% endfor %}
+{% set breadcrumbList %}
+    {
+      "@type": "BreadcrumbList"
+      {{- member("@id", metaUrl + "#breadcrumb") }}
+      {{- member("itemListElement", trail) }}
+    }{% endset %}
+{% set _ = nodes.push(breadcrumbList) %}
+{% endif %}
 <script type="application/ld+json">
 {
   "@context": "https://schema.org",

package/themes/default/partials/kicker.njk

@@ -0,0 +1,36 @@
+{#
+  The kicker: what an entry is, said once, small, above it (doc-9). The kind
+  word first, then the date, then the categories, each after a middle dot the
+  screen reader skips.
+
+  Import it with the context, because the category links read the archive
+  base off `site`:
+
+    {% import "partials/kicker.njk" as kicker with context %}
+    {{ kicker.line("Note", post.date, post.url) }}
+
+  `kind` is the word printed: Article, Note or Reply for a post (its
+  `postType`, capitalised), Page for a page, and whatever names an archive or
+  an error page. `date` is the entry's `dt-published`, printed long. With
+  `href` the date is the entry's `u-url`, which is how a feed links an entry
+  that has no title to link; an entry with no date links `label` instead.
+  `categories` are printed as `p-category` links. `lang` is the entry's own
+  language when it names one, so its date is written in that language rather
+  than the site's (TASK-189); a listing passes `lang=post.lang`.
+#}
+{% macro line(kind, date=false, href=false, categories=[], label="", lang=false) %}
+<p class="kicker">
+  <span class="kicker-kind">{{ kind }}</span>
+  {%- if href %}
+  <span class="kicker-dot" aria-hidden="true">·</span>
+  <a href="{{ href | url }}" class="u-url">{% if date %}<time class="feed-date dt-published" datetime="{{ date | date("iso") }}">{{ date | date("readable", none, lang) }}</time>{% else %}{{ label }}{% endif %}</a>
+  {%- elif date %}
+  <span class="kicker-dot" aria-hidden="true">·</span>
+  <time class="feed-date dt-published" datetime="{{ date | date("iso") }}">{{ date | date("readable", none, lang) }}</time>
+  {%- endif %}
+  {%- for category in categories %}
+  <span class="kicker-dot" aria-hidden="true">·</span>
+  <a href="{{ ("/" + (site.categoryBase or "category") + "/" + (category | urlencode) + "/") | url }}" class="p-category" rel="category">{{ category }}</a>
+  {%- endfor %}
+</p>
+{% endmacro %}

package/themes/default/partials/lang.njk

@@ -0,0 +1,7 @@
+{#- The `lang` attribute of an article written in a language other than the
+    site's (TASK-154), with its leading space, and nothing for one in the
+    site's own: the `<html lang>` already names that. Imported with context,
+    since the site's language is what it compares against. -#}
+{% macro attr(tag) -%}
+{%- if tag and tag != (site.language | default("en")) %} lang="{{ tag }}"{% endif -%}
+{%- endmacro %}

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

@@ -1,21 +1,24 @@
 {#
-  The feed a listing is made of: `h-feed` of `h-entry` items, as the source
-  design lists them (decision-16).
+  The feed a listing is made of: `h-feed` of `h-entry` items (doc-9).
 
-  Expects `posts`. A note, which has no title, is printed whole as its
-  `e-content`, with its date as the link to it. Every other entry prints its
-  title as a linked `p-name`, its `summary` — the very line the feeds publish —
-  as a `p-summary` cut to about 280 characters, a Continue reading link, its
-  publish date and the categories it is filed under. 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.
+  Expects `posts`. Every entry opens on a kicker naming its kind and its date.
+  An article is the only entry with a headline: its title as a linked
+  `p-name`, its `summary` (the very line the feeds publish) as a `p-summary`
+  cut to about 280 characters, and a Continue reading link, with the
+  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.
 
   `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
   front page whose feed sits under a heading of its own sets 3 so the outline
   never skips a level.
 #}
-{% import "partials/tags.njk" as taxonomy with context %}
+{% import "partials/kicker.njk" as kicker with context %}
+{% import "partials/lang.njk" as language with context %}
 {% set feedTitleTag = "h" + (feedHeading | default(2)) %}
 {% if posts.length %}
 <div class="feed h-feed">
@@ -23,44 +26,37 @@
   {% if not loop.first %}
   <hr class="feed-separator">
   {% endif %}
-  <article class="feed-item h-entry">
-    <div class="feed-content">
-      {% if post.inReplyTo %}
-      <p class="feed-reply small">In reply to <a class="u-in-reply-to" href="{{ post.inReplyTo }}">{{ post.inReplyTo }}</a></p>
-      {% endif %}
-      {% if not post.named %}
-      <div class="feed-excerpt e-content">{{ post.content | safe }}</div>
-      {% else %}
-      <{{ feedTitleTag }} class="feed-title p-name">
-        <a href="{{ post.url | url }}" class="u-url">{{ post.title }}</a>
-      </{{ feedTitleTag }}>
-      {% if post.summary %}
-      <div class="feed-excerpt p-summary">
-        {#- `truncate` cuts at the last space before the length and adds an
-            ellipsis, so a description short enough is printed whole and a long
-            one never breaks a word. -#}
-        <p>{{ post.summary | truncate(280) }}</p>
-      </div>
-      {% endif %}
-      <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>
-      {% endif %}
-      <div class="feed-meta">
-        {% if not post.named %}
-        <p>
-          <a href="{{ post.url | url }}" class="u-url">{% if post.date %}<time class="feed-date dt-published" datetime="{{ post.date | date("iso") }}">{{ post.date | date }}</time>{% else %}{{ post.label }}{% endif %}</a>
-        </p>
-        {% elif post.date %}
-        <p>
-          <time class="feed-date dt-published" datetime="{{ post.date | date("iso") }}">
-            {{ post.date | date }}
-          </time>
-        </p>
-        {% endif %}
-        {{ taxonomy.categories(post.categories) }}
-      </div>
+  <article class="feed-item h-entry"{{ language.attr(post.lang) }}>
+    {% if post.named %}
+    {{ kicker.line(post.postType | capitalize, post.date, false, post.categories, lang=post.lang) }}
+    {% 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. -#}
+    {% if post.inReplyTo %}
+    {% set inReplyTo = post.inReplyTo %}
+    {% set replyContext = post.replyContext %}
+    {% set lang = post.lang %}
+    {% include "partials/reply-context.njk" %}
+    {% endif %}
+    {% if not post.named %}
+    <div class="feed-excerpt e-content">{{ post.content | safe }}</div>
+    {% else %}
+    <{{ feedTitleTag }} class="feed-title p-name">
+      <a href="{{ post.url | url }}" class="u-url">{{ post.title }}</a>
+    </{{ feedTitleTag }}>
+    {% if post.summary %}
+    <div class="feed-excerpt p-summary">
+      {#- `truncate` cuts at the last space before the length and adds an
+          ellipsis, so a description short enough is printed whole and a long
+          one never breaks a word. -#}
+      <p>{{ post.summary | truncate(280) }}</p>
     </div>
+    {% endif %}
+    <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>
+    {% endif %}
   </article>
   {% endfor %}
 </div>

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

@@ -3,15 +3,24 @@
   `u-in-reply-to h-cite` that always carries the target's URL, so a parser
   reads what this post answers even when nothing more is known about it.
 
+  Drawn as the citation block (doc-9): a rule on the start side, a sans line
+  naming the target, and its words as an italic quote. An entry includes it
+  with `inReplyTo` and `replyContext` on the context; a feed sets both from
+  the entry it is printing.
+
   `replyContext` is what the target said about itself when the reply was saved
   or synced: its name, a short excerpt, its author and its date, each only when
   it said so. It is somebody else's words, so every piece is printed through
-  autoescaping and none of it with `safe`.
+  autoescaping and none of it with `safe`. With a name, the name is the link;
+  with only an author, "a post" is; with neither, the bare URL. Its date is
+  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`.
 #}
 {% if inReplyTo %}
-<div class="reply-context u-in-reply-to h-cite">
-  <p class="small">In reply to
+<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">
@@ -19,11 +28,11 @@
       {%- else %}<span class="p-name">{{ replyContext.author.name }}</span>{% endif -%}
     </span>
     {%- endif %}
-    {%- if replyContext.published %} on <time class="dt-published" datetime="{{ replyContext.published | date("iso") }}">{{ replyContext.published | date }}</time>
+    {%- if replyContext.published %}, <time class="dt-published" datetime="{{ replyContext.published | date("iso") }}">{{ replyContext.published | date("readable", none, lang) }}</time>
     {%- endif -%}
   </p>
   {% if replyContext.text %}
-  <blockquote class="p-content">{{ replyContext.text }}</blockquote>
+  <blockquote class="cite-quote p-content">{{ replyContext.text }}</blockquote>
   {% endif %}
 </div>
 {% endif %}