Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • osian/sucs-site
  • kais58/sucs-site
  • imranh/sucs-site
  • foshjedi2004/sucs-site
  • gigosaurus/sucs-site
  • matstn/sucs-site
  • ripp_/sucs-site
  • eggnog/sucs-site
  • sucssite/sucs-site
  • elbows/sucs-site
  • realitykiller/sucs-site
  • crox/sucs-site
  • vectre/sucs-site
  • welshbyte/sucs-site
  • paperclipman/sucs-site
15 results
Show changes
Commits on Source (40)
Hide whitespace changes
Inline Side-by-side
Showing
with 302 additions and 248 deletions
components/front.php
View file @ a2d96936
......@@ -9,7 +9,7 @@ if (!$session->loggedin) {
$output = file_get_contents("../static/fragments/Join.txt");
} else {
$output = "<div class=\"cbb\"><h3>You are logged in</h3><p>If you would like to contribute to the site or report a bug, please contact imranh.</p></div>";
$output = "<div class=\"cbb\"><h3>You are logged in</h3><p style=\"text-align: center;\">Why not join our <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')\" style=\"font-size: 150%; font-weight: bold; color: #ffc62b;\">Live Chat</a>?</p></div>";
$output = "<div class=\"cbb\"><h3>You are logged in</h3><p style=\"text-align: center;\">Why not join our <a href=\"https://chat.sucs.org\" target=\"_blank\">Live Chat</a>?</p></div>";
//include('users.php');
//$output .= $result;
include('electionreminder.php');
......
htdocs/css/box.css
View file @ a2d96936
......@@ -6,7 +6,7 @@
margin: 1em 0;
margin-left: 0.5em;
margin-right: 0.5em;
background: #e76808;
background: #e65c00;
font-size: 85%;
}
......
htdocs/css/common.css
View file @ a2d96936
......@@ -62,7 +62,8 @@ acronym, abbr {
float: left;
padding: 0.2em;
min-width: 170px;
width: 17%;
margin-left: 1%;
width: 16%;
}
#title {
......@@ -170,7 +171,7 @@ table.wide {
}
table.border, table.border td, table.border th {
border: 1px solid #e76808;
border: 1px solid #ff6600;
border-collapse: collapse;
}
......
htdocs/css/sucs.css
View file @ a2d96936
......@@ -3,12 +3,15 @@
-------------------------------------------------- */
body {
background: #fff;
padding: 0;
margin: 0;
background: #f2f2f2;
min-width: 600px;
height: calc(100vh - 30px);
}
hr {
border: 1px solid #e76808;
border: 1px solid #e65c00;
}
/* --------------------------------------------------
......@@ -16,7 +19,7 @@ hr {
-------------------------------------------------- */
a:link {
color: #d45e08;
color: #e65c00;
}
a:visited {
......@@ -31,38 +34,20 @@ a:hover {
}
/* --------------------------------------------------
Page corners
-------------------------------------------------- */
#branding, #brandingC {
border-top-left-radius: 15px;
border-top-right-radius: 15px;
-moz-border-radius-topleft: 15px;
-moz-border-radius-topright: 15px;
}
#footer {
border-bottom-left-radius: 15px;
border-bottom-right-radius: 15px;
-moz-border-radius-bottomleft: 15px;
-moz-border-radius-bottomright: 15px;
}
/* --------------------------------------------------
Branding
-------------------------------------------------- */
#branding {
background: url('/images/orangefade.png') repeat-x #ffc62b bottom;
clear: both;
}
#brandingC {
background: url('/images/bgfade.png') repeat-y;
background: #e65c00;
}
#title {
color: #a52f0f;
color: #f2f2f2;
}
#loginForm {
......@@ -78,6 +63,42 @@ a:hover {
width: 8em;
}
#loginText a:link {
color: #f2f2f2;
}
#loginText a:visited {
color: #f2f2f2;
}
#loginForm input[type=text] {
padding: 5px 15px;
box-sizing: border-box;
border: 0px;
}
#loginForm input[type=password] {
padding: 5px 15px;
box-sizing: border-box;
border: 0px;
}
#loginForm input[type=submit] {
padding: 5px 15px;
background: #f2f2f2;
border: 0 none;
cursor: pointer;
-webkit-border-radius: 5px;
border-radius: 0px
}
.join-header {
font-size: 30pt;
margin-left: 10px;
text-decoration: none;
color: #ffc62b !important;
}
/* --------------------------------------------------
Breadcrumb
-------------------------------------------------- */
......@@ -85,7 +106,15 @@ a:hover {
#breadcrumb {
font-weight: bold;
font-size: 80%;
color: #ffc62b;
color: #f2f2f2;
}
#breadcrumb a:link {
color: #f2f2f2;
}
#breadcrumb a:visited {
color: #f2f2f2;
}
#breadcrumb ul {
......@@ -107,39 +136,92 @@ a:hover {
-------------------------------------------------- */
#wrapper {
background: #fff0cd;
padding: 0;
clear: both;
border: 2px solid #e76808;
border-top: 0;
border-bottom: 0;
background: #f2f2f2;
min-height: 100%;
margin-top: 10px;
}
#navigation {
float: left;
width: 17%;
padding-top: 0.5em;
/* overflow: auto; */
float: left;
width: 300px;
padding-top: 0.5em;
}
#content {
float: right;
width: 82%;
float: right;
width: calc(100% - 300px);
}
#primary {
float: left;
width: 66%;
padding: 0;
float: left;
width: calc(100% - 400px);
}
#primaryC {
padding-right: 0.5em;
padding-left: 20px;
padding-right: 20px;
}
#secondary {
float: right;
width: 33%;
float: right;
width: 400px;
}
@media only screen and (max-width: 1080px) {
#wrapper {
margin-top: -5px;
display: flex;
flex-direction: column;
}
#navigation {
order: 1;
width: 100%;
float: top;
}
#content {
margin-top: 10px;
order: 2;
float: bottom;
width: 100%;
}
#primary {
float: none;
width: 100%;
}
#secondary {
float: none;
width: 100%;
}
#footer {
height: auto !important;
}
#branding {
height: auto !important;
}
#logo {
padding-right: 0;
}
#title h1 {
margin-top: 20px;
font-size: 12pt;
padding-left: 0;
}
#breadcrumb li {
display: block;
}
#loginForm {
padding-top: 1em;
}
}
/* --------------------------------------------------
......@@ -160,13 +242,11 @@ a:hover {
line-height: 1.5em;
font-size: 95%;
color: #ffc62b;
background: #e76808;
border-top-right-radius: 7px;
border-bottom-right-radius: 7px;
-moz-border-radius-topright: 7px;
-moz-border-radius-bottomright: 7px;
background: #e65c00;
padding-left: 1em;
margin-bottom: 2px;
padding-top: 5px;
padding-bottom: 5px;
}
#navigationC ul li a:hover {
......@@ -185,10 +265,6 @@ a:hover {
font-weight: normal;
padding-left: 2em;
background: #ffa405;
border-top-right-radius: 0;
border-bottom-right-radius: 0;
-moz-border-radius-topright: 0;
-moz-border-radius-bottomright: 0;
color: #d45e08;
}
......@@ -200,24 +276,14 @@ a:hover {
color: #fff0cd;
}
#navigationC ul ul li.lastsub a {
border-bottom-right-radius: 7px;
-moz-border-radius-bottomright: 7px;
}
#navigationC ul li.lastsub a {
display: block;
border-bottom-right-radius: 7px;
-moz-border-radius-bottomright: 7px;
}
/* --------------------------------------------------
Boxes
-------------------------------------------------- */
div.cbb {
border-radius: 12px;
-moz-border-radius: 12px;
-webkit-border-radius: 12px;
padding: 1em;
box-shadow: 3px 3px 5px #777;
-moz-box-shadow: 3px 3px 5px #777;
......@@ -260,17 +326,18 @@ ul#valid {
Footer
-------------------------------------------------- */
#footer-fix {
min-height: calc(100% - 16px);
}
#footer {
margin: 0;
margin-bottom: 0.5em;
background: url('/images/orangefade-bottom.png') top repeat-x #ffc62b;
background: #e65c00;
height: 30px;
}
#footer p {
margin: 0;
text-align: center;
font-size: 80%;
padding: 0.5em;
padding-top: 5px;
}
/* --------------------------------------------------
......@@ -279,13 +346,11 @@ ul#valid {
.box {
background: #ffffff;
border-radius: 7px;
-moz-border-radius: 7px;
}
.box div.boxcontent {
border: 2px solid #e76808;
border-top: 1px solid #e76808;
border: 2px solid #e65c00;
border-top: 1px solid #e65c00;
border-bottom: 1px solid #ffffff;
}
......@@ -294,33 +359,21 @@ ul#valid {
}
.box .boxhead {
background: #e76808;
border-top-left-radius: 7px;
border-top-right-radius: 7px;
-moz-border-radius-topleft: 7px;
-moz-border-radius-topright: 7px;
background: #e65c00;
}
.box .hollowhead {
background: #ffffff;
border-top: 2px solid #e76808;
border-left: 2px solid #e76808;
border-right: 2px solid #e76808;
border-top-left-radius: 7px;
border-top-right-radius: 7px;
-moz-border-radius-topleft: 7px;
-moz-border-radius-topright: 7px;
border-top: 2px solid #e65c00;
border-left: 2px solid #e65c00;
border-right: 2px solid #e65c00;
height: 5px;
margin: 0;
padding: 0;
}
.box .boxfoot {
background: #e76808;
border-bottom-left-radius: 7px;
border-bottom-right-radius: 7px;
-moz-border-radius-bottomleft: 7px;
-moz-border-radius-bottomright: 7px;
background: #e65c00;
}
.box .hollowfoot {
......@@ -328,13 +381,9 @@ ul#valid {
height: 5px;
margin: 0;
padding: 0;
border-bottom: 2px solid #e76808;
border-left: 2px solid #e76808;
border-right: 2px solid #e76808;
border-bottom-left-radius: 7px;
border-bottom-right-radius: 7px;
-moz-border-radius-bottomleft: 7px;
-moz-border-radius-bottomright: 7px;
border-bottom: 2px solid #e65c00;
border-left: 2px solid #e65c00;
border-right: 2px solid #e65c00;
}
/* --------------------------------------------------
......@@ -421,7 +470,7 @@ ul#valid {
-------------------------------------------------- */
table.border th {
background: #e76808;
background: #e65c00;
color: #ffc62b;
}
......
htdocs/images/sucslogo-trans-white.png 0 → 100644
View file @ a2d96936
htdocs/images/sucslogo-trans-white.png

22.6 KiB

static/About/Donations.txt
View file @ a2d96936
<h2>Donations Policy</h2>
<ol>
<li> All donations to the society are final, and non-returnable. Any equipment loaned to the society must have the terms of the loan (e.g. time period and/or conditions of fair use) laid out clearly before the loan is accepted.</li>
<li>The society shall not feel obligated to reimburse a donator in any way. Donations should be given freely for the benefit of the society and its members, not for personal gain.</li>
<li>Only equipment that has a direct and immediate use, or a clearly defined planned near-future use, shall be accepted. We simply do not have the storage capacity to collect items that 'may be useful someday'.</li>
<li>A clear log shall be kept of who, what and when equipment was donated, and kept in a prominent place so as to honour our benefactors.</li>
<li> The Society can not be held responsible for the safe keeping of any items loaned or otherwise to it. Whilst every effort will be maintained to protect it, any subsequent damage or theft is entirely at your own risk.</li>
<li> The Society retains the right to return or dispose of any item that threatens, or is believed to threaten the safety rules laid down by the Student Union and the University.</li>
<li> The Society may use, or dispose of donated equipment (non-loan items) in any manner that benefits the society, this includes potentially selling items in order to raise funds to purchase more directly useful items, or donating or swapping equipment with others for good will and favour towards the society.</li>
</ol>
<h2>Donated Equipment List</h2>
<p> This list is incomplete</p>
<table border="0" class="border wide">
<tbody>
<tr>
<th>Who</th><th>Date</th><th>Type</th><th>Items</th>
</tr>
<tr>
<td>Arthur</td>
<td>Sept 99</td>
<td>Loan</td>
<td>Deskjet 540 colour printer</td>
</tr>
<tr>
<td>Zaphod &amp; Spook</td>
<td>2000</td>
<td>Loan</td>
<td>Sun Workstations</td>
</tr>
<tr>
<td>Anarchy</td>
<td>2000</td>
<td>Loan</td>
<td>Motherboard, CPU, and RAM for Platinum</td>
</tr>
<tr>
<td>Milamber</td>
<td>2001</td>
<td>Loan</td>
<td>Brother Mono Laser Printer.</td>
</tr>
<tr>
<td>Weazel</td>
<td>Sep 2002</td>
<td>Loan</td>
<td>120Gb IDE Hard disk for Silver</td>
</tr>
<tr>
<td>Rohan</td>
<td>Jan 2003</td>
<td>Donated</td>
<td>PII 350MHz machine to be used as Cobalt<br /> Dual CPU machine<br /> Empty 1U Rack Case </td>
</tr>
<tr>
<td>Anarchy</td>
<td>Feb 2003</td>
<td>Donated</td>
<td>17" Dell Monitor for Cobalt</td>
</tr>
<tr>
<td>Anarchy &amp; Dick</td>
<td>Feb 2003</td>
<td>Donated</td>
<td>Profits from 2002 BT lecture, presented as components to build 2 new workstations</td>
</tr>
<tr>
<td>Anarchy</td>
<td>Dec 2003</td>
<td>Loan</td>
<td>Pentium to replace the router, a Cyrix machine for workstation</td>
</tr>
<tr>
<td>jk</td>
<td>June 2005</td>
<td>Donated</td>
<td>PIII 1GHz + Board + Memory, used to create thorium</td>
</tr>
<tr>
<td>aeternus</td>
<td>Nov 2005</td>
<td>Donated</td>
<td>19" monitor. Used to replace platinum's old small one</td>
</tr>
<tr>
<td>Rohan</td>
<td>Nov 2005</td>
<td>Donated</td>
<td>Dual PIII 1GHz machine with SCSI disk<br /> 2 other boxes (expand on this..)</td>
</tr>
<tr>
<td>EMC via Rohan</td>
<td>Nov 2005</td>
<td>Donated</td>
<td>PIII 800MHz 1U box with 4x80GB disks</td>
</tr>
<tr>
<td>gimbo</td>
<td>Feb 2006</td>
<td>Donated</td>
<td>17" monitor. Used to replace zinc's old one.</td>
</tr>
<tr>
<td>mattaw</td>
<td>Sep 2006</td>
<td>Donated</td>
<td>Athlon PC</td>
</tr>
<tr>
<td>Rohan<br /></td>
<td>Summer 2006<br /></td>
<td>Donated<br /></td>
<td>Another Dual PIII 1GHz machine with SCSI disk</td>
</tr>
<tr>
<td>Rohan<br /></td>
<td>August 2011<br /></td>
<td>Loan<br /></td>
<td>
<p>UPS (Smart-UPS 1400) and Switch (3Com 3870)</p>
</td>
</tr>
<tr>
<td>Problaze<br /></td>
<td>September 2012<br /></td>
<td>Donated<br /></td>
<td>
<p>Dell Poweredge 1950</p>
</td>
</tr>
</tbody>
<h2>Donations Policy</h2>
<ol>
<li> All donations to the society are final, and non-returnable. Any equipment loaned to the society must have the terms of the loan (e.g. time period and/or conditions of fair use) laid out clearly before the loan is accepted.</li>
<li>The society shall not feel obligated to reimburse a donator in any way. Donations should be given freely for the benefit of the society and its members, not for personal gain.</li>
<li>Only equipment that has a direct and immediate use, or a clearly defined planned near-future use, shall be accepted. We simply do not have the storage capacity to collect items that 'may be useful someday'.</li>
<li>A clear log shall be kept of who, what and when equipment was donated, and kept in a prominent place so as to honour our benefactors.</li>
<li> The Society can not be held responsible for the safe keeping of any items loaned or otherwise to it. Whilst every effort will be maintained to protect it, any subsequent damage or theft is entirely at your own risk.</li>
<li> The Society retains the right to return or dispose of any item that threatens, or is believed to threaten the safety rules laid down by the Student Union and the University.</li>
<li> The Society may use, or dispose of donated equipment (non-loan items) in any manner that benefits the society, this includes potentially selling items in order to raise funds to purchase more directly useful items, or donating or swapping equipment with others for good will and favour towards the society.</li>
</ol>
<h2>Donated Equipment List</h2>
<p> This list is incomplete</p>
<table border="0" class="border wide">
<tbody>
<tr>
<th>Who</th><th>Date</th><th>Type</th><th>Items</th>
</tr>
<tr>
<td>Arthur</td>
<td>Sept 99</td>
<td>Loan</td>
<td>Deskjet 540 colour printer</td>
</tr>
<tr>
<td>Zaphod &amp; Spook</td>
<td>2000</td>
<td>Loan</td>
<td>Sun Workstations</td>
</tr>
<tr>
<td>Anarchy</td>
<td>2000</td>
<td>Loan</td>
<td>Motherboard, CPU, and RAM for Platinum</td>
</tr>
<tr>
<td>Milamber</td>
<td>2001</td>
<td>Loan</td>
<td>Brother Mono Laser Printer.</td>
</tr>
<tr>
<td>Weazel</td>
<td>Sep 2002</td>
<td>Loan</td>
<td>120Gb IDE Hard disk for Silver</td>
</tr>
<tr>
<td>Rohan</td>
<td>Jan 2003</td>
<td>Donated</td>
<td>PII 350MHz machine to be used as Cobalt<br /> Dual CPU machine<br /> Empty 1U Rack Case </td>
</tr>
<tr>
<td>Anarchy</td>
<td>Feb 2003</td>
<td>Donated</td>
<td>17" Dell Monitor for Cobalt</td>
</tr>
<tr>
<td>Anarchy &amp; Dick</td>
<td>Feb 2003</td>
<td>Donated</td>
<td>Profits from 2002 BT lecture, presented as components to build 2 new workstations</td>
</tr>
<tr>
<td>Anarchy</td>
<td>Dec 2003</td>
<td>Loan</td>
<td>Pentium to replace the router, a Cyrix machine for workstation</td>
</tr>
<tr>
<td>jk</td>
<td>June 2005</td>
<td>Donated</td>
<td>PIII 1GHz + Board + Memory, used to create thorium</td>
</tr>
<tr>
<td>aeternus</td>
<td>Nov 2005</td>
<td>Donated</td>
<td>19" monitor. Used to replace platinum's old small one</td>
</tr>
<tr>
<td>Rohan</td>
<td>Nov 2005</td>
<td>Donated</td>
<td>Dual PIII 1GHz machine with SCSI disk<br /> 2 other boxes (expand on this..)</td>
</tr>
<tr>
<td>EMC via Rohan</td>
<td>Nov 2005</td>
<td>Donated</td>
<td>PIII 800MHz 1U box with 4x80GB disks</td>
</tr>
<tr>
<td>gimbo</td>
<td>Feb 2006</td>
<td>Donated</td>
<td>17" monitor. Used to replace zinc's old one.</td>
</tr>
<tr>
<td>mattaw</td>
<td>Sep 2006</td>
<td>Donated</td>
<td>Athlon PC</td>
</tr>
<tr>
<td>Rohan<br /></td>
<td>Summer 2006<br /></td>
<td>Donated<br /></td>
<td>Another Dual PIII 1GHz machine with SCSI disk</td>
</tr>
<tr>
<td>Rohan<br /></td>
<td>August 2011<br /></td>
<td>Loan<br /></td>
<td>
<p>UPS (Smart-UPS 1400) and Switch (3Com 3870)</p>
</td>
</tr>
<tr>
<td>Problaze<br /></td>
<td>September 2012<br /></td>
<td>Donated<br /></td>
<td>
<p>Dell Poweredge 1950</p>
</td>
</tr>
<tr>
<td>imranh<br /></td>
<td>June 2017<br /></td>
<td>Donated<br /></td>
<td>
<p>PlayStation 2</p>
</td>
</tr>
</tbody>
</table>
\ No newline at end of file
static/fragments/Join.txt
View file @ a2d96936
<!-- Joining box -->
<div class="cbb">
<h3>Join SUCS!</h3>
<a class="join-header" href="https://www.swansea-union.co.uk/activities/society/sucs/" target="_blank">Join SUCS!</a>
<p>As well as being an excellent way to meet people with similar interests (we have regular social events and we&#39;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>
......
templates/branding.tpl
View file @ a2d96936
......@@ -3,7 +3,7 @@
<div class="cornerTopLeft">
<div class="cornerTopRight">
<div id="logo">
<a href="{$baseurl}/"><img src="{$baseurl}/images/sucslogo-halo.png" width="170" height="76"
<a href="{$baseurl}/"><img src="{$baseurl}/images/sucslogo-trans-white.png" height="76"
alt="SUCS"/></a>
</div>
......
templates/foot.tpl
View file @ a2d96936
......@@ -15,15 +15,11 @@
<div class="clear"></div>
</div>
</div>
<div id="footer">
<div class="cornerBottomLeft">
<div class="cornerBottomRight">
<p>Site designed and maintained by SUCS. All opinions expressed are those of the relevant individual and not
of the society.</p>
{if isset($totaltime)}<p>Script executed in {$totaltime} seconds</p>{/if}
</div>
</div>
<p>Site designed and maintained by SUCS. All opinions expressed are those of the relevant individual and not of the society.</p>
{if isset($totaltime)}<p>Script executed in {$totaltime} seconds</p>{/if}
</div>
{if $action=="edit"}
......
templates/head.tpl
View file @ a2d96936
......@@ -3,6 +3,7 @@
<head>
<meta http-equiv="Content-type" content="text/html;charset=UTF-8"/>
<meta name="theme-color" content="#e65c00">
<title>{$title} - SUCS</title>
<link rel="SHORTCUT ICON" href="{$baseurl}/favicon.ico"/>
<link rel="apple-touch-icon" href="{$baseurl}/images/apple-touch-icon.png"/>
......@@ -30,7 +31,8 @@
content="Swansea University Computer Society - providing student computing facilities and personal web pages."/>
{if $refresh}
<meta http-equiv="REFRESH" content="{$refresh}" />{/if}
<meta name="viewport" content="width=device-width">
{if isset($extra_scripts)}
{foreach from=$extra_scripts item=script}
......@@ -53,10 +55,9 @@
</head>
<body>
{include file="branding.tpl"}
<div id="wrapper">
<div id="footer-fix">
{include file="branding.tpl"}
<div id="content">
{include file="usermessages.tpl"}
<div id="wrapper">
<div id="content">
{include file="usermessages.tpl"}
templates/login.tpl
View file @ a2d96936
<div id="loginForm">
<form method="post" action="{$ssl_url|escape:'htmlall'}{getparams gets=$gets}">
<div>
<div id="loginText">
{if $session->loggedin}
Hello
<a href="{$baseurl}/Community/Members/{$session->username}">{$session->username}</a>
......@@ -17,7 +17,6 @@
<br/>
Print balance: {$session->printbalance} |
<a href="{$baseurl}/Options">Membership Options</a>
<br/>
{/if}
<input type="submit" class="button" name="Logout" id="Logout" value="Logout"/>
{else}
......