Merge branch 'master' of /users/www/www/
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 3.3 KiB |
BIN
buttons/csc.xcf
BIN
buttons/docs.png
Before Width: | Height: | Size: 3.9 KiB |
BIN
buttons/docs.xcf
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 3.3 KiB |
Before Width: | Height: | Size: 2.7 KiB |
Before Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 208 B After Width: | Height: | Size: 186 B |
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 4.8 KiB |
BIN
buttons/home.png
Before Width: | Height: | Size: 511 B After Width: | Height: | Size: 2.4 KiB |
Before Width: | Height: | Size: 2.4 KiB |
After Width: | Height: | Size: 3.5 KiB |
After Width: | Height: | Size: 4.1 KiB |
Before Width: | Height: | Size: 3.6 KiB |
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 2.9 KiB |
Before Width: | Height: | Size: 4.1 KiB |
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 3.5 KiB |
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 3.8 KiB |
|
@ -14,12 +14,12 @@
|
|||
|
||||
<!--
|
||||
|
||||
Set global "pre" variable based on /cscpage/@pre, which represents the
|
||||
Set global "g_pre" variable based on /cscpage/@pre, which represents the
|
||||
relative path needed to get to the root. If you do not include a "pre"
|
||||
attribute on cscpage then the "pre" attribute will default to "../".
|
||||
|
||||
-->
|
||||
<xsl:variable name="pre">
|
||||
<xsl:variable name="g_pre">
|
||||
<xsl:choose>
|
||||
<xsl:when test="/cscpage/@pre"><xsl:value-of select="/cscpage/@pre" /></xsl:when>
|
||||
<xsl:otherwise>../</xsl:otherwise>
|
||||
|
@ -27,8 +27,8 @@
|
|||
</xsl:variable>
|
||||
|
||||
<!-- mirror variables -->
|
||||
<xsl:variable name="mirror_csc">http://csclub.uwaterloo.ca/files/</xsl:variable>
|
||||
<xsl:variable name="mirror_cs">http://mirror.cs.uwaterloo.ca/csclub/</xsl:variable>
|
||||
<xsl:variable name="g_mirror_csc">http://csclub.uwaterloo.ca/files/</xsl:variable>
|
||||
<xsl:variable name="g_mirror_cs">http://mirror.cs.uwaterloo.ca/csclub/</xsl:variable>
|
||||
|
||||
<xsl:output method="xml" encoding="ISO-8859-1" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" />
|
||||
|
||||
|
|
|
@ -189,7 +189,7 @@ div.webtitle {
|
|||
background-color: #215498;
|
||||
border-bottom: 4px solid #104387;
|
||||
padding-left: 10px;
|
||||
padding-top: 12px;
|
||||
padding-top: 10px;
|
||||
}
|
||||
|
||||
div.webtitle div {
|
||||
|
@ -197,11 +197,6 @@ div.webtitle div {
|
|||
background-color: #215498;
|
||||
}
|
||||
|
||||
div.webtitle div.csclogo {
|
||||
padding-right: 10px;
|
||||
background-color: #215498;
|
||||
}
|
||||
|
||||
a.diritem, a.diritem:link, a.diritem:visited, a.diritem:active {
|
||||
font-family: 'Lucida Grande', Sans, Sans-serif;
|
||||
font-size: 14px;
|
||||
|
|
|
@ -1,3 +0,0 @@
|
|||
|
||||
csc_only.png: csc_only.ps Makefile
|
||||
echo | gs -sDEVICE=pngmono -sOutputFile=$@ -dBATCH -dNOWAIT -dDOINTERPOLATE -g3200x1400 $<
|
Before Width: | Height: | Size: 7.7 KiB |
Before Width: | Height: | Size: 908 B |
Before Width: | Height: | Size: 1.1 KiB |
|
@ -1,27 +0,0 @@
|
|||
%!PS-Adobe-2.0
|
||||
%%Creator:Ian Goldberg
|
||||
%%Title:CSC Logo
|
||||
%%BoundingBox: 0 0 320 140
|
||||
%%EndComments
|
||||
gsave %0 setlinecap 0 setlinejoin 1 setlinewidth
|
||||
newpath
|
||||
10 %% Half of the line width, where the circles have radius 60
|
||||
%% Calculate the magic angles
|
||||
dup dup dup 2 mul 30 sub exch 60 sub div dup dup mul 1 exch sub sqrt exch atan
|
||||
/csclogomagic1 exch def
|
||||
dup 2 mul 30 add exch 60 add div dup dup mul 1 exch sub sqrt exch atan
|
||||
/csclogomagic2 exch def
|
||||
/csclogowid exch def
|
||||
|
||||
10 10 scale
|
||||
130 70 60 csclogowid sub 0 180 csclogomagic1 sub arcn
|
||||
70 70 60 csclogowid add csclogomagic2 360 arc
|
||||
190 70 60 csclogowid sub 180 csclogomagic1 neg arcn
|
||||
250 70 60 csclogowid add 180 csclogomagic2 add 180 qarc
|
||||
csclogowid dup add 0 rmoveto
|
||||
250 70 60 csclogowid sub 180 csclogomagic1 180 add arcn
|
||||
190 70 60 csclogowid add csclogomagic2 neg 180 arc
|
||||
70 70 60 csclogowid sub 0 csclogomagic1 arcn
|
||||
130 70 60 csclogowid add 180 csclogomagic2 sub 360 arc
|
||||
closepath fill
|
||||
showpage
|
After Width: | Height: | Size: 3.1 KiB |
Before Width: | Height: | Size: 2.2 KiB |
|
@ -1,31 +0,0 @@
|
|||
%!PS-Adobe-2.0 EPSF-1.2
|
||||
%%Creator:Ian Goldberg
|
||||
%%Title:CSC Logo
|
||||
%%BoundingBox: 0 0 540 165
|
||||
%%EndComments
|
||||
gsave %0 setlinecap 0 setlinejoin 1 setlinewidth
|
||||
newpath
|
||||
10 %% Half of the line width, where the circles have radius 60
|
||||
%% Calculate the magic angles
|
||||
dup dup dup 2 mul 30 sub exch 60 sub div dup dup mul 1 exch sub sqrt exch atan
|
||||
/csclogomagic1 exch def
|
||||
dup 2 mul 30 add exch 60 add div dup dup mul 1 exch sub sqrt exch atan
|
||||
/csclogomagic2 exch def
|
||||
/csclogowid exch def
|
||||
|
||||
130 95 60 csclogowid sub 0 180 csclogomagic1 sub arcn
|
||||
70 95 60 csclogowid add csclogomagic2 360 arc
|
||||
190 95 60 csclogowid sub 180 csclogomagic1 neg arcn
|
||||
250 95 60 csclogowid add 180 csclogomagic2 add 180 arc
|
||||
csclogowid dup add 0 rmoveto
|
||||
250 95 60 csclogowid sub 180 csclogomagic1 180 add arcn
|
||||
190 95 60 csclogowid add csclogomagic2 neg 180 arc
|
||||
70 95 60 csclogowid sub 0 csclogomagic1 arcn
|
||||
130 95 60 csclogowid add 180 csclogomagic2 sub 360 arc
|
||||
closepath fill
|
||||
/Helvetica findfont 48 scalefont setfont
|
||||
(Computer) 330 115 moveto show
|
||||
(Science) 330 75 moveto show
|
||||
(Club) 330 35 moveto show
|
||||
/Helvetica findfont 18 scalefont setfont
|
||||
(A Student Chapter of the ACM) 135 5 moveto show grestore
|
14
menu.xml
|
@ -1,14 +1,14 @@
|
|||
<menudefs>
|
||||
<menuitem title="Home" icon="homepage" href="index.html"/>
|
||||
<menuitem title="About" icon="csc" href="about/"/>
|
||||
<menuitem title="Home" icon="home" href="index.html"/>
|
||||
<menuitem title="About" icon="about" 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="Events" icon="events" href="events/"/>
|
||||
<menuitem title="Media" icon="media" 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="Wiki" icon="wiki" absolute="true" href="http://wiki.csclub.uwaterloo.ca/"/>
|
||||
<menuitem title="Webmail" icon="webmail" absolute="true" href="https://mail.csclub.uwaterloo.ca/"/>
|
||||
<menuitem title="Mailman" icon="mailman" 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>
|
||||
|
|
|
@ -18,6 +18,10 @@ available (this section will contain links to them when they do become
|
|||
available). There is also a brief (instead of legalese)
|
||||
<a href="machine_usage_summary.html">summary of the usage policy</a> available.
|
||||
</p>
|
||||
<p>
|
||||
The usage policy signature form is available as an <a
|
||||
href="/misc/usage_agreement.odt">ODT file</a>.
|
||||
</p>
|
||||
</section>
|
||||
|
||||
<section title="Usage Policy">
|
||||
|
|
|
@ -13,7 +13,10 @@ available). This is a brief (instead of legalese) version of the
|
|||
Everyone who receives an account on one of the CSC machines must sign
|
||||
the agreement based on the usage policy, and this summary lists the
|
||||
things that the users will agree to.
|
||||
|
||||
</p>
|
||||
<p>
|
||||
The usage policy signature form is available as an <a
|
||||
href="/misc/usage_agreement.odt">ODT file</a>.
|
||||
</p>
|
||||
</section>
|
||||
|
||||
|
|
17
vfeed.js
|
@ -1,17 +0,0 @@
|
|||
var e = document.getElementById("vfeed");
|
||||
var f = new net.core("http://caramel-colour.csclub.uwaterloo.ca:8080/singleframe", "rvf");
|
||||
function callvfeed() {
|
||||
f.connect("http://caramel-colour.csclub.uwaterloo.ca:8080/singleframe");
|
||||
e.innerHTML = "<div class=\"vfeedmon\">"
|
||||
+ "<div id=\"rvf\">Connecting...</div>"
|
||||
+ "<h2>Visual Feed from the Office</h2>";
|
||||
+ "<div class=\"vfeed-cmds\">Feed 1 | Feed 2 | "
|
||||
+ "<a href=\"#\" onclick=\"stopvfeed()\">X</div>";
|
||||
+ "</div>";
|
||||
}
|
||||
|
||||
function stopvfeed() {
|
||||
e.innerHTML = "";
|
||||
}
|
||||
|
||||
document.getElementById("extracmds").innerHTML = "<a href=\"#\" onclick=\"callvfeed()\">Visual Feed</a>";
|
|
@ -15,6 +15,7 @@
|
|||
<xsl:template match="//eventdefs">
|
||||
<xsl:call-template name="atom">
|
||||
<xsl:with-param name="title">Events</xsl:with-param>
|
||||
<xsl:with-param name="feedfile">events.atom</xsl:with-param>
|
||||
<xsl:with-param name="uuid">006f667f-ecae-483a-8cbc-f0c5084dccb1</xsl:with-param>
|
||||
</xsl:call-template>
|
||||
</xsl:template>
|
||||
|
@ -22,16 +23,18 @@
|
|||
<xsl:template match="//newsdefs">
|
||||
<xsl:call-template name="atom">
|
||||
<xsl:with-param name="title">News</xsl:with-param>
|
||||
<xsl:with-param name="feedfile">news.atom</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="feedfile"/>
|
||||
<xsl:param name="uuid"/>
|
||||
<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/{$feedfile}" 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>
|
||||
|
|
|
@ -11,12 +11,12 @@
|
|||
<html>
|
||||
<head>
|
||||
<link rel="shortcut icon" href="/favicon.ico" />
|
||||
<link rel="alternate" title="CSC Events Feed" href="{$pre}events.atom"
|
||||
<link rel="alternate" title="CSC Events Feed" href="{$g_pre}events.atom"
|
||||
type="application/rss+xml" />
|
||||
<link rel="alternate" title="CSC News Feed" href="{$pre}news.atom"
|
||||
<link rel="alternate" title="CSC News Feed" href="{$g_pre}news.atom"
|
||||
type="application/rss+xml" />
|
||||
<title><xsl:value-of select="@title" /></title>
|
||||
<link rel="stylesheet" href="{$pre}default.css" type="text/css" />
|
||||
<link rel="stylesheet" href="{$g_pre}default.css" type="text/css" />
|
||||
</head>
|
||||
<body><div>
|
||||
<a id="pagetop" />
|
||||
|
@ -39,15 +39,15 @@
|
|||
<xsl:template match="biglogo">
|
||||
<div class="biglogo">
|
||||
<div class="uwlogo">
|
||||
<a href="http://www.uwaterloo.ca/"><img src="{$pre}logos/uw_logo.gif"
|
||||
<a href="http://www.uwaterloo.ca/"><img src="{$g_pre}logos/uw_logo.gif"
|
||||
alt="University of Waterloo" width="105" height="70" /></a>
|
||||
</div>
|
||||
<div class="acmlogo">
|
||||
<a href="http://www.acm.org"><img src="{$pre}logos/acm_logo.gif"
|
||||
<a href="http://www.acm.org"><img src="{$g_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"
|
||||
<a href="{$g_pre}index.html"><img src="{$g_pre}logos/csc_logo.gif"
|
||||
alt="University of Waterloo" width="420" height="79" /></a>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -64,16 +64,9 @@
|
|||
<xsl:template name="header">
|
||||
<xsl:param name="title" />
|
||||
<xsl:param name="href" />
|
||||
<div id="vfeed" />
|
||||
<div class="webtitle">
|
||||
<div class="csclogo">
|
||||
<a href="{$pre}"><img src="{$pre}logos/csc_80_35_white.png"
|
||||
alt="CSC Logo" /></a>
|
||||
</div>
|
||||
<div>
|
||||
<a href="{$pre}"><img src="{$pre}logos/csc_title.png"
|
||||
alt="Computer Science Club" /></a>
|
||||
</div>
|
||||
<a href="{$g_pre}"><img src="{$g_pre}logos/csc_title.gif"
|
||||
alt="CSC Logo" /></a>
|
||||
</div>
|
||||
<div class="template-header">
|
||||
<xsl:apply-templates
|
||||
|
@ -94,9 +87,9 @@
|
|||
<div class="infobox">
|
||||
<p>
|
||||
This site supports TLS/SSL using a certificate signed by the
|
||||
"CSC Certificate Authority". Click <a href="{$pre}csclub.pem">here</a>
|
||||
(PEM format) or <a href="{$pre}csclub.der">here</a> (DER format) to
|
||||
install the certificate authority into your browser.
|
||||
"CSC Certificate Authority". Click <a href="{$g_pre}csclub.pem">
|
||||
here</a> (PEM format) or <a href="{$g_pre}csclub.der">here</a> (DER
|
||||
format) to install the certificate authority into your browser.
|
||||
</p><p>
|
||||
This page was generated on <xsl:value-of select="$g_date" /> at
|
||||
<xsl:value-of select="$g_time" />.
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
</xsl:choose>
|
||||
</xsl:variable>
|
||||
<xsl:if test="@title">
|
||||
<a class="diritem homedir" href="{$pre}">Home</a>
|
||||
<a class="diritem homedir" href="{$g_pre}">Home</a>
|
||||
<a class="diritem" href="{$href}">
|
||||
<xsl:value-of select="@title" />
|
||||
</a>
|
||||
|
|
|
@ -48,12 +48,12 @@
|
|||
<xsl:template name="events-by-term">
|
||||
<xsl:param name="date" />
|
||||
<p>The events for <xsl:value-of select="csc:term($date)" /> are listed here.
|
||||
You can also <a href="{$pre}events.ics">download an ICS</a> of them.</p>
|
||||
You can also <a href="{$g_pre}events.ics">download an ICS</a> of them.</p>
|
||||
<xsl:for-each select="document(concat($g_root, '/events.xml'))/eventdefs/eventitem">
|
||||
<xsl:sort select="translate(@date, '-', '')"
|
||||
order="ascending" data-type="number" />
|
||||
<xsl:if test="csc:term(@date) = csc:term($date)">
|
||||
<h3><a href="{translate(concat($pre, 'events/', @room, '-', @date, '-', @time, '.html'), ' ', '_')}"><xsl:value-of select="@title" /></a></h3>
|
||||
<h3><a href="{translate(concat($g_pre, 'events/', @room, '-', @date, '-', @time, '.html'), ' ', '_')}"><xsl:value-of select="@title" /></a></h3>
|
||||
<p>
|
||||
<strong>
|
||||
<xsl:value-of select="@room" />,
|
||||
|
@ -78,7 +78,7 @@
|
|||
<html>
|
||||
<head>
|
||||
<title><xsl:value-of select="@title" /></title>
|
||||
<link rel="stylesheet" href="{$pre}default.css" type="text/css" />
|
||||
<link rel="stylesheet" href="{$g_pre}default.css" type="text/css" />
|
||||
</head>
|
||||
<body><div>
|
||||
<xsl:call-template name="header" />
|
||||
|
@ -118,7 +118,7 @@
|
|||
<html>
|
||||
<head>
|
||||
<title>Events for <xsl:value-of select="csc:term(@date)" /></title>
|
||||
<link rel="stylesheet" href="{$pre}default.css" type="text/css" />
|
||||
<link rel="stylesheet" href="{$g_pre}default.css" type="text/css" />
|
||||
</head>
|
||||
<body><div>
|
||||
<xsl:call-template name="header" />
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
|
||||
<xsl:template match="mediaitem">
|
||||
<xsl:call-template name="makemediaitem">
|
||||
<xsl:with-param name="mirror" select="$mirror_csc" />
|
||||
<xsl:with-param name="mirror" select="$g_mirror_csc" />
|
||||
<xsl:with-param name="bittorrent">yes</xsl:with-param>
|
||||
<xsl:with-param name="ads">yes</xsl:with-param>
|
||||
</xsl:call-template>
|
||||
|
@ -43,7 +43,7 @@
|
|||
against your ResNet quota.
|
||||
</p>
|
||||
</xsl:with-param>
|
||||
<xsl:with-param name="mirror" select="$mirror_cs" />
|
||||
<xsl:with-param name="mirror" select="$g_mirror_cs" />
|
||||
</xsl:call-template>
|
||||
<li><a href= "{@title}.html"><xsl:value-of select="@title" /></a></li>
|
||||
</xsl:template>
|
||||
|
@ -62,7 +62,7 @@
|
|||
<html>
|
||||
<head>
|
||||
<title><xsl:value-of select="@title" /></title>
|
||||
<link rel="stylesheet" href="{$pre}default.css" type="text/css" />
|
||||
<link rel="stylesheet" href="{$g_pre}default.css" type="text/css" />
|
||||
</head>
|
||||
<body><div>
|
||||
<xsl:call-template name="header">
|
||||
|
|
|
@ -12,12 +12,12 @@
|
|||
<xsl:choose>
|
||||
<xsl:when test="@absolute = 'true'" />
|
||||
<xsl:otherwise>
|
||||
<xsl:value-of select="$pre" />
|
||||
<xsl:value-of select="$g_pre" />
|
||||
</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</xsl:variable>
|
||||
<div class="menuitem">
|
||||
<a href="{$preabs}{@href}"><img src="{$pre}buttons/{@icon}.png" width="40"
|
||||
<a href="{$preabs}{@href}"><img src="{$g_pre}buttons/{@icon}.png" width="40"
|
||||
height="40" alt="{@title}" /><br /><xsl:value-of select="@title" /></a>
|
||||
</div>
|
||||
</xsl:template>
|
||||
|
|
|
@ -72,7 +72,7 @@
|
|||
<html>
|
||||
<head>
|
||||
<title>News for <xsl:value-of select="csc:term(@date)" /></title>
|
||||
<link rel="stylesheet" href="{$pre}default.css" type="text/css" />
|
||||
<link rel="stylesheet" href="{$g_pre}default.css" type="text/css" />
|
||||
</head>
|
||||
<body><div>
|
||||
<xsl:call-template name="header" />
|
||||
|
|