diff options
-rw-r--r-- | assets/templates/markdown-feed.yaml | 22 | ||||
-rw-r--r-- | assets/templates/markdown.yaml | 9 | ||||
-rw-r--r-- | themes/default/layouts/partials/card-meta.html | 10 | ||||
-rw-r--r-- | themes/default/layouts/partials/context-profile.html | 17 | ||||
-rw-r--r-- | themes/default/layouts/partials/feeds-generate.html | 19 | ||||
-rw-r--r-- | themes/default/layouts/partials/meta-date-time.html | 2 | ||||
-rw-r--r-- | themes/default/layouts/partials/meta-handle.html | 2 | ||||
-rw-r--r-- | themes/default/layouts/partials/meta-name.html | 9 | ||||
-rw-r--r-- | themes/default/layouts/partials/meta-source.html | 2 |
9 files changed, 60 insertions, 32 deletions
diff --git a/assets/templates/markdown-feed.yaml b/assets/templates/markdown-feed.yaml new file mode 100644 index 0000000..afb8c8a --- /dev/null +++ b/assets/templates/markdown-feed.yaml @@ -0,0 +1,22 @@ +--- +{{ range $key, $value := . -}} +{{- if or + (eq $key "date") + (eq $key "tags") +-}} +{{- $key }}: {{ $value }} +{{ end -}} +{{ end -}} +feed: +{{ range $key, $value := . -}} +{{- if and + (ne $key "content") + (ne $key "date") + (ne $key "tags") +-}} +{{ print " " }}{{- $key }}: {{ $value }} +{{ end -}} +{{ end -}} +--- + +{{ .content }} diff --git a/assets/templates/markdown.yaml b/assets/templates/markdown.yaml index 109f5a1..e69de29 100644 --- a/assets/templates/markdown.yaml +++ b/assets/templates/markdown.yaml @@ -1,9 +0,0 @@ ---- -{{ range $key, $value := . -}} -{{- if ne $key "content" -}} -{{- $key }}: {{ $value }} -{{ end -}} -{{- end -}} ---- - -{{ .content }} diff --git a/themes/default/layouts/partials/card-meta.html b/themes/default/layouts/partials/card-meta.html index 23219e7..b3e3f8e 100644 --- a/themes/default/layouts/partials/card-meta.html +++ b/themes/default/layouts/partials/card-meta.html @@ -23,15 +23,7 @@ </anchored-entry> {{ end }} - <h2> - <b> - {{- with .Params.feedName -}} - {{ . }} - {{- else -}} - {{ partial "author-name.html" . }} - {{- end -}} - </b> - </h2> + {{- partial "meta-name.html" . -}} · {{ partial "meta-handle.html" . }} diff --git a/themes/default/layouts/partials/context-profile.html b/themes/default/layouts/partials/context-profile.html index 056009c..4124a8b 100644 --- a/themes/default/layouts/partials/context-profile.html +++ b/themes/default/layouts/partials/context-profile.html @@ -5,7 +5,11 @@ <div> <aside> <figure> + {{- with .Params.feed.name -}} + <a title="{{ . }}" href="http://{{ $.Params.feed.domain }}"> + {{- else -}} <a title="{{ $author.name }}" href="{{ .Site.BaseURL }}/{{ $author.user }}"> + {{- end -}} <picture> <img alt="{{ $author.name }}" src="{{ .Site.BaseURL }}/{{ $author.user }}/media/profile/picture.png" /> </picture> @@ -13,10 +17,19 @@ </figure> </aside> <aside> - <h2>{{ $author.name }}</h2> - <p>@{{ $author.user }}</p> + {{- with .Params.feed.name -}} + <h2>{{ . }}</h2> + <p>@{{ $.Params.feed.domain }}</p> + {{- else -}} + <h2>{{ $author.name }}</h2> + <p>@{{ $author.user }}</p> + {{- end -}} </aside> </div> + {{- with .Params.feed.description -}} + <p>{{ . }}</p> + {{- else -}} <p>{{- $author.description | markdownify -}}</p> + {{- end -}} </context-menu> </context-profile> diff --git a/themes/default/layouts/partials/feeds-generate.html b/themes/default/layouts/partials/feeds-generate.html index 24ed9a8..2f0e0bd 100644 --- a/themes/default/layouts/partials/feeds-generate.html +++ b/themes/default/layouts/partials/feeds-generate.html @@ -101,20 +101,21 @@ {{ end }} {{ range $feeds }} - {{ $template := resources.Get "templates/markdown.yaml" }} + {{ $template := resources.Get "templates/markdown-feed.yaml" }} {{ $name := urlize (replace .FeedTitle "/" "-") }} {{ $path := print "/data/generates/content/" $author.user "/feeds/" $name ".md" }} {{ $markdown := resources.ExecuteAsTemplate $path (dict - "content" (print (or .FeedDescription .FeedTitle) ".") - "date" .FeedDateTime - "tags" "[rss]" - "feedName" .FeedName - "feedDomain" .FeedSourceDomain - "feedLink" .FeedLink - "feedSelf" (print $author.user "/feeds/" $name "/") - "feedRaw" (strings.TrimLeft "/" $path) + "content" (print (or .FeedDescription .FeedTitle) ".") + "date" .FeedDateTime + "description" .FeedSourceTitle + "domain" .FeedSourceDomain + "link" .FeedLink + "name" .FeedName + "raw" (strings.TrimLeft "/" $path) + "self" (print $author.user "/feeds/" $name "/") + "tags" "[rss]" ) $template }} diff --git a/themes/default/layouts/partials/meta-date-time.html b/themes/default/layouts/partials/meta-date-time.html index 2c73bc2..0d63096 100644 --- a/themes/default/layouts/partials/meta-date-time.html +++ b/themes/default/layouts/partials/meta-date-time.html @@ -1,6 +1,6 @@ {{- $author := index .Site.Data.authors ((or .Params.author .Site.Author.default.user) | default "default") -}} -{{- with .Params.feedSelf -}} +{{- with .Params.feed.self -}} <a href="{{ $.Site.BaseURL }}/{{ . }}"> {{ else }} <a href="{{ .Site.BaseURL }}/{{ $author.user }}/messages/{{ path.Base .Permalink }}#{{ partial "card-id.html" . }}"> diff --git a/themes/default/layouts/partials/meta-handle.html b/themes/default/layouts/partials/meta-handle.html index b9da43b..aa1ea53 100644 --- a/themes/default/layouts/partials/meta-handle.html +++ b/themes/default/layouts/partials/meta-handle.html @@ -1,4 +1,4 @@ -{{- with .Params.feedDomain -}} +{{- with .Params.feed.domain -}} <a title="{{ . }}" href="http://{{ . }}"> diff --git a/themes/default/layouts/partials/meta-name.html b/themes/default/layouts/partials/meta-name.html new file mode 100644 index 0000000..eb5990f --- /dev/null +++ b/themes/default/layouts/partials/meta-name.html @@ -0,0 +1,9 @@ +<h2> + <b> + {{- with .Params.feed.name -}} + {{ . }} + {{- else -}} + {{ partial "author-name.html" . }} + {{- end -}} + </b> +</h2> diff --git a/themes/default/layouts/partials/meta-source.html b/themes/default/layouts/partials/meta-source.html index a2099e2..024ec26 100644 --- a/themes/default/layouts/partials/meta-source.html +++ b/themes/default/layouts/partials/meta-source.html @@ -2,7 +2,7 @@ {{- $source := print $author.user "/messages/" .File.LogicalName -}} <cite> -{{- with .Params.feedRaw -}} +{{- with .Params.feed.raw -}} <a title="{{ $.Site.BaseURL }}/{{ . }}" href="{{ $.Site.BaseURL }}/{{ . }}"> {{- else -}} <a title="{{ .Site.BaseURL }}/raw/{{ $source }}" href="{{ .Site.BaseURL }}/raw/{{ $source }}"> |