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

Commit c74c91d

Browse files
authored
Merge pull request #627 from yvovandoorn/issue626
allow for comments when talk or workshop type is selected
2 parents c8d1514 + e68aa66 commit c74c91d

3 files changed

Lines changed: 11 additions & 1 deletion

File tree

REFERENCE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ program:
189189
| `date` | Yes | The date of the program element, in YYYY-MM-DD format. | 2017-06-16 |
190190
| `start_time` | Yes | The start time of the program element. | "08:00" |
191191
| `end_time` | Yes | The end time of the program element. | "13:40" |
192-
| `comments` | No | Additional comments/notes about the program element (for example, location of an evening event). Markdown is supported. | "This will be at the [Pony Club](http://www.mattstratton.com),1005 Ponyville Drive,Ponyville, IL,60612" |
192+
| `comments` | No | Additional comments/notes about the program types `talk`, `workshop` and `custom` (for example, location of an evening event). Markdown is supported. | "This will be at the [Pony Club](http://www.mattstratton.com),1005 Ponyville Drive,Ponyville, IL,60612" |
193193
| `background_color` | No | Allows the ability to override the color of the program element. Only the background color can be changed; please test to make sure the color works with the displayed text colors. Color is expressed in RGB HEX value. Must be in quotes. | "#FFFA99" |
194194

195195
##### Program Element Colors

exampleSite/data/events/2017-ponyville.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ program:
197197
date: 2017-07-16
198198
start_time: "09:15"
199199
end_time: "09:45"
200+
comments: "Talk located in Main Room"
200201
- title: "Sponsors"
201202
type: custom
202203
date: 2017-07-16
@@ -252,6 +253,12 @@ program:
252253
date: 2017-07-16
253254
start_time: "14:15"
254255
end_time: "15:00"
256+
- title: "twilight-sparkle"
257+
type: talk
258+
date: 2017-07-16
259+
start_time: "14:15"
260+
end_time: "15:00"
261+
comments: "Alternative Track | Located in other room"
255262
- title: "Break"
256263
type: workshop
257264
date: 2017-07-16

layouts/program/single.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,9 @@ <h5 class="mb-0">
9090
-
9191
{{ $.Scratch.Get .title }}
9292
</a><br/>
93+
{{- if .comments -}}
94+
<span class="program-page-desc">{{ .comments | markdownify }}<br/></span>
95+
{{- end -}}
9396
{{- else if eq .type "ignite" -}}
9497
{{ .title }}
9598
<!-- do ignite stuff here -->

0 commit comments

Comments
 (0)