[SUCS Devel] site r710 - in trunk: . components htdocs/images static static/About static/Community static/Community/Talks/2014-03-20 static/Knowledge

Fri May 22 22:04:21 BST 2015

Author: imranh
Date: 2015-05-22 22:04:13 +0100 (Fri, 22 May 2015)
New Revision: 710

Modified:
   trunk/
   trunk/components/members.php
   trunk/components/signup.php
   trunk/htdocs/images/lastsnap.jpg
   trunk/static/About/Joining.txt
   trunk/static/About/Room.txt
   trunk/static/About/Staff.txt
   trunk/static/Community/Talks.txt
   trunk/static/Community/Talks/2014-03-20/grepwood.txt
   trunk/static/Knowledge/FAQ.txt
   trunk/static/Tools.txt
   trunk/static/stats.txt
Log:
Merrge changes from live to trunk. svn merge -r 708:709 ../branches/sucs-site .


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/beta:664-666,668-675,677-678
/branches/imranh:590-591
/branches/sucs-site:318-680
/branches/sucs-site/branches/sucs-site:590-591
   + /branches/beta:664-666,668-675,677-678
/branches/imranh:590-591
/branches/sucs-site:318-680,709
/branches/sucs-site/branches/sucs-site:590-591

Modified: trunk/components/members.php
===================================================================

--- trunk/components/members.php	2015-05-22 20:58:32 UTC (rev 709)
+++ trunk/components/members.php	2015-05-22 21:04:13 UTC (rev 710)
@@ -88,7 +88,8 @@
 		$stats['yeartop'] = $DB->GetAll($yeartop_sql, array(academicYear(time())."-09-01"));
 
 		// bottom 5
-		$stats['bottom'] = $DB->GetAll("SELECT username, sum(score) as sum FROM awards GROUP BY username ORDER BY sum ASC LIMIT 5");
+		// exclude sambws and frostys allways decresing banana that scres up the result
+		$stats['bottom'] = $DB->GetAll("SELECT username, sum(score) as sum FROM awards WHERE id!=685 and id!=393 GROUP BY username ORDER BY sum ASC LIMIT 5");
 		// recent awards
 		// today's definition of "recent" is all awards within three days of the newest award and a minimum of five... 
 		// if this seems like a dumb method then try something else :-)

Modified: trunk/components/signup.php
===================================================================
--- trunk/components/signup.php	2015-05-22 20:58:32 UTC (rev 709)
+++ trunk/components/signup.php	2015-05-22 21:04:13 UTC (rev 710)
@@ -333,7 +333,7 @@
                                 mail(
                                     $error_email,
                                     "Error adding user to mailing lists from signup id: ".$signupid,
-                                    $execoutputstr,
+                                    $execoutputstr.$ececreturn,
                                     "From: \"SUCS Admin\" <admin at sucs.org>"
                                 );
                                 $failed=true;

Modified: trunk/htdocs/images/lastsnap.jpg
===================================================================
(Binary files differ)

Modified: trunk/static/About/Joining.txt
===================================================================
--- trunk/static/About/Joining.txt	2015-05-22 20:58:32 UTC (rev 709)
+++ trunk/static/About/Joining.txt	2015-05-22 21:04:13 UTC (rev 710)
@@ -1,6 +1,6 @@
 <h2>Who can join?</h2>
 <ul>
-<li>You <strong>must</strong> be a member of Swansea University Student Union (<a href="http://swansea-union.co.uk/">SUSU</a>) to be able to join the society.</li>
+<li>You <strong>must</strong> be a member of Swansea University Students' Union (<a href="http://swansea-union.co.uk/">SUSU</a>) to be able to join the society.</li>
 </ul>
 <h2>How much is it?</h2>
 <ul>

Modified: trunk/static/About/Room.txt
===================================================================
--- trunk/static/About/Room.txt	2015-05-22 20:58:32 UTC (rev 709)
+++ trunk/static/About/Room.txt	2015-05-22 21:04:13 UTC (rev 710)
@@ -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 cards in the card reader or hold them up to the <abbr>RFID</abbr> sensor pad denoted by the black square (both located to the right, 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 swipe their student card in the card reader or hold it up to the <abbr>RFID</abbr> sensor pad denoted by the black square (both located to the right of our blue door, underneath the window).</p>
\ No newline at end of file

Modified: trunk/static/About/Staff.txt
===================================================================
--- trunk/static/About/Staff.txt	2015-05-22 20:58:32 UTC (rev 709)
+++ trunk/static/About/Staff.txt	2015-05-22 21:04:13 UTC (rev 710)
@@ -16,9 +16,11 @@
 </li>
 <li>
 <div>
+<div> <img height="100" src="https://sucs.org/pictures/people/sockitwench.png" width="100" />
     <br />
 	<strong>Secretary</strong><br />Courtney Simone Vasile (~sockitwench)
 </div>
+</div>
 </li>
 <li>
 <div> <img height="100" src="https://sucs.org/pictures/people/andy.png" width="100" />
@@ -26,6 +28,12 @@
     <strong>Publicity</strong><br />Andrew Vincent Pover (~andy)
 </div>
 </li>
+<li>
+<div> <img height="100" src="https://sucs.org/pictures/people/unreturnable.png" width="100" />
+    <br />
+    <strong>Gaming</strong><br />Peter Jenkins (~unreturnable)
+</div>
+</li>
 </ul>
 <div class="clear"></div>
 <h2>Additional Staff</h2>

Modified: trunk/static/Community/Talks/2014-03-20/grepwood.txt
===================================================================
--- trunk/static/Community/Talks/2014-03-20/grepwood.txt	2015-05-22 20:58:32 UTC (rev 709)
+++ trunk/static/Community/Talks/2014-03-20/grepwood.txt	2015-05-22 21:04:13 UTC (rev 710)
@@ -1,23 +1,23 @@
-<div class="box">
-<div class="boxhead">
-<h2>Michael Dec (grepwood) - "Time to glorify my waste of time again"</h2>
-</div>
-<div class="boxcontent">
-<div id="player">
-<object data="//sucs.org/videos/talks/mediaplayer.swf?file=2014-03-20/grepwood.flv" height="480" id="player" type="application/x-shockwave-flash" width="600">
-<param name="height" value="480" />
-<param name="width" value="600" />
-<param name="file" value="/videos/talks/2014-03-20/grepwood.flv" />
-<param name="image" value="/videos/talks/2014-03-20/grepwood.png" />
-<param name="id" value="player" />
-<param name="displayheight" value="480" />
-<param name="FlashVars" value="image=/videos/talks/2014-03-20/grepwood.png" />
-</object>
-</div>
-<p><strong>Length: </strong>00m 00s</p>
-<p><strong>Video: </strong><a href="/videos/talks/2014-03-20/grepwood.flv" title="600x480 MPEG-4 AVC - 00MB">600x480</a> (MPEG-4 AVC, 00MB)</p>
-</div>
-<div class="boxfoot">
-<p> </p>
-</div>
-</div>
+<div class="box">
+<div class="boxhead">
+<h2>Michael Dec (grepwood) - "Time to glorify my waste of time again"</h2>
+</div>
+<div class="boxcontent">
+<div id="player">
+<object data="//sucs.org/videos/talks/mediaplayer.swf?file=2014-03-20/grepwood.flv" height="480" id="player" type="application/x-shockwave-flash" width="600">
+<param name="height" value="480" />
+<param name="width" value="600" />
+<param name="file" value="/videos/talks/2014-03-20/grepwood.flv" />
+<param name="image" value="/videos/talks/2014-03-20/grepwood.png" />
+<param name="id" value="player" />
+<param name="displayheight" value="480" />
+<param name="FlashVars" value="image=/videos/talks/2014-03-20/grepwood.png" />
+</object>
+</div>
+<p><strong>Length: </strong>19m 03s</p>
+<p><strong>Video: </strong><a href="/videos/talks/2014-03-20/grepwood.flv" title="600x480 MPEG-4 AVC - 00MB">600x480</a> (MPEG-4 AVC, 1.1GB)</p>
+</div>
+<div class="boxfoot">
+<p> </p>
+</div>
+</div>
\ No newline at end of file

Modified: trunk/static/Community/Talks.txt
===================================================================
--- trunk/static/Community/Talks.txt	2015-05-22 20:58:32 UTC (rev 709)
+++ trunk/static/Community/Talks.txt	2015-05-22 21:04:13 UTC (rev 710)
@@ -7,10 +7,10 @@
 knowledge.</p>
 <h3>When are the next
 ones?</h3>
-<p>When the Exec Plan plan the next one, contact <a href="mailto:exec at sucs.org">exec at sucs.org</a> if one has happenend for a while.</p>
+<p>When the Exec Plan plan the next one, contact <a href="mailto:exec at sucs.org">exec at sucs.org</a> if one hasn't happened for a while.</p>
 <h3>Can I take part?</h3>
 <p>You certainly can! If you want to do a talk at
-a future SUCS Talks event, either e-mail us at exec [at] sucs [dot] org.  </p>
+a future SUCS Talks event, e-mail us at exec [at] sucs [dot] org.  </p>
 <h3>How can I watch the videos?</h3>
 <p>Each talk is
 available below as both a streaming flash video (you just need flash installed

Modified: trunk/static/Knowledge/FAQ.txt
===================================================================
--- trunk/static/Knowledge/FAQ.txt	2015-05-22 20:58:32 UTC (rev 709)
+++ trunk/static/Knowledge/FAQ.txt	2015-05-22 21:04:13 UTC (rev 710)
@@ -111,7 +111,6 @@
 <dl>	
 <dt><a id="s_m1">I missed you at Freshers' Fayre and enrolment, how do I join?</a></dt>
 <dd>Use the online form at the bottom of the <a href="../About/Joining">Joining</a> page or come to the room.</dd>
-
 <dt><a id="s_m2">Why should I join SUCS?</a></dt>
 <dd>There is more information about joining SUCS and the benefits of joining on the <a href="../About/Joining">Joining page</a>.</dd>
 </dl>

Modified: trunk/static/Tools.txt
===================================================================
--- trunk/static/Tools.txt	2015-05-22 20:58:32 UTC (rev 709)
+++ trunk/static/Tools.txt	2015-05-22 21:04:13 UTC (rev 710)
@@ -4,8 +4,8 @@
 <h2><a href="Tools/ShortURI">ShortURI</a></h2>
 <p>Make long web addresses shorter. Useful if you wish to paste it to Milliways, or perhaps a forum or chatroom elsewhere; you can use ShortURI to create a shorter version that will direct you to the original address.</p>
 <h2><a href="https://sucs.org/webmail">Web Mail</a></h2>
-<p>Check your SUCS e-mail account via the web using <cite>Roundcube</cite>. Learn more about <a href="/Knowledge/Help/SUCS%20Services/Accessing%20your%20email">accessing your SUCS e-mail</a> in our Help section.</p>
+<p>Check your SUCS e-mail account via the web using <cite>Roundcube</cite>. Learn more about <a href="Knowledge/Help/SUCS%20Services/Accessing%20your%20email">accessing your SUCS e-mail</a> in our Help section.</p>
 <h2><a href="Tools/PasteBin">PasteBin</a></h2>
 <p>If you are having trouble with some code and have gone to Milliways for help, use the Pastebin to avoid spamming Milliways with lines of code, plus it also has a nifty syntax highlighting feature. </p>
 <h2><a href="Tools/Desktop%20on%20Demand">Desktop on Demand</a></h2>
-<p>Desktop on Demand allows you to connect to one of the SUCS computer remotely to run linux applications from anywhere. For more information see <a href="/Knowledge/Help/SUCS%20Services/Using%20Desktop%20on%20Demand">Using Desktop on Demand</a>.</p>
\ No newline at end of file
+<p>Desktop on Demand allows you to connect to one of the SUCS computers remotely to run linux applications from anywhere. For more information see <a href="Knowledge/Help/SUCS%20Services/Using%20Desktop%20on%20Demand">Using Desktop on Demand</a>.</p>
\ No newline at end of file

Modified: trunk/static/stats.txt
===================================================================
--- trunk/static/stats.txt	2015-05-22 20:58:32 UTC (rev 709)
+++ trunk/static/stats.txt	2015-05-22 21:04:13 UTC (rev 710)
@@ -3,4 +3,5 @@
 <p><a href="https://sucs.org/stats/webalizer/" title="Webalizer" target="_blank">Webalizer</a></p>
 <p><a href="https://sucs.org/stats/cacti/" title="Cacti" target="_blank">Cacti</a> (Bypass login <a href="https://sucs.org/stats/cacti/graph_view.php?action=tree&tree_id=1&leaf_id=8&select_first=true" target="_blank">here</a>)</p>
 <p><a href="https://sucs.org/stats/nut/upsstats.cgi" target="_self">Nut</a></p>
-<p><a href="https://sucs.org/stats/ganglia/" title="Ganglia" target="_blank">Ganglia</a></p>
\ No newline at end of file
+<p><a href="https://sucs.org/stats/ganglia/" title="Ganglia" target="_blank">Ganglia</a></p>
+<p> </p>
\ No newline at end of file


