Add a second check for image files (checking "content/") - Fix devops…

…days#573
somatorio · Dec 10, 2018 · 13ef2b2 · 13ef2b2
1 parent f446db5
commit 13ef2b2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/layouts/shortcodes/list_organizers.html b/layouts/shortcodes/list_organizers.html
@@ -14,7 +14,8 @@ <h4>Organizer</h4>
             </div>
             {{- if .image -}}
             {{ $imagefile := printf "static/events/%s/organizers/%s" $e.name .image }}
-              {{ if (fileExists $imagefile) -}}
+            {{ $imagefile2 := printf "content/events/%s/organizers/%s" $e.name .image }}
+              {{ if or (fileExists $imagefile) (fileExists $imagefile2) -}}
               <img class="card-img-top organizer-image" src="{{ (printf "events/%s/organizers/%s" $e.name .image) | absURL }}" alt="{{ .name }}">
               {{- else }}
                 {{ errorf "%s not found" $imagefile }}

diff --git a/layouts/speaker/single.html b/layouts/speaker/single.html
@@ -35,7 +35,8 @@ <h3>{{ .Title }} at {{ $e.city }} {{$e.year}}</h3>
     {{- if isset .Params "image" -}}
       {{- if ne .Params.image "" -}}
         {{ $imagefile := printf "static/events/%s/speakers/%s" $e.name .Params.image }}
-        {{ if fileExists $imagefile }}
+        {{ $imagefile2 := printf "content/events/%s/speakers/%s" $e.name .Params.image }}
+        {{ if or (fileExists $imagefile) (fileExists $imagefile2) }}
         <img src = "{{ (printf "events/%s/speakers/%s" $e.name .Params.image) |absURL }}" class="img-fluid" alt="{{ .Title }}"/><br />
         {{ else }}
           {{ errorf "%s not found" $imagefile }}

diff --git a/layouts/speakers/single.html b/layouts/speakers/single.html
@@ -13,7 +13,8 @@
         {{- if isset .Params "image" -}}
           {{- if ne .Params.image "" -}}
             {{ $imagefile := printf "static/events/%s/speakers/%s" $e.name .Params.image }}
-            {{ if fileExists $imagefile }}
+            {{ $imagefile2 := printf "content/events/%s/speakers/%s" $e.name .Params.image }}
+            {{ if or (fileExists $imagefile) (fileExists $imagefile2) }}
             <img src = "{{ (printf "events/%s/speakers/%s" $e.name .Params.image) | absURL}}" class="speakers-page img-fluid" alt="{{ .Title }}"/><br />
             {{ else }}
               {{ errorf "%s not found" $imagefile }}