adds enforcement of asset directory for square logos

themes/devopsdays-theme/layouts/index.html

@@ -20,10 +20,24 @@
                         {{- $.Scratch.Set "assetsdir" (printf "assets/events/%s/" ($.Scratch.Get "subdir")) -}}
                         {{- $.Scratch.Set "contentdir" (printf "static/events/%s/" ($.Scratch.Get "subdir")) -}}
                         {{- if (where (readDir "assets/events") "Name" ($.Scratch.Get "subdir")) -}}
-                            {{- if (where (readDir ($.Scratch.Get "assetsdir")) "Name" "logo.png") -}}
-                                {{- $imagelocation := (printf "events/%s/logo.png" .name) -}}
+                            {{- warnf "in the assets directory for %s" ($.Scratch.Get "subdir") -}}
+                            <!-- get the logo for front page here -->
+                            {{- if (where (readDir ($.Scratch.Get "assetsdir")) "Name" "logo-square.png") -}}
+                                {{- $.Scratch.Set "squarelogofile" "logo-square.png" -}}
+                            {{- else -}}
+                                {{- if (where (readDir ($.Scratch.Get "assetsdir")) "Name" "logo.png") -}}
+                                    {{- $.Scratch.Set "squarelogofile" "logo.png" -}}
+                                {{- else -}}
+                                    {{- $.Scratch.Set "squarelogofile" "" -}}
+                                {{- end -}}
+                            {{- end -}}
+                            {{- warnf "Value of the squarelogofile is %s" ($.Scratch.Get "squarelogofile") -}}
+
+                            {{- if ($.Scratch.Get "squarelogofile") -}}
+                                {{- $imagelocation := (printf "events/%s/%s" .name ($.Scratch.Get "squarelogofile")) -}}
+                                {{- warnf "Processing %s" ($.Scratch.Get "imagelocation") -}}
                                 {{- $imageresource := resources.Get $imagelocation -}}
-                                {{- $imagefile := $imageresource.Fit "236x236 webp Lanczos q100" -}}
+                                {{- $imagefile := $imageresource.Fill "236x236 webp Lanczos q100 Center" -}}
                                 <a href='{{ (printf "/events/%s" .name) }}'><img src='{{ $imagefile.RelPermalink  }}' class="img-fluid" alt="devopsdays {{ .city }}"/></a>
                                 {{- $.Scratch.Set "logo" "set" -}}
                             {{- end -}}

themes/devopsdays-theme/layouts/shortcodes/event_logo.html

@@ -2,11 +2,13 @@
 {{- $.Scratch.Set "contentdir" (printf "static/events/%s/" $e.name) -}}
 {{- $.Scratch.Set "assetsdir" (printf "assets/events/%s/" $e.name) -}}
 {{- if (where (readDir "assets/events") "Name" $e.name) -}}
-  {{- $imagelocation := (printf "events/%s/logo.png" $e.name) -}}
-  {{- $imageresource := resources.Get $imagelocation -}}
-  {{- $imagefile := $imageresource.Fit "600x600 webp Lanczos q100" -}}
-  <img alt="devopsdays {{ $e.city }} {{ $e.year }}" src='{{ $imagefile.RelPermalink }}' class="welcome-page-event-logo"/>
-{{- else if (where (readDir "static/events") "Name" $e.name) -}}
+  {{- if (where (readDir ($.Scratch.Get "assetsdir")) "Name" "logo.png") -}} 
+    {{- $imagelocation := (printf "events/%s/logo.png" $e.name) -}}
+    {{- $imageresource := resources.Get $imagelocation -}}
+    {{- $imagefile := $imageresource.Fit "600x600 webp Lanczos q100" -}}
+    <img alt="devopsdays {{ $e.city }} {{ $e.year }}" src='{{ $imagefile.RelPermalink }}' class="welcome-page-event-logo"/>
+  {{- end -}}
+  {{- else if (where (readDir "static/events") "Name" $e.name) -}}
   {{- if (where (readDir ($.Scratch.Get "contentdir")) "Name" "logo.jpg") -}}
     {{- $.Scratch.Set "logo" "logo.jpg" -}}
   {{- else -}}

utilities/README.md

@@ -20,7 +20,8 @@ Use [add_new_event.sh](add_new_event.sh) to add a new event. This is year-specif
 1. The script will create a data file for your event in `data/events/yyyy-city.yml`. This is where you will configure many of your updates and customizations. In particular, you need to list your local organizer team here.
 1. The script will populate your event directory in `content/events/yyyy-city` with default content. You should edit it as desired.
 1. The script will add or update your entry in `static/_redirects`. This allows you to use the url `https://devopsdays.org/city-name` to point to your current-year event.
-1. Once you have created a logo graphic, place it in `static/events/yyyy-city/logo.png`. (The file MUST be called `logo.png`.) The sample welcome page has a commented-out element to display a logo named in this way. For front-page use, you also need a square version in `static/events/yyyy-city/logo-square.jpg`.
+1. Once you have created a logo graphic, place it in `assets/images/events/yyyy-city/logo.png`. (The file MUST be called `logo.png`.) The sample welcome page has a commented-out element to display a logo named in this way.
+1. The image used for your event on the front page of the site will be the image located in `assets/images/events/yyyy-city/logo.png`, which will be cropped automatically cropped to square. If you want to override this, you can place a square image in `assets/images/events/yyyy-city/logo-square.png`.
 
 ## Google Analytics