Merge pull request #151 from jyee/future_year

Former-commit-id: df00a04
devopsdays · Apr 17, 2016 · bf8cff4 · bf8cff4
2 parents ab17aac + b06ab36
commit bf8cff4
Showing 1 changed file with 26 additions and 7 deletions.
diff --git a/themes/devopsdays-legacy/layouts/partials/future.html b/themes/devopsdays-legacy/layouts/partials/future.html
@@ -1,3 +1,23 @@
+<!--
+Future events (i.e. "current" status) should take place in the current or
+following year. E.g. We should have events in January next year appear when it
+is December of the current year.
+
+This code creates 2-3 lists: One of current years and a list of current events
+for each year (namespaced with "future" to prevent collisions). Later we loop
+through these lists to generate our event info.
+-->
+
+{{ range seq .Now.Year (add .Now.Year 1) }}
+  {{ $future_year := (chomp .) }}
+  {{ range $.Site.Data.events }}
+    {{ if and (eq .year $future_year) (eq .status "current") }}
+      {{ $.Scratch.SetInMap "future_years" $future_year $future_year }}
+      {{ $.Scratch.SetInMap (print "future" $future_year) .startdate .friendly }}
+    {{ end }}
+  {{ end }}
+{{ end }}
+
 <div class="span-6 last">
     <div style=" padding-top:18px;" class="span-5 last">
         <h1>Future</h1>
@@ -9,14 +29,13 @@ <h1>Future</h1>
                 <tr>
                     <div style="display:table-cell; vertical-align:top">
                         <div style="margin:1px;">
-                            <strong>2016</strong> <!--lazy hardcoding! -->
-                            <br/>
+                            {{ range ($.Scratch.GetSortedMapValues "future_years") }}
+                                <strong>{{ . }}</strong><br/>
 
-                            {{ range $.Site.Data.events }}
-                              {{ if eq .status "current" }}
-                                <a href="/events/{{ .friendly}}">{{ .city }}: {{ dateFormat "Jan 2" .startdate }} - {{ dateFormat "Jan 2" .enddate }}</a>
-                                <br />
-                              {{ end }}
+                                {{ range ($.Scratch.GetSortedMapValues (print "future" .)) }}
+                                    {{ $c_event := (index $.Site.Data.events .) }}
+                                    <a href="/events/{{ $c_event.friendly }}">{{ $c_event.city }}: {{ dateFormat "Jan 2" $c_event.startdate }} - {{ dateFormat "Jan 2" $c_event.enddate }}</a><br />
+                                {{ end }}
                             {{ end }}
                         </div>
                     </div>