From 09bff4fe240dd5bd0a0021fd7fcadb8d0e67d9cf Mon Sep 17 00:00:00 2001 From: Bridget Kromhout Date: Tue, 30 May 2017 20:47:41 -0500 Subject: [PATCH 1/3] Adding ignite+workshop talk types to talk display --- layouts/program/single.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/program/single.html b/layouts/program/single.html index f9b07c556..6d473d484 100644 --- a/layouts/program/single.html +++ b/layouts/program/single.html @@ -83,7 +83,7 @@
{{- if .comments -}} {{ .comments | markdownify }}
 {{- end -}} - {{- else if eq .type "talk" -}} + {{- else if or (eq .type "talk") (eq .type "ignite") (eq .type "workshop") -}} {{ $.Scratch.Get (printf "%s-speaker" .title) }} - From 97b2a46708ba0ef0d77675f0c63869cb1c035a81 Mon Sep 17 00:00:00 2001 From: Bridget Kromhout Date: Tue, 30 May 2017 20:49:42 -0500 Subject: [PATCH 2/3] Documenting additional talk types + how handled --- REFERENCE.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/REFERENCE.md b/REFERENCE.md index f85272122..da0372c70 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -180,8 +180,8 @@ program: | Field Name | Required | Description | Example | |--------------------|----------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------| -| `title` | Yes | The name of the program element. If it is a talk or ignite, it should be the name of the talk/ignite file, minus the `.md` extension. | "Opening Welcome" or "apple-jack" | -| `type` | Yes | The type for the program element. Valid choices are `custom`, `talk`, `ignite`, `workshop`, or `open-space`. This defines the color of the program element. If you set `ignite`, it will also display all ignites for that date. | talk | +| `title` | Yes | The name of the program element. If it is a talk, ignite, or workshop, use the name of the talk/ignite/workshop file, minus the `.md` extension. | "Opening Welcome" or "apple-jack" | +| `type` | Yes | The type for the program element. Valid choices are `custom`, `talk`, `ignite`, `workshop`, or `open-space`. This defines the color of the program element. `talk`, `ignite`, and `workshop` types will create a link to the program item named in `title`. | talk | | `date` | Yes | The date of the program element, in YYYY-MM-DD format. | 2017-06-16 | | `start_time` | Yes | The start time of the program element. | "08:00" | | `end_time` | Yes | The end time of the program element. | "13:40" | From 3dc61c44369f6a3587bf270a37965e9519ca7214 Mon Sep 17 00:00:00 2001 From: Bridget Kromhout Date: Tue, 30 May 2017 21:48:12 -0500 Subject: [PATCH 3/3] Correction; ignites handled differently --- layouts/program/single.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/program/single.html b/layouts/program/single.html index 6d473d484..fbfd05e04 100644 --- a/layouts/program/single.html +++ b/layouts/program/single.html @@ -83,7 +83,7 @@
{{- if .comments -}} {{ .comments | markdownify }}
 {{- end -}} - {{- else if or (eq .type "talk") (eq .type "ignite") (eq .type "workshop") -}} + {{- else if or (eq .type "talk") (eq .type "workshop") -}} {{ $.Scratch.Get (printf "%s-speaker" .title) }} -