Large reorganization of the web site

* Removed keyboard on home page
* Moved constituion into about
* Created services page
* Merged users and clubs pages into services page
* Moved machine usage policy into services page
* Removed now empty docs page
* Removed icon-based menu
* Inserted text menu at top of home page

Makefile

@@ -1,7 +1,7 @@
 INPUTS = index.xml
-SUBDIRS = about events docs office news users clubs media
+SUBDIRS = about events docs office news services media
 
-first: noroot events.ics members.xml menu.xml all
+first: noroot events.ics members.xml all
 	find ! -regex '.*/\..*' -type f ! -perm -0664 -print0 | xargs -r0 chmod u=rwX,g=rwX,o=rX || true
 	find ! -regex '.*/\..*' -type d ! -perm 2775 -print0 | xargs -r0 chmod 2775 || true
 	find ! -regex '.*/\..*' -type d ! -group www -print0 | xargs -r0 chgrp www || true

TODO

@@ -1,9 +0,0 @@
-Convert cellspacing and cellpadding to CSS equivalents.
-IMO (dtbartle), keyboard thing on front page is way too big - reduce or remove.
-Make RSS and ICS feeds more prominent.
-Replace /events with a web-based calendar?
-Replace all email addresses with generated graphics?
-Possibly rewrite web page build instructions.
-On media pages, get rid of trailing comma.
-Replace <br>'s with <p>'s wherever it makes sense.
-Replace <strong>, <b>, <i>, etc... tags with CSS.

about/Makefile

@@ -1,4 +1,5 @@
-INPUTS = index.xml exec.xml members.xml 
+INPUTS = index.xml exec.xml members.xml constitution.xml \
+    constitution-change-20020920.xml constitution-change-20040205.xml
 
 include ../default.mk
 

about/directory.xml

@@ -3,6 +3,8 @@
 <!DOCTYPE directory SYSTEM "../csc.dtd">
 
 <directory title="About">
+ <diritem title="Constitution" href="constitution.html" />
  <diritem title="The Executive" href="exec.html" />
  <diritem title="Membership List" href="members.html" />
+ <diritem title="CSC Wiki" href="http://wiki.csclub.uwaterloo.ca/" />
 </directory>

about/exec.xml

@@ -58,7 +58,7 @@
    held, check the <a href="../index.html">homepage</a> and the <a
    href="http://csclub.uwaterloo.ca/newsgroup/thread.php?group=uw.csc">uw.csc newsgroup</a>. For details on the
    election rules, see the <a
-   href="../docs/constitution.html">constitution</a>.
+   href="constitution.html">constitution</a>.
   </p>
  </section>
  <footer/>

about/index.xml

@@ -7,7 +7,7 @@
  
  <section title="What... is your name?"> 
   <p>
-    According to our <a href="../docs/constitution.html">constitution</a> we
+    According to our <a href="constitution.html">constitution</a> we
     are officially the &quot;Computer Science Club of the University
     of Waterloo.&quot; You can contact <a href="exec.html">our
     executive</a> by e-mail at <a
@@ -15,20 +15,18 @@
     come by the <a href="../office/">office</a> in MC3036/3037 or mail
     us at the following address.
   </p>
-  <pre>
+<pre>Computer Science Club
-Computer Science Club
 Math &amp; Computer 3036/3037
 University of Waterloo
 200 University Avenue West
 Waterloo, Ontario, CANADA
-N2L 3G1    
+N2L 3G1</pre>
-  </pre>
+  <p>Our office phone number is (519) 888-4567 x33870.</p>
-  <p>Our office phone number is (519) 888-4567 x33870</p>
  </section>
 
  <section title="What... is your quest?">
   <p>
-    Again our lovely <a href="../docs/constitution.html">constitution</a> (it
+    Again our lovely <a href="constitution.html">constitution</a> (it
     really <i>is</i> quite a read, see for yourself!) answers this
     question. In short, we exist to promote knowledge of and interest
     in computer science as well as allowing those interested in

clubs/Makefile

@@ -1,4 +0,0 @@
-INPUTS = index.xml
-SUBDIRS = 
-
-include ../default.mk

clubs/directory.xml

@@ -1,8 +0,0 @@
-<?xml version='1.0'?>
-
-<!DOCTYPE directory SYSTEM "../csc.dtd">
-
-<directory title="Clubs">
-  <diritem title="Mailing Lists"
-    href="/mailman/" />
-</directory>

csc.dtd

@@ -1,9 +1,8 @@
-<!ELEMENT cscpage (biglogo*, menu*, section*, header*, footer*)>
+<!ELEMENT cscpage (biglogo*, section*, header*, footer*)>
 <!ATTLIST cscpage
   title CDATA #REQUIRED>
 
 <!ELEMENT biglogo EMPTY>
-<!ELEMENT menu EMPTY>
 <!ELEMENT section (#PCDATA)>
 <!ATTLIST section
   title CDATA #REQUIRED>
@@ -39,13 +38,6 @@
 
 <!ELEMENT members-this-term EMPTY>
 
-<!ELEMENT menudefs (menuitem*)>
-<!ELEMENT menuitem EMPTY>
-<!ATTLIST menuitem
-  icon CDATA #REQUIRED
-  href CDATA #REQUIRED
-  title CDATA #REQUIRED>
-
 <!ELEMENT directory (diritem*)>
 <!ATTLIST directory
   href CDATA ""

cscweb.xsl

@@ -36,7 +36,6 @@
 <xsl:include href="./xsl/functions.xsl" />
 <xsl:include href="./xsl/common.xsl" />
 <xsl:include href="./xsl/directory.xsl" />
-<xsl:include href="./xsl/menu.xsl" />
 <xsl:include href="./xsl/exec.xsl" />
 <xsl:include href="./xsl/members.xsl" />
 <xsl:include href="./xsl/events.xsl" />

default.css

@@ -123,8 +123,7 @@ div.webcam {
 }
 
 div.biglogo {
-    background: url(./csc_welcome.jpg) -20px 25px transparent no-repeat;
+    height: 100px;
-    height: 340px;
 }
 div.biglogo div {
     float: left;
@@ -135,6 +134,10 @@ div.biglogo div.uwlogo {
 div.biglogo div.acmlogo {
     margin-top: 12px;
 }
+div.biglogo div.csclogo {
+    margin-top: 12px;
+    float: right;
+}
 
 div.template-header {
     padding-top: 5px;
@@ -159,48 +162,9 @@ div.webtitle div.csclogo {
     background-color: #215498;
 }
 
-div.menubar {
-    background-color: white;
-    padding-top: 12px;
-    margin: 0 auto;
-    text-align: center;
-    height: 75px;
-    vertical-align: middle;
-    font-size: 11px;
-    text-transform: uppercase;
-}
-
-div.menuitem {
-    margin: 0;
-    padding: 0;
-    text-align: center;
-    float: left;
-}
-
-div.menuitem a {
-    display: block;
-    text-align: center;
-    padding: 5px;
-    margin: 0;
-    text-decoration: none;
-    font-weight: 400;
-    font-family: 'Lucida Grande', Sans, Sans-serif;
-}
-
-div.menuitem a:hover {
-    font-weight: 700;
-    color: black;
-    background-color: #eee;
-    border: 1px solid #ccc;
-}
-
-div.menuitem p {
-    margin: 0;
-    padding: 0;
-}
-
 a.diritem, a.diritem:link, a.diritem:visited, a.diritem:active {
     font-family: 'Lucida Grande', Sans, Sans-serif;
+    font-size: 14px;
     border-left: 4px solid #ccc;
     padding: 0 15px 0 5px;
     color: blue;
@@ -210,16 +174,15 @@ a.diritem:hover {
     border-left: 4px solid green;
 }
 
-a.headdir {
+a.homedir {
     font-weight: 700;
 }
 
 a.pagetop, a.pagetop:link, a.pagetop:visited, a.pagetop:hover {
     font-family: 'Lucida Grande',sans, sans-serif;
     display: block;
-    padding: 0 10px 10px 10px;
+    padding: 5px 10px 5px 10px;
-    margin: 10px 0 0 0;
+    border: 1px solid #ccc;
-    border-top: 1px solid #ccc;
     background-color: #eee;
     color: #999;
     font-size: 9px;
@@ -237,7 +200,6 @@ div.footer {
 div.infobox {
     border: 1px solid #ccc;
     padding: 2px 2px;
-    margin: 1px;
 }
 
 div.infobox p {

default.mk.in

@@ -11,6 +11,6 @@ clean:
 	@for i in $(SUBDIRS) ; do cd $$i && ($(MAKE) clean || exit 1) && cd .. ; done
 	rm -f *.html events.ics
 
-%.html: %.xml $(ROOT)/csc.dtd $(ROOT)/cscweb.xsl $(ROOT)/xsl/*.xsl $(ROOT)/events.xml $(ROOT)/news.xml $(ROOT)/menu.xml $(ROOT)/default.mk directory.xml
+%.html: %.xml $(ROOT)/csc.dtd $(ROOT)/cscweb.xsl $(ROOT)/xsl/*.xsl $(ROOT)/events.xml $(ROOT)/news.xml $(ROOT)/default.mk directory.xml
 	java -classpath $(CLASSPATH) net.sf.saxon.Transform -o $@ $< $(ROOT)/cscweb.xsl $(XSLTARGS)
 	sed -i 's| xmlns=""||' $@

directory.xml

@@ -2,5 +2,10 @@
 
 <!DOCTYPE directory SYSTEM "csc.dtd">
 
-<directory title="Index">
+<directory>
+ <diritem title="About" href="about/" />
+ <diritem title="Services" href="services/" />
+ <diritem title="Office" href="office/" />
+ <diritem title="Events" href="events/" />
+ <diritem title="Media" href="media/" />
 </directory>

docs/Makefile

@@ -1,5 +0,0 @@
-INPUTS = index.xml constitution.xml machine_usage.xml \
-	machine_usage_summary.xml website.xml constitution-change-20020920.xml \
-	constitution-change-20040205.xml machine_usage-change-20070819.xml
-
-include ../default.mk

docs/directory.xml

@@ -1,6 +0,0 @@
-<?xml version='1.0'?>
-
-<!DOCTYPE directory SYSTEM "../csc.dtd">
-
-<directory title="Documents">
-</directory>

docs/index.xml

@@ -1,23 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE cscpage SYSTEM "../csc.dtd">
-
-<cscpage title="Documents">
-
- <header />
- <section title="CSC Documents">
-  <p>
-    Here you'll find official CSC documents:
-  </p>
-    <ul>
-      <li><a href="constitution.html">Our constitution</a></li>
-      <li><a href="machine_usage.html">The machine usage policy</a>
-      (see also the <a href="machine_usage_summary.html">summary</a>)</li>
-    </ul>
-    <p>You may also be interested in:</p>
-    <ul>
-      <li><a href="../about/members.html">Our membership list</a></li>
-    </ul>
- </section>
-
- <footer />
-</cscpage>

docs/website.xml

@@ -1,44 +0,0 @@
-<?xml version='1.0'?>
-
-<!DOCTYPE cscpage SYSTEM "../csc.dtd">
-
-<cscpage title="The CSC Website">
-  <header/>
-  <section title="Developing the website">
-    <p>
-      The CSC website is currently being revamped, what you are seeing
-      is the new design and structure of the site. If you would like
-      to help out you should probably e-mail the 
-      <a href="mailto:www@csclub.uwaterloo.ca">webmaster</a>, and they'll
-      let you know how to get started.
-    </p>
-    <p>
-      This website is completely generated from XML sources using an
-      XSLT (XML Stylesheet Language Transformation), which is
-      basically a simple XML programming language specifically built
-      for this kind of thing. This allows complete separation of form
-      and content as well as automating a number of tasks (such as
-      generating the <a href="../events/">events pages</a>).
-    </p>
-  </section>
-  <section title="Links">
-    <p>
-      I have provided some helpful links regarding XSLT and XML below.
-    </p>
-    <ul>
-      <li><a href="http://www.w3.org/TR/2000/REC-xml-20001006">XML 1.0
-      specification</a></li>
-      <li><a href="http://www.w3.org/TR/xslt">XSLT
-      specification</a></li>
-      <li><a href="http://www.w3.org/TR/xpath">XPath
-      specification</a></li>
-      <li><a href="http://www.garshol.priv.no/download/xmltools/">Free
-      XML tools and software</a></li>
-      <li><a href="http://www.dpawson.co.uk/xsl/xslfaq.html">XSL
-      Frequently Asked Questions</a></li>
-      <li><a href="http://xmlsoft.org/XSLT/">libxslt</a>, which this
-      site uses extensively.</li>
-    </ul>
-  </section>
-  <footer/>
-</cscpage>

events.xml

@@ -3674,7 +3674,7 @@ Mathematics and restricted to the same.</i>
 
       <p>
 	The proposed change is illustrated <a
-	href="http://www.csclub.uwaterloo.ca/docs/constitution-change-20020920.html">on
+	href="http://www.csclub.uwaterloo.ca/about/constitution-change-20020920.html">on
 	a web page</a>.
       </p>
 

index.xml

@@ -4,14 +4,13 @@
 
 <cscpage title="Computer Science Club of the University of Waterloo: Home" pre="./">
  <biglogo />
- <menu />
 
  <section title="Welcome!">
  <p>
    Welcome to the University of Waterloo Computer Science Club website. Use
-   the menus at the top and bottom of our pages to navigate around our kickass
+   the menu at the top of our pages to navigate around our kickass website.
-   website. If you're new to the Computer Science Club, be sure to check out
+   If you're new to the Computer Science Club, be sure to check out our
-   our <a href="about/">About section</a>.
+   <a href="about/">About section</a>.
  </p>
  </section>
  
@@ -38,7 +37,7 @@
   <p>
    Many members of the Computer Science Club host their homepage on
    our webserver. To find out how to
-   get your own, check out the <a href="users/">Users page</a>.
+   get your own, check out the <a href="services/">Services page</a>.
   </p>
  </section>
 

menu.xml

@@ -1,19 +0,0 @@
-<menudefs>
- <menuitem title="Home" icon="homepage" href="index.html"/>
- <menuitem title="About" icon="csc" href="about/"/>
- <menuitem title="Events" icon="calendar" href="events/"/>
- <menuitem title="Docs" icon="docs" href="docs/"/>
-<!-- <menuitem title="Gallery" icon="gallery" href="/gallery/"/>-->
- <menuitem title="Office" icon="office" href="office/"/>
-<!-- <menuitem title="Exec" icon="csc" href="about/exec.html"/> -->
- <menuitem title="Users" icon="users" href="users/"/>
- <menuitem title="Clubs" icon="clubs" href="clubs/"/>
-<!--<menuitem title="Stats" icon="stats" href="/stats/"/>-->
- <menuitem title="Media" icon="package_multimedia" href="media/"/>
- <menuitem title="Library" icon="library" absolute="true" href="http://library.csclub.uwaterloo.ca/"/>
- <menuitem title="Wiki" icon="sunflower" absolute="true" href="http://wiki.csclub.uwaterloo.ca/"/>
- <menuitem title="Webmail" icon="horde" absolute="true" href="https://mail.csclub.uwaterloo.ca/"/>
- <menuitem title="Mailman" icon="mm-icon" absolute="true" href="/mailman/"/>
- <menuitem title="gopher" icon="gopher" absolute="true" href="gopher://csclub.uwaterloo.ca/"/>
- <menuitem title="gitweb" icon="gitweb" absolute="true" href="http://gitweb.csclub.uwaterloo.ca/"/>
-</menudefs>

news.xml

@@ -107,7 +107,7 @@ have the developement tools!), or just watch the funny lights on the front of it
  </newsitem>
  <newsitem author="sfllaw" date="2004-02-05">
   We voted 15 to 0 to 0 in favour of changing the
-  <a href="/docs/constitution.html">constitution</a> to follow MathSoc
+  <a href="/about/constitution.html">constitution</a> to follow MathSoc
   policy.  An updated copy of the document is now online.
  </newsitem>
  <newsitem author="sfllaw" date="2004-02-02">
@@ -132,7 +132,8 @@ have the developement tools!), or just watch the funny lights on the front of it
   for reading mail on.
  </newsitem>
  <newsitem author="ja2morri" date="2003-08-12">
-  The <a href="docs/procedure.html">CSC Procedures manual</a> has been added to the website.  Thanks go to
+  The <a href="http://wiki.csclub.uwaterloo.ca/wiki/Exec_Manual">CSC
+  Procedures manual</a> has been added to the website.  Thanks go to
   Shannon Mann for reminding us of this document.
  </newsitem>
  <newsitem author="ja2morri" date="2003-08-06">
@@ -171,9 +172,9 @@ have the developement tools!), or just watch the funny lights on the front of it
  </newsitem>
  <newsitem author="sjdutoit" date="2002-09-30">
   The business meeting of 2002-09-30 was concluded and the <a
-  href="/docs/constitution-change-20020920.html">constitutional
+  href="/about/constitution-change-20020920.html">constitutional
   change</a> was approved with a 14:2 majority (and one spoiled
-  ballot). See the new <a href="/docs/constitution.html">constitution</a>.
+  ballot). See the new <a href="/about/constitution.html">constitution</a>.
  </newsitem>
  <newsitem author="sjdutoit" date="2002-09-16">
   The Fall elections have occured and the <a
@@ -194,9 +195,9 @@ have the developement tools!), or just watch the funny lights on the front of it
   ISBN numbers onto disc.
  </newsitem>
  <newsitem author="sjdutoit" date="2002-04-15">
-  Added a bunch of <a href="/events/old.html">old events</a> and <a
+  Added a bunch of <a href="/events/old.html">old events</a> and some
-  href="/docs/">some documents</a>, including the <a
+  documents, including the <a
-  href="/docs/constitution.html">constitution</a>.
+  href="/about/constitution.html">constitution</a>.
  </newsitem>
  <newsitem author="sjdutoit" date="2002-04-15">
   Added the <a href="/about/members.html">membership list</a>. <a

services/Makefile

@@ -0,0 +1,5 @@
+INPUTS = index.xml clubs.xml machine_usage.xml machine_usage_summary.xml \
+    machine_usage-change-20070819.xml
+SUBDIRS = 
+
+include ../default.mk

services/clubs.xml

@@ -1,18 +1,10 @@
 <?xml version='1.0'?>
 <!DOCTYPE cscpage SYSTEM "../csc.dtd">
 
-<cscpage title="Clubs the CSC hosts">
+<cscpage title="Clubs list">
 
  <header/>
- <section title="Clubs">
- <p>We have had a long history of serving the clubs at the University. 
- We currently host <a href="#websites">websites</a> and
- <a href="#lists">mailing lists</a> for various organizations.</p>
 
- <p>If you'd like to have your club hosted on our servers, please
- contact the Systems Committee at <a href="mailto:systems-committee@csclub.uwaterloo.ca">systems-committee@csclub.uwaterloo.ca</a>.</p>
-
- </section>
  <section title="Club websites we host or have hosted" id="websites">
  <p>The following is a listing of clubs whose websites the CSC hosts
  or has hosted in the past:</p>
@@ -61,12 +53,5 @@
   </ul>
  </section>
 
- <section title="Mailing lists we host" id="lists">
- <p>We also host a number of <a
- href="/mailman/">mailing lists</a>
- for various organisations, on-campus or in the community.  We provide
- archives of mailing list postings, as well as a web-based interface for
- administring lists.</p>
- </section>
  <footer />
 </cscpage>

services/directory.xml

@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+
+<!DOCTYPE directory SYSTEM "../csc.dtd">
+
+<directory title="Services">
+ <diritem title="Usage Agreement" href="machine_usage.html" />
+ <diritem title="Usage Agreement Summary" href="machine_usage_summary.html" />
+ <diritem title="Webmail" href="https://mail.csclub.uwaterloo.ca/" />
+ <diritem title="Library" href="http://library.csclub.uwaterloo.ca/" />
+</directory>

services/index.xml

@@ -0,0 +1,97 @@
+<?xml version='1.0'?>
+<!DOCTYPE cscpage SYSTEM "../csc.dtd">
+
+<cscpage title="Services that the CSC offers">
+
+ <header />
+ <section title="Machine accounts">
+  <p>
+   The main benifit of becoming a CSC member is to get access to our various
+   machines. We offer a large range of hardware, including Alpha, MIPS,
+   UltraSPARC, i386, and x86_64. Our primary development machine, taurine, is
+   a dual AMD Operaton (4 cores in total) with 8 GiB of RAM. Most of our
+   machines are connected via Gigabit ethernet. We offer 2 GiB of disk quota
+   that is accessible across all of our machines. Our wiki contains a <a
+   href="http://wiki.csclub.uwaterloo.ca/wiki/Machine_List">full machine
+   list</a>.
+  </p>
+ </section>
+
+ <section title="Email">
+  <p>
+   Members also receive a username@csclub.uwaterloo.ca email address.
+   Mailboxes are considered as part of your disk quota, so your mailbox may
+   grow up to the amount of disk quota you have. Attachments of any file size
+   or type may be sent. Our mailserver runs a POP3, IMAP, and SMTP server with
+   SSL/TLS enabled. You can also access your mail via a <a
+   href="https://mail.csclub.uwaterloo.ca">secure web interface</a>.
+  </p>
+ </section>
+
+ <section title="Webspace">
+  <p>
+   Many of members take advantage of our web hosting service. Our web server
+   runs on Apache, and has PHP, Python, and Perl modules installed. We also
+   have MySQL and PostgreSQL databases available upon request.
+  </p><p>
+   If you are already a member, you can enable your webspace as follows:
+   <ol>
+     <li>
+       Log in to one of the CSC machines (e.g. csclub.uwaterloo.ca)
+       using an <a href="http://www.openssh.com/">SSH</a> client (e.g. <a
+       href="http://www.chiark.greenend.org.uk/~sgtatham/putty/">PuTTY</a> on
+       Windows or <a href="http://www.openssh.com/">OpenSSH</a> on *nix).
+     </li><li>
+       Create a directory called <code>www</code> in your home directory by
+       typing <code>mkdir ~/www</code>.
+     </li><li>
+       Put the files you want on your web page in your new <code>www</code>
+       directory. <code>index.html/php/py</code> will be loaded by default.
+       You can upload files using an scp client (e.g. <a
+       href="http://winscp.net/">WinSCP</a> on Windows or <a
+       href="http://www.openssh.com/">OpenSSH</a> on *nix).
+     </li>
+     <li>
+       Visit your snazzy new webpage at
+       <code>http://csclub.uwaterloo.ca/~username/</code>, where
+       <code>username</code> should be replaced by your username.</li>
+    </ol>
+  </p><p>
+    If you're still having trouble getting your page up, just contact
+    the <a href="mailto:webmaster@csclub.uwaterloo.ca">Webmaster</a> or the
+    <a href="mailto:syscom@csclub.uwaterloo.ca">Systems Committee</a>.
+  </p>
+ </section>
+
+ <section title="Club hosting">
+  <p>
+   If you're a club and looking for web space, the CSC is the place go. We
+   offer clubs the same services we offer members (e.g. disk quota,
+   databases). We also offer the following additional services to clubs:
+   <ul>
+     <li>
+       club.uwaterloo.ca domain registration.
+     </li><li>
+       president@club.uwaterloo.ca or similar email addresses.
+     </li><li>
+       mailing-lists@club.uwaterloo.ca or similar mailing lists.
+     </li>
+   </ul>
+  </p><p>
+   You can view a list of clubs that we have hosted or still host on our
+   <a href="clubs.html">clubs list</a>.
+  </p>
+ </section>
+
+ <section title="Library">
+  <p>
+   The CSC maintains an extensive collection of Computer Science related
+   books. You browse our library online by going to our <a
+   href="http://library.csclub.uwaterloo.ca/">library system</a>. CSC members
+   are free to borrow most of the books in the library. Certain books must
+   remain in the club office, and can be read there.
+  </p>
+ </section>
+
+ <footer />
+</cscpage>

services/machine_usage-change-20070819.xml

@@ -40,7 +40,7 @@ CSC machine, unless otherwise specified.
 <p>
 The CSC machines are intended for research, personal projects,
 and general use in accordance with the aims of the CSC (see the
-<a href="constitution.html">CSC Constitution</a> for further details).
+<a href="../about/constitution.html">CSC Constitution</a> for further details).
 Projects that are of interest to the CSC may be given special priority
 by the CSC Systems Committee.
 </p>
@@ -117,7 +117,7 @@ explanation is given.  Cause for removal of access to an account
 includes, but is not limited to, violation of the machine usage policy.
 In the event of a dispute, a user whose account has been revoked
 may appeal to the CSC Executive for its reinstatement, as per the
-<a href="constitution.shtml">CSC Constitution</a>.
+<a href="../about/constitution.html">CSC Constitution</a>.
 
 </p>
 <p>
@@ -210,7 +210,7 @@ Computer, terminal or other piece of hardware.  Non-CSC machines
 An appointed body responsible for the operation of the CSC network
         and the software that runs on it.
         A complete description is available in the
-        <a href="constitution.shtml">CSC Constitution</a>.
+        <a href="../about/constitution.html">CSC Constitution</a>.
     </dd>
 
 <dt>Network Bandwidth</dt>

services/machine_usage.xml

@@ -40,7 +40,7 @@ CSC machine, unless otherwise specified.
 <p>
 The CSC machines are intended for research, personal projects,
 and general use in accordance with the aims of the CSC (see the
-<a href="constitution.html">CSC Constitution</a> for further details).
+<a href="../about/constitution.html">CSC Constitution</a> for further details).
 Projects that are of interest to the CSC may be given special priority
 by the CSC Systems Committee.
 </p>
@@ -117,7 +117,7 @@ explanation is given.  Cause for removal of access to an account
 includes, but is not limited to, violation of the machine usage policy.
 In the event of a dispute, a user whose account has been revoked
 may appeal to the CSC Executive for its reinstatement, as per the
-<a href="constitution.shtml">CSC Constitution</a>.
+<a href="../about/constitution.html">CSC Constitution</a>.
 
 </p>
 <p>
@@ -210,7 +210,7 @@ Computer, terminal or other piece of hardware.  Non-CSC machines
 An appointed body responsible for the operation of the CSC network
         and the software that runs on it.
         A complete description is available in the
-        <a href="constitution.shtml">CSC Constitution</a>.
+        <a href="../about/constitution.html">CSC Constitution</a>.
     </dd>
 
 <dt>Network Bandwidth</dt>

users/Makefile

@@ -1,4 +0,0 @@
-INPUTS = index.xml
-SUBDIRS = 
-
-include ../default.mk

users/directory.xml

@@ -1,7 +0,0 @@
-<?xml version='1.0'?>
-
-<!DOCTYPE directory SYSTEM "../csc.dtd">
-
-<directory title="User webpages">
- <diritem title="Membership List" href="../about/members.html" />
-</directory>

users/index.xml

@@ -1,38 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE cscpage SYSTEM "../csc.dtd">
-
-<cscpage title="User homepages at the CSC">
-
- <header />
- <section title="Getting a homepage on here">
-  <p>
-   Would you like your own homepage on our server? That's easy! First,
-   just make sure that you have a CSC <a
-   href="../about/members.html">membership</a> and account (just
-   come by our <a href="../office/">office</a> and sign up if not), then
-   follow these easy steps:
-  </p>
-  <ul>
-   <li>Log in to one of the CSC machines (e.g. csclub.uwaterloo.ca)
-   using an <a href="http://www.openssh.com/">SSH</a> client (e.g. <a
-   href="http://www.chiark.greenend.org.uk/~sgtatham/putty/">PuTTY</a> on
-   Windows or <a href="http://www.openssh.com/">OpenSSH</a> on
-   unix).</li>
-   <li>Create a directory called <code>www</code> by typing
-   <code>mkdir www</code> from your home directory.</li>
-   <li>Put the files you want on your web page in your new
-   <code>www</code> directory. <code>index.html</code> will be loaded
-   by default.</li>
-   <li>Go visit your snazzy new webpage at
-   <code>http://csclub.uwaterloo.ca/~username/</code>, where
-   <code>username</code> should be replaced by your username!</li>
-  </ul>
-  <p>
-   If you're still having trouble getting your page up, just contact
-   the <a href="mailto:webmaster@csclub.uwaterloo.ca">Webmaster</a> or
-   <a href="mailto:sysadmin@csclub.uwaterloo.ca">Sysadmin</a> by
-   e-mail.
-  </p>
- </section>
- <footer />
-</cscpage>

xsl/common.xsl

@@ -10,15 +10,15 @@
 <xsl:template match="cscpage">
   <html>
     <head>
-      	<link rel="shortcut icon" href="/favicon.ico" />
+      <link rel="shortcut icon" href="/favicon.ico" />
-	<title><xsl:value-of select="@title" /></title>
+      <title><xsl:value-of select="@title" /></title>
       <link rel="stylesheet" href="{$pre}default.css" type="text/css" />
     </head>
     <body><div>
       <a id="pagetop" />
       <xsl:apply-templates select="biglogo" />
       <xsl:apply-templates select="header" />
-      <xsl:apply-templates select="section|menu" />
+      <xsl:apply-templates select="section" />
       <xsl:apply-templates select="footer" />
     </div></body>
   </html>
@@ -42,6 +42,14 @@
       <a href="http://www.acm.org"><img src="{$pre}logos/acm_logo.gif"
            alt="A Student Chapter of the ACM" width="82" height="88" /></a>
     </div>
+    <div class="csclogo">
+      <a href="{$pre}index.html"><img src="{$pre}logos/csc_logo.gif"
+          alt="University of Waterloo" width="420" height="79" /></a>
+    </div>
+  </div>
+  <div class="template-header">
+    <xsl:apply-templates
+        select="document(concat($g_pwd, '/directory.xml'))/directory"/>
   </div>
 </xsl:template>
 
@@ -64,45 +72,34 @@
 </xsl:template>
 
 <xsl:template match="footer" name="footer">
-  <a href="#pagetop" class="pagetop">Go to top</a>
   <div class="footer">
-  <xsl:call-template name="menu" />
+    <a href="#pagetop" class="pagetop">Go to top</a>
-  <div class="infobox"><p>
+    <div class="infobox">
-    This page was generated on <xsl:value-of select="$g_date" /> at 
+      <p>
-    <xsl:value-of select="$g_time" />.
+        This site supports TLS/SSL using a certificate signed by the 
-    </p><p>
+        "CSC Certificate Authority". Click <a href="{$pre}csclub.pem">here</a>
-    This site supports TLS/SSL using a certificate signed by the 
+        (PEM format) or <a href="{$pre}csclub.der">here</a> (DER format) to
-    "CSC Certificate Authority". Click <a href="{$pre}csclub.pem">here</a>
+        install the certificate authority into your browser.
-    (PEM format) or <a href="{$pre}csclub.der">here</a> (DER format) to
+      </p><p>
-    install the certificate authority into your browser.
+        This page was generated on <xsl:value-of select="$g_date" /> at 
-  </p></div>
+        <xsl:value-of select="$g_time" />.
-  <p>
+      </p><p>
-    <a href="http://validator.w3.org/check?uri=referer">
+        Copyright
-    <img src="http://www.w3.org/Icons/valid-xhtml10"
+        <xsl:text disable-output-escaping="yes">&amp;copy;</xsl:text>
-        alt="Valid XHTML 1.0 Strict" height="31" width="88" />
+        2002<xsl:text disable-output-escaping="yes">&amp;ndash;</xsl:text>2007
-    </a>
+        Computer Science Club of the University of Waterloo.
-    <a href="http://jigsaw.w3.org/css-validator/check/referer">
+      </p>
+    </div>
+    <p>
+      <a href="http://validator.w3.org/check?uri=referer">
+      <img src="http://www.w3.org/Icons/valid-xhtml10"
+          alt="Valid XHTML 1.0 Strict" height="31" width="88" />
+      </a>
+      <a href="http://jigsaw.w3.org/css-validator/check/referer">
       <img style="border:0;width:88px;height:31px"
           src="http://jigsaw.w3.org/css-validator/images/vcss" 
           alt="Valid CSS!" />
-    </a>
+      </a>
-  </p>
-  <div class="footerlogo"><a href="{$pre}"><img src=
-      "{$pre}logos/csc_80_35.png" alt="CSC" /></a></div>
-    <p>
-      Copyright
-      <xsl:text disable-output-escaping="yes">&amp;copy;</xsl:text>
-      2002<xsl:text disable-output-escaping="yes">&amp;ndash;</xsl:text>2007
-      Computer Science Club of the University of Waterloo.<br />
-      KDE Crystal theme icons are copyright
-      <xsl:text disable-output-escaping="yes">&amp;copy;</xsl:text>
-      2002 and following years KDE Artists. Sunflower image is copyright Manan 
-      Tuli. Horde image is copyright horde contributors. Both are available 
-      under the <a href="http://creativecommons.org/licenses/by-sa/2.5/">
-      Creative Commons::Attribution-ShareAlike license</a>. Gopher image is 
-      copyright Elron6900 (Flickr) and is available under the <a
-      href="http://creativecommons.org/licenses/by-nc/2.0/">
-      Attribution-NonCommercial 2.0</a> license.
     </p>
   </div>
 </xsl:template>

xsl/directory.xsl

@@ -14,9 +14,12 @@
       <xsl:otherwise>index.html</xsl:otherwise>
     </xsl:choose>
   </xsl:variable>
-  <a class="diritem headdir" href="{$href}">
+  <xsl:if test="@title">
-    <xsl:value-of select="@title" />
+    <a class="diritem homedir" href="{$pre}">Home</a>
-  </a>
+    <a class="diritem" href="{$href}">
+      <xsl:value-of select="@title" />
+    </a>
+  </xsl:if>
   <xsl:apply-templates select="diritem" />
 </xsl:template>
 

xsl/menu.xsl

@@ -1,35 +0,0 @@
-<?xml version='1.0'?>
-
-<xsl:stylesheet version="2.0"
-    xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:fn="http://www.w3.org/2005/xpath-functions"
-    xmlns:csc="http://csclub.uwaterloo.ca/xslt">
-
-<xsl:template match="menuitem">
-  <xsl:variable name="preabs">
-    <xsl:choose>
-      <xsl:when test="@absolute = 'true'" />
-      <xsl:otherwise>
-        <xsl:value-of select="$pre" />
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <div class="menuitem">
-    <a href="{$preabs}{@href}"><p><img src="{$pre}buttons/{@icon}.png" width="40" 
-      height="40" alt="{@title}" /></p><p><xsl:value-of select="@title" /></p></a>
-  </div>
-</xsl:template>
-
-<xsl:template match="menudefs">
-  <div class="menubar">
-    <xsl:apply-templates select="menuitem" />
-  </div>
-</xsl:template>
-
-<xsl:template match="menu" name="menu">
- <xsl:apply-templates select="document(concat($g_root, '/menu.xml'))/menudefs" />
-</xsl:template>
-
-</xsl:stylesheet>