URN · johnathan99j · Aug 21, 2018 · Aug 21, 2018 · Aug 21, 2018 · Aug 28, 2018
diff --git a/_content/search.html b/_content/search.html
@@ -49,8 +49,9 @@ <h3 class="search-result-person-title">
           <% if (item.poster_thumb_tag) { %><%= item.poster_thumb_tag %><% } else { %><i class="ion-ios-person"></i><% } %>
           <a href="<%= item.link %>"><%= item.title %></a>
           </h3>
-        <p class="meta"><%= item.graduated %><% if (item.award) { %> <%= item.award %><% } %></p>
-        <p><%= item.excerpt %></p>
+        <p class="meta">Graduated: <%= item.graduated %></p>
+        <% if (item.award)  { %><p class="meta">Awards<%= item.award %></p><% }%>
+        <% if (item.excerpt)  { %><p><%= item.excerpt %></p><% }%>
       </div>
     <% } else { %>
       <% if (item.group == "about") { %>

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
@@ -96,8 +96,10 @@ <h2>Then</h2>
         {% endfor %}
 
         {% if person.award.size != 0 %}
-        <dt><i class="fas fa-fw fa-trophy"></i>Award</dt>
-        <dd>{{ person.award }}</dd>
+          <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.size != 0 %}

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/george_oneill.md b/_people/george_oneill.md
@@ -9,6 +9,23 @@ links:
   - type: Twitter
     username: ofluff
 
+award:
+  - title: Best Newcomer
+    year: 2012
+    org: SRA
+  - title: Best Journalistic Programming (Bronze) (The Science Show)
+    year: 2012
+    org: SRA
+  - title: Best Journalistic Programming (Silver) (The Science Show)
+    year: 2013
+    org: SRA
+  - title: Best Speech Program (Silver) (The Science Show - A Brief History of You)
+    year: 2014
+    org: SRA
+  - title: Best Technical Achievement (Gold)
+    year: 2015
+    org: SRA
+
 submitted: 2018-08-13
 ---
 

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/johnathan_graydon.md b/_people/johnathan_graydon.md
@@ -5,6 +5,9 @@ course:
 graduated: 2018
 contact_allowed: true
 
-award: SU Lifetime Membership
+award:
+  - title: SU Lifetime Membership
+    year: 2018
+    org: SU
 submitted: 2018-08-23
 ---
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
 ---
diff --git a/_people/michael_gaffney.md b/_people/michael_gaffney.md
@@ -8,7 +8,10 @@ contact_allowed: true
 links:
   - type: Twitter
     username: M_W_Gaffney
-award: SU Award for Contributing to the Student Experience.
+award:
+  - title: SU Award for Contributing to the Student Experience
+    year: 2013?
+    org: SU
 submitted: 2018-08-21
 
 ---

diff --git a/_people/stuart_manton.md b/_people/stuart_manton.md
@@ -9,6 +9,41 @@ links:
 - type: LinkedIn
   username: stumanton
 
+award:
+- title: Best Interview (Nominated)
+  year: 2011
+  org: SRA
+- title: Best Live Event or OB (Silver)
+  year: 2011
+  org: SRA
+- title: Best Journalistic Programming (Silver) (The Pulse)
+  year: 2011
+  org: SRA
+- title: Best Student Radio Station (Gold)
+  year: 2011
+  org: SRA
+- title: Best Journalistic Programming (Gold) (The Pulse - The Truth about Taxis)
+  year: 2012
+  org: SRA
+- title: Best Journalistic Programming (Silver) (The Pulse - Who's Lenton Is It?)
+  year: 2012
+  org: SRA
+- title: Best Journalistic Programming (Bronze) (The Pulse - Who's Protecting Who?)
+  year: 2012
+  org: SRA
+- title: Best Marketing and Station Sound (Gold)
+  year: 2012
+  org: SRA
+- title: Best Student Radio Station (Gold)
+  year: 2012
+  org: SRA
+- title: Best Marketing and Station Sound (Bronze)
+  year: 2013
+  org: SRA
+- title: Best Student Radio Station (Gold)
+  year: 2013
+  org: SRA
+submitted: 2018-08-21
 ---
 
 Obviously being part of the team that won Station of the Year every year for the four years I was at URN - particularly 2011/12 and 2012/13 where I edited the entries. This was special.

diff --git a/_plugins/people.rb b/_plugins/people.rb
@@ -129,14 +129,14 @@ def generate_person(person)
         person.data["graduated_estimated"] = false
       end
 
-      # Student status 
+      # Student status
       if not person.data["graduated"] or not person.data["graduated_actual"] or (person.data["graduated"] > Time.now().year)
         if (person.data["shows"]) or (person.data["committees"])
-          person.data["student"] = true 
-        else 
-          person.data["student"] = false 
+          person.data["student"] = true
+        else
+          person.data["student"] = false
         end
-      end 
+      end
 
       # Replace headshots with SmugMug Images
       if person.data["headshot"]

diff --git a/feeds/search.json b/feeds/search.json
@@ -38,7 +38,7 @@ excerpt: ""
         "excerpt": {{ person.content | strip_html | truncatewords: 50 | jsonify}},
         {% if person.headshot %}"poster_thumb_tag": "<a href='{{person.url}}'><img src='{{person.headshot.person_search}}' class='search-result-poster-thumb' alt='{{person.name}}' /></a>",{% endif %}
         "graduated": {{ person.graduated | jsonify }},
-        "award": {{ person.award | jsonify }},
+        "award": {% if person.award.first == null %}null{% else %}"{% for award in person.award %} | {{award.title}}, {{award.year}}, {{award.org}}{% endfor %}"{% endif %},
         "link": {{ person.url | jsonify }}
     }
     {% assign first = false %}
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 %}