Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement (better) awards #1110

Draft
wants to merge 36 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
0bebb66
Person page displays detailed awards
samozzy Apr 2, 2018
8d4f1e8
Update all people with awards
samozzy Apr 2, 2018
ad1cfe1
Add NSDF 2013 Awards
samozzy Apr 2, 2018
998ba89
Add NSDF 2018
samozzy Apr 2, 2018
ed92a22
NSDF 2011 Awards
samozzy Apr 2, 2018
a484224
NSDF 2011 Reviews
samozzy Apr 2, 2018
c8a81a2
href required on reviews
samozzy Apr 2, 2018
fd3214d
Update documentation
samozzy Apr 2, 2018
e03ceee
NSDF 2016
samozzy Apr 3, 2018
1fa910f
Correction to award titles
samozzy Apr 3, 2018
898d051
NSDF Wikipedia Notes
samozzy Apr 3, 2018
7072c48
NSDF 2008
samozzy Apr 3, 2018
d7b292b
NSDF 2007
samozzy Apr 3, 2018
1cd8ede
Add Director to Edinburgh 'Cast Aside'
samozzy Apr 3, 2018
3c05dae
Move awards into include; add documentation
samozzy Apr 3, 2018
8c3e126
Boat Party Awards
samozzy Apr 3, 2018
237b0a5
Mechaical --> Mechanical
GingertronMk1 Apr 3, 2018
d9d7ea8
Izzie got special rec last year IIRC
GingertronMk1 Apr 3, 2018
c25da1a
Award and Committee header only when relevant
samozzy Apr 3, 2018
a8b7d40
Merge remote-tracking branch 'origin/awards' into awards
samozzy Apr 3, 2018
66402ad
Merge branch 'master' into awards
samozzy Apr 3, 2018
9369463
year++
GingertronMk1 Apr 3, 2018
c6cdc24
Maddy for Best Director
GingertronMk1 Apr 3, 2018
56c0fed
All 2017 awards bar tearjerker and comedy and fringe spec reg
nhyty Apr 6, 2018
c18dd84
Forgot quotation marks
nhyty Apr 6, 2018
2b55a61
Adding Last 2017
nhyty Apr 7, 2018
2af87ed
Replacing deleted -
nhyty Apr 7, 2018
287fb87
Merge branch 'master' into awards
nhyty Jul 9, 2018
f6580aa
Commenting out Webiste for now
nhyty Jul 9, 2018
2083a69
Merge branch 'master' into awards
nhyty Jul 9, 2018
72ff4bc
Adding most of the 2018 awards
nhyty Jul 9, 2018
f769b7b
Updated people's awards in line with new syntax
GingertronMk1 Jul 10, 2018
49aa5b4
Adding the last of the 2018 awards
nhyty Jul 10, 2018
1292e0f
Minor Correction
nhyty Jul 10, 2018
0edb27a
Fixing fringe ld award
nhyty Jul 14, 2018
2be47d6
Fix search display
samozzy Sep 9, 2018
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
10 changes: 9 additions & 1 deletion _content/docs/person.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ gender: male
headshot: ABC123
course: BEng Mechanical Engineering
graduated: 2010
award:
- title: Best Lighting Design Ever
org: Chorley Chronicle
year: 2010
show: The Best Show Ever
careers:
- Lighting Designer
links:
Expand All @@ -47,7 +52,10 @@ course:
- Creative Writing BA
- English MA
graduated: 2015
award: Commendation
award:
- title: Commendation
org: NNT
year: 2015
careers:
- Finance
---
Expand Down
5 changes: 5 additions & 0 deletions _content/docs/show.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@ crew:
- role: Producer
name: Nick Stevenson

award:
- title: Best National Show
org: The National
year: 2013

prod_shots: abcd123

assets:
Expand Down
2 changes: 1 addition & 1 deletion _content/search.html
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ <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 class="meta"><%= item.graduated %><% if (item.award) { %><p class="meta">Awards<%= item.award %></p><% } %></p>
<p><%= item.excerpt %></p>
</div>
<% } else { %>
Expand Down
6 changes: 3 additions & 3 deletions _data/defs/person.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@
generated: true

- attr: award
type: string
short: Award person recieved on leaving the theatre
description: "Should be in title case, Fellowship, Commendation. If not applicable line should be omitted."
type: array
short: Award person recieved following activity at the theatre
description: "New Theatre awards include Fellowship and Commendation. If not applicable line should be omitted. Should implement title, org(anisation), year and, where appropriate, show."

- attr: careers
type: array
Expand Down
5 changes: 5 additions & 0 deletions _data/defs/show.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,11 @@
short: List of tours the show has been on (NSDF &c).
description: "Specify venue, date_start, date_end and notes. See [#12](https://github.com/newtheatre/history-project/issues/12). Shows taken to Edinburgh should have a separate show created under the Edinburgh period."

- attr: award
type: array
short: List of awards the show has won.
description: "Specify title, year and organisation who gave the award (eg. NSDF, NNT, 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."
Expand Down
4 changes: 4 additions & 0 deletions _data/history.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@
href: https://photos.newtheatre.org.uk/2011-12/Matthew-Bannister-Visit-2012/i-VgSsh2w/0/M/428161_10150669394401460_1300692780_n-M.jpg
alt: First foyer

- year: 2008
title: Success at NSDF 2008
description: "After several years away from the festival, the New Theatre returned to the National Student Drama Festival in 2008 with two shows: 'Proof' and 'Disco Pigs'. The theatre won the prestigious Judges' Award for Promoting Student Theatre, as well as 'Proof' winning five awards."

- year: 2011
title: UNCUT
description: "Another season of shows allows for more opportunity, and the UNCUT Season—now *Fringe*—is just that. Providing a platform for experimental, new, or more intimate theatre, this season runs parallel to the In House season. The majority of initial performances were located outside of the Theatre."
Expand Down
1 change: 1 addition & 0 deletions _includes/award.html
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 %}
10 changes: 6 additions & 4 deletions _layouts/person.html
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,14 @@ <h2>Then</h2>
<dd><span class="unknown">Unknown</span></dd>
{% endfor %}

{% if person.award %}
<dt><i class="fa fa-fw fa-trophy"></i>Award</dt>
<dd>{{ person.award }}</dd>
{% if person.award.size != 0 %}
<dt><i class="fa fa-fw fa-trophy"></i>Award</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="fa fa-fw fa-group"></i>Committees</dt>
<dd>
<ul class="person-meta-list">
Expand Down
10 changes: 10 additions & 0 deletions _layouts/show.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
11 changes: 11 additions & 0 deletions _people/alex_piechowski.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
title: Alex Piechowski
gender: male
submitted: false
award:
- title: Best Actor in a Supporting Gender Neutral Role (In House)
org: NNT
year: 2018
show: "Macbeth"

---
5 changes: 4 additions & 1 deletion _people/ali_blackwell.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ headshot: xR63swn
course:
- English Studies
graduated: 2008
award: Fellowship
award:
- title: Fellowship
org: NNT
year: 2008
careers:
- Web Designer
- Technology Consultant
Expand Down
9 changes: 8 additions & 1 deletion _people/andrew_houghton.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,14 @@
title: Andrew Houghton
headshot: xbRZdS6
graduated: 2018
award: Merit
gender: male
submitted: false
award:
- title: Best Director (Fringe)
org: NNT
year: 2017
show: "Contractions"
- title: Merit
org: NNT
year: 2018
---
5 changes: 4 additions & 1 deletion _people/andy_mcnamee.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ headshot: kD9JFM3
course:
- Film and Television Studies
graduated: 2010
award: Fellowship
award:
- title: Fellowship
org: NNT
year: 2010
submitted: false
careers:
- Freelance Director
Expand Down
9 changes: 8 additions & 1 deletion _people/angharad_davies.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,14 @@ title: Angharad Davies
headshot: F69VSZQ
gender: female
graduated: 2018
award: Merit
award:
- title: Outstanding Contribution to Unscripted
org: NNT
year: 2018
- title: Merit
org: NNT
year: 2018

submitted: false
graduated: 2018
---
5 changes: 4 additions & 1 deletion _people/anna_scholes.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
title: Anna Scholes
headshot: XJR3gnB
graduated: 2018
award: Commendation
gender: female
submitted: false
award:
- title: Commendation
org: NNT
year: 2018
---
5 changes: 5 additions & 0 deletions _people/anna_wheatley.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ course:
- Spanish and Portuguese
careers:
- Actress
award:
- title: Spotlight Award for Best Actress
org: NSDF
year: 2008
show: Proof

links:
- type: Spotlight
Expand Down
5 changes: 5 additions & 0 deletions _people/arthur_mckechnie.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,9 @@ title: Arthur Mckechnie
headshot: F74jtmG
gender: male
submitted: false
award:
- title: Best Lighting and Sound Design (Fringe)
org: NNT
year: 2017
show: "Crystal Quest"
---
7 changes: 6 additions & 1 deletion _people/becca_jones.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
---
title: Becca Jones
gender: female
graduated: 2016
submitted: false
award:
- title: Judges' Award for Acting
org: NSDF
year: 2016
show: West
graduated: 2016

---
9 changes: 8 additions & 1 deletion _people/ben_hollands.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,14 @@ course:
- English
graduated: 2015
contact_allowed: true
award: Fellowship
award:
- title: Fellowship
org: NNT
year: 2015
- title: Best Poster Design and Publicity (Fringe)
org: NNT
year: 2017
show: "Crystal Quest"
links:
- type: LinkedIn
username: ben-hollands-0ab589122
Expand Down
5 changes: 4 additions & 1 deletion _people/ben_standish.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
title: Ben Standish
headshot: c7McwwQ
graduated: 2018
award: Commendation
gender: male
submitted: false
award:
- title: Commendation
org: NNT
year: 2018
---
9 changes: 8 additions & 1 deletion _people/ben_woodford.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,15 @@ title: Ben Woodford
gender: male
headshot: cpDjp3Q
graduated: 2018
award: Merit
submitted: false
course:
- History BA
award:
- title: Best Backstage Crew Member
org: NNT
year: 2017
show: "DEAD: A Musical"
- title: Merit
org: NNT
year: 2018
---
5 changes: 4 additions & 1 deletion _people/beth_angella.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@
title: Beth Angella
headshot: Dq7wFs4
graduated: 2018
award: Commendation
gender: female
submitted: false
graduated: 2018
award:
- title: Commendation
org: NNT
year: 2018
---
18 changes: 17 additions & 1 deletion _people/beth_mullen.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,25 @@ title: Beth Mullen
headshot: sT7fj5J
gender: female
graduated: 2018
award: Merit
submitted: false
course:
- Economics BSc
- Behavioural Economics MSc

award:
- title: Best Costume (Fringe)
org: NNT
year: 2017
show: "Crystal Quest"
- title: Best Actor in a Leading Gender Neutral Role (In House)
org: NNT
year: 2018
show: "Dirk Gently's Holistic Detective Agency"
- title: Best Set Design (In House)
org: NNT
year: 2018
show: "One Man, Two Guvnors"
- title: Merit
org: NNT
year: 2018
---
5 changes: 4 additions & 1 deletion _people/charlie_brafman.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
title: Charlie Brafman
gender: male
graduated: 2008
award: Fellowship
award:
- title: Fellowship
org: NNT
year: 2008
links:
- type: Twitter
username: chazbobb
Expand Down
10 changes: 10 additions & 0 deletions _people/charlie_jamieson.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
title: Charlie Jamieson
gender: male
submitted: false
award:
- title: Best Supporting Actor (In House)
org: NNT
year: 2017
show: "Mercury Fur"
---
5 changes: 5 additions & 0 deletions _people/charlotte_kirkman.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,9 @@ headshot: 6V4G2RM
gender: female
submitted: false
graduated: 2017
award:
- title: Best Comedy Moment (Fringe)
org: NNT
year: 2017
show: The Super Awesome Happy Fun-Time Trick Performance
---
5 changes: 4 additions & 1 deletion _people/charlotte_sanders.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@ title: Charlotte Sanders
headshot: M9fTtmR
gender: female
graduated: 2018
award: Merit
submitted: false
course:
- Politics BA
award:
- title: Merit
org: NNT
year: 2018
---
5 changes: 4 additions & 1 deletion _people/chris_sharp-paul.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
title: Chris Sharp-Paul
headshot: Jr8L2Hr
graduated: 2018
award: Merit
gender: male
submitted: false
award:
- title: Merit
org: NNT
year: 2018
---
9 changes: 8 additions & 1 deletion _people/chris_trueman.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@ title: Chris Trueman
headshot: HdcsxkW
gender: male
graduated: 2017
award: Fellowship
award:
- title: Fellowship
org: NNT
year: 2017
- title: Best Supporting Actor (Fringe)
org: NNT
year: 2017
show: "Crystal Quest"
submitted: false
---
Loading