From f2f35372c8ff110ccc9f85b30d59fb451098420d Mon Sep 17 00:00:00 2001
From: Matt Stratton <matt.stratton@gmail.com>
Date: Thu, 2 Feb 2017 15:38:39 -0600
Subject: [PATCH 1/2] Removes dependency on welcome.md filename

Fixes #59

Signed-off-by: Matt Stratton <matt.stratton@gmail.com>
---
 archetypes/event.md                           |  1 -
 archetypes/welcome.md                         |  5 ++++
 .../content/events/2017-ponyville/index.md    |  7 +++++
 .../content/events/2017-ponyville/welcome.md  |  3 +--
 exampleSite/data/events/2017-ponyville.yml    |  1 +
 layouts/partials/welcome.html                 |  3 +++
 layouts/program/single.html                   | 10 +++++++
 layouts/welcome/single.html                   | 27 +++++++++++++++++++
 8 files changed, 54 insertions(+), 3 deletions(-)
 create mode 100644 archetypes/welcome.md
 create mode 100644 exampleSite/content/events/2017-ponyville/index.md
 create mode 100644 layouts/welcome/single.html

diff --git a/archetypes/event.md b/archetypes/event.md
index c5227cec0..60d1d0846 100644
--- a/archetypes/event.md
+++ b/archetypes/event.md
@@ -1,6 +1,5 @@
 +++
 Description = ""
 Title = ""
-Aliases = [""]
 Type = "event"
 +++
diff --git a/archetypes/welcome.md b/archetypes/welcome.md
new file mode 100644
index 000000000..8b7f044fa
--- /dev/null
+++ b/archetypes/welcome.md
@@ -0,0 +1,5 @@
++++
+Description = ""
+Title = ""
+Type = "welcome"
++++
diff --git a/exampleSite/content/events/2017-ponyville/index.md b/exampleSite/content/events/2017-ponyville/index.md
new file mode 100644
index 000000000..b383263a7
--- /dev/null
+++ b/exampleSite/content/events/2017-ponyville/index.md
@@ -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.
diff --git a/exampleSite/content/events/2017-ponyville/welcome.md b/exampleSite/content/events/2017-ponyville/welcome.md
index 87a76606b..b383263a7 100644
--- a/exampleSite/content/events/2017-ponyville/welcome.md
+++ b/exampleSite/content/events/2017-ponyville/welcome.md
@@ -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.
diff --git a/exampleSite/data/events/2017-ponyville.yml b/exampleSite/data/events/2017-ponyville.yml
index d1dccc1e0..b610224c0 100644
--- a/exampleSite/data/events/2017-ponyville.yml
+++ b/exampleSite/data/events/2017-ponyville.yml
@@ -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:
diff --git a/layouts/partials/welcome.html b/layouts/partials/welcome.html
index 4b599e994..f9f85331e 100644
--- a/layouts/partials/welcome.html
+++ b/layouts/partials/welcome.html
@@ -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">
diff --git a/layouts/program/single.html b/layouts/program/single.html
index ad490fbd2..8dbd0ef6a 100644
--- a/layouts/program/single.html
+++ b/layouts/program/single.html
@@ -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 -}}
@@ -214,7 +221,10 @@ <h4>August 31, 2016</h4>
   </div>
 </div>
 
+</div>{{ "<!-- close the content -->" | safeHTML }}
+
 
+</div>{{ "<!-- whole big thing -->" | safeHTML }}
 
 
 {{ end }}
diff --git a/layouts/welcome/single.html b/layouts/welcome/single.html
new file mode 100644
index 000000000..d18a420c4
--- /dev/null
+++ b/layouts/welcome/single.html
@@ -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 }}

From 827567ad812643a24f06915cce15c07330f9e39c Mon Sep 17 00:00:00 2001
From: Matt Stratton <matt.stratton@gmail.com>
Date: Thu, 2 Feb 2017 15:38:39 -0600
Subject: [PATCH 2/2] Removes dependency on welcome.md filename

Fixes #59

Signed-off-by: Matt Stratton <matt.stratton@gmail.com>
---
 archetypes/event.md                           |  1 -
 archetypes/welcome.md                         |  6 +++++
 .../content/events/2017-ponyville/index.md    |  7 +++++
 .../content/events/2017-ponyville/welcome.md  |  3 +--
 exampleSite/data/events/2017-ponyville.yml    |  1 +
 layouts/partials/welcome.html                 |  3 +++
 layouts/program/single.html                   | 10 +++++++
 layouts/welcome/single.html                   | 27 +++++++++++++++++++
 8 files changed, 55 insertions(+), 3 deletions(-)
 create mode 100644 archetypes/welcome.md
 create mode 100644 exampleSite/content/events/2017-ponyville/index.md
 create mode 100644 layouts/welcome/single.html

diff --git a/archetypes/event.md b/archetypes/event.md
index c5227cec0..60d1d0846 100644
--- a/archetypes/event.md
+++ b/archetypes/event.md
@@ -1,6 +1,5 @@
 +++
 Description = ""
 Title = ""
-Aliases = [""]
 Type = "event"
 +++
diff --git a/archetypes/welcome.md b/archetypes/welcome.md
new file mode 100644
index 000000000..7ed6231e3
--- /dev/null
+++ b/archetypes/welcome.md
@@ -0,0 +1,6 @@
++++
+Description = ""
+Title = ""
+Type = "welcome"
+Aliases = [""]
++++
diff --git a/exampleSite/content/events/2017-ponyville/index.md b/exampleSite/content/events/2017-ponyville/index.md
new file mode 100644
index 000000000..b383263a7
--- /dev/null
+++ b/exampleSite/content/events/2017-ponyville/index.md
@@ -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.
diff --git a/exampleSite/content/events/2017-ponyville/welcome.md b/exampleSite/content/events/2017-ponyville/welcome.md
index 87a76606b..b383263a7 100644
--- a/exampleSite/content/events/2017-ponyville/welcome.md
+++ b/exampleSite/content/events/2017-ponyville/welcome.md
@@ -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.
diff --git a/exampleSite/data/events/2017-ponyville.yml b/exampleSite/data/events/2017-ponyville.yml
index d1dccc1e0..b610224c0 100644
--- a/exampleSite/data/events/2017-ponyville.yml
+++ b/exampleSite/data/events/2017-ponyville.yml
@@ -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:
diff --git a/layouts/partials/welcome.html b/layouts/partials/welcome.html
index 4b599e994..f9f85331e 100644
--- a/layouts/partials/welcome.html
+++ b/layouts/partials/welcome.html
@@ -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">
diff --git a/layouts/program/single.html b/layouts/program/single.html
index ad490fbd2..8dbd0ef6a 100644
--- a/layouts/program/single.html
+++ b/layouts/program/single.html
@@ -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 -}}
@@ -214,7 +221,10 @@ <h4>August 31, 2016</h4>
   </div>
 </div>
 
+</div>{{ "<!-- close the content -->" | safeHTML }}
+
 
+</div>{{ "<!-- whole big thing -->" | safeHTML }}
 
 
 {{ end }}
diff --git a/layouts/welcome/single.html b/layouts/welcome/single.html
new file mode 100644
index 000000000..d18a420c4
--- /dev/null
+++ b/layouts/welcome/single.html
@@ -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 }}