Skip to content

v0.55 .URL deprecated,.RSSLink deprecated,use hugo global function #117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

v0.55 .URL deprecated,.RSSLink deprecated,use hugo global function #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions layouts/404.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
{{ if .Site.Menus.main }}
<a class="menu-button" href="#"><span class="burger">&#9776;</span><span class="word">Menu</span></a>
{{else}}
{{ if .Site.Params.RSSLink}}
<a class="menu-button icon-feed" href="{{.Site.Params.RSSLink }}">&nbsp;&nbsp;Subscribe</a>
{{ if .Site.Params.RelPermalink}}
<a class="menu-button icon-feed" href="{{ with .OutputFormats.Get "RSS" }} {{ .RelPermalink }} {{ end }}">&nbsp;&nbsp;Subscribe</a>
{{else}}
<a class="menu-button icon-feed" href="{{ .RSSLink }}">&nbsp;&nbsp;Subscribe</a>
<a class="menu-button icon-feed" href="{{ with .OutputFormats.Get "RSS" }} {{ .RelPermalink }} {{ end }}">&nbsp;&nbsp;Subscribe</a>
{{end}}
{{end}}
</nav>
Expand Down
8 changes: 4 additions & 4 deletions layouts/_default/list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
{{ if .Site.Menus.main }}
<a class="menu-button" href="#"><span class="burger">&#9776;</span><span class="word">Menu</span></a>
{{else}}
{{ if .Site.Params.RSSLink}}
<a class="menu-button icon-feed" href="{{.Site.Params.RSSLink }}">&nbsp;&nbsp;Subscribe</a>
{{ if .Site.Params.RelPermalink}}
<a class="menu-button icon-feed" href="{{ with .OutputFormats.Get "RSS" }} {{ .RelPermalink }} {{ end }}">&nbsp;&nbsp;Subscribe</a>
{{else}}
<a class="menu-button icon-feed" href="{{ .RSSLink }}">&nbsp;&nbsp;Subscribe</a>
<a class="menu-button icon-feed" href="{{ with .OutputFormats.Get "RSS"}} {{ .RelPermalink }} {{ end }}">&nbsp;&nbsp;Subscribe</a>
{{end}}
{{end}}
</nav>
Expand Down Expand Up @@ -58,4 +58,4 @@ <h2 class="page-description">



{{ partial "footer.html" . }}
{{ partial "footer.html" . }}
12 changes: 6 additions & 6 deletions layouts/page/cover.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
{{ if .Site.Menus.main }}
<a class="menu-button" href="#"><span class="burger">&#9776;</span><span class="word">Menu</span></a>
{{else}}
{{ if .Site.Params.RSSLink}}
<a class="menu-button icon-feed" href="{{.Site.Params.RSSLink }}">&nbsp;&nbsp;Subscribe</a>
{{ if .Site.Params.RelPermalink}}
<a class="menu-button icon-feed" href="{{ with .OutputFormats.Get "RSS" }}{{ .RelPermalink }} {{ end }}">&nbsp;&nbsp;Subscribe</a>
{{else}}
<a class="menu-button icon-feed" href="{{ .RSSLink }}">&nbsp;&nbsp;Subscribe</a>
<a class="menu-button icon-feed" href="{{ with .OutputFormats.Get "RSS" }} {{ .RelPermalink }} {{ end }}">&nbsp;&nbsp;Subscribe</a>
{{end}}
{{end}}
</nav>
Expand Down Expand Up @@ -79,15 +79,15 @@ <h2 class="page-description">
{{if or ($currentNode.IsMenuCurrent "main" .) ($currentNode.HasMenuCurrent "main" .)}}
{{ range .Children }}
<ul>
<li><a href="{{.URL}}">{{.Name}}</a>
<li><a href="{{.Permalink}}">{{.Name}}</a>
{{ if .HasChildren }}
<ul>
{{ range .Children }}
<li><a href="{{.URL}}">{{.Name}}</a>
<li><a href="{{.Permalink}}">{{.Name}}</a>
{{ if .HasChildren }}
<ul>
{{ range .Children }}
<li><a href="{{.URL}}">{{ .Name }}</a></li>
<li><a href="{{.Permalink}}">{{ .Name }}</a></li>
{{ end }}
</ul>
{{ end }}
Expand Down
6 changes: 3 additions & 3 deletions layouts/page/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
{{ if .Site.Menus.main }}
<a class="menu-button" href="#"><span class="burger">&#9776;</span><span class="word">Menu</span></a>
{{else}}
{{ if .Site.Params.RSSLink}}
<a class="menu-button icon-feed" href="{{.Site.Params.RSSLink }}">&nbsp;&nbsp;Subscribe</a>
{{ if .Site.Params.RelPermalink}}
<a class="menu-button icon-feed" href="{{ with .OutputFormats.Get "RSS" }} {{ .RelPermalink }} {{ end }}">&nbsp;&nbsp;Subscribe</a>
{{else}}
<a class="menu-button icon-feed" href="{{ .RSSLink }}">&nbsp;&nbsp;Subscribe</a>
<a class="menu-button icon-feed" href="{{ with .OutputFormats.Get "RSS"}} {{ .RelPermalink }} {{ end }}">&nbsp;&nbsp;Subscribe</a>
{{end}}
{{end}}
</nav>
Expand Down
8 changes: 4 additions & 4 deletions layouts/page/list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
{{ if .Site.Menus.main }}
<a class="menu-button" href="#"><span class="burger">&#9776;</span><span class="word">Menu</span></a>
{{else}}
{{ if .Site.Params.RSSLink}}
<a class="menu-button icon-feed" href="{{.Site.Params.RSSLink }}">&nbsp;&nbsp;Subscribe</a>
{{ if .Site.Params.RelPermalink}}
<a class="menu-button icon-feed" href="{{ with .OutputFormats.Get "RSS" }} {{ .RelPermalink }} {{ end }}">&nbsp;&nbsp;Subscribe</a>
{{else}}
<a class="menu-button icon-feed" href="{{ .RSSLink }}">&nbsp;&nbsp;Subscribe</a>
<a class="menu-button icon-feed" href="{{ with .OutputFormats.Get "RSS"}} {{ .RelPermalink }} {{ end }}">&nbsp;&nbsp;Subscribe</a>
{{end}}
{{end}}
</nav>
Expand Down Expand Up @@ -57,4 +57,4 @@ <h2 class="page-description">



{{ partial "footer.html" . }}
{{ partial "footer.html" . }}
20 changes: 10 additions & 10 deletions layouts/page/single.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
{{ if .Site.Menus.main }}
<a class="menu-button" href="#"><span class="burger">&#9776;</span><span class="word">Menu</span></a>
{{else}}
{{ if .Site.Params.RSSLink}}
<a class="menu-button icon-feed" href="{{.Site.Params.RSSLink }}">&nbsp;&nbsp;Subscribe</a>
{{ if .Site.Params.RelPermalink}}
<a class="menu-button icon-feed" href="{{ with .OutputFormats.Get "RSS" }} {{ .RelPermalink }} {{ end }}">&nbsp;&nbsp;Subscribe</a>
{{else}}
<a class="menu-button icon-feed" href="{{ .RSSLink }}">&nbsp;&nbsp;Subscribe</a>
<a class="menu-button icon-feed" href="{{ with .OutputFormats.Get "RSS" }} {{ .RelPermalink }} {{ end }}">&nbsp;&nbsp;Subscribe</a>
{{end}}
{{end}}
</nav>
Expand Down Expand Up @@ -57,15 +57,15 @@ <h2 class="page-description">
{{ $currentNode := . }}
{{ range .Site.Menus.main }}
{{if or ($currentNode.IsMenuCurrent "main" .) ($currentNode.HasMenuCurrent "main" .)}}
<li><a href="{{.URL}}">{{.Name}}</a></li>
<li><a href="{{.Permalink}}">{{.Name}}</a></li>
{{ range .Children }}
{{ if .HasChildren }}
{{if or ($currentNode.IsMenuCurrent "main" .) ($currentNode.HasMenuCurrent "main" .)}}
<li><a href="{{.URL}}">{{.Name}}</a></li>
<li><a href="{{.Permalink}}">{{.Name}}</a></li>
{{ range .Children }}
{{ if .HasChildren }}
{{if or ($currentNode.IsMenuCurrent "main" .) ($currentNode.HasMenuCurrent "main" .)}}
<li><a href="{{.URL}}">{{.Name}}</a></li>
<li><a href="{{.Permalink}}">{{.Name}}</a></li>
{{end}}
{{end}}
{{end}}
Expand Down Expand Up @@ -106,7 +106,7 @@ <h1 class="post-title">{{.Title}}</h1>
<!-- Children contents -->

{{ range .Menus.main.Children }}
<li><a href="{{.URL}}" >{{ .Name }}</a></li>
<li><a href="{{.Permalink}}" >{{ .Name }}</a></li>
{{ end }}

</ul>
Expand All @@ -122,15 +122,15 @@ <h1 class="post-title">{{.Title}}</h1>
{{if or ($currentNode.IsMenuCurrent "main" .) ($currentNode.HasMenuCurrent "main" .)}}
{{ range .Children }}
<ul>
<li><a href="{{.URL}}">{{.Name}}</a>
<li><a href="{{.Permalink}}">{{.Name}}</a>
{{ if .HasChildren }}
<ul>
{{ range .Children }}
<li><a href="{{.URL}}">{{.Name}}</a>
<li><a href="{{.Permalink}}">{{.Name}}</a>
{{ if .HasChildren }}
<ul>
{{ range .Children }}
<li><a href="{{.URL}}">{{ .Name }}</a></li>
<li><a href="{{.Permalink}}">{{ .Name }}</a></li>
{{ end }}
</ul>
{{ end }}
Expand Down
14 changes: 7 additions & 7 deletions layouts/partials/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

{{ partial "twitter_card.html" . }}

<meta property="og:title" content="{{ if ne .URL "/" }}{{ .Title }} &middot; {{ end }}{{ .Site.Title }}" />
<meta property="og:title" content="{{ if ne .Permalink "/" }}{{ .Title }} &middot; {{ end }}{{ .Site.Title }}" />
<meta property="og:site_name" content="{{ .Site.Title }}" />
<meta property="og:url" content="{{ .Permalink }}" />

Expand All @@ -32,7 +32,7 @@
<meta property="og:description" content="{{ .Site.Params.description }}" />
{{ end }}

<title>{{ if ne .URL "/" }}{{ .Title }} &middot; {{ end }}{{ .Site.Title }}</title>
<title>{{ if ne .Permalink "/" }}{{ .Title }} &middot; {{ end }}{{ .Site.Title }}</title>

{{ if .IsPage }}
<meta name="description" content="{{ .Description | default (substr .Summary 0 160) }}" />
Expand Down Expand Up @@ -64,17 +64,17 @@
<script>hljs.initHighlightingOnLoad();</script>
{{end}}

{{ if .Site.Params.RSSLink}}
<link href="{{.Site.Params.RSSLink }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" />
{{ if .Site.Params.RelPermalink}}
<link href="{{ with .OutputFormats.Get "RSS" }} {{ .RelPermalink }} {{ end }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" />
{{else}}
{{ if ne .URL "/" }}
{{ if ne .Permalink "/" }}
<link href="{{ "index.xml" | relURL}}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" />
{{ end }}
{{if .IsNode}}
<link href="{{.RSSLink}}" rel="alternate" type="application/rss+xml" title="{{ if ne .URL "/" }}{{ .Title }} &middot; {{ end }}{{ .Site.Title }}" />
<link href="{{ with .OutputFormats.Get "RSS" }} {{ .RelPermalink }} {{ end }}" rel="alternate" type="application/rss+xml" title="{{ if ne .RelPermalink "/" }}{{ .Title }} &middot; {{ end }}{{ .Site.Title }}" />
{{end}}
{{end}}
{{.Hugo.Generator}}
{{hugo.Generator}}

<link rel="canonical" href="{{ .Permalink }}" />

Expand Down
6 changes: 3 additions & 3 deletions layouts/partials/navigation.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ <h3 class="nav-title">Menu</h3>
{{end}}
</ul>

{{ if .Site.Params.RSSLink}}
<a class="subscribe-button icon-feed" href="{{.Site.Params.RSSLink }}">Subscribe</a> </div>
{{ if .Site.Params.RelPermalink}}
<a class="subscribe-button icon-feed" href="{{ with .OutputFormats.Get "RSS" }} {{ .RelPermalink }} {{ end }}">Subscribe</a> </div>
{{else}}
<a class="subscribe-button icon-feed" href="{{if .IsNode}}{{.RSSLink}}{{else}}{{"index.xml" | relURL}}{{end}}">Subscribe</a>
<a class="subscribe-button icon-feed" href="{{if .IsNode}}{{ with .OutputFormats.Get "RSS" }} {{ .Permalink }} {{ end }}{{else}}{{"index.xml" | relURL}}{{end}}">Subscribe</a>
{{end}}
</div>
<span class="nav-cover"></span>
4 changes: 2 additions & 2 deletions layouts/partials/pagination.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<nav class="pagination" role="navigation">
{{if .HasPrev}}
<a class="newer-posts" href="{{ .Prev.URL }}">&larr; Newer Posts</a>
<a class="newer-posts" href="{{ .Prev.Permalink }}">&larr; Newer Posts</a>
{{end}}
<span class="page-number">Page {{ .PageNumber }} of {{.TotalPages}}</span>
{{if .HasNext}}
<a class="older-posts" href="{{ .Next.URL }}">Older Posts &rarr;</a>
<a class="older-posts" href="{{ .Next.Permalink }}">Older Posts &rarr;</a>
{{end}}
</nav>