Merge pull request #404 from devopsdays/bug-fixes

mattstratton · web-flow · commit 34f87b0c0146 · 2017-03-21T12:42:03.000-05:00
Bug fixes
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{{ .Site.LanguageCode }}">
+<html itemscope lang="{{ .Site.LanguageCode }}">
 
 <head>
     {{- partial "head.html" . -}}
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
@@ -1,6 +1,3 @@
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-{{ .Hugo.Generator }}
 {{ partial "meta.html" . }}
 {{ partial "head/seo.html" . }}
 
diff --git a/layouts/partials/map.html b/layouts/partials/map.html
@@ -7,7 +7,7 @@
 -->
 <!-- <link href="/css/googlemaps.css" rel="stylesheet"> -->
 <!-- the above stylesheet has been moved into the main one -->
-<script type="text/javascript" language="javascript">
+<script type="text/javascript">
 function initialize() {
     var map;
     var bounds = new google.maps.LatLngBounds();
@@ -66,7 +66,7 @@
             labelStyle: { opacity: 1 },
             url: markers[i][4]
         });
-        
+
         google.maps.event.addListener(marker, 'click', function() {
             window.location.href = this.url;
         });
@@ -76,7 +76,7 @@
 }
 </script>
 
-<script type="text/javascript" language="javascript">
+<script type="text/javascript">
       window.onload = function()
       {
           initialize();
diff --git a/layouts/partials/meta.html b/layouts/partials/meta.html
@@ -1,6 +1,7 @@
+<meta http-equiv="X-UA-Compatible" content="IE=edge" />
 <meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="chrome=1">
 <meta name="HandheldFriendly" content="True">
 <meta name="MobileOptimized" content="320">
 <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 {{- if .Site.Params.Description -}}<meta name="description" content="{{ .Site.Params.Description }}">{{- end -}}
+{{ .Hugo.Generator }}
diff --git a/layouts/shortcodes/event_logo.html b/layouts/shortcodes/event_logo.html
@@ -1,5 +1,17 @@
 {{ $path := split .Page.Source.File.Path .Site.Params.PathSeparator }}
 {{ $event_slug := index $path 1 }}
 {{ $e :=  (index .Page.Site.Data.events $event_slug) }}
+{{ $.Scratch.Set "contentdir" (printf "static/events/%s/" $event_slug) }}
 
-<img alt="devopsdays {{ $e.city }} {{ $e.year }}" src="/events/{{ $event_slug }}/logo.png" class="welcome-page-event-logo"/>
+{{if (where (readDir "static/events") "Name" $event_slug)}}
+
+
+  {{ if (where (readDir ($.Scratch.Get "contentdir")) "Name" "logo.jpg") }}
+    {{ $.Scratch.Set "logo" "logo.jpg" }}
+  {{ else }}
+    {{ $.Scratch.Set "logo" "logo.png" }}
+  {{ end }}
+
+  <img alt="devopsdays {{ $e.city }} {{ $e.year }}" src="/events/{{ $event_slug }}/{{$.Scratch.Get "logo"}}" class="welcome-page-event-logo"/>
+
+{{ end }}
