Commit f59ad92e authored by Imran Hussain's avatar Imran Hussain

Merge branch 'master' into 'beta'

Merge changes from master (tunk) into beta

sucs-site (live) is ahead of beta :/

Pushing merge changes (the new fancy way) from master (trunk) into the beat branch.

See merge request !1
parents 01f89fc0 148b8dce
......@@ -88,7 +88,8 @@ if ($session->loggedin) {
$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 :-)
......
......@@ -333,7 +333,7 @@ if(isset($_REQUEST['signupid'])&&isset($_REQUEST['signuppw'])){
mail(
$error_email,
"Error adding user to mailing lists from signup id: ".$signupid,
$execoutputstr,
$execoutputstr.$ececreturn,
"From: \"SUCS Admin\" <admin@sucs.org>"
);
$failed=true;
......
......@@ -457,6 +457,11 @@ table.border a:link {
padding-left: 1em;
}
form.admin {
float: left;
}
/* --------------------------------------------------
Hacks to work around inadequacies of TinyMCE
-------------------------------------------------- */
......
htdocs/images/lastsnap.jpg

51.1 KB | W: | H:

htdocs/images/lastsnap.jpg

63.9 KB | W: | H:

htdocs/images/lastsnap.jpg
htdocs/images/lastsnap.jpg
htdocs/images/lastsnap.jpg
htdocs/images/lastsnap.jpg
  • 2-up
  • Swipe
  • Onion skin
$( document ).ready(function() {
console.log( "ready!" );
CKEDITOR.replace( 'body' );
});
This diff is collapsed.
......@@ -28,12 +28,18 @@ if (isset($session->groups[$permission])) {
$why = $_POST['why'];
if ( abs($number) <= $maxbanana ){
if ( (abs($number) <= $maxbanana ) && $number ){
$DB->Query("INSERT INTO awards (username, score, whn, who, why) VALUES (?,?,NOW(),?,?)", array($who, $number, $session->username, $why));
header("Location: " . $_SERVER['PHP_SELF']);
header("Location: " . $_SERVER['PHP_SELF']);
} else {
}
// Checks for a nonzero banana and denies awarding if it's zero
elseif ( $number == 0 ){
trigger_error("Come on ".$session->username.", enter a nonzero value please");
}
else {
trigger_error("Nice try ".$session->username."! You've submitted a request with too many bananas");
}
......
......@@ -4,7 +4,7 @@ $base = "$BASEDIR/";
$baseurl = "/~$USERNAME/sucssite";
$preferred_hostname = "sucs.org";
$dbname="beta";
$sucsdbname="sucs";
$sucsdbname="sucs-dummy";
$dbuser="$USERNAME";
// Settings for current election (god knows why they are here):
......
<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>
......
......@@ -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
......@@ -16,9 +16,11 @@
</li>
<li>
<div>
<div>&nbsp;<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>&nbsp;<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>&nbsp;<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>
......
......@@ -8,10 +8,10 @@ Community</h3>
<dt><a href="Community/Projects">SUCS Projects</a></dt>
<dd>SUCS hosts a number of open source coding projects and offers its members Subversion repositories and Trac wiki/ticket trackers to manage their projects. The projects page lists a number of projects which SUCS members are currently working on, and which you can get involved with.</dd>
<dt>Socials</dt>
<dd>We regularly meet in JC's every Wednesday at 1PM. It's a great chance to get to know everyone and have a chat with people. </dd>
<dd>We regularly meet in JCs every Wednesday at 1PM and most Fridays at 7PM. It's a great chance to get to know everyone and have a chat with people. </dd>
</dl>
<h3>Other ways</h3>
<ul>
<li>We have a page on <a href="https://www.facebook.com/SwanseaUniversityComputerSociety" title="SUCS">Facebook</a></li>
<li>Through our <a href="https://twitter.com/SUCSExec">Twitter</a></li>
</ul>
\ No newline at end of file
</ul>
......@@ -7,10 +7,10 @@ Linux. The talks are a great way to meet people, learn things, and share your
knowledge.</p>
<h3>When are the next
ones?</h3>
<p>When the Exec Plan plan the next one, contact <a href="mailto:exec@sucs.org">exec@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@sucs.org">exec@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.&nbsp; </p>
a future SUCS Talks event, e-mail us at exec [at] sucs [dot] org.&nbsp; </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
......
<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>&nbsp;</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>&nbsp;</p>
</div>
</div>
\ No newline at end of file
......@@ -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>
......@@ -191,7 +190,7 @@
<dt><a id="t_r5">How do I connect to GuestNET?</a></dt>
<dd>Take a look at the GuestNET How To page in the Help section <a href="Help/SUCS%20Services/Connecting%20to%20GuestNet">here</a>.</dd>
<dt><a id="iDevice"> I have an iPhone/iPad/Mac how do I connect to the WiFi?</a></dt><a id="iDevice">
</a><dd><a id="iDevice">You can use the wireless profile </a><a href="https://sucs.org/SUCS_WiFi.mobileconfig">here</a></dd></dl>
</a><dd><a id="iDevice">You can use the wireless profile </a><a href="https://sucs.org/files/SUCS_WiFi.mobileconfig">here</a></dd></dl>
<p><a id="iDevice">
</a></p>
<h3><a id="iDevice"></a><a id="computers">Computers</a></h3>
......@@ -275,4 +274,4 @@
<h2><a id="problems">Problems</a></h2>
<dl>
<dt><a id="prob1">Something has gone awry with one of the SUCS services, where can I get help?</a></dt>
<dd>If it is not answered in this section of the FAQ or in the Help files, e-mail the admin team. </dd></dl>
\ No newline at end of file
<dd>If it is not answered in this section of the FAQ or in the Help files, e-mail the admin team. </dd></dl>
......@@ -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
......@@ -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>&nbsp;(Bypass login <a href="https://sucs.org/stats/cacti/graph_view.php?action=tree&amp;tree_id=1&amp;leaf_id=8&amp;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>&nbsp;</p>
\ No newline at end of file
......@@ -28,6 +28,18 @@
</div>
</div>
{if $action=="edit"}
<!--
<script language="javascript" type="text/javascript" src="{$baseurl}/js/tinymce/jscripts/tiny_mce/tiny_mce.js"></script>
<script language="javascript" type="text/javascript" src="{$baseurl}/js/tiny_mce.js"></script>
--!>
<script language="javascript" type="text/javascript" src="{$baseurl}/js/jquery-2.1.3.min.js"></script>
<script language="javascript" type="text/javascript" src="{$baseurl}/js/ckeditor/ckeditor.js"></script>
<script language="javascript" type="text/javascript" src="{$baseurl}/js/ckeditor.js"></script>
{/if}
{if $debug}{debug}{/if}
</body>
</html>
......@@ -29,10 +29,6 @@
<meta name="description" content="Swansea University Computer Society - providing student computing facilities and personal web pages." />
{if $refresh} <meta http-equiv="REFRESH" content="{$refresh}" />{/if}
{if $action=="edit"}
<script language="javascript" type="text/javascript" src="{$baseurl}/js/tinymce/jscripts/tiny_mce/tiny_mce.js"></script>
<script language="javascript" type="text/javascript" src="{$baseurl}/js/tiny_mce.js"></script>
{/if}
{if isset($extra_scripts)}
{foreach from=$extra_scripts item=script}
......
......@@ -127,7 +127,7 @@
<label for="email">External Email:</label>
<span class="textinput">
<input type="text" name="email" id="email" value="{$member.email}" style="width: 95%;" />
<div class="note">We are required by the Student Union to keep contact details for our members. Please note that these details will be held in accordance with the Data Protection Act.</div>
<div class="note">We are required by the Students' Union to keep contact details for our members. Please note that these details will be held in accordance with the Data Protection Act.</div>
</span>
</div>
<div class="row">
......
Markdown is supported
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