Skip to content
This repository was archived by the owner on Jul 21, 2019. It is now read-only.

Bug fixes #404

Merged
mattstratton merged 5 commits into from
Mar 21, 2017
Merged

Bug fixes #404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
eca55e6
Support jpg by default for logo shortcode
mattstratton Mar 21, 2017
190b9aa
Change UA compatible to proper setting
mattstratton Mar 21, 2017
64fd16c
Move meta tags around to reduce duplication
mattstratton Mar 21, 2017
592f0e8
Remove unneeded javascript type tags
mattstratton Mar 21, 2017
4c7792a
Add itemscope to html element
mattstratton Mar 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion layouts/_default/baseof.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html lang="{{ .Site.LanguageCode }}">
<html itemscope lang="{{ .Site.LanguageCode }}">

<head>
{{- partial "head.html" . -}}
Expand Down
3 changes: 0 additions & 3 deletions layouts/partials/head.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" . }}

Expand Down
6 changes: 3 additions & 3 deletions layouts/partials/map.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -66,7 +66,7 @@
labelStyle: { opacity: 1 },
url: markers[i][4]
});

google.maps.event.addListener(marker, 'click', function() {
window.location.href = this.url;
});
Expand All @@ -76,7 +76,7 @@
}
</script>

<script type="text/javascript" language="javascript">
<script type="text/javascript">
window.onload = function()
{
initialize();
Expand Down
3 changes: 2 additions & 1 deletion layouts/partials/meta.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 }}
14 changes: 13 additions & 1 deletion layouts/shortcodes/event_logo.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 }}