Skip to content

Commit 0fc5620

Browse files
eternoendlesseternoendless
committed
Merge pull request vjeantet#117 from nonumeros/master
2 parents dd254e1 + 6332891 commit 0fc5620

File tree

9 files changed

+42
-42
lines changed

9 files changed

+42
-42
lines changed

‎layouts/404.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
{{ if .Site.Menus.main }}
1414
<a class="menu-button" href="#"><span class="burger">&#9776;</span><span class="word">Menu</span></a>
1515
{{else}}
16-
{{ if .Site.Params.RSSLink}}
17-
<a class="menu-button icon-feed" href="{{.Site.Params.RSSLink }}">&nbsp;&nbsp;Subscribe</a>
16+
{{ if .Site.Params.RelPermalink}}
17+
<a class="menu-button icon-feed" href="{{ with .OutputFormats.Get "RSS" }} {{ .RelPermalink }} {{ end }}">&nbsp;&nbsp;Subscribe</a>
1818
{{else}}
19-
<a class="menu-button icon-feed" href="{{ .RSSLink }}">&nbsp;&nbsp;Subscribe</a>
19+
<a class="menu-button icon-feed" href="{{ with .OutputFormats.Get "RSS" }} {{ .RelPermalink }} {{ end }}">&nbsp;&nbsp;Subscribe</a>
2020
{{end}}
2121
{{end}}
2222
</nav>

‎layouts/_default/list.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
{{ if .Site.Menus.main }}
2424
<a class="menu-button" href="#"><span class="burger">&#9776;</span><span class="word">Menu</span></a>
2525
{{else}}
26-
{{ if .Site.Params.RSSLink}}
27-
<a class="menu-button icon-feed" href="{{.Site.Params.RSSLink }}">&nbsp;&nbsp;Subscribe</a>
26+
{{ if .Site.Params.RelPermalink}}
27+
<a class="menu-button icon-feed" href="{{ with .OutputFormats.Get "RSS" }} {{ .RelPermalink }} {{ end }}">&nbsp;&nbsp;Subscribe</a>
2828
{{else}}
29-
<a class="menu-button icon-feed" href="{{ .RSSLink }}">&nbsp;&nbsp;Subscribe</a>
29+
<a class="menu-button icon-feed" href="{{ with .OutputFormats.Get "RSS"}} {{ .RelPermalink }} {{ end }}">&nbsp;&nbsp;Subscribe</a>
3030
{{end}}
3131
{{end}}
3232
</nav>
@@ -58,4 +58,4 @@ <h2 class="page-description">
5858

5959

6060

61-
{{ partial "footer.html" . }}
61+
{{ partial "footer.html" . }}

‎layouts/page/cover.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
{{ if .Site.Menus.main }}
2020
<a class="menu-button" href="#"><span class="burger">&#9776;</span><span class="word">Menu</span></a>
2121
{{else}}
22-
{{ if .Site.Params.RSSLink}}
23-
<a class="menu-button icon-feed" href="{{.Site.Params.RSSLink }}">&nbsp;&nbsp;Subscribe</a>
22+
{{ if .Site.Params.RelPermalink}}
23+
<a class="menu-button icon-feed" href="{{ with .OutputFormats.Get "RSS" }}{{ .RelPermalink }} {{ end }}">&nbsp;&nbsp;Subscribe</a>
2424
{{else}}
25-
<a class="menu-button icon-feed" href="{{ .RSSLink }}">&nbsp;&nbsp;Subscribe</a>
25+
<a class="menu-button icon-feed" href="{{ with .OutputFormats.Get "RSS" }} {{ .RelPermalink }} {{ end }}">&nbsp;&nbsp;Subscribe</a>
2626
{{end}}
2727
{{end}}
2828
</nav>
@@ -79,15 +79,15 @@ <h2 class="page-description">
7979
{{if or ($currentNode.IsMenuCurrent "main" .) ($currentNode.HasMenuCurrent "main" .)}}
8080
{{ range .Children }}
8181
<ul>
82-
<li><a href="{{.URL}}">{{.Name}}</a>
82+
<li><a href="{{.Permalink}}">{{.Name}}</a>
8383
{{ if .HasChildren }}
8484
<ul>
8585
{{ range .Children }}
86-
<li><a href="{{.URL}}">{{.Name}}</a>
86+
<li><a href="{{.Permalink}}">{{.Name}}</a>
8787
{{ if .HasChildren }}
8888
<ul>
8989
{{ range .Children }}
90-
<li><a href="{{.URL}}">{{ .Name }}</a></li>
90+
<li><a href="{{.Permalink}}">{{ .Name }}</a></li>
9191
{{ end }}
9292
</ul>
9393
{{ end }}

‎layouts/page/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
{{ if .Site.Menus.main }}
1818
<a class="menu-button" href="#"><span class="burger">&#9776;</span><span class="word">Menu</span></a>
1919
{{else}}
20-
{{ if .Site.Params.RSSLink}}
21-
<a class="menu-button icon-feed" href="{{.Site.Params.RSSLink }}">&nbsp;&nbsp;Subscribe</a>
20+
{{ if .Site.Params.RelPermalink}}
21+
<a class="menu-button icon-feed" href="{{ with .OutputFormats.Get "RSS" }} {{ .RelPermalink }} {{ end }}">&nbsp;&nbsp;Subscribe</a>
2222
{{else}}
23-
<a class="menu-button icon-feed" href="{{ .RSSLink }}">&nbsp;&nbsp;Subscribe</a>
23+
<a class="menu-button icon-feed" href="{{ with .OutputFormats.Get "RSS"}} {{ .RelPermalink }} {{ end }}">&nbsp;&nbsp;Subscribe</a>
2424
{{end}}
2525
{{end}}
2626
</nav>

‎layouts/page/list.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
{{ if .Site.Menus.main }}
2323
<a class="menu-button" href="#"><span class="burger">&#9776;</span><span class="word">Menu</span></a>
2424
{{else}}
25-
{{ if .Site.Params.RSSLink}}
26-
<a class="menu-button icon-feed" href="{{.Site.Params.RSSLink }}">&nbsp;&nbsp;Subscribe</a>
25+
{{ if .Site.Params.RelPermalink}}
26+
<a class="menu-button icon-feed" href="{{ with .OutputFormats.Get "RSS" }} {{ .RelPermalink }} {{ end }}">&nbsp;&nbsp;Subscribe</a>
2727
{{else}}
28-
<a class="menu-button icon-feed" href="{{ .RSSLink }}">&nbsp;&nbsp;Subscribe</a>
28+
<a class="menu-button icon-feed" href="{{ with .OutputFormats.Get "RSS"}} {{ .RelPermalink }} {{ end }}">&nbsp;&nbsp;Subscribe</a>
2929
{{end}}
3030
{{end}}
3131
</nav>
@@ -57,4 +57,4 @@ <h2 class="page-description">
5757

5858

5959

60-
{{ partial "footer.html" . }}
60+
{{ partial "footer.html" . }}

‎layouts/page/single.html

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
{{ if .Site.Menus.main }}
2121
<a class="menu-button" href="#"><span class="burger">&#9776;</span><span class="word">Menu</span></a>
2222
{{else}}
23-
{{ if .Site.Params.RSSLink}}
24-
<a class="menu-button icon-feed" href="{{.Site.Params.RSSLink }}">&nbsp;&nbsp;Subscribe</a>
23+
{{ if .Site.Params.RelPermalink}}
24+
<a class="menu-button icon-feed" href="{{ with .OutputFormats.Get "RSS" }} {{ .RelPermalink }} {{ end }}">&nbsp;&nbsp;Subscribe</a>
2525
{{else}}
26-
<a class="menu-button icon-feed" href="{{ .RSSLink }}">&nbsp;&nbsp;Subscribe</a>
26+
<a class="menu-button icon-feed" href="{{ with .OutputFormats.Get "RSS" }} {{ .RelPermalink }} {{ end }}">&nbsp;&nbsp;Subscribe</a>
2727
{{end}}
2828
{{end}}
2929
</nav>
@@ -57,15 +57,15 @@ <h2 class="page-description">
5757
{{ $currentNode := . }}
5858
{{ range .Site.Menus.main }}
5959
{{if or ($currentNode.IsMenuCurrent "main" .) ($currentNode.HasMenuCurrent "main" .)}}
60-
<li><a href="{{.URL}}">{{.Name}}</a></li>
60+
<li><a href="{{.Permalink}}">{{.Name}}</a></li>
6161
{{ range .Children }}
6262
{{ if .HasChildren }}
6363
{{if or ($currentNode.IsMenuCurrent "main" .) ($currentNode.HasMenuCurrent "main" .)}}
64-
<li><a href="{{.URL}}">{{.Name}}</a></li>
64+
<li><a href="{{.Permalink}}">{{.Name}}</a></li>
6565
{{ range .Children }}
6666
{{ if .HasChildren }}
6767
{{if or ($currentNode.IsMenuCurrent "main" .) ($currentNode.HasMenuCurrent "main" .)}}
68-
<li><a href="{{.URL}}">{{.Name}}</a></li>
68+
<li><a href="{{.Permalink}}">{{.Name}}</a></li>
6969
{{end}}
7070
{{end}}
7171
{{end}}
@@ -106,7 +106,7 @@ <h1 class="post-title">{{.Title}}</h1>
106106
<!-- Children contents -->
107107

108108
{{ range .Menus.main.Children }}
109-
<li><a href="{{.URL}}" >{{ .Name }}</a></li>
109+
<li><a href="{{.Permalink}}" >{{ .Name }}</a></li>
110110
{{ end }}
111111

112112
</ul>
@@ -122,15 +122,15 @@ <h1 class="post-title">{{.Title}}</h1>
122122
{{if or ($currentNode.IsMenuCurrent "main" .) ($currentNode.HasMenuCurrent "main" .)}}
123123
{{ range .Children }}
124124
<ul>
125-
<li><a href="{{.URL}}">{{.Name}}</a>
125+
<li><a href="{{.Permalink}}">{{.Name}}</a>
126126
{{ if .HasChildren }}
127127
<ul>
128128
{{ range .Children }}
129-
<li><a href="{{.URL}}">{{.Name}}</a>
129+
<li><a href="{{.Permalink}}">{{.Name}}</a>
130130
{{ if .HasChildren }}
131131
<ul>
132132
{{ range .Children }}
133-
<li><a href="{{.URL}}">{{ .Name }}</a></li>
133+
<li><a href="{{.Permalink}}">{{ .Name }}</a></li>
134134
{{ end }}
135135
</ul>
136136
{{ end }}

‎layouts/partials/header.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
{{ partial "twitter_card.html" . }}
99

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

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

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

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

67-
{{ if .Site.Params.RSSLink}}
68-
<link href="{{.Site.Params.RSSLink }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" />
67+
{{ if .Site.Params.RelPermalink}}
68+
<link href="{{ with .OutputFormats.Get "RSS" }} {{ .RelPermalink }} {{ end }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" />
6969
{{else}}
70-
{{ if ne .URL "/" }}
70+
{{ if ne .Permalink "/" }}
7171
<link href="{{ "index.xml" | relURL}}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" />
7272
{{ end }}
7373
{{if .IsNode}}
74-
<link href="{{.RSSLink}}" rel="alternate" type="application/rss+xml" title="{{ if ne .URL "/" }}{{ .Title }} &middot; {{ end }}{{ .Site.Title }}" />
74+
<link href="{{ with .OutputFormats.Get "RSS" }} {{ .RelPermalink }} {{ end }}" rel="alternate" type="application/rss+xml" title="{{ if ne .RelPermalink "/" }}{{ .Title }} &middot; {{ end }}{{ .Site.Title }}" />
7575
{{end}}
7676
{{end}}
77-
{{.Hugo.Generator}}
77+
{{hugo.Generator}}
7878

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

‎layouts/partials/navigation.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ <h3 class="nav-title">Menu</h3>
1515
{{end}}
1616
</ul>
1717

18-
{{ if .Site.Params.RSSLink}}
19-
<a class="subscribe-button icon-feed" href="{{.Site.Params.RSSLink }}">Subscribe</a> </div>
18+
{{ if .Site.Params.RelPermalink}}
19+
<a class="subscribe-button icon-feed" href="{{ with .OutputFormats.Get "RSS" }} {{ .RelPermalink }} {{ end }}">Subscribe</a> </div>
2020
{{else}}
21-
<a class="subscribe-button icon-feed" href="{{if .IsNode}}{{.RSSLink}}{{else}}{{"index.xml" | relURL}}{{end}}">Subscribe</a>
21+
<a class="subscribe-button icon-feed" href="{{if .IsNode}}{{ with .OutputFormats.Get "RSS" }} {{ .Permalink }} {{ end }}{{else}}{{"index.xml" | relURL}}{{end}}">Subscribe</a>
2222
{{end}}
2323
</div>
2424
<span class="nav-cover"></span>

‎layouts/partials/pagination.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<nav class="pagination" role="navigation">
22
{{if .HasPrev}}
3-
<a class="newer-posts" href="{{ .Prev.URL }}">&larr; Newer Posts</a>
3+
<a class="newer-posts" href="{{ .Prev.Permalink }}">&larr; Newer Posts</a>
44
{{end}}
55
<span class="page-number">Page {{ .PageNumber }} of {{.TotalPages}}</span>
66
{{if .HasNext}}
7-
<a class="older-posts" href="{{ .Next.URL }}">Older Posts &rarr;</a>
7+
<a class="older-posts" href="{{ .Next.Permalink }}">Older Posts &rarr;</a>
88
{{end}}
99
</nav>

0 commit comments

Comments
 (0)