Skip to content

Commit fe40207

Browse files
authored
fix: replace .Site.BaseURL with absURL in templates (#69)
1 parent 26ec65a commit fe40207

File tree

8 files changed

+100
-100
lines changed

8 files changed

+100
-100
lines changed

layouts/404.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ <h1>Page not found</h1>
99
<div class="col-md-4">
1010
</div>
1111
<div class="card-body">
12-
12+
1313
<div class="card-text">
14-
<p>Uh oh! We couldn't find the page you were looking for.</p>
15-
<p><a class="button button-solid" href="{{.Site.BaseURL}}">Return to the NGINX Docs Home page.</a></p>
14+
<p>Uh oh! We couldn't find the page you were looking for.</p>
15+
<p><a class="button button-solid" href="{{ "/" | absURL }}">Return to the NGINX Docs Home page.</a></p>
1616
</div>
17-
</div>
17+
</div>
1818
</div>
1919
</div>
2020
</div>
2121

22-
22+
2323

2424

2525
{{ end }}

layouts/partials/favicon.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<link rel="shortcut icon" type="image/x-icon" href="{{.Site.BaseURL}}/images/favicon-48x48.ico">
1+
<link rel="shortcut icon" type="image/x-icon" href="{{ "/images/favicon-48x48.ico" | absURL }}">

layouts/partials/footer.html

Lines changed: 76 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,89 +1,89 @@
11
<footer id="footer">
2-
<div class="container-fluid">
2+
<div class="container-fluid">
33

4-
<div class="row align-items-center">
4+
<div class="row align-items-center">
55

6-
<div class="col-md-6 d-md-flex">
7-
<img class="nginx-logo-footer" src="{{.Site.BaseURL}}/images/icons/[email protected]"/>
8-
</div>
6+
<div class="col-md-6 d-md-flex">
7+
<img class="nginx-logo-footer" src="{{ "/images/icons/[email protected]" | absURL }}"/>
8+
</div>
99

10-
{{ if not ( in .Site.Params.buildtype "package" ) }}
11-
<div class="col-md d-flex footer-text">
12-
<div class="col-xl d-none d-md-block align-self-center text-semibold align-right">
13-
<span>Found a bug? Looking for something new?</span>
14-
</div>
15-
<div class="col-lg d-none d-md-block pl-0">
16-
<button class="button footer-button"><a href="/feedback/" alt="Select if you have feedback">Let Us Know</a></button>
17-
</div>
18-
</div>
19-
{{ end }}
10+
{{ if not ( in .Site.Params.buildtype "package" ) }}
11+
<div class="col-md d-flex footer-text">
12+
<div class="col-xl d-none d-md-block align-self-center text-semibold align-right">
13+
<span>Found a bug? Looking for something new?</span>
14+
</div>
15+
<div class="col-lg d-none d-md-block pl-0">
16+
<button class="button footer-button"><a href="{{ "/feedback/" | absURL }}" alt="Select if you have feedback">Let Us Know</a></button>
17+
</div>
18+
</div>
19+
{{ end }}
2020

21-
</div>
21+
</div>
2222

2323

24-
{{ if not ( in .Site.Params.buildtype "package" ) }}
25-
<div class="row d-print-none d-none d-md-flex">
26-
<div class="col-md-3 d-none d-md-block">
27-
<span class="footer-head">Company</span>
28-
<ul class="footer-text">
29-
<li><a href="https://www.f5.com/go/product/welcome-to-nginx" target="_blank" alt="Select to learn about F5 NGINX">About F5 NGINX</a></li>
30-
<li><a href="https://www.f5.com/company/events" target="_blank" alt="Select to learn about F5 events">Events</a></li>
31-
</ul>
32-
<br />
33-
<span class="footer-head">Resources</span>
34-
<ul class="footer-text">
35-
<li><a href="https://www.f5.com/company/blog/nginx" target="_blank" alt="Select to visit the F5 NGINX blog" >Blog</a></li>
36-
<li><a href="https://www.f5.com/go/faq/nginx-faq" target="_blank" alt="Select to visit the F5 NGINX frequently asked questions page" >FAQ</a></li>
37-
<li><a href="https://www.f5.com/services" target="_blank" alt="Select to learn about F5 NGINX Support">Professional Services</a></li>
38-
<li><a href="https://www.f5.com/learn/training" target="_blank" alt="Select to learn about F5 training offerings" >Training</a></li>
39-
</ul>
40-
</div>
24+
{{ if not ( in .Site.Params.buildtype "package" ) }}
25+
<div class="row d-print-none d-none d-md-flex">
26+
<div class="col-md-3 d-none d-md-block">
27+
<span class="footer-head">Company</span>
28+
<ul class="footer-text">
29+
<li><a href="https://www.f5.com/go/product/welcome-to-nginx" target="_blank" alt="Select to learn about F5 NGINX">About F5 NGINX</a></li>
30+
<li><a href="https://www.f5.com/company/events" target="_blank" alt="Select to learn about F5 events">Events</a></li>
31+
</ul>
32+
<br />
33+
<span class="footer-head">Resources</span>
34+
<ul class="footer-text">
35+
<li><a href="https://www.f5.com/company/blog/nginx" target="_blank" alt="Select to visit the F5 NGINX blog" >Blog</a></li>
36+
<li><a href="https://www.f5.com/go/faq/nginx-faq" target="_blank" alt="Select to visit the F5 NGINX frequently asked questions page" >FAQ</a></li>
37+
<li><a href="https://www.f5.com/services" target="_blank" alt="Select to learn about F5 NGINX Support">Professional Services</a></li>
38+
<li><a href="https://www.f5.com/learn/training" target="_blank" alt="Select to learn about F5 training offerings" >Training</a></li>
39+
</ul>
40+
</div>
4141

42-
<div class="col-md-3 d-none d-md-block">
43-
<span class="footer-head">Products</span>
44-
<ul class="footer-text">
45-
<li><a title="F5 NGINX Plus" aria-label="F5 NGINX Plus" href="https://www.f5.com/products/nginx/nginx-plus">F5 NGINX Plus</a></li>
46-
<li><a title="F5 NGINX App Protect" aria-label="F5 NGINX App Protect" href="https://www.f5.com/products/nginx/nginx-app-protect">F5 NGINX App Protect</a></li>
47-
<li><a title="F5 NGINX Instance Manager" aria-label="F5 NGINX Instance Manager" href="https://www.f5.com/products/nginx/instance-manager">F5 NGINX Instance Manager</a></li>
48-
<li><a title="F5 NGINX Ingress Controller" aria-label="F5 NGINX Ingress Controller" href="https://www.f5.com/products/nginx/nginx-ingress-controller">F5 NGINX Ingress Controller</a></li>
49-
<li><a title="F5 NGINX Gateway Fabric" aria-label="F5 NGINX Gateway Fabric" href="https://www.f5.com/products/nginx/nginx-gateway-fabric">F5 NGINX Gateway Fabric</a></li>
50-
<li><a title="F5 NGINXaaS for Azure" aria-label="F5 NGINXaaS for Azure" href="https://www.f5.com/products/nginx/f5-nginxaas-for-azure">F5 NGINXaaS for Azure</a></li>
51-
</ul>
52-
</div>
42+
<div class="col-md-3 d-none d-md-block">
43+
<span class="footer-head">Products</span>
44+
<ul class="footer-text">
45+
<li><a title="F5 NGINX Plus" aria-label="F5 NGINX Plus" href="https://www.f5.com/products/nginx/nginx-plus">F5 NGINX Plus</a></li>
46+
<li><a title="F5 NGINX App Protect" aria-label="F5 NGINX App Protect" href="https://www.f5.com/products/nginx/nginx-app-protect">F5 NGINX App Protect</a></li>
47+
<li><a title="F5 NGINX Instance Manager" aria-label="F5 NGINX Instance Manager" href="https://www.f5.com/products/nginx/instance-manager">F5 NGINX Instance Manager</a></li>
48+
<li><a title="F5 NGINX Ingress Controller" aria-label="F5 NGINX Ingress Controller" href="https://www.f5.com/products/nginx/nginx-ingress-controller">F5 NGINX Ingress Controller</a></li>
49+
<li><a title="F5 NGINX Gateway Fabric" aria-label="F5 NGINX Gateway Fabric" href="https://www.f5.com/products/nginx/nginx-gateway-fabric">F5 NGINX Gateway Fabric</a></li>
50+
<li><a title="F5 NGINXaaS for Azure" aria-label="F5 NGINXaaS for Azure" href="https://www.f5.com/products/nginx/f5-nginxaas-for-azure">F5 NGINXaaS for Azure</a></li>
51+
</ul>
52+
</div>
5353

54-
<div class="col-md-3 d-none d-md-block">
55-
<span class="footer-head">NGINX on GitHub</span>
56-
<ul class="footer-text">
57-
<li><a title="NGINX Open Source" aria-label="NGINX Open Source" href="https://github.com/nginx/nginx"><span class="inner">NGINX Open Source</span></a></li>
58-
<li><a title="NGINX Unit" aria-label="NGINX Unit" href="https://github.com/nginx/unit"><span class="inner">NGINX Unit</span></a></li>
59-
<li><a title="NGINX Amplify" aria-label="NGINX Amplify" href="https://github.com/nginxinc/nginx-amplify-agent"><span class="inner">NGINX Amplify</span></a></li>
60-
<li><a title="NGINX Agent" aria-label="NGINX Agent" href="https://github.com/nginx/Agent"><span class="inner">NGINX Agent</span></a></li>
61-
<li><a title="NGINX Kubernetes Ingress Controller" aria-label="NGINX Kubernetes Ingress Controller" href="https://github.com/nginxinc/kubernetes-ingress"><span class="inner">NGINX Kubernetes Ingress Controller</span></a></li>
62-
<li><a title="NGINX Gateway Fabric" aria-label="NGINX Gateway Fabric" href="https://github.com/nginxinc/nginx-gateway-fabric"><span class="inner">NGINX Gateway Fabric</span></a></li>
63-
</ul>
64-
</div>
54+
<div class="col-md-3 d-none d-md-block">
55+
<span class="footer-head">NGINX on GitHub</span>
56+
<ul class="footer-text">
57+
<li><a title="NGINX Open Source" aria-label="NGINX Open Source" href="https://github.com/nginx/nginx"><span class="inner">NGINX Open Source</span></a></li>
58+
<li><a title="NGINX Unit" aria-label="NGINX Unit" href="https://github.com/nginx/unit"><span class="inner">NGINX Unit</span></a></li>
59+
<li><a title="NGINX Amplify" aria-label="NGINX Amplify" href="https://github.com/nginxinc/nginx-amplify-agent"><span class="inner">NGINX Amplify</span></a></li>
60+
<li><a title="NGINX Agent" aria-label="NGINX Agent" href="https://github.com/nginx/Agent"><span class="inner">NGINX Agent</span></a></li>
61+
<li><a title="NGINX Kubernetes Ingress Controller" aria-label="NGINX Kubernetes Ingress Controller" href="https://github.com/nginxinc/kubernetes-ingress"><span class="inner">NGINX Kubernetes Ingress Controller</span></a></li>
62+
<li><a title="NGINX Gateway Fabric" aria-label="NGINX Gateway Fabric" href="https://github.com/nginxinc/nginx-gateway-fabric"><span class="inner">NGINX Gateway Fabric</span></a></li>
63+
</ul>
64+
</div>
6565

66-
<div class="col-md-2 d-none d-md-block">
67-
<span class="footer-head">Social</span>
68-
<ul class="footer-social">
69-
<li><a href="https://www.facebook.com/nginxinc" title="facebook" aria-label="facebook" target="_blank" rel="noreferrer"><i class="fa-brands fa-facebook" aria-hidden="true"></i>
70-
Facebook</a></li>
71-
<li><a href="https://twitter.com/nginx" title="twitter" aria-label="twitter" target="_blank" rel="noreferrer"><i class="fa-brands fa-twitter" aria-hidden="true"></i>Twitter</a></li>
72-
<li><a href="https://www.linkedin.com/company/nginx" title="linkedin" aria-label="linkedin" target="_blank" rel="noreferrer"><i class="fa-brands fa-linkedin" aria-hidden="true"></i>
73-
LinkedIn</a></li>
74-
<li><a href="https://www.youtube.com/user/NginxInc" title="youtube" aria-label="youtube" target="_blank" rel="noreferrer" alt="NGINX Youtube Channel"><i class="fa-brands fa-square-youtube" aria-hidden="true"></i>
75-
YouTube</a></li>
76-
</ul>
77-
</div>
78-
</div>
79-
{{ end }}
80-
<div class="site-info footer-text">
66+
<div class="col-md-2 d-none d-md-block">
67+
<span class="footer-head">Social</span>
68+
<ul class="footer-social">
69+
<li><a href="https://www.facebook.com/nginxinc" title="facebook" aria-label="facebook" target="_blank" rel="noreferrer"><i class="fa-brands fa-facebook" aria-hidden="true"></i>
70+
Facebook</a></li>
71+
<li><a href="https://twitter.com/nginx" title="twitter" aria-label="twitter" target="_blank" rel="noreferrer"><i class="fa-brands fa-twitter" aria-hidden="true"></i>Twitter</a></li>
72+
<li><a href="https://www.linkedin.com/company/nginx" title="linkedin" aria-label="linkedin" target="_blank" rel="noreferrer"><i class="fa-brands fa-linkedin" aria-hidden="true"></i>
73+
LinkedIn</a></li>
74+
<li><a href="https://www.youtube.com/user/NginxInc" title="youtube" aria-label="youtube" target="_blank" rel="noreferrer" alt="NGINX Youtube Channel"><i class="fa-brands fa-square-youtube" aria-hidden="true"></i>
75+
YouTube</a></li>
76+
</ul>
77+
</div>
78+
</div>
79+
{{ end }}
80+
<div class="site-info footer-text">
8181

82-
<div class="text-center">
83-
<p><a href="https://www.f5.com/"><img class="f5-logo-footer" src="{{.Site.BaseURL}}/images/icons/Logo_F5.svg" alt="F5 logo"></a>
84-
©2024 F5, Inc. All rights reserved.</p><p><a href="https://www.f5.com/company/policies/trademarks" rel="noopener" target="_blank">Trademarks</a> <a href="https://www.f5.com/company/policies" rel="noopener" target="_blank">Policies</a> <a href="{{ .Site.BaseURL }}/ossc">Open Source Components</a> <a href="https://www.f5.com/company/policies/privacy-notice" rel="noopener" target="_blank">Privacy</a> <a href="https://www.f5.com/company/policies/F5-California-privacy-summary" rel="noopener" target="_blank">California Privacy</a> <a href="https://www.f5.com/company/policies/privacy-notice#no-sell" rel="noopener" target="_blank">Do Not Sell My Personal Information</a> <span id="teconsent"></span></p>
85-
</div>
82+
<div class="text-center">
83+
<p><a href="https://www.f5.com/"><img class="f5-logo-footer" src="{{ "/images/icons/Logo_F5.svg" | absURL }}" alt="F5 logo"></a>
84+
©2024 F5, Inc. All rights reserved.</p><p><a href="https://www.f5.com/company/policies/trademarks" rel="noopener" target="_blank">Trademarks</a> <a href="https://www.f5.com/company/policies" rel="noopener" target="_blank">Policies</a> <a href="{{ "/ossc" | absURL }}">Open Source Components</a> <a href="https://www.f5.com/company/policies/privacy-notice" rel="noopener" target="_blank">Privacy</a> <a href="https://www.f5.com/company/policies/F5-California-privacy-summary" rel="noopener" target="_blank">California Privacy</a> <a href="https://www.f5.com/company/policies/privacy-notice#no-sell" rel="noopener" target="_blank">Do Not Sell My Personal Information</a> <span id="teconsent"></span></p>
85+
</div>
8686

87-
</div><!-- /.site-info -->
88-
</div><!-- /.container-fluid -->
87+
</div><!-- /.site-info -->
88+
</div><!-- /.container-fluid -->
8989
</footer>

layouts/partials/header.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="navbar navbar-expand navbar-dark flex-column flex-md-row bd-navbar navbar-fixed-top">
33
<div class="container-fluid flex-md-row flex-column">
44
<a class="navbar-brand mr-0 mr-md-2" href="/" aria-label="NGINX Docs">
5-
<img class="navbar-img" src="{{.Site.BaseURL}}/images/icons/NGINX-Docs-horiz-white-type.svg" alt="NGINX Docs">
5+
<img class="navbar-img" src="{{ "/images/icons/NGINX-Docs-horiz-white-type.svg" | absURL }}" alt="NGINX Docs">
66
</a>
77
{{ if ( not ( in .Site.Params.buildtype "package" ) ) }}
88
<div class="navbar navbar-nav">
@@ -21,15 +21,15 @@
2121
Sections
2222
</a>
2323
{{ partial "products-menu.html" . }}
24-
</li>
24+
</li>
2525
</ul>
2626
</div>
2727
{{ end }}
2828

2929
<ul class="navbar navbar-nav">
3030
<li class="nav-item-explore active">
3131
<button class="button navbar-button"><a href="https://www.f5.com/products" alt="Explore all products on f5.com" target="_blank">Explore All Products</a></button>
32-
</li>
32+
</li>
3333
</ul>
3434
</div>
3535
</div>

layouts/partials/meta.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<title>{{ block "title" . }}{{ if .IsHome }}{{ .Site.Title }}{{else}}{{ .Title }}{{end }}{{ if and ( not .IsHome ) ( .Site.Title ) }} | {{ .Site.Title }}{{end}}{{ end }}</title>
66

77
{{ with .Description }}
8-
<meta name="description" content="{{ . | markdownify }}">
8+
<meta name="description" content="{{ . | markdownify }}">
99
{{ end }}
1010

1111
{{ if .Params.categories }}
@@ -24,14 +24,14 @@
2424
{{ end }}
2525

2626
<meta property="article:publisher" content="https://www.facebook.com/nginxinc" />
27-
<meta property="og:image" content="{{ .Site.BaseURL }}/images/icons/NGINX-Docs-new-docs-dark-1200x630.png" />
27+
<meta property="og:image" content="{{ "/images/icons/NGINX-Docs-new-docs-dark-1200x630.png" | absURL }}" />
2828
<meta property="og:image:width" content="500" />
2929
<meta property="og:image:height" content="300" />
3030
<meta name="twitter:card" content="summary" />
3131
<meta name="twitter:description" content="{{.Page.Description}}" />
3232
<meta name="twitter:title" content="{{.Page.Title}}" />
3333
<meta name="twitter:site" content="@nginx" />
34-
<meta name="twitter:image" content="{{ .Site.BaseURL }}/images/icons/NGINX-Docs-new-docs-dark-1200x630.png" />
34+
<meta name="twitter:image" content="{{ "/images/icons/NGINX-Docs-new-docs-dark-1200x630.png" | absURL }}" />
3535
<meta name="twitter:creator" content="@nginx" />
3636
{{ if .Page.Lastmod }}
3737
<meta http-equiv="last-modified" content="{{ .Page.Lastmod.Format "02/01/2006" }}" />
@@ -41,7 +41,7 @@
4141
{{/* set custom CSP to load styles and scripts with special handling for GTM scripts (requires unsafe-inline) and Dev Portal page(s) (requires 'unsafe-eval') */}}
4242
<meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'
4343
https://consent.trustarc.com/ https://mktg.tags.f5.com/basic/prod/utag.sync.js https://static.cloud.coveo.com/ https://*.f5.com/
44-
https://*.netlify.app https://gist.github.com
44+
https://*.netlify.app https://gist.github.com
4545
https://tag.demandbase.com/pscSDsz4.min.js
4646
https://munchkin.brightfunnel.com/js/build/bf-munchkin.min.js
4747
https://www.googletagmanager.com/gtm.js
@@ -52,7 +52,7 @@
5252
https://cdn.bizible.com/xdc.js
5353
https://f5networksglobalprod.122.2o7.net/
5454
https://f5networksnginxdocs.122.2o7.net/
55-
{{ if in .Params.doctypes "devportal" }} 'unsafe-eval' {{end}};
55+
{{ if in .Params.doctypes "devportal" }} 'unsafe-eval' {{end}};
5656
worker-src 'self' blob:">
5757
{{/* end */}}
5858

@@ -63,5 +63,5 @@
6363

6464
<!-- Coveo metadata-->
6565
<meta name="product" content="{{ .Site.Title }}">
66-
<meta name="version" content="{{ .Site.Params.currentVersion }}">
66+
<meta name="version" content="{{ .Site.Params.currentVersion }}">
6767
<meta name="doc_type" content="Manual">

layouts/partials/sidebar.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<div id="sidebar-content">
1212
<h3>
1313
<a class="sidebar-title" href="{{.Site.Home.Permalink}}" alt="{{.Site.Title}}">{{ if .Site.Params.logo }}<img
14-
class="card-img-top" src="{{ .Site.BaseURL}}/images/icons/{{ .Site.Params.logo }}"
14+
class="card-img-top" src="{{ "/images/icons/" | absURL }}{{ .Site.Params.logo }}"
1515
alt="{{.Site.Title}}">{{end}}
1616
{{.Site.Title}}</a>
1717
</h3>

0 commit comments

Comments
 (0)