diff --git a/layouts/404.html b/layouts/404.html index 824067c..b24dc79 100644 --- a/layouts/404.html +++ b/layouts/404.html @@ -1,5 +1,5 @@ {{- define "photomosaic" -}} -{{- partial "partials/shared/photomosaic.html" . -}} +{{- partial "shared/photomosaic.html" . -}} {{- end -}} {{- define "content" -}} diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index e942a84..362cbb1 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -1,15 +1,15 @@ - {{- partial "partials/shared/head.html" . -}} + {{- partial "shared/head.html" . -}}
- {{- partial "partials/shared/logo-and-navigation.html" . -}} + {{- partial "shared/logo-and-navigation.html" . -}}
{{- block "photomosaic" . }}{{- end }} {{- block "content" . }}{{- end }}
- {{- partial "partials/shared/footer.html" . -}} + {{- partial "shared/footer.html" . -}}
- {{- partial "partials/shared/js.html" . -}} + {{- partial "shared/js.html" . -}} \ No newline at end of file diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 616f972..80de965 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,5 +1,5 @@ {{- define "photomosaic" -}} - {{- partial "partials/shared/photomosaic.html" . -}} + {{- partial "shared/photomosaic.html" . -}} {{- end -}} {{ define "content"}} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 05d03af..9f0359c 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,5 +1,5 @@ {{- define "photomosaic" -}} - {{- partial "partials/shared/photomosaic.html" . -}} + {{- partial "shared/photomosaic.html" . -}} {{- end -}} {{ define "content"}} @@ -18,9 +18,9 @@ {{- if and (eq $titleGalleryLen 0) (eq $coverImageLen 0) -}}{{- $topRadius = " post_text_top_radius" -}}{{- end -}}
- {{- partial "partials/shared/links-to-translations.html" . .Page -}} - {{- partial "partials/shared/tags.html" . -}} - {{- partial "partials/shared/date.html" . -}} + {{- partial "shared/links-to-translations.html" . .Page -}} + {{- partial "shared/tags.html" . -}} + {{- partial "shared/date.html" . -}}

{{ .Title }}

@@ -34,7 +34,7 @@

{{ .Title }}

- {{- partial "partials/remark42/comments.html" . -}} + {{- partial "remark42/comments.html" . -}}
diff --git a/layouts/partials/_funcs/get-page-images.html b/layouts/_partials/_funcs/get-page-images.html similarity index 100% rename from layouts/partials/_funcs/get-page-images.html rename to layouts/_partials/_funcs/get-page-images.html diff --git a/layouts/partials/embedded-gallery-partial.html b/layouts/_partials/embedded-gallery-partial.html similarity index 100% rename from layouts/partials/embedded-gallery-partial.html rename to layouts/_partials/embedded-gallery-partial.html diff --git a/layouts/partials/list/full-width-blog.html b/layouts/_partials/list/full-width-blog.html similarity index 85% rename from layouts/partials/list/full-width-blog.html rename to layouts/_partials/list/full-width-blog.html index e8a4553..9a756cd 100644 --- a/layouts/partials/list/full-width-blog.html +++ b/layouts/_partials/list/full-width-blog.html @@ -9,9 +9,9 @@ {{- if and (eq $titleGalleryLen 0) (eq $coverImageLen 0) -}}{{- $topRadius = " post_text_top_radius" -}}{{- end -}}
- {{- partial "partials/shared/links-to-translations.html" . .Page -}} - {{- partial "partials/shared/tags.html" . -}} - {{- partial "partials/shared/date.html" . -}} + {{- partial "shared/links-to-translations.html" . .Page -}} + {{- partial "shared/tags.html" . -}} + {{- partial "shared/date.html" . -}}

{{ .Title }}

diff --git a/layouts/partials/list/full-width-gallery.html b/layouts/_partials/list/full-width-gallery.html similarity index 96% rename from layouts/partials/list/full-width-gallery.html rename to layouts/_partials/list/full-width-gallery.html index 6426fa8..08f0009 100644 --- a/layouts/partials/list/full-width-gallery.html +++ b/layouts/_partials/list/full-width-gallery.html @@ -18,8 +18,8 @@
- {{- partial "partials/shared/tags.html" . -}} - {{- partial "partials/shared/date.html" . -}} + {{- partial "shared/tags.html" . -}} + {{- partial "shared/date.html" . -}}

{{ .Title }}

diff --git a/layouts/partials/list/full-width-note.html b/layouts/_partials/list/full-width-note.html similarity index 85% rename from layouts/partials/list/full-width-note.html rename to layouts/_partials/list/full-width-note.html index 04ecbb6..8589724 100644 --- a/layouts/partials/list/full-width-note.html +++ b/layouts/_partials/list/full-width-note.html @@ -9,9 +9,9 @@ {{- if and (eq $titleGalleryLen 0) (eq $coverImageLen 0) -}}{{- $topRadius = " post_text_top_radius" -}}{{- end -}}
- {{- partial "partials/shared/links-to-translations.html" . .Page -}} - {{- partial "partials/shared/tags.html" . -}} - {{- partial "partials/shared/date.html" . -}} + {{- partial "shared/links-to-translations.html" . .Page -}} + {{- partial "shared/tags.html" . -}} + {{- partial "shared/date.html" . -}}

{{ .Title }}

diff --git a/layouts/_partials/list/full-width-post.html b/layouts/_partials/list/full-width-post.html new file mode 100644 index 0000000..6c4f39a --- /dev/null +++ b/layouts/_partials/list/full-width-post.html @@ -0,0 +1,9 @@ +{{- if eq .Page.Type "gallery" -}} + {{- partial "list/full-width-gallery.html" . -}} +{{- else if eq .Page.Type "note" -}} + {{- partial "list/full-width-note.html" . -}} +{{- else if eq .Page.Type "story" -}} + {{- partial "list/full-width-story.html" . -}} +{{- else -}} + {{- partial "list/full-width-blog.html" . -}} +{{- end -}} \ No newline at end of file diff --git a/layouts/partials/list/full-width-story.html b/layouts/_partials/list/full-width-story.html similarity index 100% rename from layouts/partials/list/full-width-story.html rename to layouts/_partials/list/full-width-story.html diff --git a/layouts/partials/list/one-third-width-blog.html b/layouts/_partials/list/one-third-width-blog.html similarity index 85% rename from layouts/partials/list/one-third-width-blog.html rename to layouts/_partials/list/one-third-width-blog.html index ddf5627..c3e2142 100644 --- a/layouts/partials/list/one-third-width-blog.html +++ b/layouts/_partials/list/one-third-width-blog.html @@ -3,8 +3,8 @@ {{ partial "shared/post-title-image-or-gallery.html" . }}
- {{- partial "partials/shared/tags.html" . -}} - {{- partial "partials/shared/date.html" . -}} + {{- partial "shared/tags.html" . -}} + {{- partial "shared/date.html" . -}}

{{ .Title }}

diff --git a/layouts/partials/list/one-third-width-gallery.html b/layouts/_partials/list/one-third-width-gallery.html similarity index 95% rename from layouts/partials/list/one-third-width-gallery.html rename to layouts/_partials/list/one-third-width-gallery.html index d21d5b3..14c1f2e 100644 --- a/layouts/partials/list/one-third-width-gallery.html +++ b/layouts/_partials/list/one-third-width-gallery.html @@ -40,8 +40,8 @@
- {{- partial "partials/shared/tags.html" . -}} - {{- partial "partials/shared/date.html" . -}} + {{- partial "shared/tags.html" . -}} + {{- partial "shared/date.html" . -}}

{{- .Title -}}

{{- i18n "fullGallery" -}} ➠
diff --git a/layouts/_partials/list/one-third-width-post.html b/layouts/_partials/list/one-third-width-post.html new file mode 100644 index 0000000..7112448 --- /dev/null +++ b/layouts/_partials/list/one-third-width-post.html @@ -0,0 +1,5 @@ +{{- if eq .Page.Type "gallery" -}} + {{- partial "list/one-third-width-gallery.html" . -}} +{{- else -}} + {{- partial "list/one-third-width-blog.html" . -}} +{{- end -}} \ No newline at end of file diff --git a/layouts/partials/remark42/comments.html b/layouts/_partials/remark42/comments.html similarity index 100% rename from layouts/partials/remark42/comments.html rename to layouts/_partials/remark42/comments.html diff --git a/layouts/partials/shared/date.html b/layouts/_partials/shared/date.html similarity index 100% rename from layouts/partials/shared/date.html rename to layouts/_partials/shared/date.html diff --git a/layouts/partials/shared/footer.html b/layouts/_partials/shared/footer.html similarity index 100% rename from layouts/partials/shared/footer.html rename to layouts/_partials/shared/footer.html diff --git a/layouts/partials/shared/ga.html b/layouts/_partials/shared/ga.html similarity index 100% rename from layouts/partials/shared/ga.html rename to layouts/_partials/shared/ga.html diff --git a/layouts/partials/shared/head.html b/layouts/_partials/shared/head.html similarity index 98% rename from layouts/partials/shared/head.html rename to layouts/_partials/shared/head.html index 9a63016..1e68eeb 100644 --- a/layouts/partials/shared/head.html +++ b/layouts/_partials/shared/head.html @@ -9,7 +9,7 @@ {{ with .Site.Params.meta.keywords }}{{ end }} {{ with .Site.Params.canonicalURL }}{{ end }} - {{- partial "partials/shared/opengraph.html" . -}} + {{- partial "shared/opengraph.html" . -}} {{- $booststrap := resources.Get "/css/bootstrap.min.css" | resources.Fingerprint -}} {{- $themeModules := resources.Get "/css/theme-modules.css" | resources.Fingerprint -}} diff --git a/layouts/partials/shared/js.html b/layouts/_partials/shared/js.html similarity index 100% rename from layouts/partials/shared/js.html rename to layouts/_partials/shared/js.html diff --git a/layouts/partials/shared/links-to-translations.html b/layouts/_partials/shared/links-to-translations.html similarity index 100% rename from layouts/partials/shared/links-to-translations.html rename to layouts/_partials/shared/links-to-translations.html diff --git a/layouts/partials/shared/logo-and-navigation.html b/layouts/_partials/shared/logo-and-navigation.html similarity index 100% rename from layouts/partials/shared/logo-and-navigation.html rename to layouts/_partials/shared/logo-and-navigation.html diff --git a/layouts/partials/shared/opengraph.html b/layouts/_partials/shared/opengraph.html similarity index 86% rename from layouts/partials/shared/opengraph.html rename to layouts/_partials/shared/opengraph.html index d1f119c..f5eea64 100644 --- a/layouts/partials/shared/opengraph.html +++ b/layouts/_partials/shared/opengraph.html @@ -18,7 +18,7 @@ -{{- $images := partial "partials/_funcs/get-page-images" . -}} +{{- $images := partial "_funcs/get-page-images" . -}} {{- range first 6 $images -}} {{- end -}} @@ -55,6 +55,14 @@ {{- if reflect.IsMap . }} {{- $facebookAdmin = .facebook_admin }} {{- end }} +<<<<<<< Updated upstream:layouts/partials/shared/opengraph.html +======= +{{- else }} +{{- with site.Params.Social.facebook_admin }} +{{- $facebookAdmin = . }} +{{- warnf "The social key in site configuration is deprecated. Use params.social.facebook_admin instead." }} +{{- end }} +>>>>>>> Stashed changes:layouts/_partials/shared/opengraph.html {{- end }} {{- /* Facebook Page Admin ID for Domain Insights */}} diff --git a/layouts/partials/shared/photomosaic-data.html b/layouts/_partials/shared/photomosaic-data.html similarity index 100% rename from layouts/partials/shared/photomosaic-data.html rename to layouts/_partials/shared/photomosaic-data.html diff --git a/layouts/partials/shared/photomosaic-impl.html b/layouts/_partials/shared/photomosaic-impl.html similarity index 94% rename from layouts/partials/shared/photomosaic-impl.html rename to layouts/_partials/shared/photomosaic-impl.html index 881e547..675a87f 100644 --- a/layouts/partials/shared/photomosaic-impl.html +++ b/layouts/_partials/shared/photomosaic-impl.html @@ -1,4 +1,4 @@ - {{- $photomosiacData := (partialCached "partials/shared/photomosaic-data.html" . ) -}} + {{- $photomosiacData := (partialCached "shared/photomosaic-data.html" . ) -}} {{- $randomPhotos := slice -}} {{- range $index, $unused := $photomosiacData -}} {{- $randomPhotos = $randomPhotos | append $index -}} diff --git a/layouts/partials/shared/photomosaic.html b/layouts/_partials/shared/photomosaic.html similarity index 90% rename from layouts/partials/shared/photomosaic.html rename to layouts/_partials/shared/photomosaic.html index d6567ca..ba7bb50 100644 --- a/layouts/partials/shared/photomosaic.html +++ b/layouts/_partials/shared/photomosaic.html @@ -14,5 +14,5 @@

{{ i18n "stories" }}

{{- $seq := seq .Site.Params.photomosaic.numberOfUniqueMosaics -}} {{- $seq = shuffle $seq -}} {{- $cacheId := first 1 $seq -}} - {{- partialCached "partials/shared/photomosaic-impl.html" . $cacheId -}} + {{- partialCached "shared/photomosaic-impl.html" . $cacheId -}}
\ No newline at end of file diff --git a/layouts/partials/shared/post-title-image-or-gallery.html b/layouts/_partials/shared/post-title-image-or-gallery.html similarity index 100% rename from layouts/partials/shared/post-title-image-or-gallery.html rename to layouts/_partials/shared/post-title-image-or-gallery.html diff --git a/layouts/partials/shared/tags.html b/layouts/_partials/shared/tags.html similarity index 100% rename from layouts/partials/shared/tags.html rename to layouts/_partials/shared/tags.html diff --git a/layouts/gallery/list.html b/layouts/gallery/list.html index c412054..d7514c6 100644 --- a/layouts/gallery/list.html +++ b/layouts/gallery/list.html @@ -1,5 +1,5 @@ {{- define "photomosaic" -}} -{{- partial "partials/shared/photomosaic.html" . -}} +{{- partial "shared/photomosaic.html" . -}} {{- end -}} {{- define "content" -}} diff --git a/layouts/gallery/single.html b/layouts/gallery/single.html index c1a1ccc..138cb49 100644 --- a/layouts/gallery/single.html +++ b/layouts/gallery/single.html @@ -1,5 +1,5 @@ {{- define "photomosaic" -}} -{{- partial "partials/shared/photomosaic.html" . -}} +{{- partial "shared/photomosaic.html" . -}} {{- end -}} {{- define "content" -}} @@ -29,8 +29,8 @@
- {{- partial "partials/shared/tags.html" . -}} - {{- partial "partials/shared/date.html" . -}} + {{- partial "shared/tags.html" . -}} + {{- partial "shared/date.html" . -}}

{{ .Title }}

@@ -76,7 +76,7 @@

{{ .Title }}

- {{- partial "partials/remark42/comments.html" . -}} + {{- partial "remark42/comments.html" . -}}
diff --git a/layouts/index.html b/layouts/index.html index 89d69c4..d4fdc3b 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -1,5 +1,5 @@ {{- define "photomosaic" -}} - {{- partial "partials/shared/photomosaic.html" . -}} + {{- partial "shared/photomosaic.html" . -}} {{- end -}} {{- define "content" -}} diff --git a/layouts/partials/list/full-width-post.html b/layouts/partials/list/full-width-post.html deleted file mode 100644 index 407d766..0000000 --- a/layouts/partials/list/full-width-post.html +++ /dev/null @@ -1,9 +0,0 @@ -{{- if eq .Page.Type "gallery" -}} - {{- partial "partials/list/full-width-gallery.html" . -}} -{{- else if eq .Page.Type "note" -}} - {{- partial "partials/list/full-width-note.html" . -}} -{{- else if eq .Page.Type "story" -}} - {{- partial "partials/list/full-width-story.html" . -}} -{{- else -}} - {{- partial "partials/list/full-width-blog.html" . -}} -{{- end -}} \ No newline at end of file diff --git a/layouts/partials/list/one-third-width-post.html b/layouts/partials/list/one-third-width-post.html deleted file mode 100644 index 852a1af..0000000 --- a/layouts/partials/list/one-third-width-post.html +++ /dev/null @@ -1,5 +0,0 @@ -{{- if eq .Page.Type "gallery" -}} - {{- partial "partials/list/one-third-width-gallery.html" . -}} -{{- else -}} - {{- partial "partials/list/one-third-width-blog.html" . -}} -{{- end -}} \ No newline at end of file diff --git a/layouts/story/single.html b/layouts/story/single.html index 7f9475d..06d23a8 100644 --- a/layouts/story/single.html +++ b/layouts/story/single.html @@ -1,5 +1,5 @@ {{- define "photomosaic" -}} -{{- partial "partials/shared/photomosaic.html" . -}} +{{- partial "shared/photomosaic.html" . -}} {{- end -}} {{- define "content" -}} @@ -78,12 +78,12 @@ {{- if .Title -}}

{{ .Title }}

{{- end -}}
- {{- partial "partials/shared/tags.html" . -}} - {{- partial "partials/shared/date.html" . -}} + {{- partial "shared/tags.html" . -}} + {{- partial "shared/date.html" . -}}
- {{- partial "partials/remark42/comments.html" . -}} + {{- partial "remark42/comments.html" . -}}