Merge branch 'madness'

news-update
David Bartley 16 years ago
commit 2e2329ec44
  1. BIN
      buttons/calendar.png
  2. BIN
      buttons/calendar.xcf
  3. BIN
      buttons/clubs.png
  4. BIN
      buttons/csc.png
  5. BIN
      buttons/csc.xcf
  6. BIN
      buttons/docs.png
  7. BIN
      buttons/docs.xcf
  8. BIN
      buttons/gallery.png
  9. BIN
      buttons/gerbil.png
  10. BIN
      buttons/gitweb.png
  11. BIN
      buttons/gopher.png
  12. BIN
      buttons/home.png
  13. BIN
      buttons/homepage.png
  14. BIN
      buttons/horde.png
  15. BIN
      buttons/library.png
  16. BIN
      buttons/mm-icon.png
  17. BIN
      buttons/office.png
  18. BIN
      buttons/office.xcf
  19. BIN
      buttons/package_multimedia.png
  20. BIN
      buttons/services.png
  21. BIN
      buttons/stats.png
  22. BIN
      buttons/stats.xcf
  23. BIN
      buttons/sunflower.png
  24. 1
      cscweb.xsl
  25. 40
      default.css
  26. 14
      menu.xml
  27. 3
      xsl/common.xsl
  28. 35
      xsl/menu.xsl

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 208 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 511 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

Binary file not shown.

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" />

@ -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;

@ -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>

@ -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>
Loading…
Cancel
Save