Setup for multiple award compatibility

See newtheatre/history-project#1110
URN · Aug 21, 2018 · 30a2a2b · 30a2a2b
1 parent 097a172
commit 30a2a2b
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 9 deletions.
diff --git a/_data/defs/person.yaml b/_data/defs/person.yaml
@@ -66,9 +66,9 @@
   generated: true
 
 - attr: award
-  type: string
-  short: Award person recieved on leaving the station
-  description: "Should be in title case, Fellowship, Commendation. If not applicable line should be omitted."
+  type: array
+  short: Award person recieved for work at the station
+  description: "If not applicable line should be omitted."
 
 - attr: careers
   type: array

diff --git a/_data/defs/show.yaml b/_data/defs/show.yaml
@@ -99,6 +99,11 @@
   short: Date of last performance
   description: "In the format YYYY-MM-DD, omit if show only ran one day."
 
+- attr: award
+  type: array
+  short: List of awards the show has won.
+  description: "Specify title, year and organisation who gave the award (eg. SRAs, URN, etc.). Awards given to people as part of a show should be recorded on the person's entry."
+
 - attr: excerpt
   type: string
   description: "Generated excerpt of synopsis for use in search results and other summaries."

diff --git a/_includes/award.html b/_includes/award.html
@@ -0,0 +1 @@
+ <strong>{{ award.org }}, {{ award.year }}: </strong>{{ award.title }} {% if award.show %}(<i>{{ award.show }}</i>){% endif %} 
diff --git a/_layouts/person.html b/_layouts/person.html
@@ -95,12 +95,14 @@ <h2>Then</h2>
           <dd><span class="unknown">Unknown</span></dd>
         {% endfor %}
 
-        {% if person.award %}
-        <dt><i class="fas fa-fw fa-trophy"></i>Award</dt>
-        <dd>{{ person.award }}</dd>
+        {% if person.award.size != 0 %}
+          <dt><i class="fas fa-fw fa-trophy"></i>Awards</dt>
+            {% for award in person.award %}
+              <dd>{%include award.html award=award %}</dd>
+            {% endfor %}
         {% endif %}
 
-        {% if person.committees %}
+        {% if person.committees.size != 0 %}
         <dt><i class="fas fa-fw fa-users"></i>Committees</dt>
         <dd>
           <ul class="person-meta-list">

diff --git a/_layouts/show.html b/_layouts/show.html
@@ -107,6 +107,16 @@ <h1 class="show-title">{{ show.title | escape_once }}</h1>
             {% endif %}
             </p>
           </div>
+          {% if show.award %}
+          <i class="meta-icon fa fa-trophy"></i>
+          <div class="meta-col show-awards">
+            <p>
+              {% for award in show.award %}
+                {% include award.html award=award %}{% unless forloop.last %}<br /> {% endunless %}
+              {% endfor %}
+            </p>
+          </div>
+          {% endif %}
         </div>
 
       </header>

diff --git a/_people/james_perkins.md b/_people/james_perkins.md
@@ -7,6 +7,9 @@ course:
 links:
   - type: Twitter
     username: JamesPkns
-award: Lifetime Membership
+award:
+  - title: Lifetime Membership
+    year: 2017
+    org: URN
 graduated: 2017
 ---
diff --git a/_people/matt_manley.md b/_people/matt_manley.md
@@ -4,6 +4,9 @@ gender: male
 links:
   - type: Twitter
     username: MattManley95
-award: Lifetime Membership
+award:
+  - title: Lifetime Membership
+    year: 2017
+    org: URN
 graduated: 2017
 ---
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<strong>{{ award.org }}, {{ award.year }}: </strong>{{ award.title }} {% if award.show %}(<i>{{ award.show }}</i>){% endif %}