fixed wrong generated URLs
All checks were successful
Build and deploy static pages / build-and-push (push) Successful in 14s
All checks were successful
Build and deploy static pages / build-and-push (push) Successful in 14s
This commit is contained in:
10
site/layouts/_default/_markup/render-link.html
Normal file
10
site/layouts/_default/_markup/render-link.html
Normal file
@@ -0,0 +1,10 @@
|
||||
{{- /* Generated content links to root-relative paths (/cloud-edge/venues/…),
|
||||
which ignore the subdirectory in baseURL and 404 when the site is served
|
||||
from e.g. https://pub.sqrt.fr/vincent/publish-assistant/. relURL prepends
|
||||
that subpath, but only for inputs without a leading slash — hence the
|
||||
trim. No-op when the site is served from the domain root. */ -}}
|
||||
{{- $dest := .Destination -}}
|
||||
{{- if and (hasPrefix $dest "/") (not (hasPrefix $dest "//")) -}}
|
||||
{{- $dest = strings.TrimPrefix "/" $dest | relURL -}}
|
||||
{{- end -}}
|
||||
<a href="{{ $dest | safeURL }}"{{ with .Title }} title="{{ . }}"{{ end }}>{{ .Text | safeHTML }}</a>
|
||||
@@ -4,7 +4,16 @@
|
||||
<h1>{{ .Title }}</h1>
|
||||
</header>
|
||||
|
||||
<div id="pa-calendar" data-events="{{ .Params.events | jsonify }}"></div>
|
||||
{{- /* Event urls are stored root-relative; strip the leading slash so relURL
|
||||
prepends the baseURL subpath, keeping event clicks working when the site
|
||||
is served from a subdirectory. */ -}}
|
||||
{{- $events := slice }}
|
||||
{{- range .Params.events }}
|
||||
{{- $e := . }}
|
||||
{{- with .url }}{{ $e = merge $e (dict "url" (strings.TrimPrefix "/" . | relURL)) }}{{ end }}
|
||||
{{- $events = $events | append $e }}
|
||||
{{- end }}
|
||||
<div id="pa-calendar" data-events="{{ $events | jsonify }}"></div>
|
||||
|
||||
{{- if .Content }}
|
||||
<div class="md-content">
|
||||
|
||||
@@ -86,29 +86,25 @@
|
||||
</div>
|
||||
{{- $section := .Section }}
|
||||
{{- if $section }}
|
||||
{{- $pfx := printf "/%s" $section }}
|
||||
{{- /* Paths are passed to relURL *without* a leading slash: relURL only
|
||||
prepends the baseURL subpath (e.g. /owner/repo/) for inputs that
|
||||
are not already root-relative. .RelPermalink carries that same
|
||||
prefix, so the active check compares like with like. */ -}}
|
||||
<ul id="menu" class="menu">
|
||||
{{- range slice "venues" "calendar" "digests" }}
|
||||
{{- $url := printf "%s/%s/" $section . | relURL }}
|
||||
<li>
|
||||
<a href="{{ $pfx }}/venues/" title="Venues">
|
||||
<span{{- if hasPrefix .RelPermalink (printf "%s/venues/" $pfx) }} class="active"{{- end }}>Venues</span>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="{{ $pfx }}/calendar/" title="Calendar">
|
||||
<span{{- if hasPrefix .RelPermalink (printf "%s/calendar/" $pfx) }} class="active"{{- end }}>Calendar</span>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="{{ $pfx }}/digests/" title="Digests">
|
||||
<span{{- if hasPrefix .RelPermalink (printf "%s/digests/" $pfx) }} class="active"{{- end }}>Digests</span>
|
||||
<a href="{{ $url }}" title="{{ . | title }}">
|
||||
<span{{- if hasPrefix $.RelPermalink $url }} class="active"{{- end }}>{{ . | title }}</span>
|
||||
</a>
|
||||
</li>
|
||||
{{- end }}
|
||||
</ul>
|
||||
{{- else }}
|
||||
<ul id="menu" class="menu">
|
||||
{{- range hugo.Data.topics.topics }}
|
||||
<li>
|
||||
<a href="/{{ .slug }}/" title="{{ .title }}">
|
||||
<a href="{{ printf "%s/" .slug | relURL }}" title="{{ .title }}">
|
||||
<span>{{ .title }}</span>
|
||||
</a>
|
||||
</li>
|
||||
|
||||
Reference in New Issue
Block a user