X-Git-Url: https://git.ucc.asn.au/?p=ucc-www.git;a=blobdiff_plain;f=index.mdwn;h=a988c31c9450166ba028acf1f14ac3a7cd5e7d48;hp=13bc9d4de99d7639b32dbde018a7ba9f4139670c;hb=c7b53b059030eea6c4d36a31e614c1bb38a45681;hpb=de66ba0ba8bc7b3ed9db2509783321e4535b31b7

diff --git a/index.mdwn b/index.mdwn
index 13bc9d4..a988c31 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,3 +1,4 @@
+[[!set PAGE_TITLE="Welcome to the UCC"]]
 ## Welcome to the University Computer Club
 
 Check out [[ThingsToDo]].
@@ -8,7 +9,6 @@ This may be remedied now? If you can read this, web-based editing works and the
 You can still update the site by checking out the git repository from mussel:/usr/local/git/ucc-site. Updates to markdown files and media are applied on git push, updates to templates require a site rebuild ('sudo /etc/ikiwiki/update_site').
 
 [[AnotherTestPage]]
-[[!set name="sidebar1_title" text="Sidebar Item"]]
 
 I think one of the first things to do is to decide how the new site will be laid out. For this purpose use the [[Sitemap]] page.
 
@@ -44,6 +44,16 @@ This wiki is powered by [ikiwiki](http://ikiwiki.info/).
 
 
 
-[[!template id=foo name="sidebar1" text="""
-Sidebars in markdown are go!
+[[!set sidebar_item1_title="Upcoming Events" zsidebar_item1="""
+*-* 10/03/09 1:00 PM: [UCC AGM] [i1]  
+*-* 16/03/09 6:00 PM: [Monday at the Movies: Wargames] [i2]  
+*-* 30/03/09 6:00 PM: [Monday at the Movies: TRON] [i3]  
+[i1]: http://wonderful
+[i2]: http://my-plugin-works
+[i3]: http://i-am-pleased
+"""]]
+
+[[!set sidebar_item2_title="System Status" asidebar_item2="""
+*-* The core router, madako, had an unscheduled reboot after multicast made it unhappy. All services restored. It had been up for 469 days. - [5 days ago] [i1]
+[i1]: http://twittter.com/ucc_status
 """]]