From 3c04d540a2ce66376c3448d096912c96a69f65b9 Mon Sep 17 00:00:00 2001 From: gfawcett Date: Thu, 26 Mar 2009 00:26:05 +0000 Subject: [PATCH] more visual touch-ups git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@221 6d9bc8c9-1ec2-4278-b937-99fde70a366f --- conifer/static/main.css | 15 +++++++++++---- conifer/static/menublocks.js | 15 ++++++++++++++- conifer/templates/components/course.xhtml | 5 ++++- 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/conifer/static/main.css b/conifer/static/main.css index 537aead..163cd14 100644 --- a/conifer/static/main.css +++ b/conifer/static/main.css @@ -100,14 +100,20 @@ a:hover { text-decoration: underline; } .nestedtitle h2 { margin-top: 8; } .nestedtitle a { color: navy; } +span.final_item { font-weight: bold; font-size: 110%; } + /* item trees (tree of headings and items in a course */ .itemtree { -padding-left: 25; +padding-left: 15; list-style-type: none; list-style-position: inside; } +.itemtree .itemtree li { + padding-left: 25; +} + .itemtree .itemtree { margin-left: 0;} /* .itemtree li { width: 400; } */ @@ -125,6 +131,7 @@ padding-left: 25; .itemadd { margin-top: 30; font-size: 90%; padding: 10; background-color: #eef; + clear: both; } .itemadd a { color: navy; } @@ -136,7 +143,7 @@ padding-left: 25; margin-top: 4; } .itemtree li.item_HEADING > a { - color: navy; + color: navy; font-size: 105%; } .itemtree li.item_ELEC { @@ -190,7 +197,7 @@ p.todo, div.todo { background-color: #fdd; padding: 6; margin: 12; border-left: font-size: 80%; color: navy; } -.menublockopener { color: gray !important; font-weight: normal !important; } +.menublockopener { margin-left: 0.25em; color: #aaa !important; font-weight: normal !important; } .menublock { background-color: #f0f0e0; font-size: 95%; padding: 1 4; } #coursebanner { background-color: #f2e4cc; margin: -12 -12 0 -12; padding: 8; } @@ -201,7 +208,7 @@ p.todo, div.todo { background-color: #fdd; padding: 6; margin: 12; border-left: #feeds_panel, .little_action_panel -{ float: right; font-size: 95%; margin: 8 0; clear: right; } +{ float: right; font-size: 95%; margin: 8 0; clear: both; } .breadcrumbs { margin: 8 8 8 0; } diff --git a/conifer/static/menublocks.js b/conifer/static/menublocks.js index be0cf35..9dd7f72 100644 --- a/conifer/static/menublocks.js +++ b/conifer/static/menublocks.js @@ -1,5 +1,6 @@ function init_blocks() { $('span.menublock').each(make_opener); + $('div').click(hideblocks); } var blocknum = 0; @@ -12,9 +13,13 @@ function make_opener() { menublock.hide(); } +function hideblocks() { + $('span.menublock').hide(); +} + function openblock(bid) { if (!resequencing) { - $('span.menublock').hide(); + hideblocks(); $('#' + bid).fadeIn('fast'); } } @@ -52,3 +57,11 @@ function doResequence() { }); } }; + +function doToggleItemTree() { + if ($('.itemtree:hidden').length > 0) { + $('.itemtree:hidden').fadeIn(1000); + } else { + $('.itemtree').not('.itemtree:nth(0)').fadeOut('slow'); + } +} diff --git a/conifer/templates/components/course.xhtml b/conifer/templates/components/course.xhtml index f8bb99e..1748beb 100644 --- a/conifer/templates/components/course.xhtml +++ b/conifer/templates/components/course.xhtml @@ -54,7 +54,7 @@ searchtext = _('search this course...') @@ -97,6 +97,9 @@ searchtext = _('search this course...')
+ -- 2.11.0