[SUCS Devel] [Git][sucssite/sucs-site][sucs-site] 40 commits: Update Donations.txt to add imranh's PS2 donation
Isabel Jenkins
unreturnable at sucs.org
Fri Oct 20 17:57:33 BST 2017
Isabel Jenkins pushed to branch sucs-site at sucssite / sucs-site
Commits:
96061966 by Andy Pover at 2017-06-02T11:18:24+01:00
Update Donations.txt to add imranh's PS2 donation
- - - - -
09cb85e1 by Isabel Jenkins at 2017-06-19T06:54:25+01:00
Updated CSS to try and give a more modern feel
- - - - -
5711b517 by Imran Hussain at 2017-06-30T13:16:26+01:00
Switch to using debian jessie docker image
- - - - -
4f6760ff by Imran Hussain at 2017-06-30T13:16:26+01:00
That didn't work so lets go back to using the default ruby image and test php against php7
- - - - -
9cf975b2 by Imran Hussain at 2017-06-30T13:16:26+01:00
npm is part of nodejs
- - - - -
aa48cb72 by Imran Hussain at 2017-06-30T13:16:26+01:00
install nodejs from the main site, debian stable packages are screweed up
- - - - -
84780e5d by Imran Hussain at 2017-06-30T13:16:26+01:00
need curl, doh!
- - - - -
d8584f05 by Imran Hussain at 2017-06-30T13:16:26+01:00
forgot a -y
- - - - -
850dc297 by Imran Hussain at 2017-06-30T13:16:26+01:00
nodejs install that is supposed to install deps doesn't actually do so, install gnupg manually
- - - - -
f522dda5 by Imran Hussain at 2017-06-30T13:16:26+01:00
the script to install nodejs DOESN'T INSTALL NODEJS!
- - - - -
c0a4eedb by Imran Hussain at 2017-06-30T13:17:02+01:00
Switch to using debian jessie docker image
- - - - -
2fb3504b by Imran Hussain at 2017-06-30T13:17:03+01:00
That didn't work so lets go back to using the default ruby image and test php against php7
- - - - -
e21e849b by Imran Hussain at 2017-06-30T13:17:03+01:00
npm is part of nodejs
- - - - -
6ae8257c by Imran Hussain at 2017-06-30T13:17:03+01:00
install nodejs from the main site, debian stable packages are screweed up
- - - - -
b3af94da by Imran Hussain at 2017-06-30T13:17:03+01:00
need curl, doh!
- - - - -
02750371 by Imran Hussain at 2017-06-30T13:17:03+01:00
forgot a -y
- - - - -
c749c42b by Imran Hussain at 2017-06-30T13:17:03+01:00
nodejs install that is supposed to install deps doesn't actually do so, install gnupg manually
- - - - -
058a41c2 by Imran Hussain at 2017-06-30T13:17:03+01:00
the script to install nodejs DOESN'T INSTALL NODEJS!
- - - - -
325be9b7 by Isabel Jenkins at 2017-07-02T20:23:33+01:00
Merge branch 'master' of projects.sucs.org:sucssite/sucs-site
- - - - -
1ed84067 by Isabel Jenkins at 2017-07-02T22:16:31+01:00
who turned out the lights
- - - - -
a7061603 by Imran Hussain at 2017-07-03T10:19:09+01:00
Merge branch 'master' into 'master'
Operation Polished Turd - Phase 1
See merge request !60
- - - - -
521ddbcd by Isabel Jenkins at 2017-08-20T21:10:57+01:00
Site now does some basic scaling for mobile phone. As well as fixed footer
- - - - -
9b5d6a8b by Isabel Jenkins at 2017-08-20T21:11:46+01:00
Merge branch 'master' of projects.sucs.org:unreturnable/sucs-site
- - - - -
83f35798 by Imran Hussain at 2017-09-19T16:49:23+01:00
Update sucs iss ldap info for signup system
- - - - -
c4c4b758 by Imran Hussain at 2017-09-21T16:52:08+01:00
Merge branch 'master' into beta
- - - - -
1a4237a8 by Isabel Jenkins at 2017-09-24T12:57:09+01:00
Update Live chat link
- - - - -
52510509 by Imran Hussain at 2017-09-26T11:49:54+01:00
shitty iss dropped uid for EDUPERSONTARGETEDID
- - - - -
620c9b63 by gigosaurus at 2017-09-26T21:59:10+01:00
Fix signup validation. Emails, names and addresses are now much less strict, and more valid postcodes are allowed.
- - - - -
777965c6 by Kit Manners at 2017-09-27T00:07:42+01:00
Fix typo in signup completion
- - - - -
fcfabbae by Kit Manners at 2017-09-27T01:13:07+01:00
Fix retrieving full name from campus ldap
- - - - -
86ccc6b7 by Kit Manners at 2017-09-27T01:20:53+01:00
Add missing space in error message
- - - - -
4063d666 by gigosaurus at 2017-09-27T02:40:47+01:00
Remember the student number if they entered it in a previous form
- - - - -
07f6b98f by gigosaurus at 2017-09-27T02:42:05+01:00
Merge branch 'master' of projects.sucs.org:gigosaurus/sucs-site
- - - - -
ea4cbf7c by Imran Hussain at 2017-09-27T10:41:03+01:00
Merge branch 'gigosaurus/sucs-site-master'
- - - - -
3eb75c79 by Imran Hussain at 2017-09-27T10:44:26+01:00
if you're a student then you don't get to choose your real name
- - - - -
fbac2096 by Kit Manners at 2017-09-27T12:30:00+01:00
Fix retrieving student number
- - - - -
2b0cf0ed by Imran Hussain at 2017-09-27T12:36:55+01:00
Merge branch 'gigosaurus/sucs-site-patch-1'
- - - - -
68376cf8 by Ciaran Crocker at 2017-10-20T17:49:07+01:00
Merge branch 'sucs-site'
- - - - -
3b3b9d96 by Ciaran Crocker at 2017-10-20T17:50:37+01:00
Merge branch 'master' into beta
- - - - -
a2d96936 by Isabel Jenkins at 2017-10-20T17:57:25+01:00
Merge branch 'sucs-site' into 'sucs-site'
Tidy up branches (3/3)
See merge request sucssite/sucs-site!71
- - - - -
11 changed files:
- components/front.php
- htdocs/css/box.css
- htdocs/css/common.css
- htdocs/css/sucs.css
- + htdocs/images/sucslogo-trans-white.png
- static/About/Donations.txt
- static/fragments/Join.txt
- templates/branding.tpl
- templates/foot.tpl
- templates/head.tpl
- templates/login.tpl
Changes:
=====================================
components/front.php
=====================================
--- a/components/front.php
+++ b/components/front.php
@@ -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
=====================================
--- a/htdocs/css/box.css
+++ b/htdocs/css/box.css
@@ -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
=====================================
--- a/htdocs/css/common.css
+++ b/htdocs/css/common.css
@@ -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
=====================================
--- a/htdocs/css/sucs.css
+++ b/htdocs/css/sucs.css
@@ -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 {
@@ -32,37 +35,19 @@ 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;
+}
+
+ at 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
=====================================
Binary files /dev/null and b/htdocs/images/sucslogo-trans-white.png differ
=====================================
static/About/Donations.txt
=====================================
--- a/static/About/Donations.txt
+++ b/static/About/Donations.txt
@@ -1,131 +1,139 @@
-<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 & 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 & 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 & 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 & 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
=====================================
--- a/static/fragments/Join.txt
+++ b/static/fragments/Join.txt
@@ -1,6 +1,6 @@
<!-- 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'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
=====================================
--- a/templates/branding.tpl
+++ b/templates/branding.tpl
@@ -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
=====================================
--- a/templates/foot.tpl
+++ b/templates/foot.tpl
@@ -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
=====================================
--- a/templates/head.tpl
+++ b/templates/head.tpl
@@ -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
=====================================
--- a/templates/login.tpl
+++ b/templates/login.tpl
@@ -1,6 +1,6 @@
<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}
View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/5c2bcecf13ac8abf8802f84ae1464718a5189f88...a2d9693645cc6584b3ce5a9c7bf3664a2c2d955b
---
View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/5c2bcecf13ac8abf8802f84ae1464718a5189f88...a2d9693645cc6584b3ce5a9c7bf3664a2c2d955b
You're receiving this email because of your account on projects.sucs.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sucs.org/pipermail/devel/attachments/20171020/aecb406e/attachment-0001.html>
More information about the Devel
mailing list