old
/
old-website
2
0
Fork 0
Code Issues 2 Pull Requests 1 Projects Releases Wiki Activity

Updated some mailman links.

Browse Source 
Updated menu links to including trailing /.
Updated subpage header to use floats instead of tables.
Fixed header directory items.
Fixed events and old events.
foo
David Bartley 16 years ago
parent 57af8298f1
commit 51898e1cd5
9 changed files with 64 additions and 54 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      clubs/directory.xml
  2. 2
      clubs/index.xml
  3. 41
      default.css
  4. 2
      events/index.xml
  5. BIN
      logos/csc_title.png
  6. 10
      menu.xml
  7. 37
      xsl/common.xsl
  8. 2
      xsl/directory.xsl
  9. 22
      xsl/events.xsl

2
clubs/directory.xml
Unescape View File

@ -4,5 +4,5 @@
<directory title="Clubs">
<diritem title="Mailing Lists"
href="http://csclub.uwaterloo.ca/mailman/listinfo/" />
href="http://mailman.csclub.uwaterloo.ca/" />
</directory>

2
clubs/index.xml
Unescape View File

@ -63,7 +63,7 @@
<section title="Mailing lists we host" id="lists">
<p>We also host a number of <a
href="http://csclub.uwaterloo.ca/cgi-bin/mailman/listinfo/">mailing lists</a>
href="http://mailman.csclub.uwaterloo.ca/">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>

41
default.css
Unescape View File

@ -8,6 +8,13 @@ body {
padding: 0 20px;
}
hr {
border: 0;
color: #ccc;
background-color: #ccc;
height: 1px;
}
h1 {
font-size: x-large;
}
@ -85,10 +92,6 @@ th.news {
font-size: x-small;
text-align: left;
}
td.pagetitle {
font-size: large;
font-weight: bold;
}
th {
background: #002288;
color: white;
@ -127,29 +130,37 @@ div.biglogo {
background: url(./csc_welcome.jpg) -20px 25px transparent no-repeat;
height: 340px;
}
div.uwlogo {
margin-top: 16px;
div.biglogo div {
float: left;
}
div.acmlogo {
div.biglogo div.uwlogo {
margin-top: 16px;
}
div.biglogo div.acmlogo {
margin-top: 12px;
float: left;
}
table.template-header {
border-bottom: 1px solid #ccc;
div.template-header {
padding-top: 5px;
}
div.webtitle {
height: 60px;
width: 760px;
height: 46px;
width: 750px;
background-color: #215498;
border-bottom: 4px solid #104387;
padding-left: 10px;
padding-top: 12px;
}
div.webtitle div.webtitle-inner {
width: 760px;
padding: 0 10px;
div.webtitle div {
float:left;
background-color: #215498;
}
div.webtitle div.csclogo {
padding-right: 10px;
background-color: #215498;
}
div.menubar {

2
events/index.xml
Unescape View File

@ -11,4 +11,4 @@
</section>
<footer />
</cscpage>
</cscpage>

BIN
logos/csc_title.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

10
menu.xml
Unescape View File

@ -10,10 +10,10 @@
<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="koha" absolute="true" href="http://koha.csclub.uwaterloo.ca"/>
<menuitem title="Wiki" icon="sunflower" absolute="true" href="http://wiki.csclub.uwaterloo.ca"/>
<menuitem title="Library" icon="koha" absolute="true" href="http://koha.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="http://mailman.csclub.uwaterloo.ca"/>
<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"/>
<menuitem title="Mailman" icon="mm-icon" absolute="true" href="http://mailman.csclub.uwaterloo.ca/"/>
<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>

37
xsl/common.xsl
Unescape View File

@ -45,29 +45,20 @@
<xsl:template match="header" name="header">
<div id="vfeed" />
<div class="webtitle"><div class="webtitle-inner">
<table cellpadding="0" cellspacing="0" border="0"><tr>
<td>
<a href="{$pre}"><img src="{$pre}logos/csc_80_35_white.png"
alt="CSC Logo" /></a>
</td><td>
<a href="{$pre}"><img src="{$pre}logos/csc_title.png"
alt="CSC Title" /></a>
</td><td valign="top" align="right" />
</tr></table>
</div></div>
<table cellspacing="0" cellpadding="2" border="0" width="100%"
class="template-header">
<tr>
<td colspan="2" class="pagetitle"><xsl:value-of select="@title" /></td>
</tr>
<tr>
<td colspan="2">
<xsl:apply-templates
select="document(concat($pwd, '/directory.xml'))/directory"/>
</td>
</tr>
</table>
<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>
</div>
<div class="template-header">
<xsl:apply-templates
select="document(concat($pwd, '/directory.xml'))/directory"/>
</div>
</xsl:template>
<xsl:template match="footer" name="footer">

2
xsl/directory.xsl
Unescape View File

@ -7,7 +7,7 @@
<xsl:template match="directory">
<xsl:variable name="href">
<xsl:choose>
<xsl:when test="@href"><xsl:value-of select="@href"/></xsl:when>
<xsl:when test="@href != ''"><xsl:value-of select="@href"/></xsl:when>
<xsl:otherwise>index.html</xsl:otherwise>
</xsl:choose>
</xsl:variable>

22
xsl/events.xsl
Unescape View File

@ -8,7 +8,7 @@
<tr>
<th colspan="2" class="news">Upcoming Events</th>
</tr>
<xsl:for-each select="document('../events.xml')/eventdefs/eventitem">
<xsl:for-each select="document(concat($pwd, '/../events.xml'))/eventdefs/eventitem">
<xsl:sort select="translate(@date, '-', '')"
order="ascending" data-type="number" />
<xsl:if test="translate(@date, '-', '') &gt;= translate($date, '-', '')">
@ -36,10 +36,17 @@
</tr>
</xsl:template>
<xsl:template match="events-this-term" name="events-by-term">
<xsl:template match="events-this-term">
<xsl:call-template name="events-by-term">
<xsl:with-param name="date" select="$date" />
</xsl:call-template>
</xsl:template>
<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>
<xsl:for-each select="document('../events.xml')/eventdefs/eventitem">
<xsl:for-each select="document(concat($pwd, '/../events.xml'))/eventdefs/eventitem">
<xsl:sort select="translate(@date, '-', '')"
order="ascending" data-type="number" />
<xsl:if test="csc:term(@date) = csc:term($date)">
@ -74,9 +81,10 @@
<xsl:call-template name="header">
<xsl:with-param name="title" select="@title" />
</xsl:call-template>
<h2>Information</h2>
<div>
Held in <xsl:value-of select="@room" /> at
<xsl:value-of select="@date" />, <xsl:value-of select="@time" />.
Held in <xsl:value-of select="@room" />, on
<xsl:value-of select="@date" />, at <xsl:value-of select="@time" />.
</div>
<h2>Abstract</h2>
<xsl:apply-templates select="abstract/node()" />
@ -87,13 +95,13 @@
</xsl:template>
<xsl:template match="generate-event-files">
<xsl:apply-templates select="document('../events.xml')/eventdefs" />
<xsl:apply-templates select="document(concat($pwd, '/../events.xml'))/eventdefs" />
</xsl:template>
<xsl:key name="eventterm" match="/eventdefs/eventitem" use="csc:term(@date)" />
<xsl:template match="old-events">
<xsl:for-each select="document('events.xml')/eventdefs/eventitem">
<xsl:for-each select="document(concat($pwd, '/../events.xml'))/eventdefs/eventitem">
<xsl:sort select="translate(@date, '-', '')"
order="descending" data-type="number" />
<xsl:if test="not(preceding-sibling::*[csc:term(@date)=csc:term(current()/@date)]) and not(csc:term(@date) = csc:term($date))">

Write Preview
Loading…
Cancel
Save