[SUCS Devel] site r688 - in branches/imranh-redesign: components htdocs htdocs/css plugins static static/About static/fragments templates
imranh at sucs.org
imranh at sucs.org
Wed Apr 22 11:30:20 BST 2015
Author: imranh
Date: 2015-04-22 11:30:13 +0100 (Wed, 22 Apr 2015)
New Revision: 688
Removed:
branches/imranh-redesign/htdocs/css/blog.css
branches/imranh-redesign/htdocs/css/box.css
branches/imranh-redesign/htdocs/css/boxie.css
branches/imranh-redesign/htdocs/css/common.css
branches/imranh-redesign/htdocs/css/downloads.css
branches/imranh-redesign/htdocs/css/editor.css
branches/imranh-redesign/htdocs/css/ie.css
branches/imranh-redesign/htdocs/css/ie8.css
branches/imranh-redesign/htdocs/css/ielt7.css
branches/imranh-redesign/htdocs/css/ielt8.css
branches/imranh-redesign/htdocs/css/members.css
branches/imranh-redesign/htdocs/css/milliways.css
branches/imranh-redesign/htdocs/css/pastebin.css
branches/imranh-redesign/htdocs/css/print.css
branches/imranh-redesign/htdocs/css/sucs.css
branches/imranh-redesign/htdocs/css/susignup-admin.css
Modified:
branches/imranh-redesign/components/front.php
branches/imranh-redesign/components/menu.php
branches/imranh-redesign/components/news.php
branches/imranh-redesign/components/users.php
branches/imranh-redesign/htdocs/index.php
branches/imranh-redesign/plugins/function.articlesummary.php
branches/imranh-redesign/static/About.txt
branches/imranh-redesign/static/About/Room-secondary.txt
branches/imranh-redesign/static/About/Room.txt
branches/imranh-redesign/static/fragments/Front.txt
branches/imranh-redesign/static/fragments/Join.txt
branches/imranh-redesign/templates/branding.tpl
branches/imranh-redesign/templates/foot.tpl
branches/imranh-redesign/templates/front.tpl
branches/imranh-redesign/templates/head.tpl
branches/imranh-redesign/templates/index.tpl
branches/imranh-redesign/templates/login.tpl
branches/imranh-redesign/templates/members.tpl
branches/imranh-redesign/templates/menu.tpl
branches/imranh-redesign/templates/news.tpl
branches/imranh-redesign/templates/users.tpl
Log:
Inital commit of the redesign
Modified: branches/imranh-redesign/components/front.php
===================================================================
--- branches/imranh-redesign/components/front.php 2015-04-22 10:25:07 UTC (rev 687)
+++ branches/imranh-redesign/components/front.php 2015-04-22 10:30:13 UTC (rev 688)
@@ -1,23 +1,22 @@
<?php
-$smarty->assign("news",$DB->GetArray("(SELECT * FROM news WHERE expiry > now() ORDER BY date DESC LIMIT 3) UNION SELECT * FROM news WHERE sticky=true and expiry > now() ORDER BY date DESC"));
-$output = $smarty->fetch("front.tpl");
-$smarty->assign("title", "Home");
-$smarty->assign("body", $output);
+$smarty->assign('extra_styles', "css/front.css");
if (!$session->loggedin) {
- $output = file_get_contents("../static/fragments/Join.txt");
+ $output2 = 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>";
-//include('users.php');
-//$output .= $result;
-include('electionreminder.php');
-$output .= $result;
-
+ $smarty->assign("news",$DB->GetArray("(SELECT * FROM news ORDER BY date DESC LIMIT 1) UNION SELECT * FROM news ORDER BY date DESC LIMIT 4"));
+ $output2 = "<div class=\"panel\"><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><p>If you would like to contribute to the site or report a bug, please contact imranh.</p></div>";
+ include('users.php');
+ //$output .= $result;
+ include('electionreminder.php');
+ $output2 .= $result;
}
-$output .= "<div class=\"cbb\"><h3>SUCS Tools</h3><p>Download the SUCS Tools to make it easier to access SUCS services from your computer.</p><ul><li><a href=\"/files/sucstools-latest.exe\">SUCS Tools for Windows</a></li><li><a href=\"/files/SUCS-latest.dmg\">SUCS Tools for Mac OS X</a></li></ul><p>More information about the tools is available in \"<a href=\"/Knowledge/Help/SUCS%20Services/Using%20the%20SUCS%20Tools\">Using the SUCS Tools</a>\".</p></div>";
+$output = $smarty->fetch("front.tpl");
+$smarty->assign("title", "Home");
+$smarty->assign("body", $output);
-$smarty->assign("secondary",$output);
+$smarty->assign("secondary",$output2);
+
?>
Modified: branches/imranh-redesign/components/menu.php
===================================================================
--- branches/imranh-redesign/components/menu.php 2015-04-22 10:25:07 UTC (rev 687)
+++ branches/imranh-redesign/components/menu.php 2015-04-22 10:30:13 UTC (rev 688)
@@ -57,6 +57,8 @@
$query .= ") order by menuorder";
$res = $DB->GetAll($query);
+
+//translate
$menu = parseMenu($res);
// this needs to choose the actual current one
@@ -78,9 +80,10 @@
$res2 = $DB->GetAll($query2);
if (count($res2)>0) {
+ // translate
$submenu = parseMenu($res2);
- $menu[translate($pagename)] = $submenu;
}
$smarty->assign("menu",$menu);
+$smarty->assign("submenu",$submenu);
?>
Modified: branches/imranh-redesign/components/news.php
===================================================================
--- branches/imranh-redesign/components/news.php 2015-04-22 10:25:07 UTC (rev 687)
+++ branches/imranh-redesign/components/news.php 2015-04-22 10:30:13 UTC (rev 688)
@@ -1,4 +1,7 @@
<?php
+// news page css file
+$smarty->assign('extra_styles', "css/news.css");
+
// Ensure we have a trailing slash so that relative links within the page work
if ($_SERVER['PATH_INFO']=="/News") header("Location: ".$baseurl."/News/");
Modified: branches/imranh-redesign/components/users.php
===================================================================
--- branches/imranh-redesign/components/users.php 2015-04-22 10:25:07 UTC (rev 687)
+++ branches/imranh-redesign/components/users.php 2015-04-22 10:30:13 UTC (rev 688)
@@ -1,6 +1,6 @@
<?php
// Generate the list of who's logged in
-$users = $DB->GetAll("SELECT DISTINCT username, min(date_trunc('second', now()-time)) AS idle FROM session WHERE username IS NOT NULL group by username order by idle LIMIT 5;");
+$users = $DB->GetAll("SELECT DISTINCT username FROM session WHERE username IS NOT NULL;");
$smarty->assign('users', $users);
Deleted: branches/imranh-redesign/htdocs/css/blog.css
===================================================================
--- branches/imranh-redesign/htdocs/css/blog.css 2015-04-22 10:25:07 UTC (rev 687)
+++ branches/imranh-redesign/htdocs/css/blog.css 2015-04-22 10:30:13 UTC (rev 688)
@@ -1,31 +0,0 @@
-.archivelink {
- text-align: right;
-}
-
-ul.blognav {
- text-align: left;
- float: left;
- width: 100%;
- list-style-type: none;
- margin: 0;
- padding: 0;
-}
-
-li.prev {
- float: left;
-}
-
-li.next {
- float: right;
-}
-
-.errorinfo {
- color: red;
-}
-
-#spinner {
- visibility: hidden;
- margin-left: 4px;
- margin-right: 4px;
-}
-
Deleted: branches/imranh-redesign/htdocs/css/box.css
===================================================================
--- branches/imranh-redesign/htdocs/css/box.css 2015-04-22 10:25:07 UTC (rev 687)
+++ branches/imranh-redesign/htdocs/css/box.css 2015-04-22 10:30:13 UTC (rev 688)
@@ -1,115 +0,0 @@
-/* CSS for the box starts here
-================================================*/
-/* Default styling. Used when JavaScript is unsupported */
-.cbb {
- padding: 5px 10px;
- margin:1em 0;
- margin-left: 0.5em;
- margin-right: 0.5em;
- background:#e76808;
- font-size: 85%;
- }
-.cbb h1 {
- margin:0 -10px;
- padding:0.3em 10px;
- background:#efece6;
- font:bold 1.2em Arial, Helvetica, sans-serif;
- }
-
-div.cbb img.emblem, div.cb img.emblem {
- float: right;
- position: relative;
- top: -1.5em;
-}
-
-/* Insert the custom corners and borders for browsers with sufficient JavaScript support */
-
-/* Two of the boxes are floated just for this demo. Adjust to your needs. */
-.cb {
- margin:0.5em 0;
- font-size: 85%;
- }
-.two {
- width:45%;
- float:left;
- }
-.three {
- width:45%;
- float:right;
- }
-/* Rules for the top corners and border */
-.bt {
- background:url('/images/box.png') no-repeat 100% 0;
- margin:0 0 0 19px;
- height:18px;
- }
-.bt div {
- height:18px;
- width:19px;
- position:relative;
- left:-19px;
- background:url('/images/box.png') no-repeat 0 0;
- }
-
-/* Rules for the bottom corners and border */
-.bb {
- background:url('/images/box.png') no-repeat 100% 100%;
- margin:0 0 0 19px;
- height:18px;
- }
-.bb div {
- height:18px;
- width:19px;
- position:relative;
- left:-19px;
- background:url('/images/box.png') no-repeat 0 100%;
- }
-
-/* Insert the left border */
-.i1 {
- padding:0 0 0 12px;
- background:url('/images/borders.png') repeat-y 0 0;
- height: 100%;
- }
-/* Insert the right border */
-.i2 {
- padding:0 12px 0 0;
- background:url('/images/borders.png') repeat-y 100% 0;
- }
-/* Wrapper for the content. Use it to set the background colour and insert some padding between the borders and the content. */
-.i3 {
- background:#e76808;
- border:1px solid #e76808;
- border-width:1px 0;
- padding:0 10px;
- }
-
-.cbb h3, .cb h3 {
- margin: 0;
- color: #ffc62b;
-}
-
-.cbb p, .cb p, .cbb ul, .cb ul {
- margin: 0;
-}
-
-/* --------------------------------------------------
- Links
- -------------------------------------------------- */
-
-.cb a:link, .cbb a:link {
- color: #ffc62b;
-}
-
-.cb a:visited, .cbb a:visited {
- color: #a52f0f;
-}
-
-.cb a:active, .cbb a:active {
- color: #ffffff;
-}
-
-.cb a:hover, .cbb a:hover {
-}
-
-/* CSS for the box ends here */
Deleted: branches/imranh-redesign/htdocs/css/boxie.css
===================================================================
--- branches/imranh-redesign/htdocs/css/boxie.css 2015-04-22 10:25:07 UTC (rev 687)
+++ branches/imranh-redesign/htdocs/css/boxie.css 2015-04-22 10:30:13 UTC (rev 688)
@@ -1,13 +0,0 @@
-/* Serve gif images to IE/Win pre version 7 */
-.i1, .i2 {
- background-image:url('/images/borders.gif');
-}
-
-.bt, .bt div, .bb, .bb div {
- background-image:url('/images/box.gif');
-}
-
-/* Set a height to fix up some rendering issues. */
-.i1, .i3 {
- height:1px;
-}
Deleted: branches/imranh-redesign/htdocs/css/common.css
===================================================================
--- branches/imranh-redesign/htdocs/css/common.css 2015-04-22 10:25:07 UTC (rev 687)
+++ branches/imranh-redesign/htdocs/css/common.css 2015-04-22 10:30:13 UTC (rev 688)
@@ -1,212 +0,0 @@
-/* --------------------------------------------------
- General
- -------------------------------------------------- */
-
-body {
- font-family: Arial, sans-serif;
-}
-
-p {
- line-height: 1.4em;
-}
-
-form {
- margin-top: 0;
- margin-bottom: 1em;
-}
-
-img {
- border: 0;
-}
-
-h1, h2, h3, h4, h5, h6 {
- text-align: left;
- margin-bottom: 0;
-}
-
-h2+p, h2+ul, h2+ol, h3+p, h3+ul, h3+ol, h4+p, h4+ul, h4+ol {
- margin-top: 0;
-}
-
-#project pre, #plan pre {
- margin: 0;
-}
-
-dd {
- margin-bottom: 0.5em;
-}
-
-acronym, abbr {
- text-transform: lowercase;
- font-variant: small-caps;
-}
-
-
-/* --------------------------------------------------
- Branding
- -------------------------------------------------- */
-
-#branding {
- width: 100%;
- height: 5.2em;
- min-height: 76px;
- overflow: hidden;
-}
-
-#brandingC {
- width: 100%;
- height: 100%;
- float: left;
-}
-
-#logo {
- float: left;
- padding: 0.2em;
- min-width: 170px;
- width: 17%;
-}
-
-#title {
- float: left;
- padding-left: 0.5em;
-}
-
-#title h1 {
- margin-top: 0.4em;
-}
-
-#loginForm form {
- margin: 0;
-}
-
-/* --------------------------------------------------
- Columns
- -------------------------------------------------- */
-#primaryC {
- margin: 0.5em 0;
- text-align: justify;
-}
-
-#primaryC > *:first-child {
- margin-top: 0;
- padding-top: 0;
-}
-
-.clear {
- clear: both;
- height: 0;
- margin: 0;
- padding: 0;
-}
-
-
-/* --------------------------------------------------
- Content box (e.g. for news items)
- -------------------------------------------------- */
-
-.box, .error {
- margin: 0.5em 0;
-}
-
-.box div.boxcontent, .error div.errorcontent {
- padding: 0 0.5em;
-}
-
-.box .boxhead h2, .box .boxhead h3, .box .boxfoot p, .error h3 {
- margin: 0;
- padding: 0 0.5em;
-}
-
-.box .boxfoot p {
- text-align: right;
- font-weight: bold;
- font-size: 95%;
-}
-
-.box div.boxcontent img.emblem {
- float: right;
- position: relative;
- top: -1.5em;
-}
-
-/* --------------------------------------------------
- Lists
- -------------------------------------------------- */
-
-ol.roman {
- list-style-type: lower-roman;
-}
-
-dt {
- font-weight: bold;
-}
-
-ul.boxes {
- display: inline;
-}
-
-ul.boxes li {
- float: left;
- display: inline;
- text-align: center;
- margin-right: 1em;
-}
-
-dd#plan, dd#project {
- margin-left: 0;
- word-wrap: break-word;
- white-space: pre-wrap;
- font-family: monospace;
-}
-
-/* --------------------------------------------------
- Tables
- -------------------------------------------------- */
-
-table {
- text-align: left;
-}
-
-table.wide {
- width: 100%;
-}
-
-table.border, table.border td, table.border th {
- border: 1px solid #e76808;
- border-collapse: collapse;
-}
-
-table.border {
- border-width: 2px;
-}
-
-table.border td, table.border th {
- padding: 0.2em;
- vertical-align: top;
-}
-
-/* --------------------------------------------------
- Forms
- -------------------------------------------------- */
-
-div.row {
- clear: both;
- padding-top: 0.5em;
-}
-
-div.row label {
- float: left;
- width: 20%;
- text-align: right;
-}
-
-div.row span.textinput {
- float: right;
- width: 78%;
- text-align: left;
-}
-
-.note {
- color: #888888;
- font-size: 80%;
-}
Deleted: branches/imranh-redesign/htdocs/css/downloads.css
===================================================================
--- branches/imranh-redesign/htdocs/css/downloads.css 2015-04-22 10:25:07 UTC (rev 687)
+++ branches/imranh-redesign/htdocs/css/downloads.css 2015-04-22 10:30:13 UTC (rev 688)
@@ -1,19 +0,0 @@
-.downloads .screenshot {
- padding: 0.4em;
- margin: 0.2em;
- float: right;
- text-align: center;
-}
-
-.downloads h3 {
- margin: 0.5em 0 0.2em 0;
- padding: 0 0 0.1em 0;
- border-bottom: 1px solid #ccc;
- font-family: arial, verdana, sans-serif;
- font-weight: bold;
-}
-
-.downloads .links {
- text-align: right;
- font-size: 90%;
-}
Deleted: branches/imranh-redesign/htdocs/css/editor.css
===================================================================
--- branches/imranh-redesign/htdocs/css/editor.css 2015-04-22 10:25:07 UTC (rev 687)
+++ branches/imranh-redesign/htdocs/css/editor.css 2015-04-22 10:30:13 UTC (rev 688)
@@ -1,2 +0,0 @@
- at import "/css/common.css";
- at import "/css/sucs.css";
Deleted: branches/imranh-redesign/htdocs/css/ie.css
===================================================================
--- branches/imranh-redesign/htdocs/css/ie.css 2015-04-22 10:25:07 UTC (rev 687)
+++ branches/imranh-redesign/htdocs/css/ie.css 2015-04-22 10:30:13 UTC (rev 688)
@@ -1,167 +0,0 @@
-/* --------------------------------------------------
- Page corners
- -------------------------------------------------- */
-
-.cornerTopLeft {
- height: 100%;
- background: url('/images/left-top-corner.png') top left no-repeat;
-}
-
-.cornerTopRight {
- height: 100%;
- background: url('/images/right-top-corner.png') top right no-repeat;
-}
-
-.cornerBottomLeft {
- height: 100%;
- background: url('/images/left-bottom-corner.png') bottom left no-repeat;
-}
-
-.cornerBottomRight {
- height: 100%;
- background: url('/images/right-bottom-corner.png') bottom right no-repeat;
-}
-
-/* --------------------------------------------------
- Menu
- -------------------------------------------------- */
-#navigationC ul li a {
- background: #e76808 url('/images/menu-top-right.png') no-repeat top right;
-}
-#navigationC ul ul li a span {
- background: url('/images/menu-bottom-right.png') no-repeat bottom right;
-}
-
-#navigationC ul li a span {
- display: block;
- background: url('/images/menu-bottom-right.png') no-repeat bottom right;
-}
-/* --------------------------------------------------
- Error box
- -------------------------------------------------- */
-
-.error {
- margin-right: 0.5em;
- margin-bottom: 0.5em;
-}
-
-.error div.errorcontent {
- background: #ffffff;
- border: 2px solid #ff0000;
-}
-
-.error .errorhead h3 {
- color: #ffffff;
-}
-
-.error .errorhead {
- background: #ff0000 url('/images/menu-top-left.png') no-repeat top left;
-}
-
-.errorbar, .navbar, .infobar {
- margin: 0.5em 0 0 0;
- font-size: 80%;
-}
-
-.errorbar {
- background: #ff0000 url('/images/menu-top-left.png') no-repeat top left;
- color: #ffffff;
- margin-right: 0.5em;
-}
-
-.infobar {
- background: #e76808 url('/images/menu-top-left.png') no-repeat top left;
- color: #ffffff;
- margin-right: 0.5em;
-}
-
-.infobar a {
- color: #ffc62b;
-}
-
-.infobar a:active {
- color: #ffffff;
-}
-
-.navbar {
- background: #e76808 url('/images/menu-top-left.png') no-repeat top left;
-}
-
-.navbar a {
- color: #ffc62b;
- font-weight: bold;
- text-decoration: none;
-}
-
-.errorbar div, .navbar div, .infobar div {
- background: url('/images/menu-top-right.png') no-repeat top right;
-}
-
-.errorbar div div, .navbar div div, .infobar div div {
- background: url('/images/menu-bottom-left.png') no-repeat bottom left;
-}
-
-.errorbar div div div, .navbar div div div, .infobar div div div {
- background: url('/images/menu-bottom-right.png') no-repeat bottom right;
- padding: 0.2em 0.5em;
-}
-/* --------------------------------------------------
- Content box (e.g. for news items)
- -------------------------------------------------- */
-.box .boxhead {
- background: #e76808 url('/images/menu-top-left.png') no-repeat top left;
-}
-
-.box .hollowhead {
- background: #ffffff url('/images/border-bottom.png') repeat-x top;
- height: 5px;
- margin: 0;
- padding: 0;
- border: none;
-}
-
-.box .hollowhead div {
- background: url('/images/border-top-left.png') no-repeat top left;
- height: 100%;
-}
-
-.box .hollowhead div div {
- background: url('/images/border-top-right.png') no-repeat top right;
- height: 100%;
-}
-
-
-.box .boxhead h2, .box .boxhead h3, .error .errorhead h3 {
- background: url('/images/menu-top-right.png') no-repeat top right;
-}
-
-.box .boxfoot {
- background: #e76808 url('/images/menu-bottom-left.png') no-repeat bottom left;
-}
-
-.box .boxfoot p {
- background: url('/images/menu-bottom-right.png') no-repeat bottom right;
-}
-
-.box .hollowfoot {
- background: #ffffff url('/images/border-bottom.png') repeat-x bottom;
- height: 5px;
- margin: 0;
- padding: 0;
-}
-
-.box .hollowfoot div {
- background: url('/images/border-bottom-left.png') no-repeat bottom left;
- height: 100%;
-}
-
-.box .hollowfoot div div {
- background: url('/images/border-bottom-right.png') no-repeat bottom right;
- height: 100%;
-}
-/* --------------------------------------------------
- Error box
- -------------------------------------------------- */
-.error .errorhead {
- background: #ff0000 url('/images/menu-top-left.png') no-repeat top left;
-}
Deleted: branches/imranh-redesign/htdocs/css/ie8.css
===================================================================
--- branches/imranh-redesign/htdocs/css/ie8.css 2015-04-22 10:25:07 UTC (rev 687)
+++ branches/imranh-redesign/htdocs/css/ie8.css 2015-04-22 10:30:13 UTC (rev 688)
@@ -1,7 +0,0 @@
-div#searchbox {
- height: 5em;
-}
-
-.buttons {
- padding-top: 5px;
-}
\ No newline at end of file
Deleted: branches/imranh-redesign/htdocs/css/ielt7.css
===================================================================
--- branches/imranh-redesign/htdocs/css/ielt7.css 2015-04-22 10:25:07 UTC (rev 687)
+++ branches/imranh-redesign/htdocs/css/ielt7.css 2015-04-22 10:30:13 UTC (rev 688)
@@ -1,148 +0,0 @@
-/* --------------------------------------------------
- Page corners
- -------------------------------------------------- */
-
-.cornerTopLeft {
- background: url('/images/left-top-corner.gif') top left no-repeat;
-}
-
-.cornerTopRight {
- background: url('/images/right-top-corner.gif') top right no-repeat;
-}
-
-.cornerBottomLeft {
- background: url('/images/left-bottom-corner.gif') bottom left no-repeat;
-}
-
-.cornerBottomRight {
- background: url('/images/right-bottom-corner.gif') bottom right no-repeat;
-}
-
-/* --------------------------------------------------
- Branding
- -------------------------------------------------- */
-
-#branding {
-/* background: #ffc62b;
- filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(enabled=true, sizingMethod=scale src='/images/orangefade.png'); */
-}
-
-#loginForm {
- margin-right: 0.5em;
- margin-bottom: 0.2em;
-}
-
-#brandingC {
- background: transparent;
-/* filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(enabled=true, sizingMethod=crop src='/images/bgfade.png'); */
-}
-
-
-/* --------------------------------------------------
- Menu
- -------------------------------------------------- */
-
-#navigationC ul li {
- line-height: 0;
-}
-
-#navigationC ul li a {
- background-image: url('/images/menu-top-right.gif');
-}
-
-#navigationC ul ul li a {
- background: #ffc62b url('/images/menu-top-right.gif') norepeat top right;
-}
-
-#navigationC ul li a span {
- background-image: url('/images/menu-bottom-right.gif');
-}
-
-#navigationC ul ul li a span {
- background-image: url('/images/menu-bottom-right.gif');
-}
-
-/* --------------------------------------------------
- Search box
- -------------------------------------------------- */
-
-#search input.text {
- width: 95%;
-}
-
-/* --------------------------------------------------
- Footer
- -------------------------------------------------- */
-
-#footer {
-/* background: #ffc62b;
- filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(enabled=true, sizingMethod=scale src='/images/orangefade-bottom.png'); */
-}
-
-/* --------------------------------------------------
- Content box (e.g. for news items)
- -------------------------------------------------- */
-
-.box {
- line-height: 1.1;
-}
-
-.box .boxhead {
- background: #e76808 url('/images/menu-top-left.gif') no-repeat top left;
-}
-
-.box .hollowhead, .box .hollowfoot {
- font-size: 0;
-}
-
-.box .hollowhead div {
- background: url('/images/border-top-left.gif') no-repeat top left;
-}
-
-.box .hollowhead div div {
- background: url('/images/border-top-right.gif') no-repeat top right;
-}
-
-.box .boxhead h2, .box .boxhead h3, .error .errorhead h3 {
- background: url('/images/menu-top-right.gif') no-repeat top right;
-}
-
-.box .boxfoot {
- background: #e76808 url('/images/menu-bottom-left.gif') no-repeat bottom left;
-}
-
-.box .boxfoot p {
- background: url('/images/menu-bottom-right.gif') no-repeat bottom right;
-}
-
-.box .hollowfoot div {
- background: url('/images/border-bottom-left.gif') no-repeat bottom left;
-}
-
-.box .hollowfoot div div {
- background: url('/images/border-bottom-right.gif') no-repeat bottom right;
-}
-
-/* --------------------------------------------------
- Error box
- -------------------------------------------------- */
-
-.error .errorhead {
- background: #ff0000 url('/images/menu-top-left.gif') no-repeat top left;
-}
-
-.errorbar {
- background: #ff0000 url('/images/menu-top-left.gif') no-repeat top left;
-}
-
-.errorbar div {
- background: url('/images/menu-top-right.gif') no-repeat top right;
-}
-
-.errorbar div div {
- background: url('/images/menu-bottom-left.gif') no-repeat bottom left;
-}
-
-.errorbar div div div {
- background: url('/images/menu-bottom-right.gif') no-repeat bottom right;
-}
Deleted: branches/imranh-redesign/htdocs/css/ielt8.css
===================================================================
--- branches/imranh-redesign/htdocs/css/ielt8.css 2015-04-22 10:25:07 UTC (rev 687)
+++ branches/imranh-redesign/htdocs/css/ielt8.css 2015-04-22 10:30:13 UTC (rev 688)
@@ -1,26 +0,0 @@
-form {
- margin: 0;
- padding: 0;
-}
-
-#navigationC ul li {
- line-height: 0;
-}
-
-#loginForm input.button {
- font-size: 80%;
-}
-
-/* --------------------------------------------------
- Content box (e.g. for news items)
- -------------------------------------------------- */
-
-ol.roman {
- list-style-type: i;
-}
-/* --------------------------------------------------
- Secondary content
- -------------------------------------------------- */
-#secondary ul {
- margin-left: 2em;
-}
\ No newline at end of file
Deleted: branches/imranh-redesign/htdocs/css/members.css
===================================================================
--- branches/imranh-redesign/htdocs/css/members.css 2015-04-22 10:25:07 UTC (rev 687)
+++ branches/imranh-redesign/htdocs/css/members.css 2015-04-22 10:30:13 UTC (rev 688)
@@ -1,63 +0,0 @@
-li.column1 {
- margin-left: 0em;
-}
-
-li.column2 {
- margin-left: 10em;
-}
-
-div.memberlist ul li {
- line-height: 1.2em;
-}
-
-div.memberlist ul {
- margin-top: 0;
-}
-
-
-ul.bananas {
- margin-left: 0;
- padding-left: 0;
- list-style: none;
-}
-
-ul.bananas li {
- margin-bottom: 0.5em;
- background-repeat: no-repeat;
- padding-left: 30px;
-}
-
-ul.bananas li small {
- color: grey;
-}
-
-ul.bananas li.yellow1 {
- background-image: url('/images/bananas/banana1.png');
- background-position: 0.5em;
-}
-
-ul.bananas li.yellow2 {
- background-image: url('/images/bananas/banana2.png');
- background-position: 0.2em;
-}
-
-ul.bananas li.yellow3 {
- background-position: 0;
- background-image: url('/images/bananas/banana3.png');
-}
-
-ul.bananas li.green1 {
- background-position: 0.5em;
- background-image: url('/images/bananas/banana-g-1.png');
-}
-
-ul.bananas li.green2 {
- background-position: 0.2em;
- background-image: url('/images/bananas/banana-g-2.png');
-}
-
-ul.bananas li.green3 {
- background-position: 0;
- background-image: url('/images/bananas/banana-g-3.png');
-}
-
Deleted: branches/imranh-redesign/htdocs/css/milliways.css
===================================================================
--- branches/imranh-redesign/htdocs/css/milliways.css 2015-04-22 10:25:07 UTC (rev 687)
+++ branches/imranh-redesign/htdocs/css/milliways.css 2015-04-22 10:30:13 UTC (rev 688)
@@ -1,4 +0,0 @@
-.date {background-color: #e0e0ff; }
-.time {background-color: #e0ffe0; }
-.user {background-color: #ffe0e0; }
-.taglist {background-color: #ffffe0; }
Deleted: branches/imranh-redesign/htdocs/css/pastebin.css
===================================================================
--- branches/imranh-redesign/htdocs/css/pastebin.css 2015-04-22 10:25:07 UTC (rev 687)
+++ branches/imranh-redesign/htdocs/css/pastebin.css 2015-04-22 10:30:13 UTC (rev 688)
@@ -1,42 +0,0 @@
-
-/********************************************************************************
- * CodeHighlight Classes
- * Originally from the Wordpress Code Highlight Plugin
- * http://www.chroder.com/archives/2005/04/16/wordpress-codehighlight-plugin/
- * These can be replaced
- *******************************************************************************/
-.hl-surround {
- -moz-border-radius: 5px;
- background-color: #F9FBFC;
- border: 1px solid #C3CED9;
- padding: 8px;
- margin-bottom: 5px;
- overflow: auto;
- text-align: left;
-}
-
-/* .hl-surround, .hl-surround pre, .hl-surround span, */
-.hl-main { font: normal 10pt 'Courier New', monospace;}
-
-.hl-default { color: Black; }
-.hl-code { color: Black; }
-.hl-brackets { color: Olive; }
-.hl-comment { color: #ffa500; } /* Orange */
-.hl-quotes { color: #8b0000; } /* Dark red */
-.hl-string { color: Red; }
-.hl-identifier { color: Blue; }
-.hl-builtin { color: Teal; }
-.hl-reserved { color: Green; }
-.hl-inlinedoc { color: Blue; }
-.hl-var { color: #00008b; } /* Dark blue */
-.hl-url { color: Blue; }
-.hl-special { color: Navy; }
-.hl-number { color: Maroon; }
-.hl-inlinetags { color: Blue; }
-.hl-main { background-color: transparent; }
-
-.hl-main pre { margin: 0; padding: 0; }
-
-div#displayCode * {
- font: normal 10pt 'Courier New', monospace;
-}
Deleted: branches/imranh-redesign/htdocs/css/print.css
===================================================================
--- branches/imranh-redesign/htdocs/css/print.css 2015-04-22 10:25:07 UTC (rev 687)
+++ branches/imranh-redesign/htdocs/css/print.css 2015-04-22 10:30:13 UTC (rev 688)
@@ -1,58 +0,0 @@
-/* --------------------------------------------------
- Branding
- -------------------------------------------------- */
-
-#branding {
- border-bottom: 1px solid #000000;
-}
-
-#loginForm {
- display: none;
-}
-
-/* --------------------------------------------------
- Columns
- -------------------------------------------------- */
-
-#navigation {
- display: none;
-}
-
-#secondary {
-}
-
-/* --------------------------------------------------
- Footer
- -------------------------------------------------- */
-
-#footer {
- border-top: 1px solid #000000;
-}
-
-#footer p {
- margin: 0;
- text-align: center;
- font-size: 80%;
- padding: 0.5em;
-}
-
-/* --------------------------------------------------
- Content box (e.g. for news items)
- -------------------------------------------------- */
-
-.box {
- border: 1px solid #e76808;
-}
-
-.box div.boxcontent {
- border-top: 1px solid #e76808;
- border-bottom: 1px solid #e76808;
-}
-
-/* --------------------------------------------------
- Edit toolbar
- -------------------------------------------------- */
-
-#edit {
- display: none;
-}
Deleted: branches/imranh-redesign/htdocs/css/sucs.css
===================================================================
--- branches/imranh-redesign/htdocs/css/sucs.css 2015-04-22 10:25:07 UTC (rev 687)
+++ branches/imranh-redesign/htdocs/css/sucs.css 2015-04-22 10:30:13 UTC (rev 688)
@@ -1,474 +0,0 @@
-/* --------------------------------------------------
- General
- -------------------------------------------------- */
-
-body {
- background: #fff;
- min-width: 600px;
-}
-
-hr {
- border: 1px solid #e76808;
-}
-
-/* --------------------------------------------------
- Links
- -------------------------------------------------- */
-
-a:link {
- color: #d45e08;
-}
-
-
-a:visited {
- color: #a52f0f;
-}
-
-a:active {
- color: #ffc62b;
-}
-
-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;
-}
-
-#title {
- color: #a52f0f;
-}
-
-#loginForm {
- float: right;
- padding: 1em;
- padding-bottom: 0;
- line-height: 1.5em;
- text-align: right;
- font-size: 80%;
-}
-
-#loginForm input.text {
- width: 8em;
-}
-
-/* --------------------------------------------------
- Breadcrumb
- -------------------------------------------------- */
-
-#breadcrumb {
- font-weight: bold;
- font-size: 80%;
- color: #ffc62b;
-}
-
-#breadcrumb ul {
- margin: 0;
- padding: 0;
- list-style-type: none;
-}
-
-#breadcrumb li {
- display: inline;
-}
-
-#breadcrumb a {
- text-decoration: none;
-}
-
-/* --------------------------------------------------
- Columns
- -------------------------------------------------- */
-
-#wrapper {
- background: #fff0cd;
- padding: 0;
- clear: both;
- border: 2px solid #e76808;
- border-top: 0;
- border-bottom: 0;
-}
-
-#navigation {
- float: left;
- width: 17%;
- padding-top: 0.5em;
-/* overflow: auto; */
-}
-
-#content {
- float: right;
- width: 82%;
-}
-
-#primary {
- float: left;
- width: 66%;
- padding: 0;
-}
-
-#primaryC {
- padding-right: 0.5em;
-}
-
-#secondary {
- float: right;
- width: 33%;
-}
-
-/* --------------------------------------------------
- Menu
- -------------------------------------------------- */
-
-#navigationC ul {
- margin: 0;
- padding-left: 0;
- list-style-type: none;
-}
-
-/* --- Menu item */
-#navigationC ul li a {
- display: block;
- text-decoration: none;
- font-weight: bold;
- 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;
- padding-left: 1em;
- margin-bottom: 2px;
-}
-
-#navigationC ul li a:hover {
- background-color: #d45e08;
-}
-
-#navigationC ul li a.select {
- color: #fff0cd;
- border-bottom-right-radius: 0;
- -moz-border-radius-bottomright: 0;
-}
-
-/* --- Submenu item */
-#navigationC ul ul li a {
- font-size: 80%;
- 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;
-}
-
-#navigationC ul li li a:hover {
- background-color: #e69200;
-}
-
-#navigationC ul ul li a.select {
- 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;
- -webkit-box-shadow: 3px 3px 5px #777;
-}
-
-/* --------------------------------------------------
- Search box
- -------------------------------------------------- */
-
-#search input.text {
- width: 100%;
-}
-
-#search .buttons {
- margin-top: 0.5em;
-}
-
-#search div.left {
- float: left;
-}
-
-#search input.submit {
- float: right;
- padding: 0;
-}
-
-/* --------------------------------------------------
- Valid box
- -------------------------------------------------- */
-
-ul#valid {
- margin: 0;
- margin-left: 1em;
- margin-bottom: 0.3em;
- padding: 0;
-}
-
-
-/* --------------------------------------------------
- Footer
- -------------------------------------------------- */
-
-#footer {
- margin: 0;
- margin-bottom: 0.5em;
- background: url('/images/orangefade-bottom.png') top repeat-x #ffc62b;
-}
-
-
-#footer p {
- margin: 0;
- text-align: center;
- font-size: 80%;
- padding: 0.5em;
-}
-
-/* --------------------------------------------------
- Content box (e.g. for news items)
- -------------------------------------------------- */
-
-.box {
- background: #ffffff;
- border-radius: 7px;
- -moz-border-radius: 7px;
-}
-
-.box div.boxcontent {
- border: 2px solid #e76808;
- border-top: 1px solid #e76808;
- border-bottom: 1px solid #ffffff;
-}
-
-.box .boxhead a, .box .boxhead h2, .box .boxhead h3, .box .boxfoot p, .boxfoot a {
- color: #ffc62b;
-}
-
-.box .boxhead {
- 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 #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: #e76808;
- border-bottom-left-radius: 7px;
- border-bottom-right-radius: 7px;
- -moz-border-radius-bottomleft: 7px;
- -moz-border-radius-bottomright: 7px;
-}
-
-.box .hollowfoot {
- background: #ffffff;
- 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;
-}
-
-/* --------------------------------------------------
- Error box
- -------------------------------------------------- */
-
-.error {
- margin-right: 0.5em;
- margin-bottom: 0.5em;
-}
-
-.error div.errorcontent {
- background: #ffffff;
- border: 2px solid #ff0000;
- border-bottom-left-radius: 7px;
- border-bottom-right-radius: 7px;
- -moz-border-radius-bottomleft: 7px;
- -moz-border-radius-bottomright: 7px;
- padding-bottom: 0.5em;
-}
-
-.error .errorhead h3 {
- color: #ffffff;
-}
-
-.error .errorhead {
- background: #ff0000;
- border-top-left-radius: 7px;
- border-top-right-radius: 7px;
- -moz-border-radius-topleft: 7px;
- -moz-border-radius-topright: 7px;
-}
-
-.errorbar, .navbar, .infobar {
- margin: 0.5em 0 0 0;
- font-size: 80%;
- border-radius: 7px;
- -moz-border-radius: 7px;
- padding: 0.2em 0.5em;
-}
-
-.errorbar {
- background: #ff0000;
- color: #ffffff;
- margin-right: 0.5em;
-}
-
-.infobar {
- background: #e76808;
- color: #ffffff;
- margin-right: 0.5em;
-}
-
-.infobar a {
- color: #ffc62b;
-}
-
-.infobar a:active {
- color: #ffffff;
-}
-
-.navbar {
- background: #e76808;
-}
-
-.navbar a {
- color: #ffc62b;
- font-weight: bold;
- text-decoration: none;
-}
-
-/* --------------------------------------------------
- Dialog box
- -------------------------------------------------- */
-
-.dialog {
- text-align: center;
- margin: auto;
- width: 20em;
-}
-
-/* --------------------------------------------------
- Tables
- -------------------------------------------------- */
-
-table.border th {
- background: #e76808;
- color: #ffc62b;
-}
-
-table.border td {
- background: #ffffff;
-}
-
-table.border a:link {
- color: #d45e08;
-}
-
-/* --------------------------------------------------
- Edit toolbar
- -------------------------------------------------- */
-
-.edit {
- margin-top: 1em;
- border-top: 2px solid #e76808;
- font-size: 80%;
- text-align: right;
-}
-
-.edit ul {
- margin: 0;
-}
-
-.edit li {
- display: inline;
- float: right;
- padding-left: 1em;
-}
-
-/* --------------------------------------------------
- Hacks to work around inadequacies of TinyMCE
- -------------------------------------------------- */
-
-.tt {
- font-family: monospace;
-}
-
-/* --------------------------------------------------
- Forms
- -------------------------------------------------- */
-
-fieldset {
- border: 2px dotted #e76808;
-}
Deleted: branches/imranh-redesign/htdocs/css/susignup-admin.css
===================================================================
--- branches/imranh-redesign/htdocs/css/susignup-admin.css 2015-04-22 10:25:07 UTC (rev 687)
+++ branches/imranh-redesign/htdocs/css/susignup-admin.css 2015-04-22 10:30:13 UTC (rev 688)
@@ -1,48 +0,0 @@
-div.susignup-admin-menu {
- float: left;
- width: 22%;
- margin-left: 10px;
- background: #E76808;
- border-radius: 15px;
- border-radius: 15px;
- -moz-border-radius: 15px;
- -moz-border-radius: 15px;
-}
-
-div.susignup-admin-menu select {
- position: relative;
- width: 65%;
-}
-
-div.susignup-admin-menu label {
- position: relative;
- width: 9em;
-}
-
-div.susignup-admin-menu input#rnsubmit {
- position: relative;
- width: 70px;
-}
-
-#susignup-renewals {
- width: 90%;
- border: 1px solid black;
- border-collapse: collapse;
-}
-
-#susignup-renewals td {
- border: 1px solid black;
- padding-left: 4px;
- padding-right: 2px;
-}
-
-#susignup-renewals th {
- border: 1px solid black;
- text-align: center;
- padding-left: 2px;
- padding-right: 2px;
-}
-
-.centre{
- text-align: center;
-}
Modified: branches/imranh-redesign/htdocs/index.php
===================================================================
--- branches/imranh-redesign/htdocs/index.php 2015-04-22 10:25:07 UTC (rev 687)
+++ branches/imranh-redesign/htdocs/index.php 2015-04-22 10:30:13 UTC (rev 688)
@@ -56,7 +56,6 @@
$session = new Session;
$smarty->assignByRef("session", $session);
-
// include feedback form stuff
if ($session->loggedin) {
include("../lib/page-feedback.php");
@@ -152,7 +151,6 @@
$smarty->assign("body", "Empty Body");
include($base."components/menu.php");
-//include($base."components/search.php");
// Load the component
$comppath = $base."components/".$component['component'].".php";
Modified: branches/imranh-redesign/plugins/function.articlesummary.php
===================================================================
--- branches/imranh-redesign/plugins/function.articlesummary.php 2015-04-22 10:25:07 UTC (rev 687)
+++ branches/imranh-redesign/plugins/function.articlesummary.php 2015-04-22 10:30:13 UTC (rev 688)
@@ -1,16 +1,16 @@
<?php
function smarty_function_articlesummary($params, &$smarty) {
-
+
$article = $params['article'];
$id = $params['id'];
$title = rawurlencode($params['title']);
- $linky = "<span style=\"float: right\"><a href=\"/News/".rawurlencode($title)."\">Read More</a></span>";
+ $linky = "<div class=\"readmorelink\"> <a href=\"/News/".rawurlencode($title)."\">Read More</a></div>";
$matches = array();
preg_match("/^(<p>.*?<\/p>)/s", $article, $matches);
- $summary = preg_replace("/<\/p>/","$linky</p>", $matches[0]);
+ $summary = preg_replace("/<\/p>/","</p>$linky", $matches[0]);
return $summary;
}
Modified: branches/imranh-redesign/static/About/Room-secondary.txt
===================================================================
--- branches/imranh-redesign/static/About/Room-secondary.txt 2015-04-22 10:25:07 UTC (rev 687)
+++ branches/imranh-redesign/static/About/Room-secondary.txt 2015-04-22 10:30:13 UTC (rev 688)
@@ -1,4 +1,4 @@
-<div class="cbb">
+<div class="panel">
<h3>Live Webcam</h3>
<div>
Modified: branches/imranh-redesign/static/About/Room.txt
===================================================================
--- branches/imranh-redesign/static/About/Room.txt 2015-04-22 10:25:07 UTC (rev 687)
+++ branches/imranh-redesign/static/About/Room.txt 2015-04-22 10:30:13 UTC (rev 688)
@@ -1,5 +1,9 @@
-<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>
+<div id="leftside">
+<div class="panel">
+<!--<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>-->
<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>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
+<div><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></div>
+<img alt="Location of SUCS Room on Campus Map" src="../pictures/room-map.jpg" /></a>
+</div>
+</div>
\ No newline at end of file
Modified: branches/imranh-redesign/static/About.txt
===================================================================
--- branches/imranh-redesign/static/About.txt 2015-04-22 10:25:07 UTC (rev 687)
+++ branches/imranh-redesign/static/About.txt 2015-04-22 10:30:13 UTC (rev 688)
@@ -1,3 +1,4 @@
+<div class="panel">
<p><em>Swansea University Computer Society</em> is open to all members of the
University's Student Union. We offer a wide range of computing services to
our members, all based on Free Open Source Software (<abbr>FOSS</abbr>). Our computers
@@ -26,4 +27,5 @@
<li>Mono Laser printing <small>(200 pages for free, 2p per page after)</small></li>
</ul>
</li>
-</ul>
\ No newline at end of file
+</ul>
+</div>
\ No newline at end of file
Modified: branches/imranh-redesign/static/fragments/Front.txt
===================================================================
--- branches/imranh-redesign/static/fragments/Front.txt 2015-04-22 10:25:07 UTC (rev 687)
+++ branches/imranh-redesign/static/fragments/Front.txt 2015-04-22 10:30:13 UTC (rev 688)
@@ -1,3 +1,5 @@
+<div id="leftside">
+<div id="topleftside" class="panel">
<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
@@ -8,4 +10,5 @@
<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
+<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>
+</div>
Modified: branches/imranh-redesign/static/fragments/Join.txt
===================================================================
--- branches/imranh-redesign/static/fragments/Join.txt 2015-04-22 10:25:07 UTC (rev 687)
+++ branches/imranh-redesign/static/fragments/Join.txt 2015-04-22 10:30:13 UTC (rev 688)
@@ -1,5 +1,5 @@
<!-- Joining box -->
-<div class="cbb">
+<div id="joinbox" class="panel">
<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>
@@ -10,7 +10,7 @@
<li>Much more!</li> </ul>
<div style="text-align: right"><a href="../About/Joining" title="More info on joining SUCS">More Info</a> </div></div>
<!-- Contact box -->
-<div class="cbb">
+<div id="contactbox" class="panel">
<h3>Contact Us</h3>
<p>If you're having any problems, you can get in touch with us by e-mailing</p>
<a href="mailto:admin at sucs.org">admin at sucs.org</a>
Modified: branches/imranh-redesign/templates/branding.tpl
===================================================================
--- branches/imranh-redesign/templates/branding.tpl 2015-04-22 10:25:07 UTC (rev 687)
+++ branches/imranh-redesign/templates/branding.tpl 2015-04-22 10:30:13 UTC (rev 688)
@@ -1,19 +1,10 @@
-<div id="branding">
- <div id="brandingC">
- <div class="cornerTopLeft">
- <div class="cornerTopRight">
+<div id="header">
<div id="logo">
- <a href="{$baseurl}/"><img src="{$baseurl}/images/sucslogo-halo.png" width="170" height="76" alt="SUCS" /></a>
+ <a href="{$baseurl}/"><img src="{$baseurl}/images/sucslogo_trans_white.png" width="113" height="76" alt="SUCS" /></a>
</div>
+{include file="menu.tpl"}
+
{include file="login.tpl"}
- <div id="title">
- <h1>{$title}</h1>
-{include file="breadcrumb.tpl"}
-
- </div>
- </div>
- </div>
- </div>
</div>
Modified: branches/imranh-redesign/templates/foot.tpl
===================================================================
--- branches/imranh-redesign/templates/foot.tpl 2015-04-22 10:25:07 UTC (rev 687)
+++ branches/imranh-redesign/templates/foot.tpl 2015-04-22 10:30:13 UTC (rev 688)
@@ -1,31 +1,39 @@
-</div>
+{*
-<div id="navigation">
-{include file="menu.tpl"}
-
-
-{include file="search.tpl"}
-
{if $session->loggedin}
<div style="resize: both;">
{include file="feedback.tpl"}
</div>
{/if}
+*}
+
{* include file="valid.tpl" *}
- </div>
+</div>
-<div class="clear"></div>
</div>
<div id="footer">
- <div class="cornerBottomLeft">
- <div class="cornerBottomRight">
+
+ <div class="pageinfo">
+ {if $modified}
+ <div class="edit">
+ {if $editable}
+ <ul>
+ <li><a href="?action=delete-query">Delete</a></li>
+ <li><a href="?action=edit">Edit</a></li>
+ </ul>
+ {/if}
+ Page last modified{if $modifiedby} by <a href="{$baseurl}/Community/Members/{$m$
+ </div>
+ {/if}
+ </div>
+
+ <div class="copyright">
<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
</div>
{if $debug}{debug}{/if}
Modified: branches/imranh-redesign/templates/front.tpl
===================================================================
--- branches/imranh-redesign/templates/front.tpl 2015-04-22 10:25:07 UTC (rev 687)
+++ branches/imranh-redesign/templates/front.tpl 2015-04-22 10:30:13 UTC (rev 688)
@@ -1,19 +1,41 @@
{include file="../static/fragments/Front.txt"}
+<div id="bottomleftside">
+{if $session->loggedin}
+ {foreach name=news from=$news key=itemnum item=item}
+ <div id="bottomleftsidebox" class="panel">
+ <h3>{$item.title}</h3>
+ <div>
+ {articlesummary id=$item.id article=$item.body title=$item.title}
+ </div>
+ </div>
+ {/foreach}
+{else}
-{if count($news) gt 0}
-<div id="news">
-<div class="box">
- <div class="boxhead"><h2>Latest Announcements</h2></div>
- <div class="boxcontent">
-{foreach name=news from=$news key=itemnum item=item}
- <h3>{$item.title}</h3>
- <div>
- {articlesummary id=$item.id article=$item.body title=$item.title}
+ <div id="bottomleftsidebox" class="panel">
+ <p>
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut id lacus fringilla, ultricies quam vitae, convallis erat. Nulla porttitor, odio a cursus pulvinar, justo quam interdum lectus, sit amet hendrerit felis nunc vitae tortor. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Fusce augue orci, lobortis eget lectus vitae, venenatis vulputate ex. Curabitur ullamcorper ultricies justo, vel ullamcorper tellus consequat eget. In dictum congue ullamcorper. Maecenas vitae consequat diam, nec suscipit nunc. Duis nec massa id mauris fringilla efficitur eget vel ex.
+ </p>
</div>
-{/foreach}
- <div class="clear"></div>
+
+ <div id="spaceor">
</div>
- <div class="hollowfoot"><div><div></div></div></div>
+
+ <div id="bottomleftsidebox" class="panel">
+ <p>
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut id lacus fringilla, ultricies quam vitae, convallis erat. Nulla porttitor, odio a cursus pulvinar, justo quam interdum lectus, sit amet hendrerit felis nunc vitae tortor. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Fusce augue orci, lobortis eget lectus vitae, venenatis vulputate ex. Curabitur ullamcorper ultricies justo, vel ullamcorper tellus consequat eget. In dictum congue ullamcorper. Maecenas vitae consequat diam, nec suscipit nunc. Duis nec massa id mauris fringilla efficitur eget vel ex.
+ </p>
+ </div>
+
+ <div id="spaceor">
+ </div>
+
+ <div id="bottomleftsidebox" class="panel">
+ <p>
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut id lacus fringilla, ultricies quam vitae, convallis erat. Nulla porttitor, odio a cursus pulvinar, justo quam interdum lectus, sit amet hendrerit felis nunc vitae tortor. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Fusce augue orci, lobortis eget lectus vitae, venenatis vulputate ex. Curabitur ullamcorper ultricies justo, vel ullamcorper tellus consequat eget. In dictum congue ullamcorper. Maecenas vitae consequat diam, nec suscipit nunc. Duis nec massa id mauris fringilla efficitur eget vel ex.
+ </p>
+ </div>
+
+
+{/if}
</div>
-</div>
-{/if}
+</div>
\ No newline at end of file
Modified: branches/imranh-redesign/templates/head.tpl
===================================================================
--- branches/imranh-redesign/templates/head.tpl 2015-04-22 10:25:07 UTC (rev 687)
+++ branches/imranh-redesign/templates/head.tpl 2015-04-22 10:30:13 UTC (rev 688)
@@ -7,18 +7,12 @@
<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="{$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" />
- <link rel="stylesheet" type="text/css" href="{$baseurl}/css/box.css" media="screen" />
- <link rel="stylesheet" type="text/css" href="{$baseurl}/css/downloads.css" media="screen" />
+ <link rel="stylesheet" type="text/css" href="{$baseurl}/css/main.css" media="screen" />
{if isset($extra_styles)}
-{foreach from=$extra_styles item=style}
- <link rel="stylesheet" type="text/css" href="{$style}" media="screen" />
-{/foreach}
+ {foreach from=$extra_styles item=style}
+ <link rel="stylesheet" type="text/css" href="{$baseurl}/{$style}" media="screen" />
+ {/foreach}
{/if}
- <link rel="stylesheet" type="text/css" href="{$baseurl}/css/print.css" media="print" />
{if isset($rss_url)}
<link rel="alternate" type="application/rss+xml" title="{$title}" href="{$rss_url}" />
@@ -40,31 +34,11 @@
{/foreach}
{/if}
-<!--[if IE]>
- <link rel="stylesheet" type="text/css" href="{$baseurl}/css/ie.css" />
- <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" />
-<![endif]-->
-
-<!--[if lt IE 8]>
- <link rel="stylesheet" type="text/css" href="{$baseurl}/css/ielt8.css" media="screen" />
-<![endif]-->
-
-<!--[if lt IE 7]>
- <link rel="stylesheet" type="text/css" href="{$baseurl}/css/ielt7.css" media="screen" />
- <link rel="stylesheet" type="text/css" href="{$baseurl}/css/boxie.css" media="screen" />
- <script defer type="text/javascript" language="JavaScript" src="{$baseurl}/js/pngfix.js"></script>
-<![endif]-->
-
</head>
<body>
{include file="branding.tpl"}
+<div id="bodyer">
-<div id="wrapper">
-
-<div id="content">
{include file="usermessages.tpl"}
Modified: branches/imranh-redesign/templates/index.tpl
===================================================================
--- branches/imranh-redesign/templates/index.tpl 2015-04-22 10:25:07 UTC (rev 687)
+++ branches/imranh-redesign/templates/index.tpl 2015-04-22 10:30:13 UTC (rev 688)
@@ -1,14 +1,18 @@
+{$body}
+<div id="rightside">
{if $secondary}
-<div id="primary">
+ {foreach from=$secondary item=widget}
+ {$widget}
+ {/foreach}
{/if}
-<div id="primaryC">
-{$body}
+</div>
{if $creatable}
<p>You can <a href="?action=create">create</a> this page though.</p>
{/if}
+{*
{if $modified}
<div class="edit">
{if $editable}
@@ -16,18 +20,8 @@
<li><a href="?action=delete-query">Delete</a></li>
<li><a href="?action=edit">Edit</a></li>
</ul>
-<div class="clear"></div>
{/if}
Page last modified{if $modifiedby} by <a href="{$baseurl}/Community/Members/{$modifiedby}">{$modifiedby}</a>{/if} on {$modified}
</div>
{/if}
-</div>
-{if $secondary}
-</div>
-
-<div id="secondary">
-{foreach from=$secondary item=widget}
-{$widget}
-{/foreach}
-</div>
-{/if}
+*}
\ No newline at end of file
Modified: branches/imranh-redesign/templates/login.tpl
===================================================================
--- branches/imranh-redesign/templates/login.tpl 2015-04-22 10:25:07 UTC (rev 687)
+++ branches/imranh-redesign/templates/login.tpl 2015-04-22 10:30:13 UTC (rev 688)
@@ -1,3 +1,4 @@
+<div id="user-area">
<div id="loginForm">
<form method="post" action="{$ssl_url|escape:'htmlall'}{getparams gets=$gets}">
<div>
@@ -15,15 +16,13 @@
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}
<input type="text" class="text" name="session_user" id="session_user" placeholder="Username" />
<input type="password" class="text" name="session_pass" id="session_pass" placeholder="Password" />
<input type="hidden" name="token" value="{$session->token}" />
<input type="submit" class="button" name="Login" id="Login" value="Login" />
- <br>
- <a href="{$baseurl}/join">No Account? Don't worry, sign up today!</a>
{/if}
</div>
</form>
</div>
+</div>
\ No newline at end of file
Modified: branches/imranh-redesign/templates/members.tpl
===================================================================
--- branches/imranh-redesign/templates/members.tpl 2015-04-22 10:25:07 UTC (rev 687)
+++ branches/imranh-redesign/templates/members.tpl 2015-04-22 10:30:13 UTC (rev 688)
@@ -80,5 +80,4 @@
<div class="memberlist">
{memberwebsitelist members=$public_members}
</div>
-{/if}
-
+{/if}
\ No newline at end of file
Modified: branches/imranh-redesign/templates/menu.tpl
===================================================================
--- branches/imranh-redesign/templates/menu.tpl 2015-04-22 10:25:07 UTC (rev 687)
+++ branches/imranh-redesign/templates/menu.tpl 2015-04-22 10:30:13 UTC (rev 688)
@@ -1,13 +1,32 @@
- <div id="navigationC">
- <ul>
-{foreach name=menu from=$menu key=name item=target}
- {if is_array($target)}<li><a href="{$baseurl}/{$name}"{if $select==$name} class="select"{/if}>{$name}</a>
- <ul>
-{foreach name=submenu from=$target key=subitem item=subname}
- <li{if $smarty.foreach.submenu.last} class="lastsub"{/if}><a href="{$baseurl}{$subname}"{if $subselect==$subitem} class="select"{/if}>{if $smarty.foreach.submenu.last}<span>{/if}{$subitem}{if $smarty.foreach.submenu.last}</span>{/if}</a></li>
-{/foreach}
- </ul>
- {else}<li class="lastsub"><a href="{$baseurl}{$target}"{if $select==$name} class="select"{/if}><span>{$name}</span></a>{/if}</li>
-{/foreach}
+<div id="menu">
+ <ul id="menulist">
+ {foreach name=menu from=$menu key=name item=target}
+ {if strpos($path, $name)}
+ <li id="menu-active">
+ <a href="{$baseurl}/{$name}">
+ {$name}
+ </a>
+ {else}
+ <li>
+ <a href="{$baseurl}{$target}">
+ {$name}
+ </a>
+ </li>
+ {/if}
+ {/foreach}
+</div>
+<div id="submenu">
+ <ul id="submenulist">
+ {foreach name=menu from=$submenu key=name item=target}
+ {if $target==$path}
+ <li id="submenu-active">
+ <a href="{$baseurl}{$target}">{$name}</a>
+ </li>
+ {else}
+ <li>
+ <a href="{$baseurl}{$target}">{$name}</a>
+ </li>
+ {/if}
+ {/foreach}
</ul>
- </div>
+</div>
\ No newline at end of file
Modified: branches/imranh-redesign/templates/news.tpl
===================================================================
--- branches/imranh-redesign/templates/news.tpl 2015-04-22 10:25:07 UTC (rev 687)
+++ branches/imranh-redesign/templates/news.tpl 2015-04-22 10:30:13 UTC (rev 688)
@@ -1,15 +1,14 @@
{if $editable}
-<div class="edit">
-<ul>
-<li><a href="?action=create">Create</a></li>
-</ul>
-<div class="clear"></div>
-</div>
+ <div id="rightside" class="edit">
+ <ul>
+ <li><a href="?action=create">Create</a></li>
+ </ul>
+ </div>
{/if}
<div id="news">
{foreach name=news from=$news key=itemnum item=item}
-<div class="box">
+<div class="panel">
<div class="boxhead"><h2><a id="{$item.id}">{$item.title}</a></h2></div>
<div class="boxcontent">
{$item.body}
@@ -32,13 +31,4 @@
{foreachelse}
<p>News item not found</p>
{/foreach}
-</div>
-
-{if $editable}
-<div class="edit">
-<ul>
-<li><a href="?action=create">Create</a></li>
-</ul>
-<div class="clear"></div>
-</div>
-{/if}
+</div>
\ No newline at end of file
Modified: branches/imranh-redesign/templates/users.tpl
===================================================================
--- branches/imranh-redesign/templates/users.tpl 2015-04-22 10:25:07 UTC (rev 687)
+++ branches/imranh-redesign/templates/users.tpl 2015-04-22 10:30:13 UTC (rev 688)
@@ -1,5 +1,5 @@
{if count($users) > 0 }
-<div class="cbb">
+<div class="panel">
<h3>Recent site visitors</h3>
More information about the Devel
mailing list