Changed menubar to use floats instead of tables.

Fixed broken header links in subpages.
Removed exec from menubar (menubar was too long).
This commit is contained in:
David Bartley 2007-07-23 04:42:32 -04:00
parent 62e890bc5c
commit 57af8298f1
5 changed files with 81 additions and 90 deletions

View File

@ -2,10 +2,10 @@ body {
background: white; background: white;
color: black; color: black;
font-family: serif; font-family: serif;
font-size: 12px; font-size: 12px;
width: 760px; width: 760px;
margin: 0 auto; margin: 0 auto;
padding: 0 20px; padding: 0 20px;
} }
h1 { h1 {
@ -13,10 +13,10 @@ h1 {
} }
h2 { h2 {
font-size: large; font-size: large;
font-family: 'Lucida Grande', Sans, Sans-serif; font-family: 'Lucida Grande', Sans, Sans-serif;
text-transform: uppercase; text-transform: uppercase;
border-left: 10px solid #ff9900; border-left: 10px solid #ff9900;
padding-left: 10px; padding-left: 10px;
color: #000055; color: #000055;
} }
h3 { h3 {
@ -107,7 +107,7 @@ tr.book2 {
} }
img { img {
border-width: 0; border-width: 0;
} }
div.footerlogo { div.footerlogo {
@ -116,7 +116,7 @@ div.footerlogo {
} }
p { p {
font-family: 'Lucida Grande', Sans, Sans-serif; font-family: 'Lucida Grande', Sans, Sans-serif;
} }
div.webcam { div.webcam {
@ -124,7 +124,7 @@ div.webcam {
} }
div.biglogo { div.biglogo {
background: url(./csc_welcome.jpg) -20px 25px transparent no-repeat; background: url(./csc_welcome.jpg) -20px 25px transparent no-repeat;
height: 340px; height: 340px;
} }
div.uwlogo { div.uwlogo {
@ -137,100 +137,92 @@ div.acmlogo {
} }
table.template-header { table.template-header {
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
} }
div.webtitle { div.webtitle {
height: 60px; height: 60px;
width: 760px; width: 760px;
background-color: #215498; background-color: #215498;
border-bottom: 4px solid #104387; border-bottom: 4px solid #104387;
} }
div.webtitle div.webtitle-inner { div.webtitle div.webtitle-inner {
width: 760px; width: 760px;
padding: 0 10px; padding: 0 10px;
} }
div.menuspace { div.menubar {
background: white; background-color: white;
} padding-top: 12px;
margin: 0 auto;
div.menuspace table.menubar { text-align: center;
background-color: transparent; height: 75px;
padding: 0;
margin: 0 auto;
text-align: center;
height: 90px;
vertical-align: middle; vertical-align: middle;
font-size: 11px; font-size: 11px;
text-transform: uppercase; text-transform: uppercase;
} }
div.menuspace td.menuitem { div.menuitem {
margin: 0; margin: 0;
padding: 0; padding: 0;
text-align: center; text-align: center;
float: left;
} }
div.menuspace td.menuitem a { div.menuitem a {
display: block; display: block;
text-align: center; text-align: center;
padding: 5px; padding: 5px;
margin: 0; margin: 0;
text-decoration: none; text-decoration: none;
font-weight: 400; font-weight: 400;
font-family: 'Lucida Grande', Sans, Sans-serif; font-family: 'Lucida Grande', Sans, Sans-serif;
} }
div.menuspace td.menuitem a:hover { div.menuitem a:hover {
font-weight: 700; font-weight: 700;
color: black; color: black;
background-color: #eee; background-color: #eee;
border: 1px solid #ccc; border: 1px solid #ccc;
} }
div.menuspace div.menuitem a:hover img {
width: 60px;
height: 60px;
}
a.diritem, a.diritem:link, a.diritem:visited, a.diritem:active { a.diritem, a.diritem:link, a.diritem:visited, a.diritem:active {
font-family: 'Lucida Grande', Sans, Sans-serif; font-family: 'Lucida Grande', Sans, Sans-serif;
border-left: 4px solid #ccc; border-left: 4px solid #ccc;
padding: 0 15px 0 5px; padding: 0 15px 0 5px;
color: blue; color: blue;
} }
a.diritem:hover { a.diritem:hover {
border-left: 4px solid green; border-left: 4px solid green;
} }
a.headdir { a.headdir {
font-weight: 700; font-weight: 700;
} }
a.pagetop, a.pagetop:link, a.pagetop:visited, a.pagetop:hover { a.pagetop, a.pagetop:link, a.pagetop:visited, a.pagetop:hover {
font-family: 'Lucida Grande',sans, sans-serif; font-family: 'Lucida Grande',sans, sans-serif;
display: block; display: block;
padding: 0 10px 10px 10px; padding: 0 10px 10px 10px;
margin: 10px 0 0 0; margin: 10px 0 0 0;
border-top: 1px solid #ccc; border-top: 1px solid #ccc;
background-color: #eee; background-color: #eee;
color: #999; color: #999;
font-size: 9px; font-size: 9px;
text-align: right; text-align: right;
text-transform: uppercase; text-transform: uppercase;
} }
div.footer { div.footer {
padding-top: 10px; padding-top: 10px;
border-top: 1px solid #ccc; border-top: 1px solid #ccc;
font-size: 10px; font-size: 10px;
color: #666; color: #666;
} }
p.infobox { p.infobox {
border: 1px solid #ccc; border: 1px solid #ccc;
padding: 5px 10px; padding: 5px 10px;
} }

View File

@ -5,7 +5,7 @@
<menuitem title="Docs" icon="docs" href="docs/"/> <menuitem title="Docs" icon="docs" href="docs/"/>
<!-- <menuitem title="Gallery" icon="gallery" href="/gallery/"/>--> <!-- <menuitem title="Gallery" icon="gallery" href="/gallery/"/>-->
<menuitem title="Office" icon="office" href="office/"/> <menuitem title="Office" icon="office" href="office/"/>
<menuitem title="Exec" icon="csc" href="about/exec.html"/> <!-- <menuitem title="Exec" icon="csc" href="about/exec.html"/> -->
<menuitem title="Users" icon="users" href="users/"/> <menuitem title="Users" icon="users" href="users/"/>
<menuitem title="Clubs" icon="clubs" href="clubs/"/> <menuitem title="Clubs" icon="clubs" href="clubs/"/>
<!--<menuitem title="Stats" icon="stats" href="/stats/"/>--> <!--<menuitem title="Stats" icon="stats" href="/stats/"/>-->

View File

@ -64,7 +64,7 @@
<tr> <tr>
<td colspan="2"> <td colspan="2">
<xsl:apply-templates <xsl:apply-templates
select="document('../directory.xml')/directory" /> select="document(concat($pwd, '/directory.xml'))/directory"/>
</td> </td>
</tr> </tr>
</table> </table>
@ -77,10 +77,10 @@
<p>This page was generated on <xsl:value-of select="$date" /> at <p>This page was generated on <xsl:value-of select="$date" /> at
<xsl:value-of select="$time" />.</p> <xsl:value-of select="$time" />.</p>
<p class="infobox"> <p class="infobox">
The overall layout is designed specially for Mozilla-based browsers. The overall layout is designed specially for modern browsers. If you
It is also printer-friendly. Please report any difficulty you may find, experience any problems, please report them, along with the version of
including the version of your browser and your operating system. your browser and operating system, to the
to the <a href="mailto:www@csclub.uwaterloo.ca">Webmaster</a>. <a href="mailto:www@csclub.uwaterloo.ca">Webmaster</a>.
</p> </p>
<p> <p>
<a href="http://validator.w3.org/check?uri=referer"> <a href="http://validator.w3.org/check?uri=referer">

View File

@ -5,19 +5,22 @@
extension-element-prefixes="csc"> extension-element-prefixes="csc">
<xsl:template match="directory"> <xsl:template match="directory">
<xsl:if test="@href = ''"> <xsl:variable name="href">
<a class="headdir diritem" href="index.html"> <xsl:choose>
<xsl:value-of select="@title" /> <xsl:when test="@href"><xsl:value-of select="@href"/></xsl:when>
</a> <xsl:otherwise>index.html</xsl:otherwise>
</xsl:if> </xsl:choose>
<xsl:if test="@href != ''"> </xsl:variable>
<a href="{@href}"><xsl:value-of select="@title" /></a> <a class="diritem headdir" href="{$href}">
</xsl:if> <xsl:value-of select="@title" />
</a>
<xsl:apply-templates match="diritem" /> <xsl:apply-templates match="diritem" />
</xsl:template> </xsl:template>
<xsl:template match="diritem"> <xsl:template match="diritem">
<a class="diritem" href="{@href}"><xsl:value-of select="@title" /></a> <a class="diritem" href="{@href}">
<xsl:value-of select="@title" />
</a>
</xsl:template> </xsl:template>
</xsl:stylesheet> </xsl:stylesheet>

View File

@ -13,19 +13,15 @@
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
</xsl:variable> </xsl:variable>
<td class="menuitem"> <div class="menuitem">
<a href="{$pre2}{@href}"><img src="{$pre}buttons/{@icon}.png" width="40" <a href="{$pre2}{@href}"><img src="{$pre}buttons/{@icon}.png" width="40"
height="40" alt="{@title}" /><br /><xsl:value-of select="@title" /></a> height="40" alt="{@title}" /><br /><xsl:value-of select="@title" /></a>
</td> </div>
</xsl:template> </xsl:template>
<xsl:template match="menudefs"> <xsl:template match="menudefs">
<div class="menuspace"> <div class="menubar">
<table cellspacing="0" cellpadding="0" border="0" class="menubar"> <xsl:apply-templates select="menuitem" />
<tr>
<xsl:apply-templates select="menuitem" />
</tr>
</table>
</div> </div>
</xsl:template> </xsl:template>