diff options
| author | syui <syui@syui.cf> | 2019-08-18 14:01:01 +0300 |
|---|---|---|
| committer | syui <syui@syui.cf> | 2019-08-18 14:01:01 +0300 |
| commit | 1250495d730e6835a74e5349ac836e18f3a78bb8 (patch) | |
| tree | c6c6028f5fb53fd9d79b0a6056854c3d12654771 | |
| parent | 1d9d2065cc47544f2e2be6b315a9184fd4c33095 (diff) | |
| -rw-r--r-- | layouts/_default/list.html | 38 | ||||
| -rw-r--r-- | layouts/archive/single.html | 2 | ||||
| -rw-r--r-- | layouts/partials/article_first.html | 4 | ||||
| -rw-r--r-- | layouts/partials/article_footer.html | 2 | ||||
| -rw-r--r-- | layouts/partials/article_list.html | 4 | ||||
| -rw-r--r-- | layouts/partials/head.html | 6 | ||||
| -rw-r--r-- | layouts/partials/navbar-icon.html | 2 | ||||
| -rw-r--r-- | layouts/partials/profile.html | 2 |
8 files changed, 30 insertions, 30 deletions
diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 81eb49b..328ef8e 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -2,25 +2,25 @@ <div id="container"> <div class="outer"> - <section id="main"> - <section class="archives-wrap"> - <div class="archive-category-wrap"> - <span class="archive-category">{{ .Title }}</span> - </div> - <div class="archives"> - {{ $pages := .Pages }} - {{ if .IsHome }} - {{ $pages = .Site.RegularPages }} - {{ end }} - {{ $paginator := .Paginate .Data.Site.RegularPages }} - {{ range $paginator.Pages }} - {{ .Render "summary" }} - {{ end }} - </div> - </section> - {{ partial "pagination" . }} - </section> - {{ partial "sidebar" . }} + <section id="main"> + <section class="archives-wrap"> + <div class="archive-category-wrap"> + <span class="archive-category">{{ .Title }}</span> + </div> + <div class="archives"> + {{ $pages := .Pages }} + {{ if .IsHome }} + {{ $pages = .Site.RegularPages }} + {{ end }} + {{ $paginator := .Paginate $pages }} + {{ range $paginator.Pages }} + {{ .Render "summary" }} + {{ end }} + </div> + </section> + {{ partial "pagination" . }} + </section> + {{ partial "sidebar" . }} </div> </div> diff --git a/layouts/archive/single.html b/layouts/archive/single.html index 9a657c7..0a5b016 100644 --- a/layouts/archive/single.html +++ b/layouts/archive/single.html @@ -24,7 +24,7 @@ </script> <div id="blog-archives" class="category"> {{ .Content }} - {{ range (where .Site.Pages "Type" "post") }} + {{ range (where .Site.RegularPages "Type" "post") }} <h1> <time datetime="{{ .Date }}" itemprop="datePublished">{{ .Date.Format "2006-01-02" }}</time> <a href="{{ .Permalink }}" title="{{ .Title }}">{{ .Title }}</a> diff --git a/layouts/partials/article_first.html b/layouts/partials/article_first.html index dfa73c0..deae401 100644 --- a/layouts/partials/article_first.html +++ b/layouts/partials/article_first.html @@ -8,4 +8,6 @@ </p> </div> - <div class="rss-right"><a href="{{ .RSSLink }}"><i class="fa fa-rss-square fa-lg"></i></a></div> +<!-- + <div class="rss-right"><a href="{{ .RelPermalink }}"><i class="fa fa-rss-square fa-lg"></i></a></div> +--> diff --git a/layouts/partials/article_footer.html b/layouts/partials/article_footer.html index 91f5892..fccf02d 100644 --- a/layouts/partials/article_footer.html +++ b/layouts/partials/article_footer.html @@ -10,7 +10,7 @@ <footer class="article-footer"> <!-- - <a data-url="{{ .Permalink }}" data-id="{{ .UniqueID }}" class="article-share-link"> + <a data-url="{{ .Permalink }}" data-id="{{ .File.UniqueID }}" class="article-share-link"> {{with .Site.Data.l10n.articles.share}}{{.}}{{end}} </a> --> diff --git a/layouts/partials/article_list.html b/layouts/partials/article_list.html index 6dc7f8b..9875767 100644 --- a/layouts/partials/article_list.html +++ b/layouts/partials/article_list.html @@ -6,9 +6,9 @@ {{ end }} {{ $paginator := .Paginate $pages }} <!-- - {{ $paginator := .Paginate (where .Site.Pages "Type" "post") }} + {{ $paginator := .Paginate (where .Site.RegularPages "Type" "post") }} --> - {{ range $paginator.Pages }} + {{ range $paginator.Pages }} <article class="article article-type-post" itemscope="" itemprop="blogPost"> <div class="article-inner"> diff --git a/layouts/partials/head.html b/layouts/partials/head.html index d433d09..2ca1c50 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -2,7 +2,6 @@ <html lang="{{ with .Site.LanguageCode }}{{ . }}{{ else }}en-US{{ end }}"> <head> <title>{{ .Title }}</title> - {{ .Hugo.Generator }} <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no"> {{ with .Site.Params.author }} @@ -41,9 +40,8 @@ <link rel="stylesheet" href="{{ .Site.BaseURL }}css/mobile.css" /> <link rel="stylesheet" href="{{ .Site.BaseURL }}bower_components/cal-heatmap/cal-heatmap.css" /> - {{ if .RSSLink }} - <link rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" href="{{ .RSSLink }}"/> - <link rel="feed" type="application/rss+xml" title="{{ .Site.Title }}" href="{{ .RSSLink }}" /> + {{ with .OutputFormats.Get "RSS" }}{{ .RelPermalink }} + {{ printf `<link rel="%s" type="%s" href="%s" title="%s" />` .Rel .MediaType.Type .Permalink $.Site.Title | safeHTML }} {{ end }} <!-- diff --git a/layouts/partials/navbar-icon.html b/layouts/partials/navbar-icon.html index 4563447..1fe217a 100644 --- a/layouts/partials/navbar-icon.html +++ b/layouts/partials/navbar-icon.html @@ -16,7 +16,7 @@ </li> <li> - <a href="{{ .RSSLink }}"> + <a href="{{ .RelPermalink }}"> <i class="fa fa-rss-square" aria-hidden="true"></i> </a> </li> diff --git a/layouts/partials/profile.html b/layouts/partials/profile.html index 288bf5a..02a21b7 100644 --- a/layouts/partials/profile.html +++ b/layouts/partials/profile.html @@ -28,7 +28,7 @@ <table class="contact-list"> <tr> {{ partial "social" . }} - <td><a href="{{ .RSSLink }}" target="_blank" title="RSS"><i class="fa fa-rss"></i></a></td> + <td><a href="{{ .RelPermalink }}" target="_blank" title="RSS"><i class="fa fa-rss"></i></a></td> </tr> </table> </div> |