Skip to content
Snippets Groups Projects
Commit 9a485814 authored by Andrew Vincent Pover's avatar Andrew Vincent Pover
Browse files

Merge branch 'beta' into 'sucs-site' 

Beta hasn't exploded, lets push these to live

See merge request !55
parents 7eee2a8f 4f12c56e
No related branches found
No related tags found
5 merge requests!70Tidy up branches (2/3),!69Tidy up branches (1/3),!67Sucs site,!61CI changes from live branch to beta,!55Beta hasn't exploded, lets push these to live
Pipeline #
Expand all Hide whitespace changes
Inline Side-by-side
lib/page-feedback.php
+ 2
− 2
View file @ 9a485814
......@@ -2,10 +2,10 @@
/* mechanism for members to give us feedback about web pages */
// where do website feedback mails go?
$contact = "imranh@sucs.org";
$contact = "devel@lists.sucs.org";
if ($session->loggedin) {
if ($_REQUEST["action"] == "feedback") {
if ($_REQUEST["action"] == "feedback" && $_REQUEST["feedback"] != "") {
$feedback = $_REQUEST["feedback"];
$msgbody = "{$session->username} had this to say about the page {$_SERVER['REQUEST_URI']}:\r\n\r\n";
......
static/About/History.txt
+ 16
− 5
View file @ 9a485814
......@@ -14,13 +14,24 @@
</tr>
<tr>
<td>
<p><strong>2016</strong></p>
<p><strong>2017</strong></p>
</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="/~gigosaurus">gigosaurus</a> (Christopher Lindsay Manners)</strong></td>
<td><strong><a href="/~eggnog">eggnog</a> (George Henry Woolley)</strong></td>
<td><strong><a href="/~sgelfod98">sgelfod98</a> (Megan Warren-Davis)</strong></td>
<td><strong><em>N/A</em></strong></td>
<td><strong><a href="/~crox">crox</a> (Ciaran Crocker)</strong></td>
</tr>
</tr>
<tr>
<td>
<p>2016</p>
</td>
<td><a href="/~elbows">elbows</a> (Laurence Sebastian Bowes)</td>
<td><a href="/~unreturnable">unreturnable</a> (Isabel Jenkins)</td>
<td><a href="/~coatlus">coatlus</a> (Megan Warren-Davis)</td>
<td><a href="/~andy">andy</a> (Andrew Vincent Pover)</td>
<td><a href="/~gigosaurus">gigosaurus</a> (Christopher Lindsay Manners)</td>
</tr>
<tr>
<td>
......
static/About/Room.txt
+ 1
− 1
View file @ 9a485814
......@@ -2,4 +2,4 @@
<p><img alt="The SUCS Room" src="../pictures/sucsroom.jpg" /></p>
<h3>Where to find the room</h3>
<p style="float: left; margin: 0.5em"><a href="../pictures/room-map.jpg"><img alt="Location of SUCS Room on Campus Map" src="../pictures/room-map_thumb.jpg" /></a></p>
<p>The SUCS room is located at the bottom of the Student Union building, approximately halfway along the side facing the back of Fulton House. To unlock the door, members can swipe their student card in the card reader or hold it up to the <abbr>RFID</abbr> sensor pad denoted by the square (both located to the right of our blue door, underneath the window).</p>
\ No newline at end of file
<p>The SUCS room is located at the bottom of the Student Union building, approximately halfway along the side facing the back of Fulton House. To unlock the door, members can hold their student card up to the <abbr>RFID</abbr> sensor pad (after first registering it with a member of the admin team) denoted by the square (both located to the right of our blue door, underneath the window).</p>
\ No newline at end of file
static/About/Staff.txt
+ 106
− 112
View file @ 9a485814
<p><em>Note that all email addresses on this page refer to sucs.org addresses. Add </em>sucs.org<em> after the @ symbol</em></p>
<h2>The Executive</h2>
<p>If you're trying to contact the Executive team please email exec@ </p>
<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>&nbsp;<img height="100" src="https://sucs.org/pictures/people/elbows.png" width="100" />
<br />
<strong>President</strong><br />Laurence Sebastian Bowes (~elbows)</div>
</li>
<li>
<div>&nbsp;<img height="100" src="https://sucs.org/pictures/people/unreturnable.png" width="100" />
<br />
<strong>Treasurer</strong><br />Isabel Jenkins (~unreturnable)
</div>
</li>
<li>
<div>
<div>&nbsp;<img height="100" src="https://sucs.org/pictures/people/coatlus.png" width="100" />
<br />
<strong>Secretary</strong><br />Quetzal Miguel Creamer Shorey (~coatlus)
</div>
</div>
</li>
<li>
<div>&nbsp;<img height="100" src="https://sucs.org/pictures/people/andy.png" width="100" />
<br />
<strong>Publicity</strong><br />Andrew Vincent Pover (~andy)
</div>
</li>
<li>
<div>&nbsp;<img height="100" src="https://sucs.org/pictures/people/gigosaurus.png" width="100" />
<br />
<strong>Gaming</strong><br />Christopher Lindsay Manners (~gigosaurus)
</div>
</li>
</ul>
<div class="clear"></div>
<h2>Additional Staff</h2>
<p>If you're trying to contact the Admin team please email admin@</p>
<ul>
<li>Chris Jones (<a href="/~rollercow">rollercow</a>)</li>
<li>Tim Clark (<a href="/~eclipse">eclipse</a>)<br /></li>
<li>Thomas Lake (<a href="/~tswsl1989/">tswsl1989</a>)</li>
<li>Nicholas Corlett (<a href="/~worldinsideme">worldinsideme</a>)</li>
<li>Callum Massey (<a href="/~kais58/">kais58</a>)</li>
<li>Imran Hussain (<a href="/~imranh/">imranh</a>)</li>
</ul>
<h2>Thanks</h2>
<p>
The society as a whole would like to thank the following staff for their
exceptional help over the years.</p>
<ul>
<li>Alan Cox (<a href="/~anarchy">anarchy</a>)</li>
<li>Justin Mitchell (<a href="/~arthur">arthur</a>)</li>
<li>Robin O'Leary (<a href="/~caederus">caederus</a>)</li>
<li>Denis Walker (<a href="/~dez">dez</a>)</li>
<li>Dick Porter (<a href="/~dick">dick</a>)</li>
<li>Steve Hill (<a href="/~firefury/">firefury</a>)<br /></li>
<li>Steve Whitehouse (<a href="/~rohan">rohan</a>)</li>
<li>Sitsofe Wheeler (<a href="/~sits">sits</a>)</li>
<li>Dave Arter (<a href="/~davea">davea</a>)</li>
<li>Chris Elsmore (<a href="/~elsmorian">elsmorian</a>)</li>
<li>James Frost (<a href="/~frosty">frosty</a>)</li>
<li>Peter Berry (<a href="/~pwb">pwb</a>)</li>
<li>Andrew Price (<a href="/~welshbyte">welshbyte</a>)</li>
</ul>
<!--
<div class="box">
<div class="boxhead">
<h2><a id="contact">Contact Us</a></h2>
</div>
<div class="boxcontent">
<p>If you are having trouble with any aspect of SUCS, then feel free to contact any of the people listed below. You may want to see if your problem is covered in the <a href="../help" mce_href="../help">help pages</a> first, though. If you want an immediate response, see if any staff members are logged on to <a href="../Community/Milliways" mce_href="../Community/Milliways">Milliways</a>. During the week, there is usually someone logged on who will be able to help you.</p>
<p>If you have a problem, you can use this form to contact the relevant people</p>
<form action="http://sucs.org/people/staff.php" method="post" accept-charset="utf-8,us-ascii">
<div class="row">
<label for="addr">To</label>
<span class="textinput"><select name="addr" id="addr" class="input">
<option value="" selected="selected"></option>
<option value="admin">The Admin Team</option>
<option value="exec">The Elected Exec.</option>
<option value="committee">The Whole Committee</option>
<option value="games">The Games Admin Team</option>
</select></span>
</div>
<div class="row">
<label for="subject">Subject</label>
<span class="textinput"><input type="text" name="subject" id="subject" size="60" class="input"></input></span>
<input type="hidden" name="message" id="message" value="send"></input>
<input type="hidden" name="msgid" id="msgid" value="Mzk3OTQ0ODU1"></input>
</div>
<div class="row">
<label for="from">Your email address</label>
<span class="textinput"><input type="text" name="from" id="from" size="60" class="input"></input></span>
</div>
<div class="row">
<label for="body">Body</label>
<span class="textinput"><textarea name="body" id="body" cols="70" rows="5" class="input"></textarea></span>
</div>
<div class="row">
<span class="textinput"><input type="submit" value="Send"></input></span>
</div>
<div class="clear"></div>
</form>
</div>
<div class="hollowfoot">
<div>
<div></div>
</div>
</div>
</div>
<p><em>Note that all email addresses on this page refer to sucs.org addresses. Add </em>sucs.org<em> after the @ symbol</em></p>
<h2>The Executive</h2>
<p>If you're trying to contact the Executive team please email exec@ </p>
<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>&nbsp;<img height="100" src="https://sucs.org/pictures/people/andy.png" width="100" />
<br />
<strong>President</strong><br />Andrew Vincent Pover (~andy)</div>
</li>
<li>
<div>&nbsp;<img height="100" src="https://sucs.org/pictures/people/eggnog.png" width="100" />
<br />
<strong>Treasurer</strong><br />George Henry Woolley (~eggnog)
</div>
</li>
<li>
<div>
<div>&nbsp;<img height="100" src="https://sucs.org/pictures/people/sgelfod98.png" width="100" />
<br />
<strong>Secretary</strong><br />Megan Warren-Davis (~sgelfod98)
</div>
</div>
</li>
<li>
<div>&nbsp;<img height="100" src="https://sucs.org/pictures/people/crox.png" width="100" />
<br />
<strong>Gaming</strong><br />Ciaran Crocker (~crox)
</div>
</li>
</ul>
<div class="clear"></div>
<h2>Additional Staff</h2>
<p>If you're trying to contact the Admin team please email admin@</p>
<ul>
<li>Chris Jones (<a href="/~rollercow">rollercow</a>)</li>
<li>Tim Clark (<a href="/~eclipse">eclipse</a>)<br /></li>
<li>Thomas Lake (<a href="/~tswsl1989/">tswsl1989</a>)</li>
<li>Nicholas Corlett (<a href="/~worldinsideme">worldinsideme</a>)</li>
<li>Callum Massey (<a href="/~kais58/">kais58</a>)</li>
<li>Imran Hussain (<a href="/~imranh/">imranh</a>)</li>
</ul>
<h2>Thanks</h2>
<p>
The society as a whole would like to thank the following staff for their
exceptional help over the years.</p>
<ul>
<li>Alan Cox (<a href="/~anarchy">anarchy</a>)</li>
<li>Justin Mitchell (<a href="/~arthur">arthur</a>)</li>
<li>Robin O'Leary (<a href="/~caederus">caederus</a>)</li>
<li>Denis Walker (<a href="/~dez">dez</a>)</li>
<li>Dick Porter (<a href="/~dick">dick</a>)</li>
<li>Steve Hill (<a href="/~firefury/">firefury</a>)<br /></li>
<li>Steve Whitehouse (<a href="/~rohan">rohan</a>)</li>
<li>Sitsofe Wheeler (<a href="/~sits">sits</a>)</li>
<li>Dave Arter (<a href="/~davea">davea</a>)</li>
<li>Chris Elsmore (<a href="/~elsmorian">elsmorian</a>)</li>
<li>James Frost (<a href="/~frosty">frosty</a>)</li>
<li>Peter Berry (<a href="/~pwb">pwb</a>)</li>
<li>Andrew Price (<a href="/~welshbyte">welshbyte</a>)</li>
</ul>
<!--
<div class="box">
<div class="boxhead">
<h2><a id="contact">Contact Us</a></h2>
</div>
<div class="boxcontent">
<p>If you are having trouble with any aspect of SUCS, then feel free to contact any of the people listed below. You may want to see if your problem is covered in the <a href="../help" mce_href="../help">help pages</a> first, though. If you want an immediate response, see if any staff members are logged on to <a href="../Community/Milliways" mce_href="../Community/Milliways">Milliways</a>. During the week, there is usually someone logged on who will be able to help you.</p>
<p>If you have a problem, you can use this form to contact the relevant people</p>
<form action="http://sucs.org/people/staff.php" method="post" accept-charset="utf-8,us-ascii">
<div class="row">
<label for="addr">To</label>
<span class="textinput"><select name="addr" id="addr" class="input">
<option value="" selected="selected"></option>
<option value="admin">The Admin Team</option>
<option value="exec">The Elected Exec.</option>
<option value="committee">The Whole Committee</option>
<option value="games">The Games Admin Team</option>
</select></span>
</div>
<div class="row">
<label for="subject">Subject</label>
<span class="textinput"><input type="text" name="subject" id="subject" size="60" class="input"></input></span>
<input type="hidden" name="message" id="message" value="send"></input>
<input type="hidden" name="msgid" id="msgid" value="Mzk3OTQ0ODU1"></input>
</div>
<div class="row">
<label for="from">Your email address</label>
<span class="textinput"><input type="text" name="from" id="from" size="60" class="input"></input></span>
</div>
<div class="row">
<label for="body">Body</label>
<span class="textinput"><textarea name="body" id="body" cols="70" rows="5" class="input"></textarea></span>
</div>
<div class="row">
<span class="textinput"><input type="submit" value="Send"></input></span>
</div>
<div class="clear"></div>
</form>
</div>
<div class="hollowfoot">
<div>
<div></div>
</div>
</div>
</div>
-->
\ No newline at end of file
static/Knowledge/FAQ.txt
+ 277
− 277
View file @ 9a485814
This diff is collapsed.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment