From 46dc10847a628f68709973d8b8f5c8d9302bde09 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 13 Nov 2008 12:11:18 +0000 Subject: [PATCH] --- src/HydraFrontend/root/hydra.css | 59 ++++++++++++++++++++++++-------- src/HydraFrontend/root/layout.tt | 41 ++++++++++------------ 2 files changed, 64 insertions(+), 36 deletions(-) diff --git a/src/HydraFrontend/root/hydra.css b/src/HydraFrontend/root/hydra.css index c54e2c2b..5059109b 100644 --- a/src/HydraFrontend/root/hydra.css +++ b/src/HydraFrontend/root/hydra.css @@ -225,7 +225,7 @@ h1 { margin-top: 0em; } -#leftnavbar ul { +#leftnavbar ul.menu { display: block; padding: 0 0 0 0; margin: 0 0 0 0; @@ -233,18 +233,18 @@ h1 { margin-right: 1em; } -#leftnavbar ul a { +#leftnavbar ul.menu a { color: #005aa0; } -#leftnavbar li.section { +#leftnavbar ul.menu > li { list-style: none; margin: 0 0 0 0; padding: 0 0 0 0; margin-bottom: 1.5em; } -#leftnavbar li.section > div.title { +#leftnavbar ul.menu > li > div.title { text-align: center; font-weight: bold; border-width: 0px; @@ -254,37 +254,68 @@ h1 { padding-bottom: 0.5em; } -#leftnavbar li.section ul { +#leftnavbar ul.submenu { padding: 0 0 0 0; margin-left: 0em; margin-right: 0em; } -#leftnavbar li.section ul li { +#leftnavbar ul.submenu > li { font-size: 90%; list-style: none; - background-image: url(/static/images/arrow-right.gif); - background-repeat: no-repeat; - background-position: 0.3em center; border-width: 0px; border-bottom-width: 1px; border-style: solid; border-color: #c0c0c0; margin: 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-color: #eef2ff; font-weight: bold; color: #606060; } -#leftnavbar li.section ul li > div.title { - margin-left: 1.3em; +#leftnavbar ul.subsubmenu { + 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 { diff --git a/src/HydraFrontend/root/layout.tt b/src/HydraFrontend/root/layout.tt index 6d87e91d..064551fa 100644 --- a/src/HydraFrontend/root/layout.tt +++ b/src/HydraFrontend/root/layout.tt @@ -1,4 +1,5 @@ [% USE date -%] + [% BLOCK makeLink %]
  • @@ -6,8 +7,6 @@
    • [% END %] - - @@ -31,10 +30,10 @@
    -
      -
    • +
        +
      • Hydra
        -
          +
            [% INCLUDE makeLink uri = c.uri_for('/') title = "Overview" %] [% INCLUDE makeLink uri = c.uri_for('/queue') title = "Queue" %] [% INCLUDE makeLink uri = c.uri_for('/latest') title = "Latest builds" %] @@ -42,29 +41,27 @@ [% INCLUDE makeLink uri = c.uri_for('/search') title = "Search builds" %]
          -
        -
          -
        • + +
        • Projects
          -
            +
              [% FOREACH project IN projects %] - [% IF curProject.name == project.name %] -
            • -
              [% project.displayname %]
              -
              • - [% ELSE %] -
            • -
              [% project.displayname %]
              -
              • - [% END %] +
            • +
              [% project.displayname %]
              + [% IF curProject.name == project.name %] +
                + [% INCLUDE makeLink uri = c.uri_for('/project' project.name 'status') title = "Status" %] + [% INCLUDE makeLink uri = c.uri_for('/project' project.name 'all') title = "All builds" %] +
              + [% END %] +
              • [% END %]
            -
          -
            -
          • + +
          • Admin
            -
              +
                [% INCLUDE makeLink uri = c.uri_for('/users') title = "Users" %] [% INCLUDE makeLink uri = c.uri_for('/create-project') title = "Create a project" %]