M block_comments.html → block_comments.html

@@ -4,7 +4,7 @@ <h6 class="comments-replies"><a name="replies"></a>Replies</h6>
 	<ol>
 		{% for reply in post.replies %}
 			<li class="h-entry p-comment">
-				<a class="u-url u-uuid" href="{{ site.url }}/{{ post.slug }}/#{{ reply.id }}" name="{{ reply.id }}"></a>
+				<a class="u-url u-uuid" href="{{ site.url }}/{{ site.commentspath }}/{{ reply.fname }}/" name="{{ reply.fname }}"></a>
 				<header>
 					<div class="p-author h-card">
 						{% if reply.author.url %}
@@ -15,8 +15,8 @@ {% else %}
 							<span class="p-name fn">{{ reply.author.name }}</span>
 						{% endif %}
 					</div>
-					<time class="dt-published" datetime="{{ reply.published|date("c") }}">
-						{{ reply.published|date("%Y-%m-%d %H:%M") }}
+					<time class="dt-published" datetime="{{ reply.published|date('c') }}">
+						{{ reply.published|date('%Y-%m-%d %H:%M') }}
 					</time>
 				</header>
 				<div class="e-content">
@@ -42,9 +42,9 @@ <dd>
 			<ul>
 			{% for reply in replies %}
 				<li class="p-comment h-entry ">
-					<a class="u-url u-uuid" href="{{ site.url }}/{{ post.slug }}/#{{ reply.id }}" name="{{ reply.id }}"></a>
-					<time class="dt-published" datetime="{{ reply.published|date("c") }}">
-						{{ reply.published|date("%Y-%m-%d %H:%M") }}
+					<a class="u-url u-uuid" href="{{ site.url }}/{{ site.commentspath }}/{{ reply.fname }}/" name="{{ reply.fname }}"></a>
+					<time class="dt-published" datetime="{{ reply.published|date('c') }}">
+						{{ reply.published|date('%Y-%m-%d %H:%M') }}
 					</time>
 					<span class="p-author h-card">
 						{% if reply.author.url %}

M block_header_open.html → block_header_open.html

@@ -14,4 +14,5 @@ <link rel="http://webmention.org/" href="{{ site.url }}/webmention" />
 	<link rel="webmention" href="{{ site.url }}/webmention" />
 	<link rel="micropub" href="{{ site.url }}/micropub" />
 	<link rel="authorization_endpoint" href="https://indieauth.com/auth" />
-	<link rel="token_endpoint" href="https://tokens.indieauth.com/token" />+	<link rel="token_endpoint" href="https://tokens.indieauth.com/token" />
+	<link rel="hub" href="https://petermolnar.superfeedr.com/">

A comment.html

@@ -0,0 +1,36 @@
+{% include 'block_header_open.html' %}
+	<title>comment #{{ reply.id }} | {{ site.domain }}</title>
+	<link rel="canonical" href="{{ site.url }}/{{ site.commentspath }}/{{ reply.fname }}/" />
+	<meta name="author" content="{{ reply.author.name }}">
+{% include 'block_header_close.html' %}
+
+<section class="content-body">
+	<article class="h-entry p-comment">
+		<a class="u-url u-uuid" href="{{ site.url }}/{{ site.commentspath }}/{{ reply.fname }}/"></a>
+		<header>
+			<div class="p-author h-card">
+				{% if reply.author.url %}
+					<a class="url u-url" href="{{ reply.author.url }}">
+						<span class="p-name fn">{{ reply.author.name }}</span>
+					</a>
+				{% else %}
+					<span class="p-name fn">{{ reply.author.name }}</span>
+				{% endif %}
+			</div>
+			<time class="dt-published" datetime="{{ reply.published|date('c') }}">
+				{{ reply.published|date('%Y-%m-%d %H:%M') }}
+			</time>
+		</header>
+		<div class="e-content">
+			{{ reply.html }}
+		</div>
+		<footer>
+			{% if reply.source|length > 0 %}
+			<a href="{{ reply.source }}" class="u-repost-of">{{ reply.source }}</a>
+			{% endif %}
+			<a class="u-in-comment-to" href="{{ reply.target }}"></a>
+		</footer>
+	</article>
+</section>
+
+{% include 'block_footer.html' %}

M rss.html → rss.html

@@ -9,19 +9,25 @@ xmlns:slash="http://purl.org/rss/1.0/modules/slash/"
 	>
 
 {%- if taxonomy.name -%}
-{%- set title = taxonomy.name ~ ' | ' ~ site.name -%}
+{%- set title = taxonomy.name ~ ' | ' ~ site.title -%}
 {%- else -%}
-{%- set title = site.name -%}
+{%- set title = site.title -%}
 {%- endif -%}
 
 <channel>
 	<title>{{ title }}</title>
-	<atom:link href="{{ site.url}}{{ taxonomy.url }}feed" rel="self" type="application/rss+xml" />
-	<link>{{ site.url}}{{ taxonomy.url }}feed</link>
+	<atom:link href="{{ site.url}}{{ taxonomy.url }}feed/" rel="self" type="application/rss+xml" />
+	<link>{{ site.url }}{{ taxonomy.url }}feed/</link>
 	<description>{{ description }}</description>
 	<language>{{ site.lang }}</language>
 	<sy:updatePeriod>daily</sy:updatePeriod>
 	<sy:updateFrequency>1</sy:updateFrequency>
+	{% if taxonomy.url|length > 0 %}
+	<!-- PubSubHubbub Discovery -->
+	<link rel="hub"  href="{{ site.websuburl }}" xmlns="http://www.w3.org/2005/Atom" />
+	<link rel="self" href="{{ site.url }}{{ taxonomy.url }}feed/" xmlns="http://www.w3.org/2005/Atom" />
+	<!-- End Of PubSubHubbub Discovery -->
+	{% endif %}
 
 {% for post in posts %}
 	<item>