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

Removes dependency on welcome.md filename #174

Merged
merged 3 commits into from
Feb 2, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion archetypes/event.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
+++
Description = ""
Title = ""
Aliases = [""]
Type = "event"
+++
6 changes: 6 additions & 0 deletions archetypes/welcome.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
+++
Description = ""
Title = ""
Type = "welcome"
Aliases = [""]
+++
7 changes: 7 additions & 0 deletions exampleSite/content/events/2017-ponyville/index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
+++
Description = ""
Title = ""
Speaker = ""
Type = "welcome"
+++
Pivot paradigm sticky note agile grok unicorn waterfall is so 2000 and late responsive affordances thought leader. Grok big data ship it unicorn long shadow long shadow hacker. Entrepreneur waterfall is so 2000 and late integrate user centered design innovate integrate parallax prototype pivot user story fund latte iterate driven. Human-centered design SpaceTeam pitch deck workflow responsive venture capital earned media ideate user centered design thinker-maker-doer viral. Engaging co-working paradigm prototype latte prototype parallax sticky note ship it.
3 changes: 1 addition & 2 deletions exampleSite/content/events/2017-ponyville/welcome.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
Description = ""
Title = ""
Speaker = ""
Aliases = ["/events/2017-ponyville/"]
Type = "event"
Type = "welcome"
+++
Pivot paradigm sticky note agile grok unicorn waterfall is so 2000 and late responsive affordances thought leader. Grok big data ship it unicorn long shadow long shadow hacker. Entrepreneur waterfall is so 2000 and late integrate user centered design innovate integrate parallax prototype pivot user story fund latte iterate driven. Human-centered design SpaceTeam pitch deck workflow responsive venture capital earned media ideate user centered design thinker-maker-doer viral. Engaging co-working paradigm prototype latte prototype parallax sticky note ship it.
1 change: 1 addition & 0 deletions exampleSite/data/events/2017-ponyville.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ registration_open: "true"
registration_link: ""
cfp_open: "true"
cfp_link: ""
description: "It's time for more DevOpsDays at Ponyville!"

# navigationelements: ["welcome", "contact", "location", "program", "propose", "proposals", "conduct", "sponsor"]
nav_elements:
Expand Down
3 changes: 3 additions & 0 deletions layouts/partials/welcome.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ <h2>DevOpsDays {{ $e.city }}</h2>
<br />
{{ end }}
{{ partial "events/cta.html" . }}
{{ if $e.description }}
{{ $e.description | markdownify }}
{{ end }}

</div>
<div class="col-xs-12 col-md-4">
Expand Down
10 changes: 10 additions & 0 deletions layouts/program/single.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@ <h2>Program Data Test</h2>
{{ $event_slug := index $path 1 }}
{{ $e := (index $.Site.Data.events $event_slug) }}

{{- partial "event_navbar.html" . -}}

<div class="row">
<!-- enclosing div -->
<div class="col-md-12">
<!-- main content -->

{{- range where $.Site.Pages "Type" "talk" -}}
{{- $talk_path := split .File.Path .Site.Params.pathseperator -}}
{{- $talk_slug := index $talk_path 1 -}}
Expand Down Expand Up @@ -214,7 +221,10 @@ <h4>August 31, 2016</h4>
</div>
</div>

</div>{{ "<!-- close the content -->" | safeHTML }}


</div>{{ "<!-- whole big thing -->" | safeHTML }}


{{ end }}
27 changes: 27 additions & 0 deletions layouts/welcome/single.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{{ define "main" }}

{{/* site data query copypasta */}}
{{ $path := split $.Source.File.Path .Site.Params.pathseperator }}
{{ $event_slug := index $path 1 }}
{{ $e := (index $.Site.Data.events $event_slug) }}
{{/* end site data query */}}

{{- partial "event_navbar.html" . -}}

<div class="row">
<!-- enclosing div -->
<div class="col-md-12">
<!-- main content -->
{{- partial "welcome.html" . -}}
<!-- need to add else statement for the rest of the content types -->
{{ partial "sponsors.html" . }}


</div>{{ "<!-- close the content -->" | safeHTML }}


</div>{{ "<!-- whole big thing -->" | safeHTML }}



{{ end }}