@geekity/cms 0.3.0 → 0.5.0

package/themes/default/layouts/404.njk

@@ -2,8 +2,7 @@
 
 {% block content %}
 <article class="not-found">
-  <h1 class="page-title">Not found</h1>
-  <p>There is nothing at <code>{{ url }}</code>.</p>
-  <p><a href="{{ "/" | url }}">Back to {{ site.title }}</a></p>
+  <h1 class="page-title">Content not found.</h1>
+  <p>Go <a href="{{ "/" | url }}">home</a>, or <a href="{{ "/search/" | url }}">search the site</a>.</p>
 </article>
 {% endblock %}

package/themes/default/layouts/author.njk

@@ -0,0 +1,36 @@
+{#
+  One person's archive, at `/author/{username}/`.
+
+  decision-14 makes this URL their ActivityPub actor as well, so a peer asking
+  for the actor and a reader asking for the page are at the same address; this
+  is the page half of it. `author` is the profile — `name`, and whatever of
+  `bio`, `avatar` and `links` they have written — and it is the same shape an
+  entry's bio is given.
+
+  The source design has no author archive, so there is nothing to port: the
+  heading is the CMS's own. What it does not keep is an h-card of its own.
+  `partials/bio.njk` is the one the theme has, and it prints the whole profile
+  — the note and the `rel="me"` links — wherever it is, so this page is headed
+  with the same card that ends each of their posts.
+#}
+{% extends "layouts/base.njk" %}
+
+{% set bioAuthor = author %}
+{% set bioLead = "Posts by" %}
+
+{% block title %}{{ author.name }}{% if pagination.pageNumber > 0 %}, page {{ pagination.pageNumber + 1 }}{% endif %} · {{ site.title }}{% endblock %}
+
+{% import "partials/feeds.njk" as feeds %}
+{% block alternates %}
+{{ super() }}
+{{ feeds.feedLinks(author.url, site.title + ": " + author.name) }}
+{% endblock %}
+
+{% block content %}
+<header class="author-header">
+  <h1 class="page-title">{{ author.name }}</h1>
+</header>
+{% include "partials/bio.njk" %}
+{% include "partials/post-list.njk" %}
+{% include "partials/pagination.njk" %}
+{% endblock %}

package/themes/default/layouts/base.njk

@@ -1,59 +1,189 @@
 {#
   The page every other layout extends.
 
+  The shell of the andrewshell.org design (decision-16): one wrapper at the
+  measure, a big site title and tagline on the front page and a small link home
+  everywhere else, and a footer holding the copyright, the colophon and the
+  site's own links. `data-is-root-path` on the wrapper is how the stylesheet
+  tells the front page from every other one.
+
+  One home for each kind of link (TASK-105). The header carries the site menu,
+  on every page. `partials/bio.njk` carries the person whose page or post it
+  is. The footer carries `menus.footer`, the site's own list, and nothing read
+  off an account. The search form is on the search page and nowhere else.
+
   Blocks a site can override without copying the whole file:
     title       the contents of <title>
-    head        extra tags at the end of <head>
+    head        the cards, the icons and the structured data, at the end of
+                <head>. Call `super()` from an override that only adds to it.
     alternates  <link rel="alternate"> tags, where the feeds go
-    header      the site header
+    header      the site header, with the site menu
     content     the page body
     footer      the site footer
     scripts     scripts at the end of <body>
-#}<!doctype html>
+#}{% import "partials/feeds.njk" as feeds %}
+{%- import "partials/menu.njk" as nav %}
+{#- Whether this is the front page, which is the one page the header and the
+    stylesheet treat differently. `page.url` is the URL being served rather
+    than the document's own permalink, so a static homepage under the Reading
+    settings is the root path too. -#}
+{% set atRoot = (page.url or url or "/") == "/" %}
+{#- What the head says this page is, in one place, because the description
+    tags, the Open Graph tags and the Twitter card all say the same thing.
+
+    `metaDescription` is the page's own description, else the entry's summary
+    — the very line the feeds publish — else the site's tagline. `metaImage` is
+    the picture the front matter names, else the site's avatar; with neither,
+    nothing is printed rather than an empty tag. `isEntry` is a rendered post
+    or page, which is what Open Graph calls an article: a listing has
+    `pagination`, and the posts page is a listing carrying a page's front
+    matter, so it is a website like every other listing. -#}
+{% set metaDescription = description or summary or site.tagline %}
+{% set metaTitle = title or site.title %}
+{% set metaUrl = (page.url or "/") | absoluteUrl %}
+{% set metaImage = image or site.avatar %}
+{% set isEntry = (type == "post" or type == "page") and not pagination %}
+<!doctype html>
 <html lang="{{ site.language | default("en") }}">
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>{% block title %}{% if title %}{{ title }} &middot; {% endif %}{{ site.title }}{% endblock %}</title>
-    {% if description %}
-    <meta name="description" content="{{ description }}">
+    {% if metaDescription %}
+    <meta name="description" content="{{ metaDescription }}">
     {% endif %}
     <link rel="canonical" href="{{ (page.url or "/") | absoluteUrl }}">
     <link rel="stylesheet" href="{{ "/theme/style.css" | url }}">
     {% block alternates %}
-    <link rel="alternate" type="application/atom+xml" title="{{ site.title }}" href="{{ "/feed.xml" | url }}">
-    <link rel="alternate" type="application/feed+json" title="{{ site.title }}" href="{{ "/feed.json" | url }}">
+    {{ feeds.feedLinks("/", site.title) }}
+    {{ feeds.commentsFeedLink("/comments/feed/", site.title + " comments") }}
+    {% if commentsFeed %}
+    {{ feeds.commentsFeedLink(commentsFeed, "Comments on: " + title) }}
+    {% endif %}
     {% if activityStreams %}
     <link rel="alternate" type="application/activity+json" href="{{ activityStreams }}">
     {% endif %}
     {% endblock %}
-    {% block head %}{% endblock %}
+    {% if webmention %}
+    <link rel="webmention" href="{{ webmention | url }}">
+    {% endif %}
+    {% block head %}
+    {#
+      What a link to this page looks like when somebody posts it: the same
+      title, description and picture to Open Graph and to a Twitter card,
+      which is the pair every reader of this markup understands. The card is
+      always `summary` — a small square picture beside the words — because the
+      picture is usually the site's avatar rather than a wide photograph.
+    #}
+    <meta property="og:title" content="{{ metaTitle }}">
+    {% if metaDescription %}
+    <meta property="og:description" content="{{ metaDescription }}">
+    {% endif %}
+    <meta property="og:url" content="{{ metaUrl }}">
+    <meta property="og:type" content="{% if isEntry %}article{% else %}website{% endif %}">
+    <meta property="og:site_name" content="{{ site.title }}">
+    {% if metaImage %}
+    <meta property="og:image" content="{{ metaImage | absoluteUrl }}">
+    {% endif %}
+    <meta name="twitter:card" content="summary">
+    <meta name="twitter:title" content="{{ metaTitle }}">
+    {% if metaDescription %}
+    <meta name="twitter:description" content="{{ metaDescription }}">
+    {% endif %}
+    {% if metaImage %}
+    <meta name="twitter:image" content="{{ metaImage | absoluteUrl }}">
+    {% endif %}
+    {#
+      The site's icons, derived from its avatar. `icons` is empty — and these
+      lines print nothing — until a site has one, so a site with no avatar
+      links no icon rather than three that answer 404.
+    #}
+    {% for icon in icons %}
+    <link rel="{{ icon.rel }}" type="image/png" sizes="{{ icon.sizes }}" href="{{ icon.href | url }}">
+    {% endfor %}
+    {% include "partials/jsonld.njk" %}
+    {% endblock %}
   </head>
   <body>
-    <a class="skip-link" href="#main">Skip to content</a>
-
-    {% block header %}
-    <header class="site-header">
-      <p class="site-title"><a href="{{ "/" | url }}">{{ site.title }}</a></p>
-      {% if site.tagline %}
-      <p class="site-tagline">{{ site.tagline }}</p>
-      {% endif %}
-    </header>
-    {% endblock %}
+    <a class="screen-reader-text" href="#main">Skip to content</a>
+    <div class="global-wrapper"{% if atRoot %} data-is-root-path="true"{% endif %}>
+      {% block header %}
+      {#
+        The header, and the site menu inside it on every page (TASK-105): one
+        place a reader looks for the navigation, whatever they are reading.
 
-    <main id="main" class="site-main">
-      {% block content %}{% endblock %}
-    </main>
-
-    {% block footer %}
-    <footer class="site-footer">
-      <p>
-        {% if site.author %}&copy; {{ site.author }}{% endif %}
-        <span class="site-colophon">Published with Geekity.</span>
-      </p>
-    </footer>
-    {% endblock %}
+        The header is two shapes and the menu sits differently in each. At the
+        root it is the site title and the tagline, and the menu is a line of
+        its own under them; everywhere else it is the small link home, and the
+        menu is beside it on that line. The stylesheet does the beside part,
+        off `data-is-root-path` on the wrapper.
+      #}
+      <header class="global-header">
+        {% if atRoot %}
+        <h1 class="main-heading">
+          <a href="{{ "/" | url }}">{{ site.title }}</a>
+        </h1>
+        {% if site.tagline %}
+        <p>{{ site.tagline }}</p>
+        {% endif %}
+        {% else %}
+        <a class="header-link-home" href="{{ "/" | url }}">{{ site.title }}</a>
+        {% endif %}
+        {{ nav.list(menus.primary, "Site") }}
+      </header>
+      {% endblock %}
+
+      <main id="main">
+        {% block content %}{% endblock %}
+      </main>
+
+      {% block footer %}
+      <footer>
+        <p>&copy; {{ "now" | date("year") }}{% if site.author %}, {{ site.author }}{% endif %} &middot; Published with Geekity</p>
+        {#
+          The footer menu: the `footer` area this theme declares in its
+          `theme.json`, which a site fills in on the Navigation screen, and the
+          whole of what the footer links (TASK-105). It is the site's own list
+          — the feed, a colophon, a webring, a Mastodon link it wants verified
+          — rather than anything read off an account: one nominated user's
+          profile links presented as the site's were nobody's to give, and on a
+          site with more than one person nobody else's appeared at all. An item
+          marked `me` carries `rel="me"`, which is what a site moving a
+          verified profile link in here needs.
+
+          Nothing is printed until a site has filled the area in: an empty
+          footer menu is no list rather than an empty one, and the copyright
+          line above stands on its own.
+
+          Webrings, badges and anything else that is markup rather than a link
+          go in a site theme's `footer` override.
+        #}
+        {{ nav.list(menus.footer, "Footer") }}
+      </footer>
+      {% endblock %}
+    </div>
 
-    {% block scripts %}{% endblock %}
+    {% block scripts %}
+    {#
+      The code highlighter, and only where there is code to highlight.
+
+      The CMS renders a fenced block as `pre > code.language-x` and highlights
+      nothing, so that a theme picks its own highlighter and runs it on the
+      client (decision-16). This one is highlight.js, self-hosted in
+      `static/highlight.js` at a pinned version — nothing is loaded from a CDN.
+
+      The test is the rendered body: a page whose `content` holds a
+      `language-` class has a code block on it, and every other page — a
+      listing, an entry with only prose — ships no JavaScript at all. `defer`
+      so it waits for the markup it works on rather than blocking it.
+
+      A site theme that wants a different highlighter, or none, overrides this
+      block; one that wants a different set of languages rebuilds the bundle.
+      See the theme README.
+    #}
+    {% if content and "language-" in content %}
+    <script src="{{ "/theme/highlight.js" | url }}" defer></script>
+    {% endif %}
+    {% endblock %}
   </body>
 </html>

package/themes/default/layouts/category.njk

@@ -0,0 +1,27 @@
+{% extends "layouts/base.njk" %}
+
+{% block title %}Filed under “{{ category }}”{% if pagination.pageNumber > 0 %}, page {{ pagination.pageNumber + 1 }}{% endif %} · {{ site.title }}{% endblock %}
+
+{% import "partials/feeds.njk" as feeds %}
+{% set categoryRoot = "/" + (site.categoryBase or "category") + "/" + (category | urlencode) + "/" %}
+{% block alternates %}
+{{ super() }}
+{{ feeds.feedLinks(categoryRoot, site.title + ": " + category) }}
+{% endblock %}
+
+{% block content %}
+{#
+  The archive's header. `categoryDescription` is what the design prints under
+  the name; nothing in the CMS writes one yet, so the header is the heading
+  alone until something does — a site whose own context carries one gets it
+  printed without overriding this layout.
+#}
+<header class="category-header">
+  <h1 class="page-title">Filed under &ldquo;{{ category }}&rdquo;</h1>
+  {% if categoryDescription %}
+  <div class="category-description">{{ categoryDescription }}</div>
+  {% endif %}
+</header>
+{% include "partials/post-list.njk" %}
+{% include "partials/pagination.njk" %}
+{% endblock %}

package/themes/default/layouts/front-page.njk

@@ -0,0 +1,56 @@
+{#
+  The front page: the page the Reading setting names, read at `/`, as the
+  source design's `front-page.php` draws it (decision-16, TASK-85).
+
+  A site's own words, then what it has been writing. The words are the page's
+  rendered body and nothing else — no title, because `layouts/base.njk` heads
+  the root path with the site title and a second `h1` under it would be one
+  heading too many, and no Published line, because a front page is read as the
+  site rather than as a page somebody wrote on a Tuesday. Then `Recent Posts`
+  over the same feed a listing is made of, headed at 3 so the outline never
+  skips a level, then the line of links, then the bio.
+
+  A theme that wants a different front page replaces this file; a site that
+  wants no front page of its own sets no homepage, and `/` is the listing.
+#}
+{% extends "layouts/base.njk" %}
+
+{#- Who the bio credits: the person the site's author setting names. -#}
+{% set bioAuthor = siteAuthor %}
+
+{% block content %}
+<div class="page-body e-content">
+  {{ content | safe }}
+</div>
+
+<h2>Recent Posts</h2>
+{#- The feed a listing prints, over the posts the CMS decided were recent:
+    this month's writing when there is enough of it and the five newest
+    otherwise. `feedHeading` is 3 because the `h2` above is what they sit
+    under. -#}
+{% set posts = recentPosts %}
+{% set feedHeading = 3 %}
+{% include "partials/post-list.njk" %}
+
+{#- Where to go next. The posts page is here only when the site has one — on a
+    site without one there is no second URL for the archive, and a link to one
+    would be a link to nothing. Search is always here (TASK-22). -#}
+<p class="front-links">
+  {% if postsPage %}
+  <a href="{{ postsPage.url | url }}">{{ postsPage.title }}<span aria-hidden="true"> &rarr;</span></a>
+  {% endif %}
+  <a href="{{ "/search/" | url }}">Search<span aria-hidden="true"> &rarr;</span></a>
+</p>
+
+{% if bioAuthor %}
+<hr>
+<footer>
+  {% include "partials/bio.njk" %}
+</footer>
+{% endif %}
+
+{# A homepage may ask for a contact form like any other page (TASK-56). #}
+{% if contactForm %}
+{% include "partials/contact-form.njk" %}
+{% endif %}
+{% endblock %}

package/themes/default/layouts/home.njk

@@ -1,9 +1,25 @@
 {% extends "layouts/base.njk" %}
 
-{% block title %}{% if pagination.pageNumber > 0 %}Page {{ pagination.pageNumber + 1 }} · {% endif %}{{ site.title }}{% endblock %}
+{% block title %}{% if pagination.pageNumber > 0 %}Page {{ pagination.pageNumber + 1 }} · {% endif %}{% if title and title != site.title %}{{ title }} · {% endif %}{{ site.title }}{% endblock %}
 
 {% block content %}
+{# Only where the header has not already said it. `layouts/base.njk` heads the
+   root path with the site title, and the root listing's own title is that same
+   title, so printing it here would give the page two `h1` elements holding the
+   same words. A listing at a path of its own gets only the small link home up
+   there, so it heads itself — even on a site whose posts page shares the
+   site's name. `layouts/front-page.njk` leaves its title out for the same
+   reason. #}
+{% if not atRoot %}
 <h1 class="page-title">{{ title }}</h1>
+{% endif %}
+{# A site whose listing lives on a posts page renders that page's own words
+   above the posts; the home listing has none, and prints nothing here. #}
+{% if content %}
+<div class="page-body e-content">
+  {{ content | safe }}
+</div>
+{% endif %}
 {% include "partials/post-list.njk" %}
 {% include "partials/pagination.njk" %}
 {% endblock %}

package/themes/default/layouts/page.njk

@@ -1,13 +1,65 @@
+{#
+  One page, as the source design's `content-page.php` draws it (decision-16,
+  TASK-83): the same `blog-post h-entry` a post is, with the same Published
+  line inside the `e-content` and the same bio under a rule.
+
+  Two front matter keys add to it: `contact: true` puts the contact form under
+  the words, and `archive: true` puts every post the site has published under
+  them, month by month (TASK-85).
+
+  What a page does not have: an IndieNews link, since it is not a post
+  anybody syndicates; neighbours, since it is in no archive; and taxonomy,
+  since only posts are filed. The bio credits `siteAuthor` — a page is by
+  whoever the site is by, not by the person a front matter line names.
+#}
 {% extends "layouts/base.njk" %}
 
+{#- Who the bio credits, and what tells `layouts/base.njk` the site menu is in
+    the bio rather than in the page footer. -#}
+{% set bioAuthor = siteAuthor %}
+
 {% block content %}
-<article class="page h-entry">
-  <header class="page-header">
-    <h1 class="page-title p-name">{{ title }}</h1>
+{% set entryUrl = page.url or url %}
+<article class="blog-post h-entry">
+  <header>
+    <h1 class="p-name">{{ title }}</h1>
   </header>
 
-  <div class="page-body e-content">
+  <section class="e-content">
     {{ content | safe }}
-  </div>
+    {#- Most pages carry no date at all — a colophon was not published on a
+        Tuesday — so this line is often empty, and empty is what it renders:
+        the stylesheet hides a `:empty` meta paragraph rather than the layout
+        deciding twice whether there is anything to say. -#}
+    <p class="page-meta">
+      {%- if date %}
+      <a href="{{ entryUrl | url }}" class="u-url"><time class="small dt-published" datetime="{{ date | date("iso") }}">Published {{ date | date }}</time></a>
+      {%- endif %}
+      {%- if updated and (not date or (updated | date("html")) != (date | date("html"))) %}
+      {% if date %}<br>{% endif %}<time class="small dt-updated" datetime="{{ updated | date("iso") }}">Updated {{ updated | date }}</time>
+      {%- endif -%}
+    </p>
+  </section>
+
+  {#- And the archive, on the one page whose front matter asked for it
+      (TASK-85). Outside the `e-content` above, because the page's words are
+      what it wrote and this list is what the site has published since. -#}
+  {% if archiveMonths %}
+  {% include "partials/archive.njk" %}
+  {% endif %}
+
+  {#- The rule and the footer are the bio's own: a site whose author setting
+      names nobody with an account here ends the page at its words. -#}
+  {% if bioAuthor %}
+  <hr>
+  <footer>
+    {% include "partials/bio.njk" %}
+  </footer>
+  {% endif %}
 </article>
+
+{# Only a page whose front matter says `contact: true` has one (TASK-56). #}
+{% if contactForm %}
+{% include "partials/contact-form.njk" %}
+{% endif %}
 {% endblock %}

package/themes/default/layouts/post.njk

@@ -1,30 +1,89 @@
+{#
+  One post, as the source design's `content-essay.php` draws it (decision-16,
+  TASK-83): `article.blog-post.h-entry`, the title as its `p-name`, the body
+  and the Published line together in one `section.e-content`, then a rule and a
+  footer holding the bio. The neighbouring posts, the conversation and the
+  comment form follow the entry.
+
+  The Published line is inside the `e-content` on purpose. It is what the
+  source theme does, and it is what makes a reader who copies the words out
+  take the date and the permalink with them.
+#}
 {% extends "layouts/base.njk" %}
-{% import "partials/tags.njk" as taxonomy %}
+{% import "partials/tags.njk" as taxonomy with context %}
+
+{#- Who the bio credits: the person the file names, and otherwise whoever the
+    site is by, which is what the source theme's bio reads. A post naming
+    nobody on a site whose author setting names nobody either has no bio at
+    all. It is set out here rather than in the block because
+    `layouts/base.njk` reads it too — a page with a bio carries the site menu
+    in it, and the page footer prints the menu only where there is none. -#}
+{% set bioAuthor = author or siteAuthor %}
 
 {% block content %}
-<article class="post h-entry">
-  <header class="post-header">
-    <h1 class="post-title p-name">{{ title }}</h1>
-    {% if date %}
-    <p class="post-meta">
-      Published
-      <time class="dt-published" datetime="{{ date | date("iso") }}">{{ date | date }}</time>
-      {% if updated %}
-      &middot; updated
-      <time class="dt-updated" datetime="{{ updated | date("iso") }}">{{ updated | date }}</time>
-      {% endif %}
-    </p>
-    {% endif %}
+{% set entryUrl = page.url or url %}
+<article class="blog-post h-entry">
+  <header>
+    <h1 class="p-name">{{ title }}</h1>
   </header>
 
-  <div class="post-body e-content">
+  <section class="e-content">
     {{ content | safe }}
-  </div>
+    <p class="entry-meta">
+      {#- A post tagged `indienews` opens the line with the link that submits
+          it there, which is how IndieNews is told the post is for it. -#}
+      {%- if "indienews" in tags %}
+      <a class="u-category small" href="https://news.indieweb.org/en">#indienews</a>
+      {%- endif %}
+      {%- if date %}
+      <a href="{{ entryUrl | url }}" class="u-url"><time class="small dt-published" datetime="{{ date | date("iso") }}">Published {{ date | date }}</time></a>
+      {%- endif %}
+      {#- Updated only when it is a different day in the site's own timezone:
+          a typo fixed an hour after publishing is not news. -#}
+      {%- if updated and (not date or (updated | date("html")) != (date | date("html"))) %}
+      {% if date %}<br>{% endif %}<time class="small dt-updated" datetime="{{ updated | date("iso") }}">Updated {{ updated | date }}</time>
+      {%- endif -%}
+    </p>
+  </section>
+
+  {# What it is filed under, inside the entry so that each link is a
+     `p-category` of it: the categories first, then the tags. #}
+  {{ taxonomy.categories(categories) }}
+  {{ taxonomy.list(tags) }}
 
-  {% if tags.length %}
-  <footer class="post-footer">
-    {{ taxonomy.list(tags) }}
+  {#- The rule and the footer are the bio's own: a post nobody is credited with
+      ends at its words rather than at an empty box. -#}
+  {% if bioAuthor %}
+  <hr>
+  <footer>
+    {% include "partials/bio.njk" %}
   </footer>
   {% endif %}
 </article>
+
+{# The post either side of this one. Each is on the context only when there is
+   one, so the ends of the archive draw one arrow and a site of a single post
+   draws none. #}
+{% if previous or next %}
+<nav class="blog-post-nav">
+  <ul>
+    {% if previous %}
+    <li><a rel="prev" href="{{ previous.url | url }}">&larr; {{ previous.title }}</a></li>
+    {% endif %}
+    {% if next %}
+    <li><a rel="next" href="{{ next.url | url }}">{{ next.title }} &rarr;</a></li>
+    {% endif %}
+  </ul>
+</nav>
+{% endif %}
+
+{# Only a post that has been replied to, liked or boosted has one of these. #}
+{% if conversation %}
+{% include "partials/conversation.njk" %}
+{% endif %}
+
+{# And only one that is still taking comments has a form (TASK-50). #}
+{% if commentForm %}
+{% include "partials/comment-form.njk" %}
+{% endif %}
 {% endblock %}

package/themes/default/layouts/search.njk

@@ -0,0 +1,57 @@
+{% extends "layouts/base.njk" %}
+
+{#
+  The search page (TASK-22): the form, and then whatever it found.
+
+  Expects `query`, the words searched for, empty before a search; `posts`, the
+  results on this page, best match first, each a listing entry with a
+  `snippet` of HTML marking where the words were found; and `pagination`, as a
+  listing has it.
+
+  The page asks not to be indexed: a results page is a question somebody asked
+  rather than something the site published, and a search engine that followed
+  every one would be crawling the site's archive once per word in it.
+#}
+
+{% block title %}{% if query %}Search results for “{{ query }}”{% if pagination.pageNumber > 0 %}, page {{ pagination.pageNumber + 1 }}{% endif %}{% else %}Search{% endif %} · {{ site.title }}{% endblock %}
+
+{% block head %}
+{{ super() }}
+    <meta name="robots" content="noindex">
+{% endblock %}
+
+{% block content %}
+<h1 class="page-title">Search</h1>
+{% include "partials/search-form.njk" %}
+{% if query %}
+<p class="search-summary" role="status">
+  {%- if pagination.total == 0 -%}
+  Nothing found for &ldquo;{{ query }}&rdquo;.
+  {%- elif pagination.total == 1 -%}
+  One result for &ldquo;{{ query }}&rdquo;.
+  {%- else -%}
+  {{ pagination.total }} results for &ldquo;{{ query }}&rdquo;.
+  {%- endif -%}
+</p>
+{% if posts.length %}
+<div class="search-results">
+  {% for post in posts %}
+  <article class="search-result h-entry">
+    <h2 class="feed-title p-name">
+      <a href="{{ post.url | url }}" class="u-url">{{ post.title }}</a>
+    </h2>
+    {% if post.snippet %}
+    <p class="search-snippet">{{ post.snippet | safe }}</p>
+    {% endif %}
+    {% if post.date %}
+    <p class="feed-meta">
+      <time class="feed-date dt-published" datetime="{{ post.date | date("iso") }}">{{ post.date | date }}</time>
+    </p>
+    {% endif %}
+  </article>
+  {% endfor %}
+</div>
+{% endif %}
+{% include "partials/pagination.njk" %}
+{% endif %}
+{% endblock %}

package/themes/default/layouts/tag.njk

@@ -2,18 +2,15 @@
 
 {% block title %}Tagged “{{ tag }}”{% if pagination.pageNumber > 0 %}, page {{ pagination.pageNumber + 1 }}{% endif %} · {{ site.title }}{% endblock %}
 
-{% set tagRoot = "/tags/" + (tag | urlencode) + "/" %}
+{% import "partials/feeds.njk" as feeds %}
+{% set tagRoot = "/" + (site.tagBase or "tag") + "/" + (tag | urlencode) + "/" %}
 {% block alternates %}
 {{ super() }}
-    <link rel="alternate" type="application/atom+xml" title="{{ site.title }}: {{ tag }}" href="{{ (tagRoot + "feed.xml") | url }}">
-    <link rel="alternate" type="application/feed+json" title="{{ site.title }}: {{ tag }}" href="{{ (tagRoot + "feed.json") | url }}">
+{{ feeds.feedLinks(tagRoot, site.title + ": " + tag) }}
 {% endblock %}
 
 {% block content %}
 <h1 class="page-title">Tagged &ldquo;{{ tag }}&rdquo;</h1>
-<p class="tag-count">
-  {{ pagination.total }} {% if pagination.total == 1 %}entry{% else %}entries{% endif %}.
-</p>
 {% include "partials/post-list.njk" %}
 {% include "partials/pagination.njk" %}
 {% endblock %}