Skip to content

Commit d60a39f

Browse files
author
Donna-Marie Smith
committed
Updated short codes to handle a latest url
1 parent ee8e39b commit d60a39f

File tree

13 files changed

+65
-23
lines changed

13 files changed

+65
-23
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ public/
33
resources/
44
node_modules/
55
tech-doc-hugo
6+
content/en/docs/latest/
7+
content/static/latest/
68
content/static/**/*.dtmp
79
content/static/**/*.bkp
810
content/static/**/*.crswap

‎.htmltest.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ IgnoreURLs:
2525
- "https://blogs.oracle.com/.*"
2626
- "https://jsonformatter.org/.*"
2727
- "https://www.newtonsoft.com/.*"
28-
- "https://.*/gov.uk/.*"
28+
- "https://.*\.gov.uk/.*"
29+
2930
IgnoreDirs:
3031
- "docs/?.*/_print/"
3132
- "docs/?.*/_shared/"

‎layouts/partials/navbar-version-selector.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
{{- $isRoot := false }}
66
{{- /* Get the current version, and whether the website is currently nested (has /docs prepended). */}}
77
{{- $isNested := false }}
8-
{{- $currentVer := index (findRE `^\/docs\/[0-9\.]*\/` .Page.RelPermalink 1) 0 }}
8+
{{- $currentVer := index (findRE `^\/docs\/([0-9\.]*|latest)\/` .Page.RelPermalink 1) 0 }}
99
{{- if (not $currentVer) }}
10-
{{- $currentVer = index (findRE `^\/docs\/docs\/[0-9\.]*\/` .Page.RelPermalink 1) 0 }}
10+
{{- $currentVer = index (findRE `^\/docs\/docs\/([0-9\.]*|latest)\/` .Page.RelPermalink 1) 0 }}
1111
{{- $currentVer = replaceRE `^\/docs` "" $currentVer 1 }}
1212
{{- if (or $currentVer (index (findRE `^\/docs\/[^\/]*\/` .Page.RelPermalink 1) 0))}}
1313
{{- $isNested = true }}

‎layouts/partials/section-index.html‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<div class="section-index">
2+
{{ $pages := (where .Site.Pages "Section" .Section).ByWeight }}
3+
{{ $pages = (where $pages "Type" "!=" "search") }}
4+
{{ $pages = (where $pages "Title" "!=" "Latest") }}
5+
{{ $parent := .Page }}
6+
{{ if $parent.Params.no_list }}
7+
{{/* If no_list is true we don't show a list of subpages */}}
8+
{{ else if $parent.Params.simple_list }}
9+
{{/* If simple_list is true we show a bulleted list of subpages */}}
10+
<ul>
11+
{{ range $pages }}
12+
{{ if eq .Parent $parent }}
13+
<li><a href="{{ .RelPermalink }}">{{- .Title -}}</a></li>
14+
{{ end }}
15+
{{ end }}
16+
</ul>
17+
{{ else }}
18+
{{/* Otherwise we show a nice formatted list of subpages with page descriptions */}}
19+
<hr class="panel-line">
20+
{{ range $pages }}
21+
{{ if eq .Parent $parent }}
22+
<div class="entry">
23+
<h5>
24+
<a href="{{ .RelPermalink }}">{{- .Title -}}</a>
25+
</h5>
26+
<p>{{ .Description | markdownify }}</p>
27+
</div>
28+
{{ end }}
29+
{{ end }}
30+
{{ end }}
31+
</div>

‎layouts/shortcodes/ahref.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
{{- $link := (printf "%s://%s%s" $url.Scheme $url.Host $url.Path) }}
77
{{- /* Get the current version, and whether the website is currently nested (has /docs prepended). */}}
88
{{- $isNested := false }}
9-
{{- $currentVer := index (findRE `^\/docs\/[0-9\.]*\/` .Page.RelPermalink 1) 0 }}
9+
{{- $currentVer := index (findRE `^\/docs\/([0-9\.]*|latest)\/` .Page.RelPermalink 1) 0 }}
1010
{{- if (not $currentVer) }}
11-
{{- $currentVer = index (findRE `^\/docs\/docs\/[0-9\.]*\/` .Page.RelPermalink 1) 0 }}
11+
{{- $currentVer = index (findRE `^\/docs\/docs\/([0-9\.]*|latest)\/` .Page.RelPermalink 1) 0 }}
1212
{{- $currentVer = replaceRE `^\/docs` "" $currentVer 1 }}
1313
{{- if (or $currentVer (index (findRE `^\/docs\/[^\/]*\/` .Page.RelPermalink 1) 0)) }}
1414
{{- $isNested = true }}

‎layouts/shortcodes/figure.html‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
{{- $versionPath := "" }}
55
{{- /* Get the current version, and whether the website is currently nested (has /docs prepended). */}}
66
{{- $isNested := false }}
7-
{{- $currentVer := index (findRE `^\/docs\/[0-9\.]*\/` .Page.RelPermalink 1) 0 }}
7+
{{- $currentVer := index (findRE `^\/docs\/([0-9\.]*|latest)\/` .Page.RelPermalink 1) 0 }}
88
{{- if (not $currentVer) }}
9-
{{- $currentVer = index (findRE `^\/docs\/docs\/[0-9\.]*\/` .Page.RelPermalink 1) 0 }}
9+
{{- $currentVer = index (findRE `^\/docs\/docs\/([0-9\.]*|latest)\/` .Page.RelPermalink 1) 0 }}
1010
{{- $currentVer = replaceRE `^\/docs` "" $currentVer 1 }}
1111
{{- if (or $currentVer (index (findRE `^\/docs\/[^\/]*\/` .Page.RelPermalink 1) 0)) }}
1212
{{- $isNested = true }}
@@ -18,12 +18,14 @@
1818
{{ range where .Site.Params.versions "url" $version }}
1919
{{ $versionPath = .version }}
2020
{{ end }}
21+
{{- else if eq $currentVer "/docs/latest/" }}
22+
{{ $versionPath = "latest" }}
2123
{{- else if $currentVer }}
2224
{{ range where .Site.Params.versions "url" $currentVer }}
2325
{{ $versionPath = .version }}
2426
{{ end }}
2527
{{- else }}
26-
{{- /* use latest as not in a versioned page */}}
28+
{{- /* use latest as not in a versioned page */}}
2729
{{ range where .Site.Params.versions "latest" true }}
2830
{{- $versionPath = .version }}
2931
{{ end }}

‎layouts/shortcodes/filelink.html‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
{{- $versionPath := "" }}
55
{{- /* Get the current version, and whether the website is currently nested (has /docs prepended). */}}
66
{{- $isNested := false }}
7-
{{- $currentVer := index (findRE `^\/docs\/[0-9\.]*\/` .Page.RelPermalink 1) 0 }}
7+
{{- $currentVer := index (findRE `^\/docs\/([0-9\.]*|latest)\/` .Page.RelPermalink 1) 0 }}
88
{{- if (not $currentVer) }}
9-
{{- $currentVer = index (findRE `^\/docs\/docs\/[0-9\.]*\/` .Page.RelPermalink 1) 0 }}
9+
{{- $currentVer = index (findRE `^\/docs\/docs\/([0-9\.]*|latest)\/` .Page.RelPermalink 1) 0 }}
1010
{{- $currentVer = replaceRE `^\/docs` "" $currentVer 1 }}
1111
{{- if (or $currentVer (index (findRE `^\/docs\/[^\/]*\/` .Page.RelPermalink 1) 0)) }}
1212
{{- $isNested = true }}
@@ -18,6 +18,8 @@
1818
{{ range where .Site.Params.versions "url" $version }}
1919
{{ $versionPath = .version }}
2020
{{ end }}
21+
{{- else if eq $currentVer "/docs/latest/" }}
22+
{{ $versionPath = "latest" }}
2123
{{- else if $currentVer }}
2224
{{ range where .Site.Params.versions "url" $currentVer }}
2325
{{ $versionPath = .version }}

‎layouts/shortcodes/image.html‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
{{- $versionPath := "" }}
33
{{- /* Get the current version, and whether the website is currently nested (has /docs prepended). */}}
44
{{- $isNested := false }}
5-
{{- $currentVer := index (findRE `^\/docs\/[0-9\.]*\/` .Page.RelPermalink 1) 0 }}
5+
{{- $currentVer := index (findRE `^\/docs\/([0-9\.]*|latest)\/` .Page.RelPermalink 1) 0 }}
66
{{- if (not $currentVer) }}
7-
{{- $currentVer = index (findRE `^\/docs\/docs\/[0-9\.]*\/` .Page.RelPermalink 1) 0 }}
7+
{{- $currentVer = index (findRE `^\/docs\/docs\/([0-9\.]*|latest)\/` .Page.RelPermalink 1) 0 }}
88
{{- $currentVer = replaceRE `^\/docs` "" $currentVer 1 }}
99
{{- if (or $currentVer (index (findRE `^\/docs\/[^\/]*\/` .Page.RelPermalink 1) 0)) }}
1010
{{- $isNested = true }}
@@ -16,6 +16,8 @@
1616
{{ range where .Site.Params.versions "url" $version }}
1717
{{ $versionPath = .version }}
1818
{{ end }}
19+
{{- else if eq $currentVer "/docs/latest/" }}
20+
{{ $versionPath = "latest" }}
1921
{{- else if $currentVer }}
2022
{{ range where .Site.Params.versions "url" $currentVer }}
2123
{{ $versionPath = .version }}

‎layouts/shortcodes/section.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
*/}}
55
{{ $filePath := .Get 0 }}
66
{{- /* Get the current version. */}}
7-
{{- $currentVer := index (findRE `^\/docs\/[0-9\.]*\/` .Page.RelPermalink 1) 0 }}
7+
{{- $currentVer := index (findRE `^\/docs\/([0-9\.]*|latest)\/` .Page.RelPermalink 1) 0 }}
88
{{- if (not $currentVer) }}
9-
{{- $currentVer = index (findRE `^\/docs\/docs\/[0-9\.]*\/` .Page.RelPermalink 1) 0 }}
9+
{{- $currentVer = index (findRE `^\/docs\/docs\/([0-9\.]*|latest)\/` .Page.RelPermalink 1) 0 }}
1010
{{- $currentVer = replaceRE `^\/docs` "" $currentVer 1 }}
1111
{{- end }}
1212
{{ $page := .Site.GetPage (printf "%s%s%s" $currentVer "_shared" $filePath) }}

‎layouts/shortcodes/url.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
{{- $link := (printf "%s://%s%s" $url.Scheme $url.Host $url.Path) }}
88
{{- /* Get the current version, and whether the website is currently nested (has /docs prepended). */}}
99
{{- $isNested := false }}
10-
{{- $currentVer := index (findRE `^\/docs\/[0-9\.]*\/` .Page.RelPermalink 1) 0 }}
10+
{{- $currentVer := index (findRE `^\/docs\/([0-9\.]*|latest)\/` .Page.RelPermalink 1) 0 }}
1111
{{- if (not $currentVer) }}
12-
{{- $currentVer = index (findRE `^\/docs\/docs\/[0-9\.]*\/` .Page.RelPermalink 1) 0 }}
12+
{{- $currentVer = index (findRE `^\/docs\/docs\/([0-9\.]*|latest)\/` .Page.RelPermalink 1) 0 }}
1313
{{- $currentVer = replaceRE `^\/docs` "" $currentVer 1 }}
1414
{{- if (or $currentVer (index (findRE `^\/docs\/[^\/]*\/` .Page.RelPermalink 1) 0) ) }}
1515
{{- $isNested = true }}

0 commit comments

Comments
 (0)