1 files changed, 21 insertions, 34 deletions
diff --git a/themes/default/layouts/_default/summary.html b/themes/default/layouts/_default/summary.html
index 4e47898..e820b24 100644
--- a/themes/default/layouts/_default/summary.html
+++ b/themes/default/layouts/_default/summary.html
@@ -1,35 +1,22 @@
-<micro-card {{ if .Weight }}pinned{{ end }} id="{{ partial "card-id.html" . }}">
-  {{ if .ExpiryDate }}<micro-expires>{{ end }}
-    <micro-summary {{ if .Draft }}draft{{ end }} title="{{- partial "title.html" . -}}">
-      <micro-thumbnail>
-        {{ partial "profile-picture.html" . }}
-      </micro-thumbnail>
-      <micro-content>
-        <micro-metadata>
-          {{ partial "card-meta.html" . }}
-        </micro-metadata>
-          {{ if .Params.unsafe }}
-            <micro-unsafe>
-            <details>
-              <summary>
-                {{ safeHTML (readFile (print (partial "function-paths-static.html") "/icons/feather/alert-circle.svg")) }}
-                <span>Danger: Unsafe Content. <b><u>Click here</u></b> to show/hide</span>
-              </summary>
-            </details>
-            <micro-unsafe-content>
-          {{ end }}
-            {{-
-              .Content |
-               replaceRE "<p>\n<figure>" "<figure>" |
-               replaceRE "</figure></p>" "</figure>" |
-               safeHTML
-            -}}
-          {{ if .Params.unsafe }}
-            </micro-unsafe-content>
-            </micro-unsafe>
-          {{ end }}
-          <micro-tags>{{ partial "tags.html" . }}</micro-tags>
-      </micro-content>
-    </micro-summary>
-  {{ if .ExpiryDate }}</micro-expires>{{ end }}
+{{- $href := or .Params.Feed.link .Permalink -}}
+{{- $content := partial "function-content.html" . | safeHTML -}}
+{{- $expired := and .ExpiryDate (ge now.Unix .ExpiryDate.Unix) -}}
+
+<micro-card
+  id="{{ partial "card-id.html" . }}"
+  {{ if .Weight }}pinned{{ end }}
+  {{ if .Draft }}draft{{ end }}
+  {{ if .ExpiryDate }}data-expires{{ end }}
+>
+  <a href="{{ $href }}"></a>
+  <header>
+    {{ partial "profile-picture.html"  . }}
+    {{ partial "card-meta-header.html" . }}
+  </header>
+  <article aria-label="article">
+    {{- $content -}}
+    <micro-tags>
+      {{- partial "tags.html" (dict "Format" "page" "Context" .) -}}
+    </micro-tags>
+  </article>
 </micro-card>