[SUCS Devel] site r676 - in branches/sucs-site: . components htdocs lib static static/About static/Community static/Community/Stream static/Knowledge static/Tools static/Vote static/fragments templates
imranh at sucs.org
imranh at sucs.org
Tue Apr 14 20:41:27 BST 2015
Author: imranh
Date: 2015-04-14 20:41:18 +0100 (Tue, 14 Apr 2015)
New Revision: 676
Modified:
branches/sucs-site/
branches/sucs-site/components/library.php
branches/sucs-site/components/members.php
branches/sucs-site/components/mw.php
branches/sucs-site/htdocs/index.php
branches/sucs-site/lib/banana-admin.php
branches/sucs-site/static/
branches/sucs-site/static/About.txt
branches/sucs-site/static/About/Constitution.txt
branches/sucs-site/static/About/History.txt
branches/sucs-site/static/About/Joining.txt
branches/sucs-site/static/About/Room-secondary.txt
branches/sucs-site/static/About/Room.txt
branches/sucs-site/static/About/Staff.txt
branches/sucs-site/static/Community.txt
branches/sucs-site/static/Community/Shame.txt
branches/sucs-site/static/Community/Stream.txt
branches/sucs-site/static/Community/Stream/FAQ.txt
branches/sucs-site/static/Community/Stream/High.txt
branches/sucs-site/static/Community/Stream/Low.txt
branches/sucs-site/static/Community/Talks.txt
branches/sucs-site/static/Getting Started.txt
branches/sucs-site/static/Knowledge.txt
branches/sucs-site/static/Knowledge/FAQ.txt
branches/sucs-site/static/Tools.txt
branches/sucs-site/static/Tools/Desktop on Demand.txt
branches/sucs-site/static/Vote/No Manifesto.txt
branches/sucs-site/static/fragments/Front.txt
branches/sucs-site/static/fragments/Join.txt
branches/sucs-site/static/fragments/Milliways.txt
branches/sucs-site/templates/banana-leaders.tpl
branches/sucs-site/templates/branding.tpl
branches/sucs-site/templates/breadcrumb.tpl
branches/sucs-site/templates/games.tpl
branches/sucs-site/templates/head.tpl
branches/sucs-site/templates/index.tpl
branches/sucs-site/templates/news.tpl
branches/sucs-site/templates/options.tpl
branches/sucs-site/templates/search.cy.tpl
branches/sucs-site/templates/search.tpl
branches/sucs-site/templates/signup.tpl
branches/sucs-site/templates/users.tpl
Log:
Merge changes into live site
Property changes on: branches/sucs-site
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/beta:664-666
/branches/imranh:590-591
/branches/sucs-site/branches/sucs-site:590-591
/trunk:664-665
+ /branches/beta:664-666,668-675
/branches/imranh:590-591
/branches/sucs-site/branches/sucs-site:590-591
/trunk:664-665,667-670,672,674
Modified: branches/sucs-site/components/library.php
===================================================================
--- branches/sucs-site/components/library.php 2015-04-14 19:33:54 UTC (rev 675)
+++ branches/sucs-site/components/library.php 2015-04-14 19:41:18 UTC (rev 676)
@@ -54,7 +54,7 @@
} else {
$mode = "taglist";
$smarty->assign("tags", $DB->GetAll("SELECT name FROM bookcategories"));
- }
+ }
} elseif (isset($pathlist[$library_index + 1]) && is_numeric($pathlist[$library_index + 1])) {
// We're displaying a specific book
@@ -115,7 +115,7 @@
$msgbody .= " {$book['title']} by {$book['author']} from the library.\n\n";
$msgbody .= "Visit https://$preferred_hostname$path to process this request.";
mail($librarian_mail, "Book Request", $msgbody);
-
+
$smarty->assign("checkout_request", true);
}
@@ -123,7 +123,6 @@
$book['title'] = htmlentities2($book['title']);
$book['author'] = htmlentities2($book['author']);
$book['onloan'] = ($book['onloan'] == 't') ? true : false;
-
if (!isset($book['description'])) {
// no book description in the database, try using Amazon data
@@ -152,7 +151,7 @@
if ($session->loggedin) {
$members = new Members;
$smarty->assign("memberlist", $members->getMemberList());
- $secondary = $smarty->get_template_vars("secondary");
+ $secondary = $smarty->getTemplateVars("secondary");
$secondary .= $smarty->fetch('library-loan.tpl');
$smarty->assign("secondary", $secondary);
}
Modified: branches/sucs-site/components/members.php
===================================================================
--- branches/sucs-site/components/members.php 2015-04-14 19:33:54 UTC (rev 675)
+++ branches/sucs-site/components/members.php 2015-04-14 19:41:18 UTC (rev 676)
@@ -131,7 +131,7 @@
}
$smarty->assign("stats", $stats);
- $secondary = $smarty->get_template_vars("secondary");
+ $secondary = $smarty->getTemplateVars("secondary");
$secondary .= $smarty->fetch("banana-leaders.tpl");
$smarty->assign("secondary", $secondary);
@@ -148,7 +148,6 @@
$smarty->assign("public_members", $public_usernames);
}
-
$smarty->assign('url', $component['path']);
$smarty->assign('extra_styles', "/css/members.css");
$result = $smarty->fetch('members.tpl');
Modified: branches/sucs-site/components/mw.php
===================================================================
--- branches/sucs-site/components/mw.php 2015-04-14 19:33:54 UTC (rev 675)
+++ branches/sucs-site/components/mw.php 2015-04-14 19:41:18 UTC (rev 676)
@@ -128,7 +128,7 @@
}
$folders = load_folders();
-$smarty->assign_by_ref("folders", $folders);
+$smarty->assignByRef("folders", $folders);
$smarty->assign("extra_styles", array("/css/forum/SUCS.css"));
unset($mode);
Modified: branches/sucs-site/htdocs/index.php
===================================================================
--- branches/sucs-site/htdocs/index.php 2015-04-14 19:33:54 UTC (rev 675)
+++ branches/sucs-site/htdocs/index.php 2015-04-14 19:41:18 UTC (rev 676)
@@ -1,4 +1,5 @@
<?php
+error_reporting(E_STRICT);
// Display execution time?
//$displaytime = TRUE;
@@ -29,8 +30,8 @@
// Include the Smarty templating engine
define('SMARTY_DIR', '/usr/share/php/smarty3/');
-require("/usr/share/php/smarty3/SmartyBC.class.php");
-$smarty = new SmartyBC();
+require("/usr/share/php/smarty3/Smarty.class.php");
+$smarty = new Smarty();
$smarty->setTemplateDir($base."templates");
$smarty->setCompileDir($base."templates_c");
$smarty->addPluginsDir($base."plugins");
@@ -53,7 +54,7 @@
// Include the session library
require($base."lib/session.php");
$session = new Session;
-$smarty->assign_by_ref("session", $session);
+$smarty->assignByRef("session", $session);
// include feedback form stuff
@@ -115,7 +116,7 @@
// Determine which component to run
$pathlist = explode('/', parse_url($pathinfo,PHP_URL_PATH));
while (end($pathlist) === "") array_pop($pathlist);
-$smarty->assign_by_ref("pathlist", $pathlist);
+$smarty->assignByRef("pathlist", $pathlist);
$path = '';
$query = "select * from pagemap where path='/' ";
$params = array();
@@ -130,7 +131,7 @@
}
// Determine the path of the request
-$smarty->assign_by_ref("path", $path);
+$smarty->assignByRef("path", $path);
$query .= "order by depth desc";
$pagemap = $DB->GetAll($query, $params);
Modified: branches/sucs-site/lib/banana-admin.php
===================================================================
--- branches/sucs-site/lib/banana-admin.php 2015-04-14 19:33:54 UTC (rev 675)
+++ branches/sucs-site/lib/banana-admin.php 2015-04-14 19:41:18 UTC (rev 676)
@@ -26,8 +26,8 @@
if (trim ($_POST['why']) !== "") {
$number = intval($_POST['number']);
- $why = $_POST['why'];
-
+ $why = $_POST['why'];
+
if ( abs($number) <= $maxbanana ){
$DB->Query("INSERT INTO awards (username, score, whn, who, why) VALUES (?,?,NOW(),?,?)", array($who, $number, $session->username, $why));
@@ -39,14 +39,14 @@
} else {
trigger_error("No reason entered for the awarding of bananas.", E_USER_WARNING);
- }
+ }
}
} elseif ($session->loggedin) {
if ($_REQUEST['action'] == "award") {
$number = intval($_POST['number']);
- $why = $_POST['why'];
+ $why = $_POST['why'];
- // Send a mail to someone about them bananas
+ // Send a mail to someone about them bananas
$msgbody = $session->username." thinks $who deserves $number bananas:\r\n";
$msgbody .= "\"$why\"\r\n\r\nVisit https://sucs.org/Community/Members/$who if you want to make an award.";
mail($contact, "Banana Award Nomination", $msgbody, $msgheaders);
@@ -56,7 +56,7 @@
}
-$secondary = $smarty->get_template_vars("secondary");
+$secondary = $smarty->getTemplateVars("secondary");
$secondary .= $smarty->fetch('banana-award.tpl');
$smarty->assign('secondary', $secondary);
Property changes on: branches/sucs-site/static
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/static:664-665
+ /branches/beta/static:668-675
/trunk/static:664-665,667-670,672,674
Modified: branches/sucs-site/static/About/Constitution.txt
===================================================================
--- branches/sucs-site/static/About/Constitution.txt 2015-04-14 19:33:54 UTC (rev 675)
+++ branches/sucs-site/static/About/Constitution.txt 2015-04-14 19:41:18 UTC (rev 676)
@@ -147,7 +147,7 @@
</tr>
<tr valign="top">
<td>2.5<br /></td>
-<td>All members are subject to the <a href="https://sucs.org/About/Conditions">Terms and Conditions</a>.<br /></td>
+<td>All members are subject to the <a href="Conditions">Terms and Conditions</a>.<br /></td>
</tr>
</tbody>
</table>
Modified: branches/sucs-site/static/About/History.txt
===================================================================
--- branches/sucs-site/static/About/History.txt 2015-04-14 19:33:54 UTC (rev 675)
+++ branches/sucs-site/static/About/History.txt 2015-04-14 19:41:18 UTC (rev 676)
@@ -138,62 +138,62 @@
<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><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>
</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><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>
</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><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>
</tr>
<tr>
<td>1996-1997</td>
<td>Ramps (Brian Coplin)</td>
-<td><a href="../~zute/">Zute</a> (Matthew Suter)<br /></td>
+<td><a href="/~zute/">Zute</a> (Matthew Suter)<br /></td>
<td><em>None</em></td>
<td><em>None</em></td>
</tr>
<tr>
<td>1995-1996</td>
<td>Eldritch (Jon Lewis)</td>
-<td><a href="https://sucs.org/%7Exadraek">Xadraek</a> (Lee Stephens)</td>
-<td><a href="../~rohan">Rohan</a> (Steven Whitehouse)</td>
+<td><a href="/~xadraek">Xadraek</a> (Lee Stephens)</td>
+<td><a href="/~rohan">Rohan</a> (Steven Whitehouse)</td>
<td><em>None</em></td>
</tr>
<tr>
<td>1994-1995</td>
-<td><a href="https://sucs.org/%7Emilamber">Milamber</a> (Andrew Hogg)</td>
-<td><a href="../~xadraek">Xadraek</a> (Lee Stephens)</td>
-<td><a href="../~rohan">Rohan</a> (Steven Whitehouse)</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>
</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><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>
</tr>
<tr>
<td>1992-1993</td>
-<td><a href="../~mocelet">Mocelet</a> (Richard Bytheway)</td>
+<td><a href="/~mocelet">Mocelet</a> (Richard Bytheway)</td>
<td> </td>
-<td><a href="../~gerbil">Gerbil</a> (Debbie Gwynne)</td>
+<td><a href="/~gerbil">Gerbil</a> (Debbie Gwynne)</td>
<td><em>None</em></td>
</tr>
<tr>
<td>1991-1992</td>
-<td><a href="../~arthur">Arthur</a> (Justin Mitchell)</td>
+<td><a href="/~arthur">Arthur</a> (Justin Mitchell)</td>
<td>Michele Poole</td>
<td>Adrian Bateman</td>
<td><em>None</em></td>
@@ -201,22 +201,22 @@
<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><a href="/~alexw">alexw</a> (Alex Williams)</td>
+<td><a href="/~cariad">Cariad</a> (Paul Rees)</td>
<td><em>None</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><a href="/~alexw">alexw</a> (Alex Williams)</td>
+<td><a href="/~caederus">caederus</a> (Robin O'Leary)</td>
<td><em>None</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><a href="/~alexw">alexw</a> (Alex Williams)</td>
+<td><a href="/~caederus">caederus</a> (Robin O'Leary)</td>
<td><em>None</em></td>
</tr>
</tbody>
Modified: branches/sucs-site/static/About/Joining.txt
===================================================================
--- branches/sucs-site/static/About/Joining.txt 2015-04-14 19:33:54 UTC (rev 675)
+++ branches/sucs-site/static/About/Joining.txt 2015-04-14 19:41:18 UTC (rev 676)
@@ -8,7 +8,6 @@
</ul>
<h2>What do I get?</h2>
<ul>
-<li><strong><a href="../blogs/">Blog</a></strong> - Use our custom blog hosting system to publish your own blog.</li>
<li><strong><a href="../Community/Milliways/">Bulletin Board System</a></strong> - Our online notice board, where society and other issues are discussed, and where users can request information and help.</li>
<li><strong><a href="../About/Room/">Computer room</a></strong> with 24 hour access.</li>
<li><strong><abbr>DVD+RW</abbr>/<abbr>CDRW</abbr></strong> - Burn downloaded software or backup your personal files onto <abbr>DVD</abbr> or <abbr>CD</abbr>.</li>
@@ -16,7 +15,7 @@
<li><strong>Extra disk space</strong> - It is possible to access your society disk space from the majority of campus computers, as well as over the internet using Web Folders, any WebDAV client, <abbr>FTP</abbr> or <abbr>SFTP</abbr>.</li>
<li><strong><a href="../Games/">Games Server</a></strong> - Use our new, campus network-based games server to play <cite>Counter-Strike: Source</cite>, <cite>UT2004</cite> and more.</li>
<li><strong>Laptop internet hookup</strong> from our room, using the campus high speed connection.</li>
-<li><strong><a href="/Knowledge/Library/">Library</a></strong> - Borrow a textbook or two to brush up on your technical knowledge (We have many of the <abbr>CS</abbr> recommended texts).</li>
+<li><strong><a href="..//Knowledge/Library/">Library</a></strong> - Borrow a textbook or two to brush up on your technical knowledge (We have many of the <abbr>CS</abbr> recommended texts).</li>
<li><strong>Printers</strong> - Make use of our laser printer. (200 free pages, 2p per page after)</li>
<li><strong>Program Advisory</strong> - All students can get some help with their programming tasks.</li>
<li><strong>Shell account</strong> - Access our server using <abbr>SSH</abbr>.</li>
@@ -30,7 +29,7 @@
<p>You can join in person by <a href="../About/Room/">visiting The Room</a> and catching a member of admin.</p>
<p>The Room is located on the <strong>ground floor of the Student Union Building</strong>. The door to the room is half way along the side which faces towards Fulton House. There are usually helpful people in the room around lunchtime/early afternoon.</p>
<h3>Online</h3>
-<p>Membership can be purchased from the <a href="http://www.swansea-union.co.uk/mysociety/sucs/">Student Union</a> once logged in. You then need to make a note of your transaction number and go to <a href="http://sucs.org/susignup">http://sucs.org/susignup</a></p>
+<p>Membership can be purchased from the <a href="http://www.swansea-union.co.uk/mysociety/sucs/">Student Union</a> once logged in. You then need to make a note of your transaction number and go to <a href="../susignup">http://sucs.org/susignup</a></p>
<p>Alternatively, fill in the form below and a member of admin will get in touch with you:</p>
<form action="/About/JoinEmail" method="post">
<div class="row">
@@ -48,7 +47,7 @@
<div class="row">
<label for="uname">Preferred username</label>
<span class="textinput"><input id="uname" name="uname" size="8" type="text" /><br />
-<div class="note">If you already have a Signup Slip, please do not use this form but go to the <a href="https://sucs.org/signup/">signup page</a> instead.</div>
+<div class="note">If you already have a Signup Slip, please do not use this form but go to the <a href="../signup/">signup page</a> instead.</div>
</span>
</div>
<div class="row">
Modified: branches/sucs-site/static/About/Room-secondary.txt
===================================================================
--- branches/sucs-site/static/About/Room-secondary.txt 2015-04-14 19:33:54 UTC (rev 675)
+++ branches/sucs-site/static/About/Room-secondary.txt 2015-04-14 19:41:18 UTC (rev 676)
@@ -1,27 +1,5 @@
<div class="cbb">
<h3>Live Webcam</h3>
-<!--
- <script type="text/javascript">
- //<![CDATA[
- function popup(mylink, windowname)
- {
- if (! window.focus) return true;
- var href;
- if (typeof(mylink) == 'string')
- href=mylink;
- else
- href=mylink.href;
- window.open(href,windowname, 'width=660,height=520,left=5,top=50,scrollbars=no');
- return false;
- }
- //]]>
- </script>
- <a href="http://old.sucs.org/services/roomp.html" onclick="return popup('http://old.sucs.org/services/roomp.html','SUCScam');">
- <img src="http://old.sucs.org/services/cam.php?scale=0.26" alt="Live RoomCam" />
- </a>
- <p>Click on image for larger version</p>
- <a href="http://old.sucs.org/services/rooms.php" onclick="return popup('http://old.sucs.org/services/rooms.php', 'SUCScam')">Stream</a>
--->
<div>
<img style="max-height:100%; max-width:100%;" src="https://sucs.org/images/lastsnap.jpg">
Modified: branches/sucs-site/static/About/Room.txt
===================================================================
--- branches/sucs-site/static/About/Room.txt 2015-04-14 19:33:54 UTC (rev 675)
+++ branches/sucs-site/static/About/Room.txt 2015-04-14 19:41:18 UTC (rev 676)
@@ -1,5 +1,5 @@
<p>The SUCS room houses our network of Linux desktop PCs, along with spaces for members with laptop computers to get connected.</p>
-<p><img alt="The SUCS Room" src="/pictures/sucsroom.jpg" /></p>
+<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 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
Modified: branches/sucs-site/static/About/Staff.txt
===================================================================
--- branches/sucs-site/static/About/Staff.txt 2015-04-14 19:33:54 UTC (rev 675)
+++ branches/sucs-site/static/About/Staff.txt 2015-04-14 19:41:18 UTC (rev 676)
@@ -1,7 +1,7 @@
<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>
+<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" />
@@ -48,14 +48,14 @@
<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="http://sucs.org/~firefury/">firefury</a>)<br /></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>
+<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">
@@ -63,7 +63,7 @@
<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="http://sucs.org/services/milliways.php" mce_href="http://sucs.org/services/milliways.php">Milliways</a>. During the week, there is usually someone logged on who will be able to help you.</p>
+<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">
Modified: branches/sucs-site/static/About.txt
===================================================================
--- branches/sucs-site/static/About.txt 2015-04-14 19:33:54 UTC (rev 675)
+++ branches/sucs-site/static/About.txt 2015-04-14 19:41:18 UTC (rev 676)
@@ -9,7 +9,7 @@
here to help!</p>
<h3>Some of the services we offer:</h3>
<ul>
-<li>Extra storage space for when your library account gets full or stops working, accessible via <a href="dav" target="_top"><cite>WebDAV / WebFolder</cite></a></li>
+<li>Extra storage space for when your library account gets full or stops working, accessible via <a href="/dav" target="_top"><cite>WebDAV / WebFolder</cite></a></li>
<li><abbr>POP3</abbr>/<abbr>IMAP</abbr> Email account featuring <a href="http://spamassassin.org/"><cite>SpamAssassin</cite></a> - Can be accessed via <a href="webmail">Secure webmail!</a></li>
<li>Web site hosting (including <a href="http://www.php.net/"><abbr><cite>PHP</cite></abbr></a> scripting and <a href="http://www.postgresql.org/"><em>PostgreSQL</em></a> database support)</li>
<li><a href="Tools/Desktop%20on%20Demand">Desktop On Demand</a></li>
Modified: branches/sucs-site/static/Community/Shame.txt
===================================================================
--- branches/sucs-site/static/Community/Shame.txt 2015-04-14 19:33:54 UTC (rev 675)
+++ branches/sucs-site/static/Community/Shame.txt 2015-04-14 19:41:18 UTC (rev 676)
@@ -2,13 +2,13 @@
<p> </p>
<div style="text-align: center">
<span style="padding-right: 15px;">
-<a href="/Community/Shame/Disk">
-<img alt="Top 12 Disk Space Users" height="158" src="/images/hard_drive.png" width="172" />
+<a href="Shame/Disk">
+<img alt="Top 12 Disk Space Users" height="158" src="../images/hard_drive.png" width="172" />
</a>
</span>
<span style="padding-left: 15px;">
-<a href="/Community/Shame/Printer">
-<img alt="Top 12 Printers" height="146" src="/images/printer.png" width="187" />
+<a href="Shame/Printer">
+<img alt="Top 12 Printers" height="146" src="../images/printer.png" width="187" />
</a>
</span>
</div>
Modified: branches/sucs-site/static/Community/Stream/FAQ.txt
===================================================================
--- branches/sucs-site/static/Community/Stream/FAQ.txt 2015-04-14 19:33:54 UTC (rev 675)
+++ branches/sucs-site/static/Community/Stream/FAQ.txt 2015-04-14 19:41:18 UTC (rev 676)
@@ -7,6 +7,6 @@
<ul>
<li>We might not be streaming anything<br />In the lead up to a planned stream then there should be a static information display, but this may disappear during testing. At other times then there may be no video. Check both quality options, or try playing the stream externally if you have a compatible media player.<br /></li>
<li>You may need to clear your browser cache - Instructions for most major browsers are <a href="http://www.wikihow.com/Clear-Your-Browser%27s-Cache">available here</a></li>
-<li>If you see short bursts of video followed by the spinner then you may not have sufficient bandwidth for the stream - try the <a href="/Community/Stream/Low">low version</a></li>
+<li>If you see short bursts of video followed by the spinner then you may not have sufficient bandwidth for the stream - try the <a href="../../Community/Stream/Low">low version</a></li>
</ul>
-<p>If you are still having problems, visit <a href="/Community/Milliways">Milliways </a>and ask for an <a href="/About/Staff">admin</a>, or email admin@</p>
\ No newline at end of file
+<p>If you are still having problems, visit <a href="../../Community/Milliways">Milliways </a>and ask for an <a href="../../About/Staff">admin</a>, or email admin@</p>
\ No newline at end of file
Modified: branches/sucs-site/static/Community/Stream/High.txt
===================================================================
--- branches/sucs-site/static/Community/Stream/High.txt 2015-04-14 19:33:54 UTC (rev 675)
+++ branches/sucs-site/static/Community/Stream/High.txt 2015-04-14 19:41:18 UTC (rev 676)
@@ -6,4 +6,4 @@
flowplayer("player", "/~tswsl1989/stream/flowplayer-3.2.7.swf");
// --></script>
</p>
-<p>Having problems? Read the <a href="/Community/Stream/FAQ">FAQ</a> or try the <a href="/Community/Stream/Low">lower bandwidth version</a></p>
\ No newline at end of file
+<p>Having problems? Read the <a href="FAQ">FAQ</a> or try the <a href="Low">lower bandwidth version</a></p>
\ No newline at end of file
Modified: branches/sucs-site/static/Community/Stream/Low.txt
===================================================================
--- branches/sucs-site/static/Community/Stream/Low.txt 2015-04-14 19:33:54 UTC (rev 675)
+++ branches/sucs-site/static/Community/Stream/Low.txt 2015-04-14 19:41:18 UTC (rev 676)
@@ -13,6 +13,6 @@
});
// --></script>
</p>
-<p>Having problems? Read the <a href="/Community/Stream/FAQ">FAQ</a></p>
+<p>Having problems? Read the <a href="FAQ">FAQ</a></p>
<p>
-Everything works but you'd like a higher quality version? <a href="/Community/Stream/High">Step this way</a></p>
\ No newline at end of file
+Everything works but you'd like a higher quality version? <a href="High">Step this way</a></p>
\ No newline at end of file
Modified: branches/sucs-site/static/Community/Stream.txt
===================================================================
--- branches/sucs-site/static/Community/Stream.txt 2015-04-14 19:33:54 UTC (rev 675)
+++ branches/sucs-site/static/Community/Stream.txt 2015-04-14 19:41:18 UTC (rev 676)
@@ -22,7 +22,7 @@
</ul>
<p>
To view the stream in an external media player <em>(e.g VLC)</em>
-<a href="https://sucs.org/Community/Stream/External">Click Here for instructions</a><em><br /></em></p>
-<p>All streams are currently FLV format. If you have any problems, please read the <a href="/Community/Stream/FAQ">FAQ</a></p>
+<a href="../Community/Stream/External">Click Here for instructions</a><em><br /></em></p>
+<p>All streams are currently FLV format. If you have any problems, please read the <a href="../Community/Stream/FAQ">FAQ</a></p>
<ul>
</ul>
\ No newline at end of file
Modified: branches/sucs-site/static/Community/Talks.txt
===================================================================
--- branches/sucs-site/static/Community/Talks.txt 2015-04-14 19:33:54 UTC (rev 675)
+++ branches/sucs-site/static/Community/Talks.txt 2015-04-14 19:41:18 UTC (rev 676)
@@ -10,9 +10,7 @@
<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>
<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, or
-leave a post on the <a href="https://sucs.org/Community/Forum/" title="SUCS Forum">SUCS
-Forum</a>. </p>
+a future SUCS Talks event, either 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
@@ -26,10 +24,10 @@
<h2>Archive of Previous Talks </h2>
<h3>#16 - 2014-03-20:</h3>
<ul>
-<li><a href="/Community/Talks/2014-03-20/mistake">Rhodri Curnow (mistake) - Points and lines and maths (oh my)</a> </li>
-<li><a href="/Community/Talks/2014-03-20/grepwood">Michael Dec (grepwood) - Time to glorify my waste of time again</a> </li>
-<li><a href="/Community/Talks/2014-03-20/eclipse">Tim Clark (eclipse) - 10 Tips for new web developers</a> </li>
-<li><a href="/Community/Talks/2014-03-20/lightwind">Joel Martin (lightwind) - Joel's Lightning Talk</a> </li>
+<li><a href="../Community/Talks/2014-03-20/mistake">Rhodri Curnow (mistake) - Points and lines and maths (oh my)</a> </li>
+<li><a href="../Community/Talks/2014-03-20/grepwood">Michael Dec (grepwood) - Time to glorify my waste of time again</a> </li>
+<li><a href="../Community/Talks/2014-03-20/eclipse">Tim Clark (eclipse) - 10 Tips for new web developers</a> </li>
+<li><a href="../Community/Talks/2014-03-20/lightwind">Joel Martin (lightwind) - Joel's Lightning Talk</a> </li>
</ul>
<h3>#15 - 2013-10-17: </h3>
<p><em>Coming soon.</em></p>
@@ -37,93 +35,93 @@
<p><em>Coming soon... maybe</em></p>
<h3>#13 - 2012-10-18: Episode XIII: They're Probably Going to Milk it This Far</h3>
<ul>
-<li><a href="/Community/Talks/2012-10-18/hantudemon">Joseph Bhart (hantudemon) - An Analogy Between Computer Science and Biochemistry</a> </li>
-<li><a href="/Community/Talks/2012-10-18/rollercow">Chris Jones (rollercow) - A Talk by Rollercow</a></li>
-<li><a href="/Community/Talks/2012-10-18/eclipse">Tim Clark (eclipse) - The Wonderful World of Amazon EC2</a> </li>
-<li><a href="/Community/Talks/2012-10-18/edmund">Edmund Smith (edmund) - Helicopters are Cool</a> </li>
+<li><a href="../Community/Talks/2012-10-18/hantudemon">Joseph Bhart (hantudemon) - An Analogy Between Computer Science and Biochemistry</a> </li>
+<li><a href="../Community/Talks/2012-10-18/rollercow">Chris Jones (rollercow) - A Talk by Rollercow</a></li>
+<li><a href="../Community/Talks/2012-10-18/eclipse">Tim Clark (eclipse) - The Wonderful World of Amazon EC2</a> </li>
+<li><a href="../Community/Talks/2012-10-18/edmund">Edmund Smith (edmund) - Helicopters are Cool</a> </li>
</ul>
<h3>#11 - 2012-02-16: Quantum Recordings (They exist unless you try and watch them)</h3>
<ul>
-<li><a href="/Community/Talks/2012-02-16/tswsl1989">Tom Lake (tswsl1989) - Quantum Computation and Communication</a></li>
-<li><a href="/Community/Talks/2012-02-16/kais58">Callum Massey (kais58) - The Life and Times of: The Beast</a><br /></li>
+<li><a href="../Community/Talks/2012-02-16/tswsl1989">Tom Lake (tswsl1989) - Quantum Computation and Communication</a></li>
+<li><a href="../Community/Talks/2012-02-16/kais58">Callum Massey (kais58) - The Life and Times of: The Beast</a><br /></li>
<li>Joseph Bhart (hantudemon) - Something biological</li>
</ul>
<h3>#11 - 2011-11-01: Streamed to the lucky few</h3>
<ul>
-<li><a href="/Community/Talks/2011-11-01/tswsl1989-1">Tom Lake (tswsl1989) - "A brief history of SUCS"</a> (No video)</li>
-<li><a href="/Community/Talks/2011-11-01/itsme">Jon Gordon (itsme) - "How a SCRAMjet Works"</a></li>
-<li><a href="/Community/Talks/2011-11-01/mistake">Rhodri Curnow (mistake) - "Bertrand Russell"</a></li>
-<li><a href="/Community/Talks/hantudemon">Joseph Bhart (hantudemon) - "Genomics"</a></li>
-<li><a href="/Community/Talks/2011-11-01/eclipse">Tim Clark (eclipse) - "How medium sized mammals defend our network!"</a></li>
-<li><a href="/Community/Talks/2011-11-01/tswsl1989-2">Tom Lake (tswsl1989) - "Faster than light neutrinos?"</a></li>
-<li><a href="/Community/Talks/2011-11-01/rollercow">Chris Jones (rollercow) - "Supercomputers and cute animals"</a></li>
+<li><a href="../Community/Talks/2011-11-01/tswsl1989-1">Tom Lake (tswsl1989) - "A brief history of SUCS"</a> (No video)</li>
+<li><a href="../Community/Talks/2011-11-01/itsme">Jon Gordon (itsme) - "How a SCRAMjet Works"</a></li>
+<li><a href="../Community/Talks/2011-11-01/mistake">Rhodri Curnow (mistake) - "Bertrand Russell"</a></li>
+<li><a href="../Community/Talks/hantudemon">Joseph Bhart (hantudemon) - "Genomics"</a></li>
+<li><a href="../Community/Talks/2011-11-01/eclipse">Tim Clark (eclipse) - "How medium sized mammals defend our network!"</a></li>
+<li><a href="../Community/Talks/2011-11-01/tswsl1989-2">Tom Lake (tswsl1989) - "Faster than light neutrinos?"</a></li>
+<li><a href="../Community/Talks/2011-11-01/rollercow">Chris Jones (rollercow) - "Supercomputers and cute animals"</a></li>
</ul>
<h3>#10 - 2011-02-24: Your guess is as good as mine</h3>
<ul>
-<li><a href="/Community/Talks/2011-02-24/eclipse">Tim Clark (eclipse) - Why Guestnet is magic</a></li>
-<li><a href="/Community/Talks/2011-02-24/mistake">Rhodri Curnow (mistake) - Goal Setting</a></li>
-<li><a href="/Community/Talks/2011-02-24/mistake2">Rhodri Curnow (mistake) - Violent Video Games</a></li>
+<li><a href="../Community/Talks/2011-02-24/eclipse">Tim Clark (eclipse) - Why Guestnet is magic</a></li>
+<li><a href="../Community/Talks/2011-02-24/mistake">Rhodri Curnow (mistake) - Goal Setting</a></li>
+<li><a href="../Community/Talks/2011-02-24/mistake2">Rhodri Curnow (mistake) - Violent Video Games</a></li>
<li>Some other talks on some other subjects. Probably</li>
</ul>
<h3>#9 - 2010-10-14: …or these</h3>
<ul>
-<li><a href="/Community/Talks/2010-10-14/tswsl1989">Tom Lake (tswsl1989) - An introduction to LaTeX</a></li>
+<li><a href="../Community/Talks/2010-10-14/tswsl1989">Tom Lake (tswsl1989) - An introduction to LaTeX</a></li>
<li>Nicholas Corlett (worldinsideme) - A recklessly short introduction to PHP</li>
<li>And some others, presumably</li>
</ul>
<h3>#8 - 2010-02-25: No idea about these...</h3>
<h3>#7 - 2009-11-12: Who knows what happened?</h3>
<ul>
-<li><a href="/Community/Talks/2009-11-12/eclipse">Tim Clark (eclipse) - Traffic Shaping: An introduction</a><br /></li>
+<li><a href="../Community/Talks/2009-11-12/eclipse">Tim Clark (eclipse) - Traffic Shaping: An introduction</a><br /></li>
</ul>
<h3>#6 - 2009-03-12: A mystery</h3>
<ul>
-<li><a href="/Community/Talks/2009-03-12/eclipse">Tim Clark (eclipse) - OSM: Database to Pictures</a><br /></li>
+<li><a href="../Community/Talks/2009-03-12/eclipse">Tim Clark (eclipse) - OSM: Database to Pictures</a><br /></li>
</ul>
<h3>#5 - 2008-10-16: Episode V: The Talks Strike Back </h3>
<ul>
-<li><a href="/Community/Talks/2008-10-16/worldinsideme">Nicholas Corlett (worldinsideme) - "A Beginner's Guide to Vim"</a></li>
-<li><a href="/Community/Talks/2008-10-16/talyn256">Sean Handley (talyn256) - "That Real World Thing"</a></li>
-<li><a href="/Community/Talks/2008-10-16/eclipse">Tim Clark (eclipse) - "LaTeX presentations with Beamer"</a></li>
+<li><a href="../Community/Talks/2008-10-16/worldinsideme">Nicholas Corlett (worldinsideme) - "A Beginner's Guide to Vim"</a></li>
+<li><a href="../Community/Talks/2008-10-16/talyn256">Sean Handley (talyn256) - "That Real World Thing"</a></li>
+<li><a href="../Community/Talks/2008-10-16/eclipse">Tim Clark (eclipse) - "LaTeX presentations with Beamer"</a></li>
</ul>
<p><span style="text-decoration: line-through;">More talks on the way soon</span> This is clearly a lie...</p>
<h3>#4 - 2008-02-27: Episode IV: A New Hope (of Talks)</h3>
<p>A long time ago in a galaxy far far away... we thought frosty might have uploaded all of these talks by now.</p>
<ul>
-<li><a href="/Community/Talks/2008-02-27/eclipse">Tim Clark (eclipse) - "NAT & IPtables"</a></li>
-<li><a href="/Community/Talks/2008-02-27/aeternus">Matthew Gwynne (aeternus) - "LaTeX Shiny"</a></li>
+<li><a href="../Community/Talks/2008-02-27/eclipse">Tim Clark (eclipse) - "NAT & IPtables"</a></li>
+<li><a href="../Community/Talks/2008-02-27/aeternus">Matthew Gwynne (aeternus) - "LaTeX Shiny"</a></li>
</ul>
<h3>#3 - 2007-11-07: Episode III: Revenge of the Talks</h3>
<ul>
-<li><a href="/Community/Talks/2007-11-07/frosty">James Frost (frosty) - What's A Linux?</a></li>
-<li><a href="/Community/Talks/2007-11-07/frosty2">James Frost (frosty) - Tips For Effective Presentations</a></li>
-<li><a href="/Community/Talks/2007-11-07/elsmorian">Chris Elsmore (elsmorian) - Digital Audio: What Happened After Music, Media, and DRM</a></li>
-<li><a href="/Community/Talks/2007-11-07/eclipse">Tim Clark (eclipse) - PICAXE, etc</a></li>
-<li><a href="/Community/Talks/2007-11-07/rollercow">Chris Jones (rollercow) - An Introduction to SUCS Systems</a></li>
-<li><a href="/Community/Talks/2007-11-07/sits">Sitsofe Wheeler (sits) - Bug Reporting</a></li>
-<li><a href="/Community/Talks/2007-11-07/welshbyte">Andrew Price (welshbyte) - Running SUCS for Fun and Profit</a></li>
+<li><a href="../Community/Talks/2007-11-07/frosty">James Frost (frosty) - What's A Linux?</a></li>
+<li><a href="../Community/Talks/2007-11-07/frosty2">James Frost (frosty) - Tips For Effective Presentations</a></li>
+<li><a href="../Community/Talks/2007-11-07/elsmorian">Chris Elsmore (elsmorian) - Digital Audio: What Happened After Music, Media, and DRM</a></li>
+<li><a href="../Community/Talks/2007-11-07/eclipse">Tim Clark (eclipse) - PICAXE, etc</a></li>
+<li><a href="../Community/Talks/2007-11-07/rollercow">Chris Jones (rollercow) - An Introduction to SUCS Systems</a></li>
+<li><a href="../Community/Talks/2007-11-07/sits">Sitsofe Wheeler (sits) - Bug Reporting</a></li>
+<li><a href="../Community/Talks/2007-11-07/welshbyte">Andrew Price (welshbyte) - Running SUCS for Fun and Profit</a></li>
</ul>
<h3>#2 - 2007-05-15: Talks the Second</h3>
<p>Apologies for the poor sound quality in some of these talks.</p>
<ul>
-<li><a href="/Community/Talks/2007-05-15/welshbyte">Andy Price (welshbyte) - FLOSSing Your Bits</a></li>
-<li><a href="/Community/Talks/2007-05-15/elsmorian">Chris Elsmore (elsmorian) - Semiconductor & Microprocessor Technology</a></li>
-<li><a href="/Community/Talks/2007-05-15/frosty">James Frost (frosty) - "Dude, What's Up With Your Keyboard?": The Dvorak Keyboard Layout</a></li>
-<li><a href="/Community/Talks/2007-05-15/bogglesteinsky">Ian Tucker(bogglesteinsky) - I Can Hear You Typing</a></li>
-<li><a href="/Community/Talks/2007-05-15/rollercow">Chris Jones (rollercow) - Hiking + Geek</a></li>
-<li><a href="/Community/Talks/2007-05-15/talyn256">Sean Handley (talyn256) - Why WEP Is Broken</a></li>
-<li><a href="/Community/Talks/2007-05-15/wedge">Will Blackstock (wedge) - Will's Top 10 List of Fictional Computers EVER!</a></li>
-<li><a href="/Community/Talks/2007-05-15/worldinsideme">Nicholas Corlett (worldinsideme) - A Beginner's Guide to UNIX Commands: Part 2</a></li>
+<li><a href="../Community/Talks/2007-05-15/welshbyte">Andy Price (welshbyte) - FLOSSing Your Bits</a></li>
+<li><a href="../Community/Talks/2007-05-15/elsmorian">Chris Elsmore (elsmorian) - Semiconductor & Microprocessor Technology</a></li>
+<li><a href="../Community/Talks/2007-05-15/frosty">James Frost (frosty) - "Dude, What's Up With Your Keyboard?": The Dvorak Keyboard Layout</a></li>
+<li><a href="../Community/Talks/2007-05-15/bogglesteinsky">Ian Tucker(bogglesteinsky) - I Can Hear You Typing</a></li>
+<li><a href="../Community/Talks/2007-05-15/rollercow">Chris Jones (rollercow) - Hiking + Geek</a></li>
+<li><a href="../Community/Talks/2007-05-15/talyn256">Sean Handley (talyn256) - Why WEP Is Broken</a></li>
+<li><a href="../Community/Talks/2007-05-15/wedge">Will Blackstock (wedge) - Will's Top 10 List of Fictional Computers EVER!</a></li>
+<li><a href="../Community/Talks/2007-05-15/worldinsideme">Nicholas Corlett (worldinsideme) - A Beginner's Guide to UNIX Commands: Part 2</a></li>
</ul>
<h3>#1 - 2007-03-20: The First Talks</h3>
<ul>
-<li><a href="/Community/Talks/2007-03-20/20070320welshbyte">Andy Price (welshbyte) - "Why Pybackpack Sucks"</a></li>
-<li><a href="/Community/Talks/2007-03-20/20070320jk">James Killick (jk) - "LaTeX"</a></li>
-<li><a href="/Community/Talks/2007-03-20/20070320frosty">James Frost (frosty) - "Procrastination and That"</a></li>
-<li><a href="/Community/Talks/2007-03-20/20070320jean">Jean van Mourik (jean) - "3D Programming in DarkBASIC"</a></li>
-<li><a href="/Community/Talks/2007-03-20/20070320talyn256">Sean Handley (talyn256) - "The Wonderful World of NXT"</a></li>
-<li><a href="/Community/Talks/2007-03-20/20070320sits">Sitsofe Wheeler (sits) - "Power Management on Linux"</a></li>
-<li><a href="/Community/Talks/2007-03-20/20070320worldinsideme">Nicholas Corlett (worldinsideme) - "A Beginner's Guide to UNIX Commands: Part 1"</a></li>
-<li><a href="/Community/Talks/2007-03-20/20070320elsmorian">Chris Elsmore (elsmorian) - "Music, Media & DRM"</a></li>
-<li><a href="/Community/Talks/2007-03-20/20070320rollercow">Chris Jones (rollercow) - "An Introduction to MythTV"</a></li>
+<li><a href="../Community/Talks/2007-03-20/20070320welshbyte">Andy Price (welshbyte) - "Why Pybackpack Sucks"</a></li>
+<li><a href="../Community/Talks/2007-03-20/20070320jk">James Killick (jk) - "LaTeX"</a></li>
+<li><a href="../Community/Talks/2007-03-20/20070320frosty">James Frost (frosty) - "Procrastination and That"</a></li>
+<li><a href="../Community/Talks/2007-03-20/20070320jean">Jean van Mourik (jean) - "3D Programming in DarkBASIC"</a></li>
+<li><a href="../Community/Talks/2007-03-20/20070320talyn256">Sean Handley (talyn256) - "The Wonderful World of NXT"</a></li>
+<li><a href="../Community/Talks/2007-03-20/20070320sits">Sitsofe Wheeler (sits) - "Power Management on Linux"</a></li>
+<li><a href="../Community/Talks/2007-03-20/20070320worldinsideme">Nicholas Corlett (worldinsideme) - "A Beginner's Guide to UNIX Commands: Part 1"</a></li>
+<li><a href="../Community/Talks/2007-03-20/20070320elsmorian">Chris Elsmore (elsmorian) - "Music, Media & DRM"</a></li>
+<li><a href="../Community/Talks/2007-03-20/20070320rollercow">Chris Jones (rollercow) - "An Introduction to MythTV"</a></li>
</ul>
\ No newline at end of file
Modified: branches/sucs-site/static/Community.txt
===================================================================
--- branches/sucs-site/static/Community.txt 2015-04-14 19:33:54 UTC (rev 675)
+++ branches/sucs-site/static/Community.txt 2015-04-14 19:41:18 UTC (rev 676)
@@ -1,22 +1,17 @@
<h3>These are some of the ways you can get involved in the SUCS
Community</h3>
<dl>
-<dt><a href="/Community/Milliways">Milliways (chat room)</a></dt>
+<dt><a href="Community/Milliways">Milliways (chat room)</a></dt>
<dd>Join us on the SUCS talker system, Milliways. It's an old school chat system that was first conceived in 1992 and is still seeing around-the-clock action. This is where the older life members usually hang out so it's a good place to find some experienced advice, coding tips etc. </dd>
-<!--
-<dt><a href="/Community/Forum/">SUCS Discussion Forum</a></dt>
-<dd>For unrealtime discussion of, well, anything really. If you're not a big fan of the commandline or just don't have time for Milliways, this is a great way to interact with your fellow SUCS members and keep up-to-date on news and events. </dd>
--->
-<dt><a href="/Community/Talks">SUCS Lightning Talks</a></dt>
+<dt><a href="Community/Talks">SUCS Lightning Talks</a></dt>
<dd>A great way to share things you are passionate about with fellow members. We've had 3 Lightning Talks so far in the past 2 years and each of them have been very well received. Footage of the talks can also be found in this section.</dd>
-<dt><a href="/Community/Projects">SUCS Projects</a></dt>
+<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>
</dl>
<h3>Other ways</h3>
<ul>
-<li>Read a selection of blogs by SUCS members on <a href="/Community/Planet">Planet SUCS</a></li>
-<li>Create and administer your own blog using the <a href="/blogs/">SUCS blog system</a></li>
-<li>We have a group on <a href="https://www.facebook.com/SwanseaUniversityComputerSociety" title="SUCS">Facebook!</a></li>
+<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
Modified: branches/sucs-site/static/Getting Started.txt
===================================================================
--- branches/sucs-site/static/Getting Started.txt 2015-04-14 19:33:54 UTC (rev 675)
+++ branches/sucs-site/static/Getting Started.txt 2015-04-14 19:41:18 UTC (rev 676)
@@ -1,15 +1,15 @@
<h2>Getting Started</h2>
<p>Congratulations on becoming a SUCS member! But what can you do with your new-found membership? Why not try one of the following?</p>
<ul>
-<li>Chat with us on our <a href="http://sucs.org/Community/Milliways" title="Milliways, the SUCS talker">chat room</a></li>
+<li>Chat with us on our <a href="Community/Milliways" title="Milliways, the SUCS talker">chat room</a></li>
<li>Come to a social [JCs, Wednesdays, 1pm]</li>
-<li>Visit <a href="http://sucs.org/About/Room" title="The SUCS room">the room</a></li>
-<li>Find out <a href="http://sucs.org/News/" title="SUCS news">what's happening</a></li>
-<li>Log in <a href="http://sucs.org/Knowledge/Help/SUCS%20Services/Logging%20in%20remotely" title="Logging in remotely">remotely</a></li>
-<li>Access your <a href="http://sucs.org/Knowledge/Help/SUCS%20Services/Using%20WebDAV" title="Accessing your files remotely with WebDAV">disk space</a></li>
-<li>Host your <a href="http://sucs.org/Knowledge/FAQ#s_s4" title="SUCS FAQ: Where's my website?">website</a> with us</li>
-<li>Play some <a href="http://sucs.org/Games" title="The SUCS game server">games</a></li>
-<li>Browse our <a href="http://sucs.org/Knowledge/Library" title="The SUCS library">library</a></li>
-<li>Check out a <a href="http://sucs.org/Community/Projects" title="SUCS Projects">project</a> (or start your own)</li>
+<li>Visit <a href="About/Room" title="The SUCS room">the room</a></li>
+<li>Find out <a href="News/" title="SUCS news">what's happening</a></li>
+<li>Log in <a href="Knowledge/Help/SUCS%20Services/Logging%20in%20remotely" title="Logging in remotely">remotely</a></li>
+<li>Access your <a href="Knowledge/Help/SUCS%20Services/Using%20WebDAV" title="Accessing your files remotely with WebDAV">disk space</a></li>
+<li>Host your <a href="Knowledge/FAQ#s_s4" title="SUCS FAQ: Where's my website?">website</a> with us</li>
+<li>Play some <a href="Games" title="The SUCS game server">games</a></li>
+<li>Browse our <a href="Knowledge/Library" title="The SUCS library">library</a></li>
+<li>Check out a <a href="Community/Projects" title="SUCS Projects">project</a> (or start your own)</li>
<li>Join our development <a href="http://lists.sucs.org/mailman/listinfo/devel" title="SUCS Devel mailing list">mailing list</a> (for our website, computer system, etc)</li>
</ul>
\ No newline at end of file
Modified: branches/sucs-site/static/Knowledge/FAQ.txt
===================================================================
--- branches/sucs-site/static/Knowledge/FAQ.txt 2015-04-14 19:33:54 UTC (rev 675)
+++ branches/sucs-site/static/Knowledge/FAQ.txt 2015-04-14 19:41:18 UTC (rev 676)
@@ -111,9 +111,9 @@
<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="https://www.sucs.org/About/Joining">Joining page</a>.</dd>
+<dd>There is more information about joining SUCS and the benefits of joining on the <a href="../About/Joining">Joining page</a>.</dd>
</dl>
<h3><a id="storage_space">Storage Space</a></h3>
<blockquote>
@@ -121,29 +121,27 @@
<dt><a id="s_s1">What <em>can</em> I use my SUCS space for?</a></dt>
<dd>Storing files and hosting a personal website or files.</dd>
<dt><a id="s_s2">What <em>can't</em> I use my SUCS space for?</a></dt>
- <dd>Storing and sharing illegal or copyrighted material such as mp3s and video files. For further details, please see the <a href="/About/Conditions">SUCS Terms and Conditions</a>. </dd>
+ <dd>Storing and sharing illegal or copyrighted material such as mp3s and video files. For further details, please see the <a href="../About/Conditions">SUCS Terms and Conditions</a>. </dd>
<dt><a id="s_s3">How do I access my files from home?</a></dt>
- <dd>There are a couple of ways you can access your SUCS files from home. One of the easiest ways is to use a system called WebDAV. This allows you to access your files as though you were looking through folders on your own computer. Check out the <a href="../Help/SUCS%20Services/Using%20WebDAV">WebDAV</a> page of the help wiki for more information. You can also log into your SUCS account using SSH, which allows you to access your files from a command line. This is somewhat more technical, but it's a good thing to know how to do. Visit the <a href="/Knowledge/Help/SUCS%20Services/Logging%20in%20remotely">remote login page</a> on the help wiki for more information.</dd>
+ <dd>There are a couple of ways you can access your SUCS files from home. One of the easiest ways is to use a system called WebDAV. This allows you to access your files as though you were looking through folders on your own computer. Check out the <a href="Help/SUCS%20Services/Using%20WebDAV">WebDAV</a> page of the help wiki for more information. You can also log into your SUCS account using SSH, which allows you to access your files from a command line. This is somewhat more technical, but it's a good thing to know how to do. Visit the <a href="Help/SUCS%20Services/Logging%20in%20remotely">remote login page</a> on the help wiki for more information.</dd>
<dt><a id="s_s4">Where is my web space?</a></dt>
- <dd>Your public_html folder in your home directory is where you can put files for online viewing. You can also see them at this address: <a href="../~username">http://www.sucs.org/~username</a></dd>
+ <dd>Your public_html folder in your home directory is where you can put files for online viewing. You can also see them at this address: <a href="/~username">http://www.sucs.org/~username</a></dd>
<dt><a id="s_s5">How can I make a website?</a></dt>
- <dd>If you are new to HTML and CSS then <a href="http://w3schools.com/" target="_blank">W3Schools</a> has a lot of tutorials that would be useful. Anything you want to be viewed online should be stored in your public_html folder. You can access this on the SUCS machines and using a program such as WinSCP or webDAV. Details of how to set up your public_html folder and write your first web page are available in the <a href="https://sucs.org/Knowledge/Help/SUCS%20Services/Using%20your%20web%20space">Using your web space</a> walkthrough. </dd>
- <dt><a id="s_s6">How do I set up a SUCS blog?</a></dt>
- <dd>You can go and start your own blog <a href="../blogs/" target="_blank">here</a>. </dd>
+ <dd>If you are new to HTML and CSS then <a href="http://w3schools.com/" target="_blank">W3Schools</a> has a lot of tutorials that would be useful. Anything you want to be viewed online should be stored in your public_html folder. You can access this on the SUCS machines and using a program such as WinSCP or webDAV. Details of how to set up your public_html folder and write your first web page are available in the <a href="Help/SUCS%20Services/Using%20your%20web%20space">Using your web space</a> walkthrough. </dd>
</dl>
</blockquote>
<hr />
<h2><a id="community">Getting to know other SUCS members</a></h2>
<dl>
<dt><a id="com1">How can I get to know other SUCS members?</a></dt>
-<dd>You can talk to them on Milliways, through the <a href="../Community/Forum/">forum</a>, join in a game on the gameserver or come to the socials :).</dd>
+<dd>You can talk to them on Milliways, join in a game on the gameserver or come to the socials :).</dd>
</dl>
<h3><a id="milliways">Milliways</a></h3>
<blockquote>
<dl>
<dt><a id="mil1">How do I use Milliways?</a></dt>
- <dd>The How To for Milliways is <a href="Help/SUCS%20Services/Using%20Milliways">here</a> or you can use the web based version of the talker, available at <a href="http://sucs.org/mw">http://sucs.org/mw</a><br />Note that the web talker only supports a few basic commands, not the full feature set supported by the main client.<br /></dd>
+ <dd>The How To for Milliways is <a href="Help/SUCS%20Services/Using%20Milliways">here</a> or you can use the web based version of the talker, available at <a href="{$baseurl}/mw">http://sucs.org/mw</a><br />Note that the web talker only supports a few basic commands, not the full feature set supported by the main client.<br /></dd>
<dt><a id="mil2">How do I get colours and other Milliways scripts?</a></dt>
<dd>There is a How To for this in the Help section <a href="Help/SUCS%20Services/Using%20Milliways/Setting%20up%20Milliways%20Scripts">here</a>.</dd>
@@ -214,7 +212,7 @@
<dl>
<dt>
<a id="prin1">Is there a limit to how much printing I can do?</a></dt>
- <dd>You get 200 pages when you becme a member, old members get another 200 pages once they renew. When you have used up your 200 you can buy more pages at 2p per page, either speak to a member of <a href="https://sucs.org/About/Staff">admin team</a> in the room or email admin at sucs.org</dd>
+ <dd>You get 200 pages when you becme a member, old members get another 200 pages once they renew. When you have used up your 200 you can buy more pages at 2p per page, either speak to a member of <a href="../About/Staff">admin team</a> in the room or email admin at sucs.org</dd>
<dt><a id="prin2">My document was written in MS Word, how can I view it on the SUCS computers?</a></dt>
<dd>LibreOffice Writer is able to import and export Microsoft Word documents, although you should be aware that some formatting information may be lost along the way.<br /></dd>
<dt><a id="prin3">I am connected to GuestNET, how do I print from my own computer?</a></dt>
@@ -243,7 +241,7 @@
<blockquote>
<dl>
<dt><a id="lib1">What books are in the library?</a></dt>
- <dd>There are a variety of computing related books, including some computer science course texts. For a full list, see our <a href="Library">Library page</a></dd>
+ <dd>There are a variety of computing related books, including some computer science course texts. For a full list, see our <a href="../Knowledge/Library">Library page</a></dd>
<dt><a id="lib2">I'm doing Computer Science, which of these are recommended course text?</a></dt>
<dd>Your lecturer should give you a recommended reading list at the beginning of your course so you can check the library for them then.</dd>
<dt><a id="lib3">How do I take a book out from the library?</a></dt>
Modified: branches/sucs-site/static/Knowledge.txt
===================================================================
--- branches/sucs-site/static/Knowledge.txt 2015-04-14 19:33:54 UTC (rev 675)
+++ branches/sucs-site/static/Knowledge.txt 2015-04-14 19:41:18 UTC (rev 676)
@@ -1,11 +1,11 @@
-<h2><a href="/Knowledge/FAQ">FAQ</a></h2>
+<h2><a href="Knowledge/FAQ">FAQ</a></h2>
<p>The FAQ section is a good starting point. It will give you an idea of the tools you will need to use to perform a particular task, often linking into the Help section for more detailed instructions</p>
-<h2><a href="/Help">Help</a></h2>
+<h2><a href="Knowledge/Help">Help</a></h2>
<p>For more specific instructions, use the Help section.</p>
-<h2><a href="/Knowledge/Articles">Articles</a></h2>
+<h2><a href="Knowledge/Articles">Articles</a></h2>
<p>Here, you will find articles written by SUCS members providing more in-depth analysis.</p>
-<h2><a href="/Knowledge/Library">Library</a></h2>
+<h2><a href="Knowledge/Library">Library</a></h2>
<p>Here you can see all the books we have in the SUCS library.</p>
\ No newline at end of file
Modified: branches/sucs-site/static/Tools/Desktop on Demand.txt
===================================================================
--- branches/sucs-site/static/Tools/Desktop on Demand.txt 2015-04-14 19:33:54 UTC (rev 675)
+++ branches/sucs-site/static/Tools/Desktop on Demand.txt 2015-04-14 19:41:18 UTC (rev 676)
@@ -14,7 +14,7 @@
}
// --></script>
</p>
-<p>The Desktop on Demand service allows you to connect to an X session on one of the SUCS desktops and use all the programs you can in the SUCS room. Please remember that the <a href="/About/Conditions">SUCS Terms and Conditions</a> apply to your use of this service.</p>
+<p>The Desktop on Demand service allows you to connect to an X session on one of the SUCS desktops and use all the programs you can in the SUCS room. Please remember that the <a href="{$baseurl}/About/Conditions">SUCS Terms and Conditions</a> apply to your use of this service.</p>
<p>Choose a desktop size to start using the service (smaller will be faster):</p>
<ul>
<li><a href="/desktop/640x480.html" onclick="return popup('/desktop/640x480.html','640','480','Desktop on Demand');">640x480</a></li>
Modified: branches/sucs-site/static/Tools.txt
===================================================================
--- branches/sucs-site/static/Tools.txt 2015-04-14 19:33:54 UTC (rev 675)
+++ branches/sucs-site/static/Tools.txt 2015-04-14 19:41:18 UTC (rev 676)
@@ -1,11 +1,11 @@
<p>Welcome to the Tools page. Here are some short descriptions of the tools available on sucs.org. Click the link in the menu bar for more information on the tool you wish to use.</p>
<h2><a href="http://lists.sucs.org/">Mailing Lists</a></h2>
<p>A directory of all the mailing lists hosted by SUCS. Using this you can find out more about a particular mailing list, subscribe or unsubscribe to a list and change your preferences for any lists you subscribed to. If you are an admin of a mailing list you can access the admin interface through this page.</p>
-<h2><a href="/Tools/ShortURI">ShortURI</a></h2>
+<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="/webmail">Web Mail</a></h2>
+<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>
-<h2><a href="/Tools/PasteBin">PasteBin</a></h2>
+<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>
+<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
Modified: branches/sucs-site/static/Vote/No Manifesto.txt
===================================================================
--- branches/sucs-site/static/Vote/No Manifesto.txt 2015-04-14 19:33:54 UTC (rev 675)
+++ branches/sucs-site/static/Vote/No Manifesto.txt 2015-04-14 19:41:18 UTC (rev 676)
@@ -1,3 +1,3 @@
<h1>Executive Election</h1>
<h2>This candidate has not submitted a manifesto.</h2>
-<p><a href="/Vote">Return to the ballot page</a></p>
\ No newline at end of file
+<p><a href="../Vote">Return to the ballot page</a></p>
\ No newline at end of file
Modified: branches/sucs-site/static/fragments/Front.txt
===================================================================
--- branches/sucs-site/static/fragments/Front.txt 2015-04-14 19:33:54 UTC (rev 675)
+++ branches/sucs-site/static/fragments/Front.txt 2015-04-14 19:41:18 UTC (rev 676)
@@ -1,11 +1,11 @@
<h2>Swansea University Computer Society</h2>
<p>SUCS is one of the university's longest-running and largest societies. In
-addition to providing members with a range of <a href="/About">IT
+addition to providing members with a range of <a href="About">IT
services</a>, we hold regular events and socials throughout the year.</p>
-<p>We have our own <a href="/About/Room">computer room</a> on campus with 24
-hour swipe-card access. There are usually members present through the week
+<p>We have our own <a href="About/Room">computer room</a> on campus with 24
+hour access. There are usually members present through the week
so feel free to stop by.</p>
-<p>Visit the <a href="/Community">Community</a> section of the site for more
-ways to get in touch with your fellow members, including <a href="/Community/Milliways">Milliways</a>, our chat room. </p>
+<p>Visit the <a href="Community">Community</a> section of the site for more
+ways to get in touch with your fellow members, including <a href="Community/Milliways">Milliways</a>, our chat room. </p>
<p>SUCS celebrated its twenty-fifth birthday in the summer of 2014. We have compiled a site about the society's history. To read about it and contribute your part of the story, visit <a href="http://history.sucs.org/">http://history.sucs.org/</a>.</p>
<div style="text-align: center"><a href="http://history.sucs.org/"><img alt="SUCS history" height="50" src="https://sucs.org/images/sucshistory.png" width="231" /></a></div>
\ No newline at end of file
Modified: branches/sucs-site/static/fragments/Join.txt
===================================================================
--- branches/sucs-site/static/fragments/Join.txt 2015-04-14 19:33:54 UTC (rev 675)
+++ branches/sucs-site/static/fragments/Join.txt 2015-04-14 19:41:18 UTC (rev 676)
@@ -3,7 +3,7 @@
<h3>Join SUCS!</h3>
<p>As well as being an excellent way to meet people with similar interests (we have regular social events and we're all really nice), you also get all this great stuff: </p>
<ul> <li>Use of our dedicated <a href="../Games/" title="Gameserver">games server</a></li>
-<li><a href="/Knowledge/Help/SUCS%20Services/Using%20your%20web%20space">Web hosting</a> with scripting and database support</li>
+<li><a href="../Knowledge/Help/SUCS%20Services/Using%20your%20web%20space">Web hosting</a> with scripting and database support</li>
<li>Free printing*</li>
<li>Disk space</li>
<li>Use of our <a href="../Knowledge/Library/" title="Library">library</a> of textbooks</li>
Modified: branches/sucs-site/static/fragments/Milliways.txt
===================================================================
--- branches/sucs-site/static/fragments/Milliways.txt 2015-04-14 19:33:54 UTC (rev 675)
+++ branches/sucs-site/static/fragments/Milliways.txt 2015-04-14 19:41:18 UTC (rev 676)
@@ -1,5 +1,5 @@
-<p>Milliways is the society's talker system, a kind of chatroom. Many current and former SUCS members hang out here and discuss anything, computer related or not. It's a great place to ask burning questions about the society and its services, or just for general computing advice and opinions from regulars including several experienced IT professionals. </p><h3>Connecting to Milliways</h3><p>SUCS members can <abbr>SSH</abbr> to <kbd>sucs.org</kbd> and run <kbd>mw</kbd>.</p><p>Non-members are also welcome (provided they play nice, see <a href="/Knowledge/Help/SUCS%20Services/Using%20Milliways/Milliways%20Etiquette">Milliways Etiquette</a>), and can <abbr>SSH</abbr> to <kbd>bbs at sucs.org</kbd> with password <kbd>bbs</kbd>.<br /></p><p>To learn more about it, and how to use it, see <a href="https://sucs.org/Knowledge/Help/SUCS%20Services/Using%20Milliways">Using Milliways</a></p>
+<p>Milliways is the society's talker system, a kind of chatroom. Many current and former SUCS members hang out here and discuss anything, computer related or not. It's a great place to ask burning questions about the society and its services, or just for general computing advice and opinions from regulars including several experienced IT professionals. </p><h3>Connecting to Milliways</h3><p>SUCS members can <abbr>SSH</abbr> to <kbd>sucs.org</kbd> and run <kbd>mw</kbd>.</p><p>Non-members are also welcome (provided they play nice, see <a href="../Knowledge/Help/SUCS%20Services/Using%20Milliways/Milliways%20Etiquette">Milliways Etiquette</a>), and can <abbr>SSH</abbr> to <kbd>bbs at sucs.org</kbd> with password <kbd>bbs</kbd>.<br /></p><p>To learn more about it, and how to use it, see <a href="../Knowledge/Help/SUCS%20Services/Using%20Milliways">Using Milliways</a></p>
<p>Whilst we currently recommend using a standalone <abbr>SSH</abbr> client to connect, you can also access Milliways through our <em>experimental</em> <a href="#" onclick="window.open('/mw/','Milliways','height=600,width=800,menubar=no,resizable=yes,location=no,directories=no,scrollbars=yes,status=no,toolbar=no')">web-based client</a>.</p>
-<p>You can also now see a live list of discussed <a href="/Community/Milliways/uri">URLs</a>, users' <a href="/Community/Milliways/Status">Status Messages</a> as well as comments with <a href="/Community/Milliways/tag">#hashtags</a></p>
+<p>You can also now see a live list of discussed <a href="../Community/Milliways/uri">URLs</a>, users' <a href="../Community/Milliways/Status">Status Messages</a> as well as comments with <a href="../Community/Milliways/tag">#hashtags</a></p>
Modified: branches/sucs-site/templates/banana-leaders.tpl
===================================================================
--- branches/sucs-site/templates/banana-leaders.tpl 2015-04-14 19:33:54 UTC (rev 675)
+++ branches/sucs-site/templates/banana-leaders.tpl 2015-04-14 19:41:18 UTC (rev 676)
@@ -1,12 +1,12 @@
<div class="cbb">
-<h3>This year's leaderboard<img class="emblem" src="/images/bananas/banana-bunch.png" alt="Yellow Bananas" /></h3>
+<h3>This year's leaderboard<img class="emblem" src="{$baseurl}/images/bananas/banana-bunch.png" alt="Yellow Bananas" /></h3>
<ol>
{foreach name=top from=$stats.yeartop key=key item=member}
{if $member.real == TRUE}
- <li><a href="/Community/Members/{$member.username}">{$member.username}</a> ({$member.sum})</li>
+ <li><a href="{$baseurl}/Community/Members/{$member.username}">{$member.username}</a> ({$member.sum})</li>
{else}
- <li><a href="/Community/Bananas/{$member.username}">{$member.username}</a> ({$member.sum})</li>
+ <li><a href="{$baseurl}/Community/Bananas/{$member.username}">{$member.username}</a> ({$member.sum})</li>
{/if}
{/foreach}
</ol>
@@ -14,26 +14,26 @@
<div class="cbb">
-<h3>Most valued members<img class="emblem" src="/images/bananas/banana-bunch.png" alt="Yellow Bananas" /></h3>
+<h3>Most valued members<img class="emblem" src="{$baseurl}/images/bananas/banana-bunch.png" alt="Yellow Bananas" /></h3>
<ol>
{foreach name=top from=$stats.top key=key item=member}
{if $member.real == TRUE}
- <li><a href="/Community/Members/{$member.username}">{$member.username}</a> ({$member.sum})</li>
+ <li><a href="{$baseurl}/Community/Members/{$member.username}">{$member.username}</a> ({$member.sum})</li>
{else}
- <li><a href="/Community/Bananas/{$member.username}">{$member.username}</a> ({$member.sum})</li>
+ <li><a href="{$baseurl}/Community/Bananas/{$member.username}">{$member.username}</a> ({$member.sum})</li>
{/if}
{/foreach}
</ol>
</div>
<div class="cbb">
-<h3>Hall of Shame<img class="emblem" src="/images/bananas/banana-g-bunch.png" alt="Green Bananas" /></h3>
+<h3>Hall of Shame<img class="emblem" src="{$baseurl}/images/bananas/banana-g-bunch.png" alt="Green Bananas" /></h3>
<ol>
{foreach name=top from=$stats.bottom key=key item=member}
{if $member.real == TRUE}
- <li><a href="/Community/Members/{$member.username}">{$member.username}</a> ({$member.sum})</li>
+ <li><a href="{$baseurl}/Community/Members/{$member.username}">{$member.username}</a> ({$member.sum})</li>
{else}
- <li><a href="/Community/Bananas/{$member.username}">{$member.username}</a> ({$member.sum})</li>
+ <li><a href="{$baseurl}/Community/Bananas/{$member.username}">{$member.username}</a> ({$member.sum})</li>
{/if}
{/foreach}
</ol>
Modified: branches/sucs-site/templates/branding.tpl
===================================================================
--- branches/sucs-site/templates/branding.tpl 2015-04-14 19:33:54 UTC (rev 675)
+++ branches/sucs-site/templates/branding.tpl 2015-04-14 19:41:18 UTC (rev 676)
@@ -3,7 +3,7 @@
<div class="cornerTopLeft">
<div class="cornerTopRight">
<div id="logo">
- <a href="/"><img src="/images/sucslogo-halo.png" width="170" height="76" alt="SUCS" /></a>
+ <a href="{$baseurl}/"><img src="{$baseurl}/images/sucslogo-halo.png" width="170" height="76" alt="SUCS" /></a>
</div>
{include file="login.tpl"}
Modified: branches/sucs-site/templates/breadcrumb.tpl
===================================================================
--- branches/sucs-site/templates/breadcrumb.tpl 2015-04-14 19:33:54 UTC (rev 675)
+++ branches/sucs-site/templates/breadcrumb.tpl 2015-04-14 19:41:18 UTC (rev 676)
@@ -2,7 +2,7 @@
{if $pathlist}
<ul>
{foreach name=pathlist from=$pathlist key=key item=item}
- <li>{if !$smarty.foreach.pathlist.first}{if $item!=""}> {/if}{/if}{if !$smarty.foreach.pathlist.last}<a href="{buildpath list=$pathlist item=$item}">{/if}{if $item}{$item|escape:'htmlall'}{else}{if $smarty.foreach.pathlist.first}SUCS{/if}{/if}{if !$smarty.foreach.pathlist.last}</a>{/if}</li>
+ <li>{if !$smarty.foreach.pathlist.first}{if $item!=""}> {/if}{/if}{if !$smarty.foreach.pathlist.last}<a href="{$baseurl}{buildpath list=$pathlist item=$item}">{/if}{if $item}{$item|escape:'htmlall'}{else}{if $smarty.foreach.pathlist.first}SUCS{/if}{/if}{if !$smarty.foreach.pathlist.last}</a>{/if}</li>
{/foreach}
</ul>
{/if}
Modified: branches/sucs-site/templates/games.tpl
===================================================================
--- branches/sucs-site/templates/games.tpl 2015-04-14 19:33:54 UTC (rev 675)
+++ branches/sucs-site/templates/games.tpl 2015-04-14 19:41:18 UTC (rev 676)
@@ -1,8 +1,8 @@
{include file="../static/fragments/Games.txt"}
<ul class="boxes">
{foreach name=games from=$games item=game}
-<li><div class="cbb"><a href="/Games/{$game.name}"><div>
-<img src="/pictures/games/{$game.name|escape:url}.jpg" alt="{$game.name}" />
+<li><div class="cbb"><a href="{$baseurl}/Games/{$game.name}"><div>
+<img src="{$baseurl}/pictures/games/{$game.name|escape:url}.jpg" alt="{$game.name}" />
<br />{$game.name}
</div></a></div></li>
{/foreach}
Modified: branches/sucs-site/templates/head.tpl
===================================================================
--- branches/sucs-site/templates/head.tpl 2015-04-14 19:33:54 UTC (rev 675)
+++ branches/sucs-site/templates/head.tpl 2015-04-14 19:41:18 UTC (rev 676)
@@ -4,10 +4,10 @@
<head>
<meta http-equiv="Content-type" content="text/html;charset=UTF-8" />
<title>{$title} - SUCS</title>
- <link rel="SHORTCUT ICON" href="/favicon.ico" />
- <link rel="apple-touch-icon" href="/images/apple-touch-icon.png" />
+ <link rel="SHORTCUT ICON" href="{$baseurl}/favicon.ico" />
+ <link rel="apple-touch-icon" href="{$baseurl}/images/apple-touch-icon.png" />
- <script type="text/javascript" src="/videos/talks/ufo.js"></script>
+ <script type="text/javascript" src="{$baseurl}/videos/talks/ufo.js"></script>
<link rel="stylesheet" type="text/css" href="{$baseurl}/css/common.css" media="screen,print" />
<link rel="stylesheet" type="text/css" href="{$baseurl}/css/sucs.css" media="screen" />
@@ -26,7 +26,6 @@
{if isset($atom_url)}
<link rel="alternate" type="application/atom+xml" title="{$title}" href="{$atom_url}" />
{/if}
-<!-- <meta name="author" content="Denis Walker" /> -->
<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}
@@ -43,7 +42,7 @@
<!--[if IE]>
<link rel="stylesheet" type="text/css" href="{$baseurl}/css/ie.css" />
- <script type="text/javascript" src="/js/cb.js"></script>
+ <script type="text/javascript" src="{$baseurl}/js/cb.js"></script>
<![endif]-->
<!--[if IE 8]>
<link rel="stylesheet" type="text/css" href="{$baseurl}/css/ie8.css" />
Modified: branches/sucs-site/templates/index.tpl
===================================================================
--- branches/sucs-site/templates/index.tpl 2015-04-14 19:33:54 UTC (rev 675)
+++ branches/sucs-site/templates/index.tpl 2015-04-14 19:41:18 UTC (rev 676)
@@ -18,7 +18,7 @@
</ul>
<div class="clear"></div>
{/if}
-Page last modified{if $modifiedby} by <a href="/Community/Members/{$modifiedby}">{$modifiedby}</a>{/if} on {$modified}
+Page last modified{if $modifiedby} by <a href="{$baseurl}/Community/Members/{$modifiedby}">{$modifiedby}</a>{/if} on {$modified}
</div>
{/if}
</div>
Modified: branches/sucs-site/templates/news.tpl
===================================================================
--- branches/sucs-site/templates/news.tpl 2015-04-14 19:33:54 UTC (rev 675)
+++ branches/sucs-site/templates/news.tpl 2015-04-14 19:41:18 UTC (rev 676)
@@ -27,7 +27,7 @@
</div>
{/if}
</div>
- <div class="boxfoot"><p>Posted by <a href="/Community/Members/{$item.author}">{$item.author}</a> on {$item.date|date_format }</p></div>
+ <div class="boxfoot"><p>Posted by <a href="{$baseurl}/Community/Members/{$item.author}">{$item.author}</a> on {$item.date|date_format }</p></div>
</div>
{foreachelse}
<p>News item not found</p>
Modified: branches/sucs-site/templates/options.tpl
===================================================================
--- branches/sucs-site/templates/options.tpl 2015-04-14 19:33:54 UTC (rev 675)
+++ branches/sucs-site/templates/options.tpl 2015-04-14 19:41:18 UTC (rev 676)
@@ -28,7 +28,7 @@
</div>
<div class="row">
<label for="groups">Groups: </label>
- <span class="textinput"><span class="note"><a href="/Knowledge/Help/Admin%20Tools/Groups">What are “Groups”?</a></span></span>
+ <span class="textinput"><span class="note"><a href="{$baseurl}/Knowledge/Help/Admin%20Tools/Groups">What are “Groups”?</a></span></span>
</div>
<div class="row">
<span class="textinput" id="groups">
Modified: branches/sucs-site/templates/search.cy.tpl
===================================================================
--- branches/sucs-site/templates/search.cy.tpl 2015-04-14 19:33:54 UTC (rev 675)
+++ branches/sucs-site/templates/search.cy.tpl 2015-04-14 19:41:18 UTC (rev 676)
@@ -5,7 +5,7 @@
<input type="text" class="text" name="q" maxlength="255" value="" /><br />
<div class="buttons">
- <div class="left"><a href="http://www.google.co.uk/"><img src="/images/google.png" width="66" height="25" alt="Google" /></a></div>
+ <div class="left"><a href="http://www.google.co.uk/"><img src="{$baseurl}/images/google.png" width="66" height="25" alt="Google" /></a></div>
<input class="submit" type="submit" name="sa" value="Chwilio" />
</div>
Modified: branches/sucs-site/templates/search.tpl
===================================================================
--- branches/sucs-site/templates/search.tpl 2015-04-14 19:33:54 UTC (rev 675)
+++ branches/sucs-site/templates/search.tpl 2015-04-14 19:41:18 UTC (rev 676)
@@ -5,7 +5,7 @@
<input type="text" class="text" name="q" maxlength="255" value="" /><br />
<div class="buttons">
- <div class="left"><a href="http://www.google.co.uk/"><img src="/images/google.png" width="66" height="25" alt="Google" /></a></div>
+ <div class="left"><a href="http://www.google.co.uk/"><img src="{$baseurl}/images/google.png" width="66" height="25" alt="Google" /></a></div>
<input class="submit" type="submit" name="sa" value="Search" />
</div>
Modified: branches/sucs-site/templates/signup.tpl
===================================================================
--- branches/sucs-site/templates/signup.tpl 2015-04-14 19:33:54 UTC (rev 675)
+++ branches/sucs-site/templates/signup.tpl 2015-04-14 19:41:18 UTC (rev 676)
@@ -18,7 +18,7 @@
<input type="submit" name="submit" value="Sign Up" /></span>
</div>
<div class="clear"></div>
- <div class="note">If you wish to renew an existing account instead, please login to <a href="https://sucs.org/Options">Membership Options</a> using your existing account details.</div>
+ <div class="note">If you wish to renew an existing account instead, please login to <a href="{$baseurl}/Options">Membership Options</a> using your existing account details.</div>
</div>
<div class="hollowfoot"><div><div></div></div></div>
</div>
@@ -76,7 +76,7 @@
<div id="phonemessage"{if $mode=='re-form'}{if isset($errors.phone)} style="color:red; float:right; clear:right;">{$errors.phone}{else} style="color:green; float:right; clear:right;">OK{/if}{else}>{/if}</div>
</div>
<div class="row" id="tncdiv">
- <span class="textinput"><input type="checkbox" id="tnc" name="tnc" size="30" {if $mode=='re-form'}value='{$fields.tnc}'{/if}/>I have read and understood, and agree to be bound by the <a href="/About/Conditions">Terms and Conditions</a>.</span>
+ <span class="textinput"><input type="checkbox" id="tnc" name="tnc" size="30" {if $mode=='re-form'}value='{$fields.tnc}'{/if}/>I have read and understood, and agree to be bound by the <a href="{$baseurl}/About/Conditions">Terms and Conditions</a>.</span>
<div id="tncmessage"{if $mode=='re-form'}{if isset($errors.tnc)} style="color:red; float:right; clear:right;">{$errors.tnc}{else} style="color:green; float:right; clear:right;">OK{/if}{else}>{/if}</div>
</div>
{if $overridable}
@@ -94,7 +94,7 @@
{elseif $mode=='result'}
{if !$failed}
<h1>Welcome to SUCS</h1>
-<p>Signup is complete, please see below for your password, a copy has also been send to {$email}, we request you change this immediatley. See our <a href="/Getting%20Started">Getting Started</a> page for some ways you can start using your new SUCS account!</p>
+<p>Signup is complete, please see below for your password, a copy has also been send to {$email}, we request you change this immediatley. See our <a href="{$baseurl}/Getting%20Started">Getting Started</a> page for some ways you can start using your new SUCS account!</p>
<p>
Username: <strong>{$username}</strong><br />
Password: <strong>{$password}</strong><br />
Modified: branches/sucs-site/templates/users.tpl
===================================================================
--- branches/sucs-site/templates/users.tpl 2015-04-14 19:33:54 UTC (rev 675)
+++ branches/sucs-site/templates/users.tpl 2015-04-14 19:41:18 UTC (rev 676)
@@ -10,7 +10,7 @@
</tr>
{foreach name=users from=$users item=user}
<tr>
- <td><a href="/Community/Members/{$user.username|escape:'url'}">{$user.username}</a></td>
+ <td><a href="{$baseurl}/Community/Members/{$user.username|escape:'url'}">{$user.username}</a></td>
<td>{$user.idle}</td>
</tr>
{/foreach}
More information about the Devel
mailing list