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

Display single-day events correctly #170

Merged
merged 1 commit into from
Feb 2, 2017
Merged

Display single-day events correctly #170

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
7 changes: 7 additions & 0 deletions layouts/partials/future.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,17 @@ <h3 class="left-nav-year">{{ dateFormat "2006" .startdate }}</h3>
<h4 class="left-nav-months">{{ dateFormat "January" .startdate }}</h4>
{{- $.Scratch.Set "month-displayed" "true" -}}
{{- end -}}
{{- if ne .startdate .enddate }}
<a href = "/events/{{ .name }}/welcome" class = "left-nav-event">
{{ dateFormat "Jan 2" .startdate }} - {{ dateFormat "Jan 2" .enddate }}
{{ .city }}
</a><br />
{{- else -}}
<a href = "/events/{{ .name }}/welcome" class = "left-nav-event">
{{ dateFormat "Jan 2" .startdate }}
{{ .city }}
</a><br />
{{- end -}}
{{- end -}}
{{- end -}}
{{- end -}}
Expand Down
6 changes: 5 additions & 1 deletion layouts/partials/welcome.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@
<h2>DevOpsDays {{ $e.city }}</h2>
{{ end }}
{{ if $e.startdate }}
{{- dateFormat "January 2" $e.startdate -}} - {{- dateFormat "2, 2006" $e.enddate -}}
{{- if ne $e.startdate $e.enddate }}
{{- dateFormat "January 2" $e.startdate -}} - {{- dateFormat "2, 2006" $e.enddate -}}
{{- else }}
{{- dateFormat "January 2" $e.startdate -}}
{{- end }}
{{ end }}
<br />
{{if $e.location }}
Expand Down