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

[svn at svn.open-ils.org]

Author: gfawcett
Date: 2009-05-03 21:33:07 -0400 (Sun, 03 May 2009)
New Revision: 447

Modified:
   servres/trunk/conifer/TODO
   servres/trunk/conifer/static/menublocks.js
   servres/trunk/conifer/templates/components/course.xhtml
Log:
Added explanation-text for Resequence Items

Actually, this had been an earlier feature, but a typo had disabled
it. This version is a bit tighter anyway.

If you click on Resequence Items, a short explanatory message will
appear below the link.


Modified: servres/trunk/conifer/TODO
===================================================================
--- servres/trunk/conifer/TODO	2009-05-04 01:17:16 UTC (rev 446)
+++ servres/trunk/conifer/TODO	2009-05-04 01:33:07 UTC (rev 447)
@@ -4,9 +4,6 @@
 
 * factor out hardcoded references to the EG server.
 
-* People should be able to register themselves into open courses.
-  That is, actually become a member of them.
-
 * Notify circulation of wanted items. What should it do?
 
 * set up a proper issue-tracker?
@@ -42,10 +39,8 @@
 
 > Course details -- seems a little terse -- but may be what folks use
 
-> Sequencing -- easy! Save -- maybe make a  button?  [where's my narrative?]
-
 > Notify circulation of wanted items -- FAIL
-
+ 
 > Why is staff a member of a course? is that a requirement? (proxy
 > instructor makes more sense; but how to accomplish that?).
 
@@ -69,3 +64,9 @@
 
 * save-sequence fails on IE6.
 
+* People should be able to register themselves into open courses.
+  That is, actually become a member of them.
+
+> Sequencing -- easy! Save -- maybe make a  button?  [where's my narrative?]
+  [I didn't make it a button, but I did add the narrative back.]
+

Modified: servres/trunk/conifer/static/menublocks.js
===================================================================
--- servres/trunk/conifer/static/menublocks.js	2009-05-04 01:17:16 UTC (rev 446)
+++ servres/trunk/conifer/static/menublocks.js	2009-05-04 01:33:07 UTC (rev 447)
@@ -59,12 +59,13 @@
     if (!resequencing)  {
 	$('.itemtree:nth(0)').sortable({axis:'y'});
 	$('.itemtree:nth(0) > .an_item').addClass('sort_item');
-	$('#resequence_panel').after($('#ropanelmessage'));
+	//$('#resequence_panel').after($('#ropanelmessage'));
+	$('#ropanelmessage').show();
 	$('#resequence_panel a').text($('#i18n-save-order').text());
 	resequencing = true;
     } else {
 	$('.an_item').removeClass('sort_item');
-	$('#ropanelmessage').remove();
+	$('#ropanelmessage').hide();
 	$('#resequence_panel a').text('...');
 	$('.itemtree').sortable('destroy');
 	resequencing = false;

Modified: servres/trunk/conifer/templates/components/course.xhtml
===================================================================
--- servres/trunk/conifer/templates/components/course.xhtml	2009-05-04 01:17:16 UTC (rev 446)
+++ servres/trunk/conifer/templates/components/course.xhtml	2009-05-04 01:33:07 UTC (rev 447)
@@ -107,13 +107,13 @@
    <div py:def="item_resequence_panel()" py:strip="True">
     <div id="resequence_panel" class="little_action_panel">
       <a href="javascript:doResequence();">Resequence items</a>
+      <div id="ropanelmessage" style="clear: right; display: none;"
+	   class="little_action_panel">Drag the items around. Then click Save Sequence, above.</div>
     </div>
     <div style="display: none;">
       <span id="i18n-save-order">Save Sequence</span>
       <span id="i18n-resequence-items">Resequence Items</span>
       <span id="i18n-new-order-saved">The new sequence has been saved.</span>
-      <div id="eropanelmessage" style="clear: right; width: 10em;"
-	   class="little_action_panel">Drag the items around. Then click Save Sequence, above.</div>
     </div>
     </div>