mirror of
https://github.com/McShelby/hugo-theme-relearn.git
synced 2024-11-23 07:47:54 +00:00
image: adjust to Hugo 0.123 #777
This commit is contained in:
parent
065d27f8a2
commit
e516a1bdd1
2 changed files with 16 additions and 18 deletions
|
@ -17,25 +17,23 @@
|
|||
{{- $width := "auto" }}
|
||||
{{- $dest_url := urls.Parse $url }}
|
||||
{{- $dest_path := $dest_url.Path }}
|
||||
{{- $image := $page.Resources.GetMatch (path.Clean $dest_url.Path) }}
|
||||
{{- if not $image }}
|
||||
{{- $image = .Resources.GetMatch $dest_path }}
|
||||
{{- end }}
|
||||
{{- if not $image }}
|
||||
{{- $image = .Resources.GetRemote $url }}
|
||||
{{- end }}
|
||||
{{- if $image }}
|
||||
{{- $url = $image.RelPermalink }}
|
||||
{{- if $dest_url.RawQuery }}
|
||||
{{- $url = printf "%s?%s" $url $dest_url.RawQuery }}
|
||||
{{- $image := "" }}
|
||||
{{- if not $dest_url.IsAbs }}
|
||||
{{- with or ($page.Resources.Get $dest_url.Path) (resources.Get $dest_url.Path) }}
|
||||
{{- $image = . }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- if and (not $image) (not $dest_url.IsAbs) }}
|
||||
{{- with $image }}
|
||||
{{- $url = $image.RelPermalink }}
|
||||
{{- with $dest_url.RawQuery }}
|
||||
{{- $url = printf "%s?%s" $url . }}
|
||||
{{- end }}
|
||||
{{- else }}
|
||||
{{- if eq $page.Site.Params.image.errorlevel "warning" }}
|
||||
{{- warnf "%q: image '%s' is not a resource but linked anyways" $page.File.Filename .url }}
|
||||
{{- else if eq $page.Site.Params.image.errorlevel "error" }}
|
||||
{{- errorf "%q: image '%s' is not a resource" $page.File.Filename .url }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- if $dest_url.RawQuery }}
|
||||
{{- if $dest_url.Query.Has "classes" }}
|
||||
|
|
|
@ -16,7 +16,6 @@
|
|||
{{- $u := urls.Parse $url }}
|
||||
{{- $href := $u.String }}
|
||||
{{- $path := $u.Path }}
|
||||
{{- $linkPage := "" }}
|
||||
{{- if $u.IsAbs }}
|
||||
{{- $target = "_blank" }}
|
||||
{{- if isset $page.Site.Params "externallinktarget" }}
|
||||
|
@ -24,6 +23,7 @@
|
|||
{{- end }}
|
||||
{{- $attributes = $attributes | merge (dict "target" $target) }}
|
||||
{{- else }}
|
||||
{{- $linkPage := "" }}
|
||||
{{- if $path }}
|
||||
{{- with or
|
||||
($page.Page.GetPage $path)
|
||||
|
|
Loading…
Reference in a new issue