Event updates

exampleSite/content/events/2017-minneapolis/welcome.md

@@ -6,7 +6,6 @@ aliases = ["/events/2017-minneapolis"]
 
 +++
 
-**devopsdays is returning to {{< event_location >}} for a fourth year!**
 
 <div class = "row">
   <div class = "col-md-2">

exampleSite/data/events/2017-minneapolis.yml

@@ -1,6 +1,7 @@
 name: "2017-minneapolis"
 year: "2017"
 city: "Minneapolis"
+description: "devopsdays is returning to Minneapolis for a fourth year!"
 
 startdate: 2017-07-25
 enddate: 2017-07-26

layouts/event/single.html

@@ -17,6 +17,7 @@
         {{ else }}
           {{ .Content }}
         {{ end }}
+        <br />
         <!-- need to add else statement for the rest of the content types -->
         {{ partial "sponsors.html" . }}
 

layouts/index.html

@@ -31,12 +31,6 @@
                     {{-  dateFormat "Jan 2, 2006" .enddate -}}<br/>
                   </span>
                     <span class="homepage-grid-city"><a href = "/events/{{ .name }}">{{ .city }}</a></span>
-                    <br/>
-                    {{- if .description -}}
-                        {{- if ne .description "" -}}
-                            <span class="homepage-grid-desc">{{ .description | markdownify }}</span>
-                        {{- end -}}
-                    {{- end -}}
                 </div>
                 {{- if modBool ($.Scratch.Get "i") 4 -}}
                   </div>

layouts/partials/event_navbar.html

@@ -1,6 +1,8 @@
+{{/* 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 */}}
 
 <nav class="navbar navbar-toggleable-md navbar-light">
 
@@ -9,6 +11,7 @@
   </button>
   <div class="collapse navbar-collapse" id="navbarSupportedContent">
     <ul class="navbar-nav mr-auto">
+      <li class="nav-item event-navigation"><a class="nav-link" href="/events/{{ $event_slug }}/index">{{ $e.city }}</a></li>
       <li class="nav-item event-navigation"><a class="nav-link" href="/events/{{ $event_slug }}/program">Program</a></li>
       <li class="nav-item event-navigation"><a class="nav-link" href="/events/{{ $event_slug }}/register">Register</a></li>
       <li class="nav-item event-navigation"><a class="nav-link" href="/events/{{ $event_slug }}/speakers">Speakers</a></li>

layouts/partials/sponsors.html

@@ -9,6 +9,7 @@
       <div class="row cta-row">
           <!--first sponsor row-->
           <div class="col-md-12">
+	    <hr>
             <h4>{{ $level.label }} Sponsors</h4>
             {{- if ( $e.startdate) or (ge (dateFormat "2006-01-02" $e.startdate) (dateFormat "2006-01-02" ($.Now.Format "2006-01-02"))) -}}
               {{- if ne $e.sponsors_accepted "no" -}}
@@ -40,3 +41,4 @@ <h4>{{ $level.label }} Sponsors</h4>
   {{- end -}}
 {{- end -}}
 {{- end -}}
+<hr><br />

layouts/partials/welcome.html

@@ -5,10 +5,10 @@
 {{/* end site data query */}}
 
 <div class="row">
+
     <div class="col-xs-12 col-md-8">
-        {{ if $e.city }}
-          <h2>DevOpsDays {{ $e.city }}</h2>
-        {{ end }}
+
+
         {{ if $e.startdate }}
           {{- if ne $e.startdate $e.enddate }}
             {{- dateFormat "January 2" $e.startdate -}} - {{- dateFormat "2, 2006" $e.enddate -}}
@@ -17,34 +17,45 @@ <h2>DevOpsDays {{ $e.city }}</h2>
           {{- end }}
         {{ end }}
         <br />
+
         {{if $e.location }}
           <span>{{- $e.location -}}</span>
           <br />
         {{ end }}
+
+        {{ if $e.description }}
+          {{ $e.description | markdownify }}
+           <br /><br />
+        {{ end }}
+</div>
+
+ <div class="col-xs-12 col-md-4">
+        {{ partial "events/cta.html" . }}
+    </div>
+
+ <div class="col-xs-12 col-md-8">
+
+<i>Past {{ $e.city }} Events</i><br />
         {{if $e.city }}
           {{- $.Scratch.Set "past-counter" 0 -}}
           {{- range sort $.Site.Data.events "startdate" -}}
           {{- if .startdate -}} <!-- for some reason, it bails on the city Chicago, and also Paris -->
               {{- if eq (lower .city) (lower $e.city) -}}
                 {{- if ne .startdate $e.startdate -}}
-                  <i>Past {{ $e.city }} Events</i><br />
                   {{- $.Scratch.Set "past-counter" 1 -}}
                 {{- end -}}
-              {{- end -}}
               {{- if eq (lower .city) (lower $e.city)}}
                 {{- if ne .startdate $e.startdate -}}
-                  <a href = "/events/{{ .name }}">{{ dateFormat "2006" .startdate }}</a> <br />
+                  <a href = "/events/{{ .name }}">{{ dateFormat "2006" .startdate }}</a> &nbsp;&nbsp; 
                 {{- end -}}
               {{- end -}}
+              {{- end -}}
             {{- end -}}
           {{- end -}}
-          <br />
-        {{ end }}
-        {{ partial "events/cta.html" . }}
-        {{ if $e.description }}
-          {{ $e.description | markdownify }}
+          <br /><br />
         {{ end }}
 
+
     </div>
     <div class="col-xs-12 col-md-4">
     </div>