[SUCS Devel] [Git][sucssite/sucs-site][sucs-site] 13 commits: Merge branch 'beta' into 'beta'
Imran Hussain
imranh at sucs.org
Mon Apr 30 12:01:23 BST 2018
Imran Hussain pushed to branch sucs-site at sucssite / sucs-site
Commits:
824dce40 by Isabel Jenkins at 2017-10-20T17:56:34+01:00
Merge branch 'beta' into 'beta'
Tidy up branches (1/3)
See merge request sucssite/sucs-site!69
- - - - -
198abcdb by Isabel Jenkins at 2017-10-20T17:59:07+01:00
Merge branch 'master' into 'master'
Tidy up branches (2/3)
See merge request sucssite/sucs-site!70
- - - - -
fd1bf290 by Andrew Vincent Pover at 2017-11-02T20:44:35+00:00
http -> https
- - - - -
90f2d348 by Imran Hussain at 2018-01-15T13:23:57+00:00
Revert "Site now does some basic scaling for mobile phone. As well as fixed footer"
This reverts commit 521ddbcdd5ccb6509727e06d44a402c9de7ab159.
- - - - -
087f78e8 by Imran Hussain at 2018-01-15T13:24:14+00:00
Revert "who turned out the lights"
This reverts commit 1ed84067a0d49facee3abb3a27fe8e7692f0e04d.
- - - - -
422a4bc0 by Imran Hussain at 2018-01-15T13:37:56+00:00
New exec for 2018
- - - - -
77c431d7 by Imran Hussain at 2018-01-15T13:45:02+00:00
Merge branch 'master' into 'beta'
Push changes from master to beta
See merge request sucssite/sucs-site!72
- - - - -
fea0d64a by Imran Hussain at 2018-01-15T13:51:50+00:00
Revert "Updated CSS to try and give a more modern feel"
This reverts commit 09cb85e1459319d7b8b3e5abbf64be59fc3be210
- - - - -
e28cdf4a by Imran Hussain at 2018-01-15T13:55:42+00:00
Merge branch 'master' into 'beta'
Revert "Updated CSS to try and give a more modern feel"
See merge request sucssite/sucs-site!73
- - - - -
0d3a41ad by Alexander Moras at 2018-04-18T23:42:09+01:00
Update JISC AUP link.
- - - - -
1d72181e by Imran Hussain at 2018-04-30T11:47:20+01:00
Merge branch 'master' into 'master'
Update JISC AUP link.
See merge request sucssite/sucs-site!75
- - - - -
8fc812ea by Imran Hussain at 2018-04-30T11:56:50+01:00
Merge branch 'master' into 'beta'
Push changes from master to beta
See merge request sucssite/sucs-site!76
- - - - -
5944c456 by Imran Hussain at 2018-04-30T12:01:15+01:00
Merge branch 'beta' into 'sucs-site'
About time changes were pushed to live
See merge request sucssite/sucs-site!77
- - - - -
13 changed files:
- htdocs/css/box.css
- htdocs/css/common.css
- htdocs/css/sucs.css
- − htdocs/images/sucslogo-trans-white.png
- static/About/Conditions.txt
- static/About/History.txt
- static/About/Staff.txt
- static/fragments/Join.txt
- templates/branding.tpl
- templates/foot.tpl
- templates/head.tpl
- templates/login.tpl
- templates/members.tpl
Changes:
=====================================
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: #e65c00;
+ background: #e76808;
font-size: 85%;
}
=====================================
htdocs/css/common.css
=====================================
--- a/htdocs/css/common.css
+++ b/htdocs/css/common.css
@@ -62,8 +62,7 @@ acronym, abbr {
float: left;
padding: 0.2em;
min-width: 170px;
- margin-left: 1%;
- width: 16%;
+ width: 17%;
}
#title {
@@ -171,7 +170,7 @@ table.wide {
}
table.border, table.border td, table.border th {
- border: 1px solid #ff6600;
+ border: 1px solid #e76808;
border-collapse: collapse;
}
=====================================
htdocs/css/sucs.css
=====================================
--- a/htdocs/css/sucs.css
+++ b/htdocs/css/sucs.css
@@ -3,15 +3,12 @@
-------------------------------------------------- */
body {
- padding: 0;
- margin: 0;
- background: #f2f2f2;
+ background: #fff;
min-width: 600px;
- height: calc(100vh - 30px);
}
hr {
- border: 1px solid #e65c00;
+ border: 1px solid #e76808;
}
/* --------------------------------------------------
@@ -19,7 +16,7 @@ hr {
-------------------------------------------------- */
a:link {
- color: #e65c00;
+ color: #d45e08;
}
a:visited {
@@ -35,19 +32,37 @@ 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: #e65c00;
+ background: url('/images/bgfade.png') repeat-y;
}
#title {
- color: #f2f2f2;
+ color: #a52f0f;
}
#loginForm {
@@ -63,42 +78,6 @@ 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
-------------------------------------------------- */
@@ -106,15 +85,7 @@ a:hover {
#breadcrumb {
font-weight: bold;
font-size: 80%;
- color: #f2f2f2;
-}
-
-#breadcrumb a:link {
- color: #f2f2f2;
-}
-
-#breadcrumb a:visited {
- color: #f2f2f2;
+ color: #ffc62b;
}
#breadcrumb ul {
@@ -136,92 +107,39 @@ a:hover {
-------------------------------------------------- */
#wrapper {
- background: #f2f2f2;
- min-height: 100%;
- margin-top: 10px;
+ background: #fff0cd;
+ padding: 0;
+ clear: both;
+ border: 2px solid #e76808;
+ border-top: 0;
+ border-bottom: 0;
}
#navigation {
- float: left;
- width: 300px;
- padding-top: 0.5em;
+ float: left;
+ width: 17%;
+ padding-top: 0.5em;
+ /* overflow: auto; */
}
#content {
- float: right;
- width: calc(100% - 300px);
+ float: right;
+ width: 82%;
}
#primary {
- float: left;
- width: calc(100% - 400px);
+ float: left;
+ width: 66%;
+ padding: 0;
}
#primaryC {
- padding-left: 20px;
- padding-right: 20px;
+ padding-right: 0.5em;
}
#secondary {
- 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;
- }
+ float: right;
+ width: 33%;
}
/* --------------------------------------------------
@@ -242,11 +160,13 @@ a:hover {
line-height: 1.5em;
font-size: 95%;
color: #ffc62b;
- background: #e65c00;
+ background: #e76808;
+ border-top-right-radius: 7px;
+ border-bottom-right-radius: 7px;
+ -moz-border-radius-topright: 7px;
+ -moz-border-radius-bottomright: 7px;
padding-left: 1em;
margin-bottom: 2px;
- padding-top: 5px;
- padding-bottom: 5px;
}
#navigationC ul li a:hover {
@@ -265,6 +185,10 @@ 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;
}
@@ -276,14 +200,24 @@ 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;
@@ -326,18 +260,17 @@ ul#valid {
Footer
-------------------------------------------------- */
-#footer-fix {
- min-height: calc(100% - 16px);
-}
-
#footer {
- background: #e65c00;
- height: 30px;
+ margin: 0;
+ margin-bottom: 0.5em;
+ background: url('/images/orangefade-bottom.png') top repeat-x #ffc62b;
}
#footer p {
+ margin: 0;
text-align: center;
- padding-top: 5px;
+ font-size: 80%;
+ padding: 0.5em;
}
/* --------------------------------------------------
@@ -346,11 +279,13 @@ ul#valid {
.box {
background: #ffffff;
+ border-radius: 7px;
+ -moz-border-radius: 7px;
}
.box div.boxcontent {
- border: 2px solid #e65c00;
- border-top: 1px solid #e65c00;
+ border: 2px solid #e76808;
+ border-top: 1px solid #e76808;
border-bottom: 1px solid #ffffff;
}
@@ -359,21 +294,33 @@ ul#valid {
}
.box .boxhead {
- background: #e65c00;
+ background: #e76808;
+ border-top-left-radius: 7px;
+ border-top-right-radius: 7px;
+ -moz-border-radius-topleft: 7px;
+ -moz-border-radius-topright: 7px;
}
.box .hollowhead {
background: #ffffff;
- border-top: 2px solid #e65c00;
- border-left: 2px solid #e65c00;
- border-right: 2px solid #e65c00;
+ 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;
height: 5px;
margin: 0;
padding: 0;
}
.box .boxfoot {
- background: #e65c00;
+ background: #e76808;
+ border-bottom-left-radius: 7px;
+ border-bottom-right-radius: 7px;
+ -moz-border-radius-bottomleft: 7px;
+ -moz-border-radius-bottomright: 7px;
}
.box .hollowfoot {
@@ -381,9 +328,13 @@ ul#valid {
height: 5px;
margin: 0;
padding: 0;
- border-bottom: 2px solid #e65c00;
- border-left: 2px solid #e65c00;
- border-right: 2px solid #e65c00;
+ 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;
}
/* --------------------------------------------------
@@ -470,7 +421,7 @@ ul#valid {
-------------------------------------------------- */
table.border th {
- background: #e65c00;
+ background: #e76808;
color: #ffc62b;
}
=====================================
htdocs/images/sucslogo-trans-white.png deleted
=====================================
Binary files a/htdocs/images/sucslogo-trans-white.png and /dev/null differ
=====================================
static/About/Conditions.txt
=====================================
--- a/static/About/Conditions.txt
+++ b/static/About/Conditions.txt
@@ -8,7 +8,7 @@ Date: May 2002</p>
<ol>
<li>Members of Swansea University Computer Society are entitled to an account on the SUCS network. For all except life members, membership will only be granted on payment of the appropriate fee.</li>
<li>All members agree not to do anything to bring the Society into disrepute, and to abide by the Terms and Conditions of the Society, as noted below and as may be subsequently amended. Non-compliance with these rules may result in membership being withdrawn.</li>
-<li>Members must comply with the regulations of the network(s) over which they access the SUCS network. This will always include the UK Joint Academic Network (JANET), the Acceptable Use Policy of which can be found at <a href="http://www.ja.net/services/publications/policy/aup.html">http://www.ja.net/services/publications/policy/aup.html</a>.</li>
+<li>Members must comply with the regulations of the network(s) over which they access the SUCS network. This will always include the UK Joint Academic Network (JANET), the Acceptable Use Policy of which can be found at <a href="https://community.jisc.ac.uk/library/acceptable-use-policy">https://community.jisc.ac.uk/library/acceptable-use-policy</a>.</li>
<li>Except when explicitly set up for clubs or groups within the University, accounts on the SUCS network are strictly for use by one person only. Multiple use of personal accounts is prohibited, and may result in the offending owner's account being withdrawn. 'Multiple use' includes the owner of the account making known his/her password to others, as well as allowing others access to the account by other means.</li>
<li>Members must take into account the relevant laws of England and Wales as they apply to their use of the SUCS network. These include, but are not limited to, the Data Protection Act (1984), the Copyright, Designs and Patents Act (1988), the Obscene Publications Act (1959 & 1964 etc), the Telecommunications Act (1984), and the Computer Misuse Act (1990).</li>
<li>Members must always use the SUCS network in a manner that does not adversely affect its use by others. In particular, disproportionate use of system resources (including, but not limited to, disc space, network bandwidth and processor time), may result in offending processes and/or files being terminated and/or removed without warning.</li>
=====================================
static/About/History.txt
=====================================
--- a/static/About/History.txt
+++ b/static/About/History.txt
@@ -14,14 +14,23 @@
</tr>
<tr>
<td>
-<p><strong>2017</strong></p>
+<p><strong>2018</strong></p>
</td>
-<td><strong><a href="/~andy">andy</a> (Andrew Vincent Pover)</strong></td>
-<td><strong><a href="/~eggnog">eggnog</a> (George Henry Woolley)</strong></td>
-<td><strong><a href="/~sgelfod98">sgelfod98</a> (Megan Warren-Davis)</strong></td>
-<td><strong><em>N/A</em></strong></td>
-<td><strong><a href="/~crox">crox</a> (Ciaran Crocker)</strong></td>
+<td><strong><a href="/~vectre">vectre</a> (Alexander Moras)</strong></td>
+<td><strong><a href="/~elbows">elbows</a> (Laurence Sebastian Bowes)</strong></td>
+<td><strong><a href="/~xray_effect">xray_effect</a> (Ryan Williams)</strong></td>
+<td><strong><em>None</em></strong></td>
+<td><strong><a href="/~arcryalis">arcryalis</a> (Hywel Williams)</strong></td>
</tr>
+<tr>
+<td>
+<p>2017</p>
+</td>
+<td><a href="/~andy">andy</a> (Andrew Vincent Pover)</td>
+<td><a href="/~eggnog">eggnog</a> (George Henry Woolley)</td>
+<td><a href="/~sgelfod98">sgelfod98</a> (Megan Warren-Davis)</td>
+<td><em>None</em></td>
+<td><a href="/~crox">crox</a> (Ciaran Crocker)</td>
</tr>
<tr>
<td>
=====================================
static/About/Staff.txt
=====================================
--- a/static/About/Staff.txt
+++ b/static/About/Staff.txt
@@ -4,29 +4,24 @@
<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/andy.png" width="100" />
+<div> <img height="100" src="https://sucs.org/pictures/people/vectre.png" width="100" />
<br />
- <strong>President</strong><br />Andrew Vincent Pover (~andy)</div>
+ <strong>President</strong><br />Alexander Moras (~vectre)</div>
</li>
<li>
-<div> <img height="100" src="https://sucs.org/pictures/people/eggnog.png" width="100" />
+<div> <img height="100" src="https://sucs.org/pictures/people/elbows.png" width="100" />
<br />
- <strong>Treasurer</strong><br />George Henry Woolley (~eggnog)
-</div>
+ <strong>Treasurer</strong><br />Laurence Sebastian Bowes (~elbows)</div>
</li>
<li>
-<div>
-<div> <img height="100" src="https://sucs.org/pictures/people/sgelfod98.png" width="100" />
+<div> <img height="100" src="https://sucs.org/pictures/people/xray_effect.png" width="100" />
<br />
- <strong>Secretary</strong><br />Megan Warren-Davis (~sgelfod98)
-</div>
-</div>
+ <strong>Secretary</strong><br />Ryan Williams (~xray_effect)</div>
</li>
<li>
-<div> <img height="100" src="https://sucs.org/pictures/people/crox.png" width="100" />
+<div> <img height="100" src="https://sucs.org/pictures/people/arcryalis.png" width="100" />
<br />
- <strong>Gaming</strong><br />Ciaran Crocker (~crox)
-</div>
+ <strong>Gaming</strong><br />Hywel Williams (~arcryalis)</div>
</li>
</ul>
<div class="clear"></div>
=====================================
static/fragments/Join.txt
=====================================
--- a/static/fragments/Join.txt
+++ b/static/fragments/Join.txt
@@ -1,6 +1,6 @@
<!-- Joining box -->
<div class="cbb">
-<a class="join-header" href="https://www.swansea-union.co.uk/activities/society/sucs/" target="_blank">Join SUCS!</a>
+<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>
=====================================
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-trans-white.png" height="76"
+ <a href="{$baseurl}/"><img src="{$baseurl}/images/sucslogo-halo.png" width="170" height="76"
alt="SUCS"/></a>
</div>
=====================================
templates/foot.tpl
=====================================
--- a/templates/foot.tpl
+++ b/templates/foot.tpl
@@ -15,11 +15,15 @@
<div class="clear"></div>
</div>
-</div>
<div id="footer">
- <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 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>
</div>
{if $action=="edit"}
=====================================
templates/head.tpl
=====================================
--- a/templates/head.tpl
+++ b/templates/head.tpl
@@ -3,7 +3,6 @@
<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"/>
@@ -31,8 +30,7 @@
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}
@@ -55,9 +53,10 @@
</head>
<body>
- <div id="footer-fix">
- {include file="branding.tpl"}
+{include file="branding.tpl"}
+
+
+<div id="wrapper">
- <div id="wrapper">
- <div id="content">
- {include file="usermessages.tpl"}
+ <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 id="loginText">
+ <div>
{if $session->loggedin}
Hello
<a href="{$baseurl}/Community/Members/{$session->username}">{$session->username}</a>
@@ -17,6 +17,7 @@
<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}
=====================================
templates/members.tpl
=====================================
--- a/templates/members.tpl
+++ b/templates/members.tpl
@@ -25,7 +25,7 @@
{if $member.website }
<dt>Website</dt>
<dd>
- <a href="http://sucs.org/~{$member.uid|escape:'url'}/">http://sucs.org/~{$member.uid|escape:'url'}/</a></dd>
+ <a href="https://sucs.org/~{$member.uid|escape:'url'}/">http://sucs.org/~{$member.uid|escape:'url'}/</a></dd>
{/if}
{if isset($member.project) }
<dt>Project</dt>
View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/a2d9693645cc6584b3ce5a9c7bf3664a2c2d955b...5944c456eb741f2dfb3e8005e9ca542bee56bc87
---
View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/a2d9693645cc6584b3ce5a9c7bf3664a2c2d955b...5944c456eb741f2dfb3e8005e9ca542bee56bc87
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/20180430/160a4db7/attachment-0001.html>
More information about the Devel
mailing list