From 343d1f1c921c5904f8a5a8c8daf3c0faf3814f7c Mon Sep 17 00:00:00 2001
From: Luke Williams <shmookey@heathen.local>
Date: Fri, 13 Mar 2009 03:15:06 +0900
Subject: [PATCH] Better sidebar support.

---
 style/uccstyle.css  |  5 ++++-
 templates/misc.tmpl | 22 ++++++++++++++--------
 templates/page.tmpl | 11 ++++++++---
 3 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/style/uccstyle.css b/style/uccstyle.css
index 724133b..f309b01 100644
--- a/style/uccstyle.css
+++ b/style/uccstyle.css
@@ -48,13 +48,16 @@ div.body_box {
 	background-color:#FFFFFF;
 	padding-bottom:25px;
 }
-div.body_item {
+div.body_item, div.body_item_fullwidth {
 	position:relative;
 	margin-left:35px;
 	margin-top:20px;
 	width:670px;
 	border:1px solid #737F76;
 }
+div.body_item_fullwidth {
+	width:800px;
+}
 div.sidebar_item {
 	position:relative;
 	margin-top:20px;
diff --git a/templates/misc.tmpl b/templates/misc.tmpl
index a3d64a9..397af1b 100644
--- a/templates/misc.tmpl
+++ b/templates/misc.tmpl
@@ -73,7 +73,7 @@ Fresher Guide
 
 <div class="body_item">
 <div class="body_item_title"><span class="item_title_left" style="color:#DFE5E1;">
-<TMPL_LOOP NAME="PARENTLINKS"><a class="title_link" href="<TMPL_VAR URL>"><TMPL_VAR PAGE></a>/</TMPL_LOOP>
+<TMPL_LOOP NAME="PARENTLINKS"><a class="title_link" href="<TMPL_VAR URL>"><TMPL_VAR PAGE></a>/</TMPL_LOOP>: <TMPL_VAR PAGE_TITLE>
  <TMPL_VAR TITLE>
 </span></div>
 <div class="body_item_content">
@@ -82,19 +82,24 @@ Fresher Guide
 </div>
 </div>
 
+<TMPL_IF NAME="sidebar_item1">
 <div class="sidebar_box">
 <div class="sidebar_item">
-<div class="body_item_title"><span class="item_title_left">Upcoming Events</span><span class="item_title_right"><img src="<TMPL_VAR BASEURL>images/rss.png" /></span></div>
+<div class="body_item_title"><span class="item_title_left"><TMPL_VAR sidebar_item1_title></span></div>
 <div class="body_item_content">
-<ul class="news_list">
-<li>10/03/09 1:00 PM: <a href="#">UCC AGM</a></li>
-<li>16/03/09 6:00 PM: <a href="#">Monday at the Movies: Wargames</a></li>
-<li>30/03/09 6:00 PM: <a href="#">Monday at the Movies: TRON</a></li>
-</ul>
-<img style="margin-left:15px" src="<TMPL_VAR BASEURL>images/ical.png" />
+<TMPL_VAR sidebar_item1>
 </div>
 </div>
+<TMPL_IF NAME="sidebar_item2">
+<div class="sidebar_item">
+<div class="body_item_title"><span class="item_title_left"><TMPL_VAR sidebar_item2_title></span></div>
+<div class="body_item_content">
+<TMPL_VAR sidebar_item2>
+</div>
+</div>
+</TMPL_IF>
 </div>
+</TMPL_IF>
 
 </div>
 <div class="footerbox">
@@ -110,4 +115,5 @@ Site developed with free software.
 </body>
 
 </html>
+<TMPL_VAR testvar>
 
diff --git a/templates/page.tmpl b/templates/page.tmpl
index f03d7dc..23e7adb 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -71,9 +71,9 @@ Fresher Guide
 
 <div class="body_box">
 
-<div class="body_item">
+<TMPL_IF NAME="sidebar_item1"><div class="body_item"><TMPL_ELSE><div class="body_item_fullwidth"></TMPL_IF>
 <div class="body_item_title"><span class="item_title_left" style="color:#DFE5E1;">
-<TMPL_LOOP NAME="PARENTLINKS"><a class="title_link" href="<TMPL_VAR URL>"><TMPL_VAR PAGE></a>/</TMPL_LOOP>
+<TMPL_LOOP NAME="PARENTLINKS"><a class="title_link" href="<TMPL_VAR URL>"><TMPL_VAR PAGE></a>/</TMPL_LOOP>: <TMPL_VAR PAGE_TITLE>
  <TMPL_VAR TITLE>
 </span></div>
 <div class="body_item_content">
@@ -91,7 +91,12 @@ Fresher Guide
 </div>
 </div>
 <TMPL_IF NAME="sidebar_item2">
-
+<div class="sidebar_item">
+<div class="body_item_title"><span class="item_title_left"><TMPL_VAR sidebar_item2_title></span></div>
+<div class="body_item_content">
+<TMPL_VAR sidebar_item2>
+</div>
+</div>
 </TMPL_IF>
 </div>
 </TMPL_IF>
-- 
2.20.1