[open-ils-commits] r221 - in servres/trunk/conifer: static templates/components (gfawcett)

[svn at svn.open-ils.org]

Author: gfawcett
Date: 2009-03-25 20:26:05 -0400 (Wed, 25 Mar 2009)
New Revision: 221

Modified:
   servres/trunk/conifer/static/main.css
   servres/trunk/conifer/static/menublocks.js
   servres/trunk/conifer/templates/components/course.xhtml
Log:
more visual touch-ups

Modified: servres/trunk/conifer/static/main.css
===================================================================
--- servres/trunk/conifer/static/main.css	2009-03-26 00:26:02 UTC (rev 220)
+++ servres/trunk/conifer/static/main.css	2009-03-26 00:26:05 UTC (rev 221)
@@ -100,14 +100,20 @@
 .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 @@
 .itemadd { 
     margin-top: 30; font-size: 90%;
     padding: 10; background-color: #eef; 
+    clear: both;
 }
 .itemadd a { color: navy; }
 
@@ -136,7 +143,7 @@
     margin-top: 4;
 }
 .itemtree li.item_HEADING > a { 
-    color: navy; 
+    color: navy; font-size: 105%;
 }
 
 .itemtree li.item_ELEC { 
@@ -190,7 +197,7 @@
     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 @@
 
 #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; }

Modified: servres/trunk/conifer/static/menublocks.js
===================================================================
--- servres/trunk/conifer/static/menublocks.js	2009-03-26 00:26:02 UTC (rev 220)
+++ servres/trunk/conifer/static/menublocks.js	2009-03-26 00:26:05 UTC (rev 221)
@@ -1,5 +1,6 @@
 function init_blocks() {
     $('span.menublock').each(make_opener);
+    $('div').click(hideblocks);
 }
 
 var blocknum = 0;
@@ -12,9 +13,13 @@
     menublock.hide();
 }
 
+function hideblocks() {
+    $('span.menublock').hide();
+}
+
 function openblock(bid) {
     if (!resequencing) {
-	$('span.menublock').hide();
+	hideblocks();
 	$('#' + bid).fadeIn('fast');
     }
 }
@@ -52,3 +57,11 @@
 		   });
     }
 };
+
+function doToggleItemTree() {
+    if ($('.itemtree:hidden').length > 0) {
+	$('.itemtree:hidden').fadeIn(1000);
+    } else {
+	$('.itemtree').not('.itemtree:nth(0)').fadeOut('slow');
+    }
+}

Modified: servres/trunk/conifer/templates/components/course.xhtml
===================================================================
--- servres/trunk/conifer/templates/components/course.xhtml	2009-03-26 00:26:02 UTC (rev 220)
+++ servres/trunk/conifer/templates/components/course.xhtml	2009-03-26 00:26:05 UTC (rev 221)
@@ -54,7 +54,7 @@
     <div class="breadcrumbs">
       <span><a href="${item.course.course_url()}">Top</a></span> &raquo;
       <span py:for="n, x in enumerate(hier)"><a href="${x.item_url()}">${x.title}</a> &raquo; </span>
-      <b>${item.title}</b>
+      <span class="final_item">${item.title}</span>
     </div>
   </div>
   
@@ -97,6 +97,9 @@
    </div>
 
    <div py:def="item_resequence_panel()" py:strip="True">
+    <div id="showtree_panel" class="little_action_panel">
+      <a href="javascript:doToggleItemTree();">Show/hide tree</a>
+    </div>
     <div id="resequence_panel" class="little_action_panel">
       <a href="javascript:doResequence();">Resequence items</a>
     </div>