git.ucc.asn.au / ucc-www.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4498da6)
And thus begins the slow grind of integrating wiki features into the template.
authorLuke Williams <[email protected]>
Mon, 9 Mar 2009 18:38:26 +0000 (03:38 +0900)
committerLuke Williams <[email protected]>
Mon, 9 Mar 2009 18:38:26 +0000 (03:38 +0900)
style/uccstyle.css patch | blob | history
templates/misc.tmpl patch | blob | history
templates/page.tmpl patch | blob | history

diff --git a/style/uccstyle.css b/style/uccstyle.css
index 0dae291..b7e5737 100644 (file)
--- a/style/uccstyle.css
+++ b/style/uccstyle.css
@@ -155,7 +155,10 @@ td.break {
        width:90px;
 }
 #col4 {
-       width: 90px;
+       width:90px;
+}
+#col5 {
+       color:#42342C;
 }
 a {
        color:#294359;
diff --git a/templates/misc.tmpl b/templates/misc.tmpl
index a0822e2..1bcfb52 100644 (file)
--- a/templates/misc.tmpl
+++ b/templates/misc.tmpl
@@ -4,7 +4,7 @@
 
 <head>
 <title>Welcome to the UCC</title>
-<link rel="stylesheet" href="style/uccstyle.css" type="text/css" />
+<link rel="stylesheet" href="<TMPL_VAR BASEURL>style/uccstyle.css" type="text/css" />
 </head>
 
 <body>
@@ -38,6 +38,11 @@
 <a class="nav_menu_item" href="blah.html">Steam</a><br />
 <a class="nav_menu_item" href="blah.html">Last.fm</a><br />
 <a class="nav_menu_item" href="blah.html">Facebook</a><br />
+</td><td class="break"><td id="col5">
+<a class="nav_menu_item" href="blah.html">Edit this page</a><br />
+<a class="nav_menu_item" href="blah.html">History</a><br />
+<a class="nav_menu_item" href="blah.html">Discussion</a><br /><br />
+<a class="nav_menu_item" href="blah.html">Recent changes</a><br />
 </td></tr></table>
 </div>
 </div>
@@ -78,7 +83,7 @@ News
 
 <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="images/rss.png" /></span></div>
+<div class="body_item_title"><span class="item_title_left">This Page</span><span class="item_title_right"><img src="images/rss.png" /></span></div>
 <div class="body_item_content">
 <ul class="news_list">
 <li>10/03/09 1:00 PM: <a href="#">UCC AGM</a></li>
diff --git a/templates/page.tmpl b/templates/page.tmpl
index a0822e2..8379923 100644 (file)
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -4,7 +4,7 @@
 
 <head>
 <title>Welcome to the UCC</title>
-<link rel="stylesheet" href="style/uccstyle.css" type="text/css" />
+<link rel="stylesheet" href="<TMPL_VAR BASEURL>style/uccstyle.css" type="text/css" />
 </head>
 
 <body>
@@ -45,19 +45,19 @@
 <table cellpadding="0" cellspacing="0" class="sections_box"><tr>
 <td class="section_left"></td>
 <td class="section_item">
-<b>Welcome</b>
+<b>Page</b>
 </td>
 <td class="section_select_left"></td>
 <td class="section_item">
-Fresher Guide
+Edit
 </td>
 <td class="section_select_left"></td>
 <td class="section_item">
-Joining
+History
 </td>
 <td class="section_select_left"></td>
 <td class="section_item">
-News
+Discussion
 </td>
 <td class="section_right"></td>
 </div>
UCC website in ikiwiki

UCC git Repository :: git.ucc.asn.au