[SUCS Devel] [Git][sucssite/sucs-site][beta] 5 commits: Update history to say N/A instead of none where the position didn't exist.
Imran Hussain
imranh at sucs.org
Mon Dec 21 18:28:17 GMT 2015
Imran Hussain pushed to branch beta at sucssite / sucs-site
Commits:
3793cd64 by Imran Hussain at 2015-12-04T15:28:10Z
Update history to say N/A instead of none where the position didn't exist.
- - - - -
59e50001 by Isabel Jenkins at 2015-12-07T01:42:42Z
Updated names
- - - - -
3f457c2e by Imran Hussain at 2015-12-08T23:01:57Z
Fix #25: Kill the projects landning page and go straight to GitLab.
- - - - -
d788d45f by Imran Hussain at 2015-12-16T14:44:30Z
Update staff and history pages to include 2016s exec
- - - - -
4795e418 by Imran Hussain at 2015-12-21T18:28:05Z
Merge branch 'master' into beta
- - - - -
3 changed files:
- database.sql
- static/About/History.txt
- static/About/Staff.txt
Changes:
=====================================
database.sql
=====================================
--- a/database.sql
+++ b/database.sql
@@ -2101,7 +2101,7 @@ COPY menu (id, title, parent, menuorder, target, title_cy, permission) FROM stdi
19 Members 16 1 /Community/Members Aelodau \N
20 Societies 16 2 /Community/Societies Cymdeithasau \N
33 Desktop on Demand 8 5 /Tools/Desktop on Demand \N \N
-34 Projects 16 8 /Community/Projects \N \N
+34 Projects 16 8 https://projects.sucs.org/explore \N \N
3 About \N 2 /About Amdano \N
16 Community \N 4 /Community Cymuned \N
37 Talks 16 5 /Community/Talks \N \N
=====================================
static/About/History.txt
=====================================
--- a/static/About/History.txt
+++ b/static/About/History.txt
@@ -14,13 +14,23 @@
</tr>
<tr>
<td>
-<p><strong>2015</strong></p>
+<p><strong>2016</strong></p>
</td>
-<td><strong><a href="/~imranh">imranh</a> (Imran Hussain)</strong></td>
-<td><strong><a href="/~stig">stig</a> (Priyan Gami)</strong></td>
-<td><strong><a href="/~sockitwench">sockitwench</a> (Courtney Simone Vasile)</strong></td>
+<td><strong><a href="/~elbows">elbows</a> (Laurence Sebastian Bowes)</strong></td>
+<td><strong><a href="/~unreturnable">unreturnable</a> (Isabel Jenkins)</strong></td>
+<td><strong><a href="/~coatlus">coatlus</a> (Quetzal Miguel Creamer Shorey)</strong></td>
<td><strong><a href="/~andy">andy</a> (Andrew Vincent Pover)</strong></td>
-<td><strong><a href="/~unreturnable">unreturnable</a> (Peter Jenkins)</strong></td>
+<td><strong><a href="/~gigosaurus">gigosaurus</a> (Christopher Lindsay Manners)</strong></td>
+</tr>
+<tr>
+<td>
+<p>2015</p>
+</td>
+<td><a href="/~imranh">imranh</a> (Imran Hussain)</td>
+<td><a href="/~stig">stig</a> (Priyan Gami)</td>
+<td><a href="/~sockitwench">sockitwench</a> (Courtney Simone Vasile)</td>
+<td><a href="/~andy">andy</a> (Andrew Vincent Pover)</td>
+<td><a href="/~unreturnable">unreturnable</a> (Isabel Jenkins)</td>
</tr>
<tr>
<td>
@@ -30,7 +40,7 @@
<td><a href="/~stig">stig</a> (Priyan Gami)</td>
<td><a href="/~nenenxi">nenenxi</a> (Calum Mark Phillips)</td>
<td><a href="/~sambw">sambw</a> (Samuel Joseph Bust-Webber)</td>
-<td><em>None</em></td>
+<td><em>N/A</em></td>
</tr>
<tr>
<td>
@@ -40,7 +50,7 @@
<td><a href="/~grepwood">grepwood</a> (Michael Dec)</td>
<td><a href="/~shirelings89">shirelings89</a> (Lorah Woodward)</td>
<td><a href="/~melonxhead">melonxhead</a> (Jake Bailey)</td>
-<td><em>None</em></td>
+<td><em>N/A</em></td>
</tr>
<tr>
<td>
@@ -50,7 +60,7 @@
<td><a href="/~zephyr">zephyr</a> (Safi Dewshi)</td>
<td><a href="/~rjames93">rjames93</a> (Rob James)</td>
<td><a href="/~shirelings89">shirelings89</a> (Lorah Woodward)</td>
-<td><em>None</em></td>
+<td><em>N/A</em></td>
</tr>
<tr>
<td>
@@ -60,7 +70,7 @@
<td><a href="/~snowdrake">snowdrake</a> (Jess Hunt)</td>
<td><a href="/~ed">ed</a> (Ed Smith)</td>
<td><a href="/~hantudemon">hantudemon</a> (Joseph Bhart)</td>
-<td><em>None</em></td>
+<td><em>N/A</em></td>
</tr>
<tr>
<td>
@@ -70,7 +80,7 @@
<td><a href="/~gandalftheginger">gandalftheginger</a> (Ashley Morris)</td>
<td><a href="/~itsme">itsme</a> (Jon Gordon)</td>
<td><em>None</em></td>
-<td><em>None</em></td>
+<td><em>N/A</em></td>
</tr>
<tr>
<td>2009</td>
@@ -78,7 +88,7 @@
<td><a href="/~tswsl1989">tswsl1989</a> (Tom Lake)</td>
<td><a href="/~insacuri">insacuri</a> (Adam Mann)</td>
<td><a href="/~foshjedi2004">foshjedi2004</a> (Chris Melvin)</td>
-<td><em>None</em></td>
+<td><em>N/A</em></td>
</tr>
<tr>
<td>2008</td>
@@ -86,7 +96,7 @@
<td><a href="/~worldinsideme">worldinsideme</a> (Nick Corlett)</td>
<td><a href="/~eclipse">eclipse</a> (Tim Clark)</td>
<td><a href="/~kyara">kyara</a> (Jocelyn Konrad-Lee)</td>
-<td><em>None</em></td>
+<td><em>N/A</em></td>
</tr>
<tr>
<td>2007</td>
@@ -94,7 +104,7 @@
<td><a href="/~loki">loki</a> (Kristian Knevitt)</td>
<td><a href="/~elsmorian">Elsmorian</a> (Chris Elsmore)</td>
<td><a href="/~frosty">frosty</a> (James Frost)</td>
-<td><em>None</em></td>
+<td><em>N/A</em></td>
</tr>
<tr>
<td>2006</td>
@@ -102,7 +112,7 @@
<td><a href="/~welshbyte">welshbyte</a> (Andrew Price)</td>
<td><a href="/~talyn256">talyn256</a> (Sean Handley)</td>
<td><a href="/~elsmorian">Elsmorian</a> (Chris Elsmore)</td>
-<td><em>None</em></td>
+<td><em>N/A</em></td>
</tr>
<tr>
<td>2005</td>
@@ -110,7 +120,7 @@
<td><a href="/~stringfellow">stringfellow</a> (Stephen Pike)</td>
<td><a href="/~davea">davea</a> (Dave Arter)</td>
<td><a href="/~wedge">wedge</a> (William Blackstock)</td>
-<td><em>None</em></td>
+<td><em>N/A</em></td>
</tr>
<tr>
<td>2004</td>
@@ -118,7 +128,7 @@
<td><a href="/~pwb">pwb</a> (Peter Berry)</td>
<td><a href="/~vortex">vortex</a> (Toby Talbot)</td>
<td><a href="/~zulu">zulu</a> (Fernando Loizides)</td>
-<td><em>None</em></td>
+<td><em>N/A</em></td>
</tr>
<tr>
<td>2003</td>
@@ -126,7 +136,7 @@
<td><a href="/~cj">cj</a> (Chris Jessop)</td>
<td><a href="/~ct">ct</a> (Chris Turner)</td>
<td><a href="/~aggie">aggie</a> (Jon Agland)</td>
-<td><em>None</em></td>
+<td><em>N/A</em></td>
</tr>
<tr>
<td>2002</td>
@@ -134,7 +144,7 @@
<td><a href="/~theraven">TheRaven</a> (David Chisnall)</td>
<td><a href="/~doug">Doug</a> (Doug Gore)</td>
<td><em>None</em></td>
-<td><em>None</em></td>
+<td><em>N/A</em></td>
</tr>
<tr>
<td>2001</td>
@@ -142,7 +152,7 @@
<td><a href="/~theraven">TheRaven</a> (David Chisnall)</td>
<td><a href="/~sonic">Sonic</a> (David Chester)</td>
<td><a href="/~daveb">DaveB</a> (David Brooks)</td>
-<td><em>None</em></td>
+<td><em>N/A</em></td>
</tr>
<tr>
<td>2000-2001</td>
@@ -150,103 +160,103 @@
<td><a href="/~paul">Paul</a> (Paul Adams)</td>
<td><a href="/~cmckenna">cmckenna</a> (Chris McKenna)</td>
<td><a href="/~jo">Jo</a> </td>
-<td><em>None</em></td>
+<td><em>N/A</em></td>
</tr>
<tr>
<td>1999-2000</td>
<td><a href="/~firefury">FireFury</a> (Steve Hill)</td>
<td><a href="/~rhys">Rhys</a> (Rhys Jones) &<br /><a href="../~">Paul</a> (Paul Adams)</td>
<td><a href="/~fry">Fry</a> (Chris Fry)</td>
-<td><em>None</em></td>
-<td><em>None</em></td>
+<td><em>N/A</em></td>
+<td><em>N/A</em></td>
</tr>
<tr>
<td>1998-1999</td>
<td><a href="/~dez">Dez</a> (Denis Walker)</td>
<td><a href="/~rhys">Rhys</a> (Rhys Jones)</td>
<td><a href="/~firefury">FireFury</a> (Steve Hill)</td>
-<td><em>None</em></td>
-<td><em>None</em></td>
+<td><em>N/A</em></td>
+<td><em>N/A</em></td>
</tr>
<tr>
<td>1997-1998</td>
<td><a href="/~dez">Dez</a> (Denis Walker)</td>
<td><a href="/~rhys">Rhys</a> (Rhys Jones)</td>
<td><em>None</em></td>
-<td><em>None</em></td>
-<td><em>None</em></td>
+<td><em>N/A</em></td>
+<td><em>N/A</em></td>
</tr>
<tr>
<td>1996-1997</td>
<td>Ramps (Brian Coplin)</td>
<td><a href="/~zute/">Zute</a> (Matthew Suter)<br /></td>
<td><em>None</em></td>
-<td><em>None</em></td>
-<td><em>None</em></td>
+<td><em>N/A</em></td>
+<td><em>N/A</em></td>
</tr>
<tr>
<td>1995-1996</td>
<td>Eldritch (Jon Lewis)</td>
<td><a href="/~xadraek">Xadraek</a> (Lee Stephens)</td>
<td><a href="/~rohan">Rohan</a> (Steven Whitehouse)</td>
-<td><em>None</em></td>
-<td><em>None</em></td>
+<td><em>N/A</em></td>
+<td><em>N/A</em></td>
</tr>
<tr>
<td>1994-1995</td>
<td><a href="/~milamber">Milamber</a> (Andrew Hogg)</td>
<td><a href="/~xadraek">Xadraek</a> (Lee Stephens)</td>
<td><a href="/~rohan">Rohan</a> (Steven Whitehouse)</td>
-<td><em>None</em></td>
-<td><em>None</em></td>
+<td><em>N/A</em></td>
+<td><em>N/A</em></td>
</tr>
<tr>
<td>1993-1994</td>
<td><a href="/~nympho">Nympho</a> (Mike Evans)</td>
<td><a href="/~milamber">Milamber</a> (Andrew Hogg)</td>
<td><a href="/~rohan">Rohan</a> (Steven Whitehouse)</td>
-<td><em>None</em></td>
-<td><em>None</em></td>
+<td><em>N/A</em></td>
+<td><em>N/A</em></td>
</tr>
<tr>
<td>1992-1993</td>
<td><a href="/~mocelet">Mocelet</a> (Richard Bytheway)</td>
<td> </td>
<td><a href="/~gerbil">Gerbil</a> (Debbie Gwynne)</td>
-<td><em>None</em></td>
-<td><em>None</em></td>
+<td><em>N/A</em></td>
+<td><em>N/A</em></td>
</tr>
<tr>
<td>1991-1992</td>
<td><a href="/~arthur">Arthur</a> (Justin Mitchell)</td>
<td>Michele Poole</td>
<td>Adrian Bateman</td>
-<td><em>None</em></td>
-<td><em>None</em></td>
+<td><em>N/A</em></td>
+<td><em>N/A</em></td>
</tr>
<tr>
<td>1990-1991</td>
<td>Pete Barber</td>
<td><a href="/~alexw">alexw</a> (Alex Williams)</td>
<td><a href="/~cariad">Cariad</a> (Paul Rees)</td>
-<td><em>None</em></td>
-<td><em>None</em></td>
+<td><em>N/A</em></td>
+<td><em>N/A</em></td>
</tr>
<tr>
<td>1989-1990</td>
<td>Andy Parkman</td>
<td><a href="/~alexw">alexw</a> (Alex Williams)</td>
<td><a href="/~caederus">caederus</a> (Robin O'Leary)</td>
-<td><em>None</em></td>
-<td><em>None</em></td>
+<td><em>N/A</em></td>
+<td><em>N/A</em></td>
</tr>
<tr>
<td>1988-1989</td>
<td>Andy Parkman</td>
<td><a href="/~alexw">alexw</a> (Alex Williams)</td>
<td><a href="/~caederus">caederus</a> (Robin O'Leary)</td>
-<td><em>None</em></td>
-<td><em>None</em></td>
+<td><em>N/A</em></td>
+<td><em>N/A</em></td>
</tr>
</tbody>
</table>
=====================================
static/About/Staff.txt
=====================================
--- a/static/About/Staff.txt
+++ b/static/About/Staff.txt
@@ -4,21 +4,21 @@
<p>The following people were elected to the following posts in accordance with the <a href="../About/Constitution">SUCS constitution</a>.</p>
<ul class="boxes">
<li>
-<div> <img height="100" src="https://sucs.org/pictures/people/imranh.png" width="100" />
+<div> <img height="100" src="https://sucs.org/pictures/people/elbows.png" width="100" />
<br />
- <strong>President</strong><br />Imran Hussain (~imranh)</div>
+ <strong>President</strong><br />Laurence Sebastian Bowes (~elbows)</div>
</li>
<li>
-<div> <img height="100" src="https://sucs.org/pictures/people/stig.png" width="100" />
+<div> <img height="100" src="https://sucs.org/pictures/people/unreturnable.png" width="100" />
<br />
- <strong>Treasurer</strong><br />Priyan Gami (~stig)
+ <strong>Treasurer</strong><br />Isabel Jenkins (~unreturnable)
</div>
</li>
<li>
<div>
-<div> <img height="100" src="https://sucs.org/pictures/people/sockitwench.png" width="100" />
+<div> <img height="100" src="https://sucs.org/pictures/people/coatlus.png" width="100" />
<br />
- <strong>Secretary</strong><br />Courtney Simone Vasile (~sockitwench)
+ <strong>Secretary</strong><br />Quetzal Miguel Creamer Shorey (~coatlus)
</div>
</div>
</li>
@@ -29,9 +29,9 @@
</div>
</li>
<li>
-<div> <img height="100" src="https://sucs.org/pictures/people/unreturnable.png" width="100" />
+<div> <img height="100" src="https://sucs.org/pictures/people/gigosaurus.png" width="100" />
<br />
- <strong>Gaming</strong><br />Peter Jenkins (~unreturnable)
+ <strong>Gaming</strong><br />Christopher Lindsay Manners (~gigosaurus)
</div>
</li>
</ul>
View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/1ef2605c94a5b48a2de07e303bf4c427d452c583...4795e418472c8aa0fe6d342a8a7c1b42906f0d0c
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sucs.org/pipermail/devel/attachments/20151221/3ea945ef/attachment-0001.html>
More information about the Devel
mailing list