Merge branch 'master' of /users/www/www/
6
Makefile
|
@ -1,7 +1,7 @@
|
|||
INPUTS = index.xml
|
||||
SUBDIRS = about events office news services media
|
||||
|
||||
first: noroot events.ics members.xml all
|
||||
first: noroot events.ics members.xml events.atom news.atom 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
|
||||
|
@ -20,6 +20,10 @@ events.ics:
|
|||
|
||||
include default.mk
|
||||
|
||||
%.atom: %.xml
|
||||
java -classpath $(CLASSPATH) net.sf.saxon.Transform -o $@ $< $(ROOT)/xsl/atom.xsl $(XSLTARGS)
|
||||
sed -i 's| xmlns=""||' $@
|
||||
|
||||
default.mk: default.mk.in
|
||||
echo 'ROOT = '`pwd` > $@
|
||||
cat $< >> $@
|
||||
|
|
|
@ -7,28 +7,28 @@
|
|||
<section title="The Executive">
|
||||
<execlist>
|
||||
<exec position="President"
|
||||
name="Nobody"
|
||||
name="Holden Karau"
|
||||
sex="male"
|
||||
userid="president" />
|
||||
|
||||
<exec position="Vice President"
|
||||
name="Nobody"
|
||||
name="Alex McCausland"
|
||||
sex="male"
|
||||
userid="vice-president" />
|
||||
|
||||
<exec position="Treasurer"
|
||||
name="Nobody"
|
||||
name="Dominik Chlobowski"
|
||||
sex="male"
|
||||
userid="treasurer" />
|
||||
|
||||
<exec position="Secretary"
|
||||
name="Nobody"
|
||||
name="Sean Cumming"
|
||||
sex="male"
|
||||
userid="secretary" />
|
||||
|
||||
<exec position="System Administrator"
|
||||
type="appointed"
|
||||
name="Nobody"
|
||||
name="David Tenty"
|
||||
sex="male"
|
||||
userid="sysadmin" />
|
||||
|
||||
|
|
After Width: | Height: | Size: 3.3 KiB |
After Width: | Height: | Size: 3.3 KiB |
After Width: | Height: | Size: 1.5 KiB |
After Width: | Height: | Size: 3.9 KiB |
After Width: | Height: | Size: 2.7 KiB |
After Width: | Height: | Size: 1.6 KiB |
After Width: | Height: | Size: 208 B |
After Width: | Height: | Size: 24 KiB |
After Width: | Height: | Size: 511 B |
After Width: | Height: | Size: 2.4 KiB |
After Width: | Height: | Size: 3.5 KiB |
After Width: | Height: | Size: 2.0 KiB |
After Width: | Height: | Size: 3.6 KiB |
After Width: | Height: | Size: 2.9 KiB |
After Width: | Height: | Size: 4.1 KiB |
After Width: | Height: | Size: 2.7 KiB |
After Width: | Height: | Size: 3.0 KiB |
After Width: | Height: | Size: 3.8 KiB |
|
@ -36,6 +36,7 @@
|
|||
<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" />
|
||||
|
|
40
default.css
|
@ -143,6 +143,46 @@ div.template-header {
|
|||
padding-top: 5px;
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
div.webtitle {
|
||||
height: 46px;
|
||||
width: 750px;
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
<?xml version='1.0'?>
|
||||
<eventdefs>
|
||||
|
||||
|
||||
|
|
BIN
favicon.ico
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 3.6 KiB |
|
@ -0,0 +1,14 @@
|
|||
<menudefs>
|
||||
<menuitem title="Home" icon="homepage" href="index.html"/>
|
||||
<menuitem title="About" icon="csc" href="about/"/>
|
||||
<menuitem title="Services" icon="services" href="services/"/>
|
||||
<menuitem title="Office" icon="office" href="office/"/>
|
||||
<menuitem title="Events" icon="calendar" href="events/"/>
|
||||
<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>
|
|
@ -0,0 +1,66 @@
|
|||
<?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:param name="g_date" required="yes" />
|
||||
<xsl:param name="g_time" required="yes" />
|
||||
<xsl:param name="g_pwd" required="yes" />
|
||||
<xsl:param name="g_root" required="yes" />
|
||||
|
||||
<xsl:template match="//eventdefs">
|
||||
<xsl:call-template name="atom">
|
||||
<xsl:with-param name="title">Events</xsl:with-param>
|
||||
<xsl:with-param name="uuid">006f667f-ecae-483a-8cbc-f0c5084dccb1</xsl:with-param>
|
||||
</xsl:call-template>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="//newsdefs">
|
||||
<xsl:call-template name="atom">
|
||||
<xsl:with-param name="title">News</xsl:with-param>
|
||||
<xsl:with-param name="uuid">bdae3752-0cb7-4932-b176-019076389b54</xsl:with-param>
|
||||
</xsl:call-template>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template name="atom">
|
||||
<xsl:param name="title"/>
|
||||
<xsl:param name="uuid"/>
|
||||
<xsl:result-document method="xml" encoding="UTF-8"
|
||||
href="{concat($g_root, '/', $title, '.atom')}">
|
||||
</xsl:result-document>
|
||||
<feed xmlns="http://www.w3.org/2005/Atom">
|
||||
<title>UW Computer Science Club <xsl:value-of select="$title"/></title>
|
||||
<link href="http://csclub.uwaterloo.ca/{$title}.atom" rel="self"/>
|
||||
<link href="http://csclub.uwaterloo.ca/"/>
|
||||
<updated><xsl:value-of select="$g_date"/></updated>
|
||||
<id>
|
||||
urn:uuid:<xsl:value-of select="$uuid"/>
|
||||
</id>
|
||||
<author>
|
||||
<name>University of Waterloo Computer Science Club</name>
|
||||
</author>
|
||||
<xsl:apply-templates select="newsitem" />
|
||||
<xsl:apply-templates select="eventitem" />
|
||||
</feed>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="//eventitem">
|
||||
<entry>
|
||||
<title><xsl:value-of select="//short"/></title>
|
||||
<link href="http://csclub.uwaterloo.ca"/>
|
||||
<summary><xsl:value-of select="//abstract"/></summary>
|
||||
</entry>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="//newsitem">
|
||||
<entry>
|
||||
<link href="http://csclub.uwaterloo.ca"/>
|
||||
<summary><xsl:value-of select="//newsitem"/></summary>
|
||||
</entry>
|
||||
</xsl:template>
|
||||
|
||||
</xsl:stylesheet>
|
|
@ -18,7 +18,7 @@
|
|||
<a id="pagetop" />
|
||||
<xsl:apply-templates select="biglogo" />
|
||||
<xsl:apply-templates select="header" />
|
||||
<xsl:apply-templates select="section" />
|
||||
<xsl:apply-templates select="section|menu" />
|
||||
<xsl:apply-templates select="footer" />
|
||||
</div></body>
|
||||
</html>
|
||||
|
@ -85,6 +85,7 @@
|
|||
|
||||
<xsl:template match="footer" name="footer">
|
||||
<div class="footer">
|
||||
<xsl:call-template name="menu" />
|
||||
<a href="#pagetop" class="pagetop">Go to top</a>
|
||||
<div class="infobox">
|
||||
<p>
|
||||
|
|
|
@ -0,0 +1,35 @@
|
|||
<?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>
|