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:
parent
62e890bc5c
commit
57af8298f1
126
default.css
126
default.css
|
|
@ -2,10 +2,10 @@ body {
|
|||
background: white;
|
||||
color: black;
|
||||
font-family: serif;
|
||||
font-size: 12px;
|
||||
width: 760px;
|
||||
margin: 0 auto;
|
||||
padding: 0 20px;
|
||||
font-size: 12px;
|
||||
width: 760px;
|
||||
margin: 0 auto;
|
||||
padding: 0 20px;
|
||||
}
|
||||
|
||||
h1 {
|
||||
|
|
@ -13,10 +13,10 @@ h1 {
|
|||
}
|
||||
h2 {
|
||||
font-size: large;
|
||||
font-family: 'Lucida Grande', Sans, Sans-serif;
|
||||
text-transform: uppercase;
|
||||
font-family: 'Lucida Grande', Sans, Sans-serif;
|
||||
text-transform: uppercase;
|
||||
border-left: 10px solid #ff9900;
|
||||
padding-left: 10px;
|
||||
padding-left: 10px;
|
||||
color: #000055;
|
||||
}
|
||||
h3 {
|
||||
|
|
@ -107,7 +107,7 @@ tr.book2 {
|
|||
}
|
||||
|
||||
img {
|
||||
border-width: 0;
|
||||
border-width: 0;
|
||||
}
|
||||
|
||||
div.footerlogo {
|
||||
|
|
@ -116,7 +116,7 @@ div.footerlogo {
|
|||
}
|
||||
|
||||
p {
|
||||
font-family: 'Lucida Grande', Sans, Sans-serif;
|
||||
font-family: 'Lucida Grande', Sans, Sans-serif;
|
||||
}
|
||||
|
||||
div.webcam {
|
||||
|
|
@ -124,7 +124,7 @@ div.webcam {
|
|||
}
|
||||
|
||||
div.biglogo {
|
||||
background: url(./csc_welcome.jpg) -20px 25px transparent no-repeat;
|
||||
background: url(./csc_welcome.jpg) -20px 25px transparent no-repeat;
|
||||
height: 340px;
|
||||
}
|
||||
div.uwlogo {
|
||||
|
|
@ -137,100 +137,92 @@ div.acmlogo {
|
|||
}
|
||||
|
||||
table.template-header {
|
||||
border-bottom: 1px solid #ccc;
|
||||
border-bottom: 1px solid #ccc;
|
||||
}
|
||||
|
||||
div.webtitle {
|
||||
height: 60px;
|
||||
width: 760px;
|
||||
background-color: #215498;
|
||||
width: 760px;
|
||||
background-color: #215498;
|
||||
border-bottom: 4px solid #104387;
|
||||
}
|
||||
|
||||
div.webtitle div.webtitle-inner {
|
||||
width: 760px;
|
||||
padding: 0 10px;
|
||||
width: 760px;
|
||||
padding: 0 10px;
|
||||
}
|
||||
|
||||
div.menuspace {
|
||||
background: white;
|
||||
}
|
||||
|
||||
div.menuspace table.menubar {
|
||||
background-color: transparent;
|
||||
padding: 0;
|
||||
margin: 0 auto;
|
||||
text-align: center;
|
||||
height: 90px;
|
||||
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.menuspace td.menuitem {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
div.menuitem {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
text-align: center;
|
||||
float: left;
|
||||
}
|
||||
|
||||
div.menuspace td.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 {
|
||||
display: block;
|
||||
text-align: center;
|
||||
padding: 5px;
|
||||
margin: 0;
|
||||
text-decoration: none;
|
||||
font-weight: 400;
|
||||
font-family: 'Lucida Grande', Sans, Sans-serif;
|
||||
}
|
||||
|
||||
div.menuspace td.menuitem a:hover {
|
||||
font-weight: 700;
|
||||
color: black;
|
||||
background-color: #eee;
|
||||
div.menuitem a:hover {
|
||||
font-weight: 700;
|
||||
color: black;
|
||||
background-color: #eee;
|
||||
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 {
|
||||
font-family: 'Lucida Grande', Sans, Sans-serif;
|
||||
border-left: 4px solid #ccc;
|
||||
padding: 0 15px 0 5px;
|
||||
color: blue;
|
||||
font-family: 'Lucida Grande', Sans, Sans-serif;
|
||||
border-left: 4px solid #ccc;
|
||||
padding: 0 15px 0 5px;
|
||||
color: blue;
|
||||
}
|
||||
|
||||
a.diritem:hover {
|
||||
border-left: 4px solid green;
|
||||
border-left: 4px solid green;
|
||||
}
|
||||
|
||||
a.headdir {
|
||||
font-weight: 700;
|
||||
font-weight: 700;
|
||||
}
|
||||
|
||||
a.pagetop, a.pagetop:link, a.pagetop:visited, a.pagetop:hover {
|
||||
font-family: 'Lucida Grande',sans, sans-serif;
|
||||
display: block;
|
||||
padding: 0 10px 10px 10px;
|
||||
margin: 10px 0 0 0;
|
||||
border-top: 1px solid #ccc;
|
||||
background-color: #eee;
|
||||
color: #999;
|
||||
font-size: 9px;
|
||||
text-align: right;
|
||||
text-transform: uppercase;
|
||||
font-family: 'Lucida Grande',sans, sans-serif;
|
||||
display: block;
|
||||
padding: 0 10px 10px 10px;
|
||||
margin: 10px 0 0 0;
|
||||
border-top: 1px solid #ccc;
|
||||
background-color: #eee;
|
||||
color: #999;
|
||||
font-size: 9px;
|
||||
text-align: right;
|
||||
text-transform: uppercase;
|
||||
}
|
||||
|
||||
div.footer {
|
||||
padding-top: 10px;
|
||||
border-top: 1px solid #ccc;
|
||||
font-size: 10px;
|
||||
color: #666;
|
||||
padding-top: 10px;
|
||||
border-top: 1px solid #ccc;
|
||||
font-size: 10px;
|
||||
color: #666;
|
||||
}
|
||||
|
||||
p.infobox {
|
||||
border: 1px solid #ccc;
|
||||
padding: 5px 10px;
|
||||
border: 1px solid #ccc;
|
||||
padding: 5px 10px;
|
||||
}
|
||||
|
|
|
|||
2
menu.xml
2
menu.xml
|
|
@ -5,7 +5,7 @@
|
|||
<menuitem title="Docs" icon="docs" href="docs/"/>
|
||||
<!-- <menuitem title="Gallery" icon="gallery" href="/gallery/"/>-->
|
||||
<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="Clubs" icon="clubs" href="clubs/"/>
|
||||
<!--<menuitem title="Stats" icon="stats" href="/stats/"/>-->
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@
|
|||
<tr>
|
||||
<td colspan="2">
|
||||
<xsl:apply-templates
|
||||
select="document('../directory.xml')/directory" />
|
||||
select="document(concat($pwd, '/directory.xml'))/directory"/>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
|
@ -77,10 +77,10 @@
|
|||
<p>This page was generated on <xsl:value-of select="$date" /> at
|
||||
<xsl:value-of select="$time" />.</p>
|
||||
<p class="infobox">
|
||||
The overall layout is designed specially for Mozilla-based browsers.
|
||||
It is also printer-friendly. Please report any difficulty you may find,
|
||||
including the version of your browser and your operating system.
|
||||
to the <a href="mailto:www@csclub.uwaterloo.ca">Webmaster</a>.
|
||||
The overall layout is designed specially for modern browsers. If you
|
||||
experience any problems, please report them, along with the version of
|
||||
your browser and operating system, to the
|
||||
<a href="mailto:www@csclub.uwaterloo.ca">Webmaster</a>.
|
||||
</p>
|
||||
<p>
|
||||
<a href="http://validator.w3.org/check?uri=referer">
|
||||
|
|
|
|||
|
|
@ -5,19 +5,22 @@
|
|||
extension-element-prefixes="csc">
|
||||
|
||||
<xsl:template match="directory">
|
||||
<xsl:if test="@href = ''">
|
||||
<a class="headdir diritem" href="index.html">
|
||||
<xsl:value-of select="@title" />
|
||||
</a>
|
||||
</xsl:if>
|
||||
<xsl:if test="@href != ''">
|
||||
<a href="{@href}"><xsl:value-of select="@title" /></a>
|
||||
</xsl:if>
|
||||
<xsl:variable name="href">
|
||||
<xsl:choose>
|
||||
<xsl:when test="@href"><xsl:value-of select="@href"/></xsl:when>
|
||||
<xsl:otherwise>index.html</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</xsl:variable>
|
||||
<a class="diritem headdir" href="{$href}">
|
||||
<xsl:value-of select="@title" />
|
||||
</a>
|
||||
<xsl:apply-templates match="diritem" />
|
||||
</xsl:template>
|
||||
|
||||
<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:stylesheet>
|
||||
|
|
|
|||
12
xsl/menu.xsl
12
xsl/menu.xsl
|
|
@ -13,19 +13,15 @@
|
|||
</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</xsl:variable>
|
||||
<td class="menuitem">
|
||||
<div class="menuitem">
|
||||
<a href="{$pre2}{@href}"><img src="{$pre}buttons/{@icon}.png" width="40"
|
||||
height="40" alt="{@title}" /><br /><xsl:value-of select="@title" /></a>
|
||||
</td>
|
||||
</div>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="menudefs">
|
||||
<div class="menuspace">
|
||||
<table cellspacing="0" cellpadding="0" border="0" class="menubar">
|
||||
<tr>
|
||||
<xsl:apply-templates select="menuitem" />
|
||||
</tr>
|
||||
</table>
|
||||
<div class="menubar">
|
||||
<xsl:apply-templates select="menuitem" />
|
||||
</div>
|
||||
</xsl:template>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue