diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index df19a9869c6ab0b11639429a43f6e03dd90d5aa0..0dbc258da3067389844091dd0bcbc3fdf710324c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ # specify what docker image # go with the default image for now and mangle it -#image: ruby:2.1 +#image: debian:jessie stages: - test @@ -14,7 +14,7 @@ php-syntax-check: script: - apt-get clean - apt-get update - - apt-get install -y php5-cli + - apt-get install -y php-cli - php -l htdocs/index.php - find components -name *.php | xargs -n 1 php -l - find plugins -name *.php | xargs -n 1 php -l @@ -25,8 +25,11 @@ js-syntax-check: script: - apt-get clean - apt-get update - - apt-get install -y npm - - ln -s /usr/bin/nodejs /usr/bin/node +# - apt-get install -y nodejs +# - ln -s /usr/bin/nodejs /usr/bin/node + - apt-get install -y curl gnupg + - curl -sL https://deb.nodesource.com/setup_8.x | bash - + - apt-get install -y nodejs - npm install -g jshint - find htdocs/js/ -name *.js ! -name jquery* | xargs -n 1 jshint --verbose diff --git a/htdocs/css/box.css b/htdocs/css/box.css index 4d2ef2446839514f568936817c3ca5236eca781b..bfbdf7546c6d67ffeb66e92d273efda72667e1a8 100644 --- 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%; } diff --git a/htdocs/css/common.css b/htdocs/css/common.css index e7f8b7cae626196b0b2a76a6132e720e6d59b0e6..675649b660301b31bdd32b6a2bc192e1612efd2a 100644 --- 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; } diff --git a/htdocs/css/sucs.css b/htdocs/css/sucs.css index 7ce8a82a8768935f6f74ccf394a0a9f950485416..7b27e5550ff6acf708f4c582be3e3c25d2121184 100644 --- 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 { @@ -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; } diff --git a/htdocs/images/sucslogo-trans-white.png b/htdocs/images/sucslogo-trans-white.png new file mode 100644 index 0000000000000000000000000000000000000000..0a49c8302319dadf67a76ed1169d835767ddaa09 Binary files /dev/null and b/htdocs/images/sucslogo-trans-white.png differ diff --git a/lib/validationData.php b/lib/validationData.php index 1eec498d6cff3b3bb59ed80f257f509da258eaa2..d4967898af3d938e8d2c99f285bbc0cffc524274 100644 --- a/lib/validationData.php +++ b/lib/validationData.php @@ -2,14 +2,12 @@ // lookup real names from sid's using campus ldap function lookupSID($sid) { - $ds = ldap_connect("ccs-suld1.swan.ac.uk"); - $ldappw = file_get_contents("/etc/unildap.secret"); - $ldappw = trim($ldappw); - ldap_bind($ds, "cn=SUCS-BIND,ou=ServiceAccount,o=SWANUNI", $ldappw); - $sr = ldap_search($ds, "ou=students,ou=Swansea,o=swanuni", "uid=" . $sid); + $ds = ldap_connect("192.168.10.16"); + ldap_bind($ds); + $sr = ldap_search($ds, "ou=Active,ou=Resources,o=Swansea", "uid=" . $sid); $info = ldap_get_entries($ds, $sr); ldap_unbind($ds); - return ucwords(strtolower($info[0]['givenname'][0] . " " . $info[0]['sn'][0])); + return ucwords(strtolower($info[0]['givenName'][0] . " " . $info[0]['sn'][0])); } // lookup addresses from postcodes using the university's website diff --git a/static/About/Donations.txt b/static/About/Donations.txt index e891bf1fdd40c208c61a78d7a6663dee08ecf90b..0814fa99955b653386e95468039050a4f15f56f4 100644 --- a/static/About/Donations.txt +++ b/static/About/Donations.txt @@ -1,131 +1,139 @@ -

Donations Policy

-
    -
  1. 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.
    2. -
  2. 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.
    3. -
  3. 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'.
    4. -
  4. 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.
    5. -
  5. 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.
    6. -
  6. 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.
    7. -
  7. 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.
    8. -
-

Donated Equipment List

-

This list is incomplete

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +

Donations Policy

+
    +
  1. 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.
    2. +
  2. 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.
    3. +
  3. 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'.
    4. +
  4. 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.
    5. +
  5. 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.
    6. +
  6. 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.
    7. +
  7. 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.
    8. +
+

Donated Equipment List

+

This list is incomplete

+
WhoDateTypeItems
ArthurSept 99LoanDeskjet 540 colour printer
Zaphod & Spook2000LoanSun Workstations
Anarchy2000LoanMotherboard, CPU, and RAM for Platinum
Milamber2001LoanBrother Mono Laser Printer.
WeazelSep 2002Loan120Gb IDE Hard disk for Silver
RohanJan 2003DonatedPII 350MHz machine to be used as Cobalt
Dual CPU machine
Empty 1U Rack Case
AnarchyFeb 2003Donated17" Dell Monitor for Cobalt
Anarchy & DickFeb 2003DonatedProfits from 2002 BT lecture, presented as components to build 2 new workstations
AnarchyDec 2003LoanPentium to replace the router, a Cyrix machine for workstation
jkJune 2005DonatedPIII 1GHz + Board + Memory, used to create thorium
aeternusNov 2005Donated19" monitor. Used to replace platinum's old small one
RohanNov 2005DonatedDual PIII 1GHz machine with SCSI disk
2 other boxes (expand on this..)
EMC via RohanNov 2005DonatedPIII 800MHz 1U box with 4x80GB disks
gimboFeb 2006Donated17" monitor. Used to replace zinc's old one.
mattawSep 2006DonatedAthlon PC
Rohan
Summer 2006
Donated
Another Dual PIII 1GHz machine with SCSI disk
Rohan
August 2011
Loan
 -

UPS (Smart-UPS 1400) and Switch (3Com 3870)

-
Problaze
September 2012
Donated
 -

Dell Poweredge 1950

-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
WhoDateTypeItems
ArthurSept 99LoanDeskjet 540 colour printer
Zaphod & Spook2000LoanSun Workstations
Anarchy2000LoanMotherboard, CPU, and RAM for Platinum
Milamber2001LoanBrother Mono Laser Printer.
WeazelSep 2002Loan120Gb IDE Hard disk for Silver
RohanJan 2003DonatedPII 350MHz machine to be used as Cobalt
Dual CPU machine
Empty 1U Rack Case
AnarchyFeb 2003Donated17" Dell Monitor for Cobalt
Anarchy & DickFeb 2003DonatedProfits from 2002 BT lecture, presented as components to build 2 new workstations
AnarchyDec 2003LoanPentium to replace the router, a Cyrix machine for workstation
jkJune 2005DonatedPIII 1GHz + Board + Memory, used to create thorium
aeternusNov 2005Donated19" monitor. Used to replace platinum's old small one
RohanNov 2005DonatedDual PIII 1GHz machine with SCSI disk
2 other boxes (expand on this..)
EMC via RohanNov 2005DonatedPIII 800MHz 1U box with 4x80GB disks
gimboFeb 2006Donated17" monitor. Used to replace zinc's old one.
mattawSep 2006DonatedAthlon PC
Rohan
Summer 2006
Donated
Another Dual PIII 1GHz machine with SCSI disk
Rohan
August 2011
Loan
 +

UPS (Smart-UPS 1400) and Switch (3Com 3870)

+
Problaze
September 2012
Donated
 +

Dell Poweredge 1950

+
imranh
June 2017
Donated
 +

PlayStation 2

+
\ No newline at end of file diff --git a/static/fragments/Join.txt b/static/fragments/Join.txt index 3759360b5de47abfab9cfa99cca63e2bee3e8dc1..57f60db9c4d6fcb9919abdfbeddb4f4d5b683bc1 100644 --- a/static/fragments/Join.txt +++ b/static/fragments/Join.txt @@ -1,6 +1,6 @@
-

Join SUCS!

+Join SUCS!

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: