From 3140426137c5c85ef34ebceeeb39bc0439b3a9bd Mon Sep 17 00:00:00 2001 From: Chris Reddington <791642+chrisreddington@users.noreply.github.com> Date: Wed, 23 Feb 2022 04:45:58 +0000 Subject: [PATCH] Preview/imagepartial fix (#76) * Attempt #1 Signed-off-by: Chris Reddington <791642+chrisreddington@users.noreply.github.com> * Fix search action (#74) Signed-off-by: Chris Reddington <791642+chrisreddington@users.noreply.github.com> * Fix search string Signed-off-by: Chris Reddington <791642+chrisreddington@users.noreply.github.com> * Search fix template Signed-off-by: Chris Reddington <791642+chrisreddington@users.noreply.github.com> * Update template Signed-off-by: Chris Reddington <791642+chrisreddington@users.noreply.github.com> * Adjust banner size Signed-off-by: Chris Reddington <791642+chrisreddington@users.noreply.github.com> * Resize images Signed-off-by: Chris Reddington <791642+chrisreddington@users.noreply.github.com> * SEO Fixes, Package-lock fix Signed-off-by: Chris Reddington <791642+chrisreddington@users.noreply.github.com> * Tweaks to GH Actions Workflow Signed-off-by: Chris Reddington <791642+chrisreddington@users.noreply.github.com> * Tweak to external Signed-off-by: Chris Reddington <791642+chrisreddington@users.noreply.github.com> * Adjust to Date Signed-off-by: Chris Reddington <791642+chrisreddington@users.noreply.github.com> * Bug fix for missing mode Signed-off-by: Chris Reddington <791642+chrisreddington@users.noreply.github.com> * Markdown image fix Signed-off-by: Chris Reddington <791642+chrisreddington@users.noreply.github.com> * Rudimentary custom style functionality Signed-off-by: Chris Reddington <791642+chrisreddington@users.noreply.github.com> --- .github/workflows/pr-checks.yaml | 3 +- REFERENCE.md | 36 ++++--- archetypes/talk/index.md | 33 +++--- assets/sass/custom_variables.scss | 7 -- assets/sass/main.scss | 19 +++- assets/sass/styles.scss | 4 +- exampleSite/config.yaml | 5 + .../content/talk/waug-azure-arc/index.md | 13 ++- exampleSite/package-lock.json | 53 ++++++--- exampleSite/package-lock.old.json | 42 ++++++++ exampleSite/package.json | 2 +- layouts/_default/_markup/render-image.html | 28 ++++- layouts/partials/cards/content-card.html | 2 +- layouts/partials/content/banner-image.html | 6 +- layouts/partials/content/event-details.html | 12 +++ layouts/partials/content/published.html | 4 +- layouts/partials/metadata/all-ld.html | 4 +- layouts/partials/metadata/image-ld.html | 3 +- layouts/partials/metadata/talk-ld.html | 102 ++++++++++++++---- layouts/partials/site-metadata.html | 11 +- layouts/talk/single.html | 18 ++-- 21 files changed, 305 insertions(+), 102 deletions(-) delete mode 100644 assets/sass/custom_variables.scss create mode 100644 exampleSite/package-lock.old.json create mode 100644 layouts/partials/content/event-details.html diff --git a/.github/workflows/pr-checks.yaml b/.github/workflows/pr-checks.yaml index 3a846ef..4f25001 100644 --- a/.github/workflows/pr-checks.yaml +++ b/.github/workflows/pr-checks.yaml @@ -112,7 +112,7 @@ jobs: pushd $SITE_FOLDER_PATH/public sudo gem install html-proofer htmlproofer -v - htmlproofer --allow-hash-href --http-status-ignore "999" --url-ignore "/https://github.com/,/https://twitter.com/,https://fonts.googleapis.com" + htmlproofer --allow-hash-href --disable-external true lighthouse: needs: matrixBuild name: "Lighthouse Eval" @@ -152,6 +152,7 @@ jobs: repo-token: ${{ secrets.GITHUB_TOKEN }} # Provide either site-dir or url url: ${{ steps.netlify.outputs.url }} + scan-timeout: '600000' - name: Upload report artifact uses: actions/upload-artifact@v2 diff --git a/REFERENCE.md b/REFERENCE.md index fe7eb1f..2e97879 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -748,31 +748,37 @@ hugo new --kind talk talk/your-talk-slug ```yaml --- # Default hugo properties -title: "" # Name of the Person -description: "" # Used for SEO optimisation -publishDate: "" # TODO: Differentiate between date -date: "" # TODO: Differentiate between PublishDate +title: "" # Name of the Person +description: "" # Used for SEO optimisation +publishDate: "" # TODO: Differentiate between date +date: "" # TODO: Differentiate between PublishDate # Site-wide [required properties] -image: "" # Displayed when referenced in listing pages -images: # An array of images used in Social Sharing +image: "" # Displayed when referenced in listing pages +images: # An array of images used in Social Sharing - "" -tags: # Used for SEO optimisation and browsing across the site. +tags: # Used for SEO optimisation and browsing across the site. - "" - "" # Site-wide [optional properties] -banner: "" # Optional, but strongly recommended to give a professional feel -externalLink: "" # Full URL to override listing links to an external page -series: # Array of series (i.e. filenames of the series this is a part of) +series: # Array of series (i.e. filenames of the series this is a part of) - "" # Content-specific properties -eventName: "" # Name of the organising group / event (e.g. Name of the conference) -hosts: # Array of hosts in the episode (i.e. filenames of those people) +event: + attendanceType: "" # physical, virtual, hybrid + organizerName: "" # Name of the organising group / event (e.g. Name of the conference) + organizerUrl: "" # URL of the organising group + eventUrl: "" # URL of the specific event, if applicable (e.g. a meetup talk, rather than the meetup group) + type: "" # Type of event (e.g. Meetup, Conference, etc.) + location: "" # Required for physical and hybrid events. + cost: "" # Cost to attend the event + costCurrency: "" # Cost currency for the event. Use a standard format - http://en.wikipedia.org/wiki/ISO_4217 + available: "" # Whether registration/ticket purchases/etc. are still available (true/false). Defaults to false when event is in past. +speakers: # Array of hosts in the episode (i.e. filenames of those people). - "" -talkType: "" # String displayed on the talk page. Represents the type of talk. -youtube: "" # ID of the YouTube video for this content +youtube: "" # ID of the YouTube video for this content --- Input your talk description here. -``` +``` \ No newline at end of file diff --git a/archetypes/talk/index.md b/archetypes/talk/index.md index 73e445b..706241a 100644 --- a/archetypes/talk/index.md +++ b/archetypes/talk/index.md @@ -1,28 +1,35 @@ --- # Default hugo properties -title: "" # Name of the Person -description: "" # Used for SEO optimisation -publishDate: "" # TODO: Differentiate between date -date: "" # TODO: Differentiate between PublishDate +title: "" # Name of the Person +description: "" # Used for SEO optimisation +publishDate: "" # TODO: Differentiate between date +date: "" # TODO: Differentiate between PublishDate # Site-wide [required properties] -image: "" # Displayed when referenced in listing pages -images: # An array of images used in Social Sharing +image: "" # Displayed when referenced in listing pages +images: # An array of images used in Social Sharing - "" -tags: # Used for SEO optimisation and browsing across the site. +tags: # Used for SEO optimisation and browsing across the site. - "" - "" # Site-wide [optional properties] -externalLink: "" # Full URL to override listing links to an external page -series: # Array of series (i.e. filenames of the series this is a part of) +series: # Array of series (i.e. filenames of the series this is a part of) - "" # Content-specific properties -eventName: "" # Name of the organising group / event (e.g. Name of the conference) -hosts: # Array of hosts in the episode (i.e. filenames of those people) +event: + attendanceType: "" # physical, virtual, hybrid + organizerName: "" # Name of the organising group / event (e.g. Name of the conference) + organizerUrl: "" # URL of the organising group + eventUrl: "" # URL of the specific event, if applicable (e.g. a meetup talk, rather than the meetup group) + type: "" # Type of event (e.g. Meetup, Conference, etc.) + location: "" # Required for physical and hybrid events. + cost: "" # Cost to attend the event + costCurrency: "" # Cost currency for the event. Use a standard format - http://en.wikipedia.org/wiki/ISO_4217 + available: "" # Whether registration/ticket purchases/etc. are still available (true/false). Defaults to false when event is in past. +speakers: # Array of hosts in the episode (i.e. filenames of those people). - "" -talkType: "" # String displayed on the talk page. Represents the type of talk. -youtube: "" # ID of the YouTube video for this content +youtube: "" # ID of the YouTube video for this content --- Input your talk description here. diff --git a/assets/sass/custom_variables.scss b/assets/sass/custom_variables.scss deleted file mode 100644 index 2e4b90e..0000000 --- a/assets/sass/custom_variables.scss +++ /dev/null @@ -1,7 +0,0 @@ -$accent-color: #157DB9; -$footer-color: #157DB9; -$compliment-color: #CFDCE1; - -$blockquote-border-color: $accent-color; -$blockquote-border-width: 5px; -$blockquote-font-size: 15px; \ No newline at end of file diff --git a/assets/sass/main.scss b/assets/sass/main.scss index 4853249..64bcc38 100644 --- a/assets/sass/main.scss +++ b/assets/sass/main.scss @@ -1,8 +1,25 @@ $fa-font-path: "/webfonts"; $breadcrumb-divider: quote(">"); -@import "custom_variables"; +$mainlink-color: {{ .Site.Params.content.theme.mainlinkcolor | default "#0C62A8" }}; +$accent-color: {{ .Site.Params.content.theme.accentcolor | default "#157DB9" }}; +$footer-color: {{ .Site.Params.content.theme.footercolor | default "#157DB9" }}; +$compliment-color: {{ .Site.Params.content.theme.complimentcolor | default "#CFDCE1" }}; +$theme-colors: ( + "primary": #FFFFFF, + "secondary": #FFFFFF, + "success": #FFFFFF, + "info": #FFFFFF, + "warning": #FFFFFF, + "danger": #FFFFFF, + "light": #FFFFFF, + "dark": #FFFFFF +); + +$blockquote-border-color: $accent-color; +$blockquote-border-width: 5px; +$blockquote-font-size: 15px; // Custom.scss // Option B: Include parts of Bootstrap diff --git a/assets/sass/styles.scss b/assets/sass/styles.scss index 85f7345..762d883 100644 --- a/assets/sass/styles.scss +++ b/assets/sass/styles.scss @@ -20,7 +20,7 @@ blockquote { } .MuiTypography-colorInherit { - color: #0C62A8 !important; + color: $mainlink-color !important; } .navbar-dark .navbar-nav .nav-link { @@ -88,7 +88,7 @@ footer a { } main a { - color: #0C62A8; + color: $mainlink-color; text-decoration: none; } diff --git a/exampleSite/config.yaml b/exampleSite/config.yaml index 1f643ad..2098f81 100644 --- a/exampleSite/config.yaml +++ b/exampleSite/config.yaml @@ -161,6 +161,11 @@ params: twitter: "CloudWithChris" twitter_domain: "cloudwithchris.com" # This domain shows in twitter cards as "View on `twitter_domain`" youtube: "CloudWithChris" + theme: + accentcolor: "#FF0000" + complimentcolor: "#FFFFFF" + footercolor: "#FF0000" + mainlinkcolor: "#000000" # Parameters relating to site features and functionality features: # Settings relating to audio players embedded diff --git a/exampleSite/content/talk/waug-azure-arc/index.md b/exampleSite/content/talk/waug-azure-arc/index.md index 2555ae0..918fc44 100644 --- a/exampleSite/content/talk/waug-azure-arc/index.md +++ b/exampleSite/content/talk/waug-azure-arc/index.md @@ -4,13 +4,11 @@ Description: "Azure Arc is a suite of Azure Services that simplifies management PublishDate: "2021-09-29T15:30:00Z" Title: "Using Azure Arc to run your Application Services on-premises or in any cloud" image: img/talks/waug.jpg -hosts: +speakers: - chrisreddington images: - img/talks/waug.jpg - img/cloudwithchris.png -talkType: "Meetup" -eventName: "Welsh Azure User Group" tags: - Azure - Azure Arc @@ -18,6 +16,13 @@ tags: - Hybrid - Multicloud - Serverless -externalLink: https://www.youtube.com/watch?v=rwJ62UqA4oQ +youtube: "rwJ62UqA4oQ" +event: + attendanceType: "hybrid" # physical, virtual, hybrid + organizerName: "Welsh Azure User Group" # Name of the organising group / event (e.g. Name of the conference) + organizerUrl: "https://www.meetup.com/MSFT-Stack/" # URL of the organising group + eventUrl: "https://www.meetup.com/MSFT-Stack/" # URL of the specific event, if applicable (e.g. a meetup talk, rather than the meetup group) + type: "Meetup" # Type of event (e.g. Meetup, Conference, etc.) + location: "Somewhere cool" # Required for physical and hybrid events. --- Azure Arc is a suite of Azure Services that simplifies management of workloads in a Hybrid and Multicloud deployment. You've likely heard about this from the Infrastructure or Virtual Machine perspective, but how can it help with your applications? We'll explore how App Services, Logic Apps, Azure Functions, Event Grid and API Management Gateways can be deployed to on-premises and other clouds using Azure Arc! diff --git a/exampleSite/package-lock.json b/exampleSite/package-lock.json index 99f0084..0bdc21b 100644 --- a/exampleSite/package-lock.json +++ b/exampleSite/package-lock.json @@ -8,35 +8,60 @@ "name": "hugo-creator", "version": "2.0.0", "dependencies": { - "@fortawesome/fontawesome-free": "^5.15.2", - "bootstrap": "^5.0.0-beta2" + "@fortawesome/fontawesome-free": "^6.0.0", + "bootstrap": "^5.0.0" } }, "node_modules/@fortawesome/fontawesome-free": { - "version": "5.15.2", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.2.tgz", - "integrity": "sha512-7l/AX41m609L/EXI9EKH3Vs3v0iA8tKlIOGtw+kgcoanI7p+e4I4GYLqW3UXWiTnjSFymKSmTTPKYrivzbxxqA==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.0.0.tgz", + "integrity": "sha512-6LB4PYBST1Rx40klypw1SmSDArjFOcfBf2LeX9Zg5EKJT2eXiyiJq+CyBYKeXyK0sXS2FsCJWSPr/luyhuvh0Q==", "hasInstallScript": true, "engines": { "node": ">=6" } }, + "node_modules/@popperjs/core": { + "version": "2.11.2", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.2.tgz", + "integrity": "sha512-92FRmppjjqz29VMJ2dn+xdyXZBrMlE42AV6Kq6BwjWV7CNUW1hs2FtxSNLQE+gJhaZ6AAmYuO9y8dshhcBl7vA==", + "peer": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/popperjs" + } + }, "node_modules/bootstrap": { - "version": "5.0.0-beta2", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.0.0-beta2.tgz", - "integrity": "sha512-e+uPbPHqTQWKyCX435uVlOmgH9tUt0xtjvyOC7knhKgOS643BrQKuTo+KecGpPV7qlmOyZgCfaM4xxPWtDEN/g==" + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.1.3.tgz", + "integrity": "sha512-fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q==", + "license": "MIT", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/bootstrap" + }, + "peerDependencies": { + "@popperjs/core": "^2.10.2" + } } }, "dependencies": { "@fortawesome/fontawesome-free": { - "version": "5.15.2", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.2.tgz", - "integrity": "sha512-7l/AX41m609L/EXI9EKH3Vs3v0iA8tKlIOGtw+kgcoanI7p+e4I4GYLqW3UXWiTnjSFymKSmTTPKYrivzbxxqA==" + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.0.0.tgz", + "integrity": "sha512-6LB4PYBST1Rx40klypw1SmSDArjFOcfBf2LeX9Zg5EKJT2eXiyiJq+CyBYKeXyK0sXS2FsCJWSPr/luyhuvh0Q==" + }, + "@popperjs/core": { + "version": "2.11.2", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.2.tgz", + "integrity": "sha512-92FRmppjjqz29VMJ2dn+xdyXZBrMlE42AV6Kq6BwjWV7CNUW1hs2FtxSNLQE+gJhaZ6AAmYuO9y8dshhcBl7vA==", + "peer": true }, "bootstrap": { - "version": "5.0.0-beta2", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.0.0-beta2.tgz", - "integrity": "sha512-e+uPbPHqTQWKyCX435uVlOmgH9tUt0xtjvyOC7knhKgOS643BrQKuTo+KecGpPV7qlmOyZgCfaM4xxPWtDEN/g==" + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.1.3.tgz", + "integrity": "sha512-fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q==", + "requires": {} } } } diff --git a/exampleSite/package-lock.old.json b/exampleSite/package-lock.old.json new file mode 100644 index 0000000..99f0084 --- /dev/null +++ b/exampleSite/package-lock.old.json @@ -0,0 +1,42 @@ +{ + "name": "hugo-creator", + "version": "2.0.0", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "name": "hugo-creator", + "version": "2.0.0", + "dependencies": { + "@fortawesome/fontawesome-free": "^5.15.2", + "bootstrap": "^5.0.0-beta2" + } + }, + "node_modules/@fortawesome/fontawesome-free": { + "version": "5.15.2", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.2.tgz", + "integrity": "sha512-7l/AX41m609L/EXI9EKH3Vs3v0iA8tKlIOGtw+kgcoanI7p+e4I4GYLqW3UXWiTnjSFymKSmTTPKYrivzbxxqA==", + "hasInstallScript": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/bootstrap": { + "version": "5.0.0-beta2", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.0.0-beta2.tgz", + "integrity": "sha512-e+uPbPHqTQWKyCX435uVlOmgH9tUt0xtjvyOC7knhKgOS643BrQKuTo+KecGpPV7qlmOyZgCfaM4xxPWtDEN/g==" + } + }, + "dependencies": { + "@fortawesome/fontawesome-free": { + "version": "5.15.2", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.2.tgz", + "integrity": "sha512-7l/AX41m609L/EXI9EKH3Vs3v0iA8tKlIOGtw+kgcoanI7p+e4I4GYLqW3UXWiTnjSFymKSmTTPKYrivzbxxqA==" + }, + "bootstrap": { + "version": "5.0.0-beta2", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.0.0-beta2.tgz", + "integrity": "sha512-e+uPbPHqTQWKyCX435uVlOmgH9tUt0xtjvyOC7knhKgOS643BrQKuTo+KecGpPV7qlmOyZgCfaM4xxPWtDEN/g==" + } + } +} diff --git a/exampleSite/package.json b/exampleSite/package.json index 0b79013..1ffe637 100644 --- a/exampleSite/package.json +++ b/exampleSite/package.json @@ -4,6 +4,6 @@ "private": true, "dependencies": { "@fortawesome/fontawesome-free": "^6.0.0", - "bootstrap": "^5.0.0-beta2" + "bootstrap": "^5.0.0" } } diff --git a/layouts/_default/_markup/render-image.html b/layouts/_default/_markup/render-image.html index 2092b26..00edeac 100644 --- a/layouts/_default/_markup/render-image.html +++ b/layouts/_default/_markup/render-image.html @@ -1,8 +1,32 @@ {{ if .Title }}
- {{ .Text }} + {{ template "image" (dict "context" . "page" .Page) }}
{{ .Title }}
{{ else }} - {{ .Text }} + {{ template "image" (dict "context" . "page" .Page) }} +{{ end }} + + +{{ define "image" }} +{{ $context := .context }} +{{ $page := .page }} +{{ $image := $page.Resources.GetMatch $context.Destination }} +{{ $tiny := ($image.Resize "480x webp") }} +{{ $small := ($image.Resize "768x webp") }} +{{ $medium := ($image.Resize "1024x webp") }} +{{ $large := ($image.Resize "1366x webp") }} +{{ $context.Text }} {{ end }} \ No newline at end of file diff --git a/layouts/partials/cards/content-card.html b/layouts/partials/cards/content-card.html index 5872632..26f7688 100644 --- a/layouts/partials/cards/content-card.html +++ b/layouts/partials/cards/content-card.html @@ -26,7 +26,7 @@ {{ end }} {{ if eq .Type "talk" }} - {{ partial "content/people.html" (dict "people" .Params.Hosts "site" $site "size" 50 )}} + {{ partial "content/people.html" (dict "people" .Params.Speakers "site" $site "size" 50 )}} {{ end }} diff --git a/layouts/partials/content/banner-image.html b/layouts/partials/content/banner-image.html index 216358b..b84bc54 100644 --- a/layouts/partials/content/banner-image.html +++ b/layouts/partials/content/banner-image.html @@ -16,9 +16,9 @@ {{- with $large.RelPermalink -}}, {{.}} 1366w{{- end -}}" src="{{ $banner.RelPermalink }}" sizes="(max-width: 600px) 480px, - (max-width: 800px) 480px, - (max-width: 1050px) 480px, - 768px" + (max-width: 800px) 768px, + (max-width: 1050px) 1024px, + 1366px" alt="{{ $content.Title }}" title="{{ $content.Title }}" /> diff --git a/layouts/partials/content/event-details.html b/layouts/partials/content/event-details.html new file mode 100644 index 0000000..014e2f7 --- /dev/null +++ b/layouts/partials/content/event-details.html @@ -0,0 +1,12 @@ +
+ {{ with .Params.event.type }}{{ . }}{{ end }}, + {{ if .Params.event.organizerName }} + {{ if .Params.event.organizerUrl }} + + {{ end }} + {{ .Params.event.organizerName }} + {{ if .Params.event.organizerUrl }} + + {{ end }} + {{ end }} +
\ No newline at end of file diff --git a/layouts/partials/content/published.html b/layouts/partials/content/published.html index a44a39f..44338be 100644 --- a/layouts/partials/content/published.html +++ b/layouts/partials/content/published.html @@ -1,4 +1,4 @@ - + - {{ .PublishDate.Format "January 2, 2006" }} + {{ .Date.Format "January 2, 2006" }} \ No newline at end of file diff --git a/layouts/partials/metadata/all-ld.html b/layouts/partials/metadata/all-ld.html index dac2570..470e349 100644 --- a/layouts/partials/metadata/all-ld.html +++ b/layouts/partials/metadata/all-ld.html @@ -22,7 +22,9 @@ "@type": "SearchAction", "target": { "@type": "EntryPoint", - "urlTemplate": {{ printf "%s%s" .Site.BaseURL "search?q={search_term_string}" | absURL }} + {{ with .Site.GetPage "search" }} + "urlTemplate": {{ printf "%s%s" .Permalink "?s={search_term_string}" }} + {{ end }} }, "query-input": "required name=search_term_string" } diff --git a/layouts/partials/metadata/image-ld.html b/layouts/partials/metadata/image-ld.html index 8836507..9f7f587 100644 --- a/layouts/partials/metadata/image-ld.html +++ b/layouts/partials/metadata/image-ld.html @@ -4,8 +4,7 @@ {{- if $banner -}} {{- $banner.Permalink -}} {{- else -}} - {{- $banner := resources.GetMatch ($content.Params.Banner | absURL) -}} - {{- $banner.Permalink -}} + {{- (resources.GetMatch $content.Params.Banner).Permalink -}} {{- end -}} {{- else -}} {{- if .Params.Image -}} diff --git a/layouts/partials/metadata/talk-ld.html b/layouts/partials/metadata/talk-ld.html index b23ceac..803e99c 100644 --- a/layouts/partials/metadata/talk-ld.html +++ b/layouts/partials/metadata/talk-ld.html @@ -1,42 +1,100 @@ -{{ $site := .Site }} +{{- $site := .Site -}} \ No newline at end of file diff --git a/layouts/partials/site-metadata.html b/layouts/partials/site-metadata.html index cb04d4b..318cee5 100644 --- a/layouts/partials/site-metadata.html +++ b/layouts/partials/site-metadata.html @@ -36,6 +36,7 @@ + @@ -92,8 +93,8 @@ - {{ $style := resources.Get "sass/main.scss" | toCSS | minify }} - + {{ $style := resources.Get "sass/main.scss" | resources.ExecuteAsTemplate "style.main.scss" . | toCSS | minify | fingerprint }} + @@ -149,6 +150,9 @@ {{ partial "metadata/paginator.html" (dict "paginator" (.Paginate (where .Pages ".Params.Upcoming" "!=" true)) "content" . )}} {{ if eq .IsPage true }} {{ partial "metadata/episode-ld.html" . }} + {{ with .Params.Youtube }} + + {{ end }} {{ end }} {{ else if eq .Section "person" }} {{ partial "metadata/paginator.html" (dict "paginator" (.Paginate (where .Pages ".Params.Upcoming" "!=" true).ByTitle) "content" . )}} @@ -159,6 +163,9 @@ {{ partial "metadata/paginator.html" (dict "paginator" (.Paginate (where .Pages ".Params.Upcoming" "!=" true)) "content" . )}} {{ if eq .IsPage true }} {{ partial "metadata/talk-ld.html" . }} + {{ with .Params.Youtube }} + + {{ end }} {{ end }} {{ else if eq .Section "series" }} {{ partial "metadata/paginator.html" (dict "paginator" (.Paginate (where .Pages ".Params.Upcoming" "!=" true)) "content" . )}} diff --git a/layouts/talk/single.html b/layouts/talk/single.html index b76ea53..d915bd4 100644 --- a/layouts/talk/single.html +++ b/layouts/talk/single.html @@ -34,22 +34,22 @@

{{ .Title }}

-
-
-
- {{ .Params.TalkType }}, {{ .Params.eventName }} + {{ if and .Params.event.organizerUrl .Params.event.organizerName}} +
+
+ {{ partial "content/event-details.html" . }}
-
+ {{ end }}
{{ partial "content/published.html" . }}
- {{ with .Params.externalLink }} + {{ with .Params.event.eventUrl }}
- See details + See event details
{{ end }} @@ -76,8 +76,9 @@

{{ .Title }}

{{ end }} + {{ define "main" }} -{{ $title := .Title }} + {{ $title := .Title }}
{{- with .Params.youtube -}}
@@ -92,5 +93,4 @@

Watch on YouTube

{{- end -}} -
{{ end }} \ No newline at end of file