This commit is contained in:
Eelco Dolstra 2008-11-13 12:11:18 +00:00
parent db68e005a6
commit 46dc10847a
2 changed files with 64 additions and 36 deletions

View file

@ -225,7 +225,7 @@ h1 {
margin-top: 0em; margin-top: 0em;
} }
#leftnavbar ul { #leftnavbar ul.menu {
display: block; display: block;
padding: 0 0 0 0; padding: 0 0 0 0;
margin: 0 0 0 0; margin: 0 0 0 0;
@ -233,18 +233,18 @@ h1 {
margin-right: 1em; margin-right: 1em;
} }
#leftnavbar ul a { #leftnavbar ul.menu a {
color: #005aa0; color: #005aa0;
} }
#leftnavbar li.section { #leftnavbar ul.menu > li {
list-style: none; list-style: none;
margin: 0 0 0 0; margin: 0 0 0 0;
padding: 0 0 0 0; padding: 0 0 0 0;
margin-bottom: 1.5em; margin-bottom: 1.5em;
} }
#leftnavbar li.section > div.title { #leftnavbar ul.menu > li > div.title {
text-align: center; text-align: center;
font-weight: bold; font-weight: bold;
border-width: 0px; border-width: 0px;
@ -254,37 +254,68 @@ h1 {
padding-bottom: 0.5em; padding-bottom: 0.5em;
} }
#leftnavbar li.section ul { #leftnavbar ul.submenu {
padding: 0 0 0 0; padding: 0 0 0 0;
margin-left: 0em; margin-left: 0em;
margin-right: 0em; margin-right: 0em;
} }
#leftnavbar li.section ul li { #leftnavbar ul.submenu > li {
font-size: 90%; font-size: 90%;
list-style: none; list-style: none;
background-image: url(/static/images/arrow-right.gif);
background-repeat: no-repeat;
background-position: 0.3em center;
border-width: 0px; border-width: 0px;
border-bottom-width: 1px; border-bottom-width: 1px;
border-style: solid; border-style: solid;
border-color: #c0c0c0; border-color: #c0c0c0;
margin: 0 0 0 0; margin: 0 0 0 0;
padding: 0 0 0 0; padding: 0 0 0 0;
padding-top: 0.5em;
padding-bottom: 0.5em;
} }
#leftnavbar li.section ul li.active { #leftnavbar ul.submenu > li > div.title {
padding-left: 1.3em;
padding-top: 0.5em;
padding-bottom: 0.5em;
background-image: url(/static/images/arrow-right.gif);
background-repeat: no-repeat;
background-position: 0.3em center;
}
#leftnavbar ul.submenu > li.active > div.title {
background-image: url(/static/images/arrow-right-active.gif); background-image: url(/static/images/arrow-right-active.gif);
background-color: #eef2ff; background-color: #eef2ff;
font-weight: bold; font-weight: bold;
color: #606060; color: #606060;
} }
#leftnavbar li.section ul li > div.title { #leftnavbar ul.subsubmenu {
margin-left: 1.3em; padding-left: 0;
}
#leftnavbar ul.subsubmenu > li {
font-size: 90%;
list-style: none;
margin: 0 0 0 0;
padding: 0 0 0 0;
border-width: 0px;
border-top-width: 1px;
border-style: solid;
border-color: #c0c0c0;
}
#leftnavbar ul.subsubmenu > li > div.title {
padding-left: 3.3em;
padding-top: 0.5em;
padding-bottom: 0.5em;
background-image: url(/static/images/arrow-right.gif);
background-repeat: no-repeat;
background-position: 2.3em center;
}
#leftnavbar ul.subsubmenu > li.active > div.title {
background-image: url(/static/images/arrow-right-active.gif);
background-color: #eef2ff;
font-weight: bold;
color: #606060;
} }
#footer { #footer {

View file

@ -1,4 +1,5 @@
[% USE date -%] [% USE date -%]
<?xml version="1.0" encoding="UTF-8"?>
[% BLOCK makeLink %] [% BLOCK makeLink %]
<li [% IF curUri == uri %]class="active"[% END %]> <li [% IF curUri == uri %]class="active"[% END %]>
@ -6,8 +7,6 @@
</li> </li>
[% END %] [% END %]
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
@ -31,10 +30,10 @@
<div id="container"> <div id="container">
<div id="leftnavbar"> <div id="leftnavbar">
<ul> <ul class="menu">
<li class="section"> <li>
<div class="title">Hydra</div> <div class="title">Hydra</div>
<ul> <ul class="submenu">
[% INCLUDE makeLink uri = c.uri_for('/') title = "Overview" %] [% INCLUDE makeLink uri = c.uri_for('/') title = "Overview" %]
[% INCLUDE makeLink uri = c.uri_for('/queue') title = "Queue" %] [% INCLUDE makeLink uri = c.uri_for('/queue') title = "Queue" %]
[% INCLUDE makeLink uri = c.uri_for('/latest') title = "Latest builds" %] [% INCLUDE makeLink uri = c.uri_for('/latest') title = "Latest builds" %]
@ -42,29 +41,27 @@
[% INCLUDE makeLink uri = c.uri_for('/search') title = "Search builds" %] [% INCLUDE makeLink uri = c.uri_for('/search') title = "Search builds" %]
</ul> </ul>
</li> </li>
</ul>
<ul> <li>
<li class="section">
<div class="title">Projects</div> <div class="title">Projects</div>
<ul> <ul class="submenu">
[% FOREACH project IN projects %] [% FOREACH project IN projects %]
[% IF curProject.name == project.name %] <li [% IF curUri == c.uri_for('/project' project.name) %]class="active"[% END %]>
<li class="active"> <div class="title"><a href="[% c.uri_for('/project' project.name) %]">[% project.displayname %]</a></div>
<div class="title"><a href="[% c.uri_for('/project' project.name) %]">[% project.displayname %]</a></div> [% IF curProject.name == project.name %]
</li> <ul class="subsubmenu">
[% ELSE %] [% INCLUDE makeLink uri = c.uri_for('/project' project.name 'status') title = "Status" %]
<li> [% INCLUDE makeLink uri = c.uri_for('/project' project.name 'all') title = "All builds" %]
<div class="title"><a href="[% c.uri_for('/project' project.name) %]">[% project.displayname %]</a></div> </ul>
</li> [% END %]
[% END %] </li>
[% END %] [% END %]
</ul> </ul>
</li> </li>
</ul>
<ul> <li>
<li class="section">
<div class="title">Admin</div> <div class="title">Admin</div>
<ul> <ul class="submenu">
[% INCLUDE makeLink uri = c.uri_for('/users') title = "Users" %] [% INCLUDE makeLink uri = c.uri_for('/users') title = "Users" %]
[% INCLUDE makeLink uri = c.uri_for('/create-project') title = "Create a project" %] [% INCLUDE makeLink uri = c.uri_for('/create-project') title = "Create a project" %]
</ul> </ul>