istio
/
istio.io
mirror of https://github.com/istio/istio.io.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace uses of the deprecated .URL field with .Permalink. (#2530)

This commit is contained in:
Martin Taillefer 2018-09-05 16:14:12 -07:00 committed by GitHub
parent fb54fb0268
commit 7e6a8924bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
layouts/faqlanding/list.html
View File

@ -16,7 +16,7 @@
<div class="card-body">
{{ $questions := .Resources.ByType "page" }}
{{ $sorted_questions := sort $questions ".Params.weight" }}
{{ $url := .URL }}
{{ $url := .Permalink }}
{{ range $q := $sorted_questions }}
<a href="{{ $url }}#{{ $q.File.BaseFileName | urlize }}">{{ $q.Title }}</a><br/>
{{ end }}

2
layouts/opslanding/list.html
View File

@ -16,7 +16,7 @@
<div class="card-body">
{{ $questions := .Resources.ByType "page" }}
{{ $sorted_questions := sort $questions ".Params.weight" }}
{{ $url := .URL }}
{{ $url := .Permalink }}
{{ range $q := $sorted_questions }}
<a href="{{ $url }}#{{ $q.File.BaseFileName | urlize }}">{{ $q.Title }}</a><br/>
{{ end }}

10
layouts/partials/header.html
View File

@ -5,7 +5,7 @@
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark justify-content-between">
{{ $home := .Site.GetPage "home" }}
<a class="navbar-brand" href="{{ $home.URL }}">
<a class="navbar-brand" href="{{ $home.Permalink }}">
<span class="logo">{{ partial "icons/istio-logo-blue-background-round.svg" }}</span>
{{ if .Site.Data.args.archive }}
@ -26,23 +26,23 @@
<ul id="navbar-links" class="navbar-nav active">
{{ with (.Site.GetPage "section" "docs") }}
<li class="nav-item">
<a class="nav-link {{ if eq $section "docs" }}active{{ end }}" title="{{ .Description }}" href="{{ .URL }}">{{ .LinkTitle }}</a>
<a class="nav-link {{ if eq $section "docs" }}active{{ end }}" title="{{ .Description }}" href="{{ .Permalink }}">{{ .LinkTitle }}</a>
</li>
{{ end }}
{{ with $latest_post }}
<li class="nav-item">
{{ $blog_home := .Site.GetPage "section" "blog" }}
<a class="nav-link {{ if eq $section "blog" }}active{{ end }}" title="{{ $blog_home.Description }}" href="{{ .URL }}">{{ $blog_home.LinkTitle }}</a>
<a class="nav-link {{ if eq $section "blog" }}active{{ end }}" title="{{ $blog_home.Description }}" href="{{ .Permalink }}">{{ $blog_home.LinkTitle }}</a>
</li>
{{ end }}
{{ with (.Site.GetPage "section" "help") }}
<li class="nav-item">
<a class="nav-link {{ if eq $section "help" }}active{{ end }}" title="{{ .Description }}" href="{{ .URL }}">{{ .LinkTitle }}</a>
<a class="nav-link {{ if eq $section "help" }}active{{ end }}" title="{{ .Description }}" href="{{ .Permalink }}">{{ .LinkTitle }}</a>
</li>
{{ end }}
{{ with (.Site.GetPage "section" "about") }}
<li class="nav-item">
<a class="nav-link {{ if eq $section "about" }}active{{ end }}" title="{{ .Description }}" href="{{ .URL }}">{{ .LinkTitle }}</a>
<a class="nav-link {{ if eq $section "about" }}active{{ end }}" title="{{ .Description }}" href="{{ .Permalink }}">{{ .LinkTitle }}</a>
</li>
{{ end }}

4
layouts/partials/primary-bottom.html
View File

@ -29,14 +29,14 @@
<div class="row">
<div class="col-6 pagenav">
{{ if .NextInSection }}
<p><a title="{{ .NextInSection.Description }}" href="{{ .NextInSection.URL }}">
<p><a title="{{ .NextInSection.Description }}" href="{{ .NextInSection.Permalink }}">
<i class="fa fa-long-arrow-alt-left"></i> {{ .NextInSection.LinkTitle }}</a>
</p>
{{ end }}
</div>
<div class="col-6 pagenav" style="text-align: right">
{{ if .PrevInSection }}
<p><a title="{{ .PrevInSection.Description }}" href="{{ .PrevInSection.URL }}">{{ .PrevInSection.LinkTitle }}
<p><a title="{{ .PrevInSection.Description }}" href="{{ .PrevInSection.Permalink }}">{{ .PrevInSection.LinkTitle }}
<i class="fa fa-long-arrow-alt-right"></i></a>
</p>
{{ end }}

2
layouts/partials/primary-top.html
View File

@ -30,7 +30,7 @@
<main aria-labelledby="title">
{{ if not .Parent.IsHome }}
<div class="pagenav">
<p><a href="{{.Parent.URL}}" title="{{ .Parent.Description }}">
<p><a href="{{ .Parent.Permalink }}" title="{{ .Parent.Description }}">
<i style="transform: scaleX(-1)" class="fa fa-level-up-alt"></i>
&nbsp;{{.Parent.Title}}</a></p>
</div>

6
layouts/partials/sidebar-level.html
View File

@ -16,17 +16,17 @@
{{ else }}
<i class='fa fa-lg fa-caret-down'></i>
{{ end }}
<a {{ if eq $current.URL .URL }}class="current"{{ end }} title="{{ .Description }}" href="{{ .URL }}">{{ .LinkTitle}} </a>
<a {{ if eq $current.Permalink .Permalink }}class="current"{{ end }} title="{{ .Description }}" href="{{ .Permalink }}">{{ .LinkTitle}} </a>
</label>
{{ partial "sidebar-level.html" (dict "pages" $pages "parent" . "current" $current "collapse" $collapse) }}
</li>
{{ else }}
<li>
{{ if eq $current.URL .URL }}
{{ if eq $current.Permalink .Permalink }}
<span class="current" title="{{ .Description }}">{{ .LinkTitle }}</span>
{{ else }}
<a title="{{ .Description }}" href="{{ .URL }}">{{ .LinkTitle }}</a>
<a title="{{ .Description }}" href="{{ .Permalink }}">{{ .LinkTitle }}</a>
{{ end }}
</li>
{{ end }}

2
layouts/section-index/list.html
View File

@ -15,7 +15,7 @@
{{ if eq .Parent $parent }}
<div class="col-xs-12 col-sm-6 col-xl-4 entry">
<h5>
<a href="{{ .URL }}">
<a href="{{ .Permalink }}">
{{ if .Params.icon }}
<img src="{{ .Params.icon }}" alt="Icon" class="page_icon" />
{{ end }}