Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge changes from m1keil #38

Merged
merged 1 commit into from
Nov 22, 2015
Merged

Merge changes from m1keil #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 content/events/2015-chicago/conduct.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
+++
Description = ""
event = "chicago2015"
event = "2015chicago"
date = "2015-11-09T17:40:56-06:00"
title = "conduct"
City = "Chicago"
Expand Down
2 changes: 1 addition & 1 deletion content/events/2015-chicago/contact.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
+++
Description = ""
event = "chicago2015"
event = "2015chicago"
date = "2015-11-09T17:40:56-06:00"
title = "contact"
City = "Chicago"
Expand Down
2 changes: 1 addition & 1 deletion content/events/2015-chicago/location.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
+++
Description = ""
event = "chicago2015"
event = "2015chicago"
date = "2015-11-09T17:40:56-06:00"
title = "location"
City = "Chicago"
Expand Down
2 changes: 1 addition & 1 deletion content/events/2015-chicago/program.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
+++
Description = ""
event = "chicago2015"
event = "2015chicago"
date = "2015-11-09T17:40:56-06:00"
title = "program"
City = "Chicago"
Expand Down
2 changes: 1 addition & 1 deletion content/events/2015-chicago/sponsor.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
+++
Description = ""
event = "chicago2015"
event = "2015chicago"
date = "2015-11-09T17:40:56-06:00"
title = "sponsor"
City = "Chicago"
Expand Down
2 changes: 1 addition & 1 deletion content/events/2015-chicago/welcome.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
+++
Description = ""
event = "chicago2015"
event = "2015chicago"
date = "2015-11-09T17:40:56-06:00"
title = "welcome"
City = "Chicago"
Expand Down
2 changes: 1 addition & 1 deletion content/events/2016-kiel/conduct.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ City = "Kiel"
Description = ""
Year = "2016"
date = "2015-11-19T23:29:49-06:00"
event = "kiel2016"
event = "2016kiel"
title = "conduct"
type = "event"

Expand Down
2 changes: 1 addition & 1 deletion content/events/2016-kiel/contact.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ City = "Kiel"
Description = ""
Year = "2016"
date = "2015-11-19T23:29:49-06:00"
event = "kiel2016"
event = "2016kiel"
title = "contact"
type = "event"

Expand Down
2 changes: 1 addition & 1 deletion content/events/2016-kiel/location.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ City = "Kiel"
Description = ""
Year = "2016"
date = "2015-11-19T23:29:49-06:00"
event = "kiel2016"
event = "2016kiel"
title = "location"
type = "event"

Expand Down
2 changes: 1 addition & 1 deletion content/events/2016-kiel/propose.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ City = "Kiel"
Description = ""
Year = "2016"
date = "2015-11-19T23:29:49-06:00"
event = "kiel2016"
event = "2016kiel"
title = "propose"
type = "event"

Expand Down
2 changes: 1 addition & 1 deletion content/events/2016-kiel/registration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ City = "Kiel"
Description = ""
Year = "2016"
date = "2015-11-19T23:29:49-06:00"
event = "kiel2016"
event = "2016kiel"
title = "registration"
type = "event"

Expand Down
2 changes: 1 addition & 1 deletion content/events/2016-kiel/sponsor.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ City = "Kiel"
Description = ""
Year = "2016"
date = "2015-11-19T23:29:49-06:00"
event = "kiel2016"
event = "2016kiel"
title = "sponsor"
type = "event"

Expand Down
2 changes: 1 addition & 1 deletion content/events/2016-kiel/welcome.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ City = "Kiel"
Description = ""
Year = "2016"
date = "2015-11-19T23:29:49-06:00"
event = "kiel2016"
event = "2016kiel"
title = "welcome"
type = "event"
aliases = ["/events/2016-kiel"]
Expand Down
28 changes: 28 additions & 0 deletions data/events/2015chicago.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: 2015chicago
year: "2015"
city: "Chicago"
friendly: "2015-chicago"
status: "past"
startdate: 2015-08-25
enddate: 2015-08-26
coordinates: "47.609895, -122.330259"
navigationelements: ["welcome", "contact","location", "conduct","sponsor"]
sponsors:
- id: chef
level: platinum
- id: datadog
level: gold
- id: arresteddevops
level: media

sponsor_levels:
- id: platinum
label: Platinum
- id: gold
label: Gold
- id: silver
label: Silver
- id: bronze
label: Bronze
- id: media
label: Media
26 changes: 26 additions & 0 deletions data/events/2015warsaw.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: 2015warsaw
year: "2015"
city: "Warsaw"
friendly: "2015-warsaw"
status: "current"
startdate: 2015-11-24
enddate: 2015-11-25
coordinates: "47.609895, -122.330259"
navigationelements: ["welcome", "location", "register", "program", "ignites", "partners", "contact", "conduct"]
sponsors:
- id: allegro
level: main
- id: uniteam
level: platinum
- id: kainos
level: gold
- id: connectis
level: regeneration-zone
- id: codersmill
level: sponsor
- id: eventory
level: partners
- id: kamea
level: partners
- id: teetbee
level: partners
30 changes: 30 additions & 0 deletions data/events/2016kiel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: 2016kiel
year: "2016"
city: "Kiel"
friendly: "2016-kiel"
status: "current"
startdate: 2016-05-12
enddate: 2016-05-13
coordinates: "47.609895, -122.330259"
navigationelements: ["welcome", "propose", "location", "registration", "sponsor", "contact", "conduct"]
sponsors:
- id: kiwi
level: host
- id: wobe
level: special
override:
url: www.microsoft.co.il
- id: puppet
level: special

sponsor_levels:
- id: gold
label: Gold
- id: host
label: Host
- id: special
label: Special
- id: silver
label: Silver
- id: media
label: Media
16 changes: 0 additions & 16 deletions data/events/chicago2015.toml
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions data/events/kiel2016.toml
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions data/events/warsaw.toml
View file
Open in desktop

This file was deleted.

44 changes: 11 additions & 33 deletions themes/devopsdays/layouts/event/single.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,42 +16,20 @@ <h1> {{ $e.city }} - {{ title .Title }} </h1>
{{ .Content }}
</div>
<div class="col-md-4">
{{ range $sponsor := $e.t1sponsors }}
{{ if isset $.Site.Data.sponsors $sponsor }}
<h2>{{ $e.t1sponsortitle }} Sponsors</h2>
{{ $s := (index $.Site.Data.sponsors $sponsor) }}
<a href = "{{ $s.url }}"><img alt = "{{ $sponsor }}" src = "/img/sponsors/{{ $sponsor }}.png" class="img-responsive"></a>
{{ end }}
{{ end }}
{{ range $sponsor := $e.t2sponsors }}
{{ if isset $.Site.Data.sponsors $sponsor }}
<h2>{{ $e.t2sponsortitle }} Sponsors</h2>
{{ $s := (index $.Site.Data.sponsors $sponsor) }}
<a href = "{{ $s.url }}"><img alt = "{{ $sponsor }}" src = "/img/sponsors/{{ $sponsor }}.png" class="img-responsive"></a>
{{ end }}
{{ end }}
{{ range $sponsor := $e.t3sponsors }}
{{ if isset $.Site.Data.sponsors $sponsor }}
<h2>{{ $e.t3sponsortitle }} Sponsors</h2>
{{ $s := (index $.Site.Data.sponsors $sponsor) }}
<a href = "{{ $s.url }}"><img alt = "{{ $sponsor }}" src = "/img/sponsors/{{ $sponsor }}.png" class="img-responsive"></a>
{{ end }}
{{ end }}
{{ range $sponsor := $e.t4sponsors }}
{{ if isset $.Site.Data.sponsors $sponsor }}
<h2>{{ $e.t4sponsortitle }} Sponsors</h2>
{{ $s := (index $.Site.Data.sponsors $sponsor) }}
<a href = "{{ $s.url }}"><img alt = "{{ $sponsor }}" src = "/img/sponsors/{{ $sponsor }}.png" class="img-responsive"></a>
{{ end }}
{{ end }}
{{ range $sponsor := $e.t5sponsors }}
{{ if isset $.Site.Data.sponsors $sponsor }}
<h2>{{ $e.t5sponsortitle }} Sponsors</h2>
{{ $s := (index $.Site.Data.sponsors $sponsor) }}
<a href = "{{ $s.url }}"><img alt = "{{ $sponsor }}" src = "/img/sponsors/{{ $sponsor }}.png" class="img-responsive"></a>
<!-- sponsor code begin -->
{{ $sponsors := $e.sponsors }}
{{ range $e.sponsor_levels }}
<h2>{{ .label }} Sponsors</h2>
{{ range where $sponsors "level" .id }}
{{ $s := (index $.Site.Data.sponsors .id) }}
{{ if isset $.Site.Data.sponsors .id }}
<a href = "{{ $s.url }}"><img alt = "{{ .id }}" src = "/img/sponsors/{{ .id }}.png" class="img-responsive"></a>
{{ end }}
{{ end }}
<a href = "/events/{{ $e.friendly }}/sponsor">Become a {{ .label }} Sponsor!</a>
{{ end }}

<!-- sponsor code end -->
</div>
</div>

Expand Down