X-Git-Url: https://git.ucc.asn.au/?p=ucc-www.git;a=blobdiff_plain;f=index.mdwn;h=6b46d2ad251bb30cf8e06cea06d0d1dfcfd261fc;hp=52e0e9323c51461fd8b32f8c766196b5eae1e3e0;hb=da117b280125a68fc900000cbd3c4a99c3d34256;hpb=628f9e23f3b419a769f4a5e651d57f35ab9f36ae

diff --git a/index.mdwn b/index.mdwn
index 52e0e93..6b46d2a 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,14 +1,15 @@
+[[!set PAGE_TITLE="Welcome to the UCC"]]
 ## Welcome to the University Computer Club
 
 Check out [[ThingsToDo]].
 
 *** THINGS ON THE WEB SIDE AREN'T GOING TO BE WORKING VERY WELL (ie: AT ALL) UNTIL I MAKE MORE PROGRESS ON THE TEMPLATES. ***
-This may be remedied now? If you can read this, web-based editing works and the new design is one step closer to implementation. Now to work out how to create new pages from the web. Maybe by following a [[Wiki]]-link to nowhere. Word.
+
+This may be remedied now? If you can read this, web-based editing works and the new design is one step closer to implementation. Now to work out how to create new pages from the web. Maybe by following a [[Wiki]]-link to nowhere. Word. 
 
 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 ]]
 
 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 +45,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" _sidebar_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" sidebar_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
+"""]