Index: openacs-4/packages/curriculum/curriculum.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/curriculum.info,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/curriculum/curriculum.info	10 Jun 2003 09:28:05 -0000	1.4
+++ openacs-4/packages/curriculum/curriculum.info	8 Jul 2003 09:46:37 -0000	1.5
@@ -15,17 +15,18 @@
         <requires url="workflow" version="0.2d2"/>
 
         <callbacks>
-            <callback type="before-uninstall"  proc="curriculum::apm::before_uninstall"/>
             <callback type="after-install"  proc="curriculum::apm::after_install"/>
-            <callback type="before-uninstantiate"  proc="curriculum::apm::before_uninstantiate"/>
             <callback type="after-instantiate"  proc="curriculum::apm::after_instantiate"/>
+            <callback type="before-uninstall"  proc="curriculum::apm::before_uninstall"/>
+            <callback type="before-uninstantiate"  proc="curriculum::apm::before_uninstantiate"/>
         </callbacks>
         <parameters>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="AutomaticBarActivationP"  default="1" description="Should the bar be automatically turned on if ther is no current cookie available?"/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="AutomaticBarActivationP"  default="1" description="Should the bar be automatically turned on if there is no current cookie available?"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="BarDirection"  default="horizontal" description="The direction that the bar should have. Options are &quot;horizontal&quot; or &quot;vertical&quot;."/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="DescTruncLength"  default="200" description="The number of characters at which the description text is cut off."/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="ExternalSiteBarPosition"  default="bottom" description="The position you want the bar to have when a subsite- or server-external element has been clicked (external pages use HTML frames in order to retain the original bar). Available options are: &quot;top&quot; or &quot;bottom&quot; if the direction is horizontal, and &quot;left&quot; or &quot;right&quot; if it is vertical."/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="ExternalSiteBarPosition"  default="top" description="The position you want the bar to have when a subsite- or server-external element has been clicked (external pages use HTML frames in order to retain the original bar). Available options are: &quot;top&quot; or &quot;bottom&quot; if the direction is horizontal, and &quot;left&quot; or &quot;right&quot; if it is vertical."/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="ShowCurriculumBarP"  default="1" description="Decides whether or not the curriculum bar should be displayed in this package instance. 1 for &quot;yes&quot;, 0 for &quot;no&quot;."/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="StateTabsP"  default="1" description="Do you want to use the workflow state tabs on the admin page? 1 for yes and 0 for no."/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="UrlPatternsToFilter"  default="*" description="A space separated list of URL patterns defining what parts of the subsite that should work with the curriculum bar. Defaults to &quot;*&quot; which means every URL will run the filter proc in question."/>
         </parameters>
 
Index: openacs-4/packages/curriculum/lib/admin-curriculums-tab.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/lib/admin-curriculums-tab.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum/lib/admin-curriculums-tab.adp	13 Jun 2003 11:44:33 -0000	1.1
+++ openacs-4/packages/curriculum/lib/admin-curriculums-tab.adp	8 Jul 2003 09:46:37 -0000	1.2
@@ -1,3 +1,5 @@
+<if @tabs_p@>
+
 <table width="0">
   <tr>
     <td>
@@ -7,3 +9,10 @@
 </table>
 
 <include src="admin-curriculums" state_id="@states.tab@" workflow_id="@workflow_id@" \>
+
+</if>
+<else>
+
+<include src="admin-curriculums" state_id="any" workflow_id="@workflow_id@" \>
+
+</else>
\ No newline at end of file
Index: openacs-4/packages/curriculum/lib/admin-curriculums-tab.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/lib/admin-curriculums-tab.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum/lib/admin-curriculums-tab.tcl	13 Jun 2003 11:44:33 -0000	1.1
+++ openacs-4/packages/curriculum/lib/admin-curriculums-tab.tcl	8 Jul 2003 09:46:37 -0000	1.2
@@ -15,18 +15,24 @@
 set title "Curriculum"
 set context {}
 
-# Create the tab strip that filters curriculums by workflow state.
-template::tabstrip create states -base_url [ad_conn url]
+set package_id [curriculum::conn package_id]
 
 # Workflow.
-set workflow_id [curriculum::get_instance_workflow_id]
+set workflow_id [curriculum::get_instance_workflow_id -package_id $package_id]    
 
-array set state_data [workflow::state::fsm::get_all_info -workflow_id $workflow_id]
+if { [set tabs_p [parameter::get -package_id $package_id -parameter StateTabsP -default 1]] } {
 
-foreach state_id $state_data(state_ids) {
-    array set state $state_data($state_id)
-    template::tabstrip add_tab states $state(state_id) $state(pretty_name) $state(short_name)
+    # Create the tab strip that filters curriculums by workflow state.
+    template::tabstrip create states -base_url [ad_conn url]
+    
+    array set state_data [workflow::state::fsm::get_all_info -workflow_id $workflow_id]
+    
+    foreach state_id $state_data(state_ids) {
+	array set state $state_data($state_id)
+	template::tabstrip add_tab states $state(state_id) $state(pretty_name) $state(short_name)
+    }
+    template::tabstrip add_tab states any "Any" any
+    
 }
-template::tabstrip add_tab states any "Any" any
 
 ad_return_template
Index: openacs-4/packages/curriculum/lib/admin-curriculums.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/lib/admin-curriculums.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/curriculum/lib/admin-curriculums.adp	3 Jul 2003 11:06:18 -0000	1.10
+++ openacs-4/packages/curriculum/lib/admin-curriculums.adp	8 Jul 2003 09:46:37 -0000	1.11
@@ -1,15 +1,15 @@
 <p>
   [
-  <a href="/admin/site-map/parameter-set?@export_vars@">Package parameters</a>
+  <a href="/admin/site-map/parameter-set?@export_vars@" title="Set site-wide preferences for this Curriculum instance">Package parameters</a>
   |
-  <a href="/permissions/one?object%5fid=@package_id@">Package permissions</a>
+  <a href="/permissions/one?object%5fid=@package_id@" title="Administer user privileges for this Curriculum instance">Package permissions</a>
   |
-  <a href="../doc/user.html#TEACHER">Help</a>
+  <a href="../doc/user.html#TEACHER" title="Read the user manual for this page">Help</a>
   ]
 </p>
 <if @curriculums:rowcount@ ne 0>
 <p align="right">
-  <a href="thorough-flush">I'm done now, update the bar for everyone! (Use sparingly)</a>
+  <a href="thorough-flush" title="Update the toolbar for every user (Use sparingly)">I'm done now, update the bar for everyone</a>
 </p>
 <table border="0" width="100%">
   <tr bgcolor="#cccccc" border="0" cellpadding="0" cellspacing="0" width="100%">
@@ -32,7 +32,7 @@
 <table bgcolor="#cccccc" border="0" cellpadding="1" cellspacing="0" width="100%">
   <tr>
     <td width="20%">
-      <a href="curriculum-ave?@curriculums.curriculum_id_export@">@curriculums.curriculum_name;noquote@</a>
+      <a href="curriculum-ave?@curriculums.curriculum_id_export@" title="Administer this curriculum">@curriculums.curriculum_name;noquote@</a>
     </td>
     <td width="50%">
       @curriculums.curriculum_desc;noquote@
@@ -46,9 +46,8 @@
     </td>
     <td width="15%">
       <a href="@notification_url@" title="@notification_title@">@notification_label@</a>
-      <a href="curriculum-delete?@curriculums.curriculum_id_export@" onclick="return confirm('Are you sure you want to delete this curriculum?');" title="Delete">
-        <img src="/shared/images/Delete16.gif" border="0" width="16" height="16">
-      </a>
+      |
+      <a href="curriculum-delete?@curriculums.curriculum_id_export@" onclick="return confirm('Are you sure you want to delete this curriculum?');" title="Delete this curriculum and all of its data">Delete</a>
     </td>
     <td width="5%">
     <if @curriculums.rownum@ gt 1>
@@ -71,9 +70,9 @@
   <group column="curriculum_id">
   <if @curriculums.groupnum@ even><tr bgcolor="#eeeedd"></if><else><tr bgcolor="#eeeeee"></else>
     <td width="20%">
-      <li>
-        <a href="element-ave?@curriculums.curriculum_id_export@&@curriculums.element_id_export@">@curriculums.element_name;noquote@</a>
-      </li>
+      &nbsp;
+      &raquo;
+        <a href="element-ave?@curriculums.curriculum_id_export@&@curriculums.element_id_export@" title="Administer this element">@curriculums.element_name;noquote@</a>
     </td>
     <td width="50%">
       @curriculums.element_desc;noquote@
@@ -87,16 +86,15 @@
       Enabled
     </td>
     <td width="15%">
-      <a href="element-disable?@curriculums.element_id_export@">Disable</a>
+      <a href="element-disable?@curriculums.element_id_export@" title="Deactivate this element">Disable</a>
     </if>
     <else>
       Disabled
     </td>
     <td width="15%">
-      <a href="element-enable?@curriculums.element_id_export@">Enable</a>
-      <a href="element-delete?@curriculums.element_id_export@" onclick="return confirm('Are you sure you want to delete this element?');" title="Delete">
-        <img src="/shared/images/Delete16.gif" border="0" width="16" height="16">
-      </a>
+      <a href="element-enable?@curriculums.element_id_export@" title="Activate this element">Enable</a>
+      |
+      <a href="element-delete?@curriculums.element_id_export@" onclick="return confirm('Are you sure you want to delete this element?');" title="Delete this element and all of its data">Delete</a>
     </else>
     </td>
     <td width="20%">
@@ -125,7 +123,7 @@
   <tr>
     <td bgcolor="beige" colspan="5">
       <li type="square">
-        <a href="element-ave?@curriculums.curriculum_id_export@">Add an element</a>
+        <a href="element-ave?@curriculums.curriculum_id_export@" title="Create a new element">Add an element</a>
       </li>
     </td>
   </tr>
@@ -142,7 +140,7 @@
 <br />
 </else>
 <li type="square">
-  <a href="curriculum-ave">Add a curriculum</a>
+  <a href="curriculum-ave" title="Create a new curriculum">Add a curriculum</a>
 </li>
 <br />
 </table>
Index: openacs-4/packages/curriculum/lib/bar-horizontal.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/lib/bar-horizontal.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/curriculum/lib/bar-horizontal.adp	2 Jul 2003 16:22:27 -0000	1.4
+++ openacs-4/packages/curriculum/lib/bar-horizontal.adp	8 Jul 2003 09:46:37 -0000	1.5
@@ -43,7 +43,7 @@
 
     </td>
     <th nowrap>
-      <a href="@package_url@start-over?curriculum_id=@elements.curriculum_id@&@return_url_export@"><img src="@package_url@graphics/refresh.jpg" border="0" width="13" height="14" alt="Refresh" title="Refresh"></a>
+      <a href="@package_url@start-over?curriculum_id=@elements.curriculum_id@&@return_url_export@"><img src="@package_url@graphics/reset.jpg" border="0" width="13" height="14" alt="Reset" title="Reset"></a>
       <if @logged_in_p@>
       <a href="@package_url@remove-from-bar?curriculum_id=@elements.curriculum_id@&@return_url_export@">
         <img src="@package_url@graphics/remove.jpg" border="0" width="15" height="13" alt="X" title="Remove">
Index: openacs-4/packages/curriculum/lib/bar-vertical.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/lib/bar-vertical.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/curriculum/lib/bar-vertical.adp	2 Jul 2003 16:22:27 -0000	1.4
+++ openacs-4/packages/curriculum/lib/bar-vertical.adp	8 Jul 2003 09:46:37 -0000	1.5
@@ -45,7 +45,7 @@
   </tr>
   <tr>
     <th nowrap">
-      <a href="@package_url@start-over?curriculum_id=@elements.curriculum_id@&@return_url_export@"><img src="@package_url@graphics/refresh.jpg" border="0" width="13" height="14" alt="Refresh" title="Refresh"></a>
+      <a href="@package_url@start-over?curriculum_id=@elements.curriculum_id@&@return_url_export@"><img src="@package_url@graphics/reset.jpg" border="0" width="13" height="14" alt="Reset" title="Reset"></a>
       <if @logged_in_p@>
       <a href="@package_url@remove-from-bar?curriculum_id=@elements.curriculum_id@&@return_url_export@">
         <img src="@package_url@graphics/remove.jpg" border="0" width="15" height="13" alt="X" title="Remove">
Index: openacs-4/packages/curriculum/lib/user-curriculums.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/lib/user-curriculums.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/curriculum/lib/user-curriculums.adp	3 Jul 2003 11:06:18 -0000	1.10
+++ openacs-4/packages/curriculum/lib/user-curriculums.adp	8 Jul 2003 09:46:37 -0000	1.11
@@ -1,13 +1,13 @@
 <if @elements:rowcount@ not nil>
 <p>
   [
-  <a href="@url@start-over?@return_url_export@">Refresh all curriculums</a>
+  <a href="@url@start-over?@return_url_export@" title="Uncheck the visited elements in all curriculums">Reset all curriculums</a>
 <if @logged_in_p@>
   |
-  <a href="@url@remove-from-bar?@return_url_export@">Remove all curriculums</a>
+  <a href="@url@remove-from-bar?@return_url_export@" title="Stop displaying the curriculum toolbar">Remove all curriculums</a>
 </if>
   |
-  <a href="doc/user.html#STUDENT">Help</a>
+  <a href="doc/user.html#STUDENT" title="Read the user manual for this page">Help</a>
   ]
 </p>
 <table border="0" width="100%">
@@ -38,19 +38,19 @@
     </td>
     <td width="15%">
       <if @elements.completed_p@>
-        <a href="@url@add-to-bar?curriculum_id=@elements.curriculum_id@&refresh_p=1&@return_url_export@">Retake</a>
+        <a href="@url@add-to-bar?curriculum_id=@elements.curriculum_id@&refresh_p=1&@return_url_export@" title="Add the removed curriculum to the toolbar">Retake</a>
       </if>
       <else>
-        <a href="@url@add-to-bar?curriculum_id=@elements.curriculum_id@&@return_url_export@">Resume</a>
+        <a href="@url@add-to-bar?curriculum_id=@elements.curriculum_id@&@return_url_export@" title="Add the dropped curriculum to the toolbar">Resume</a>
       </else>
       </if>
       <else>
         <if @elements.completed_p@>Completed</if><else>Ongoing</else>
     </td>
     <td width="15%">
-        <a href="@url@start-over?curriculum_id=@elements.curriculum_id@&@return_url_export@">Refresh</a>
+        <a href="@url@start-over?curriculum_id=@elements.curriculum_id@&@return_url_export@" title="Uncheck the visited elements">Reset</a>
         |
-        <a href="@url@remove-from-bar?curriculum_id=@elements.curriculum_id@&@return_url_export@">
+        <a href="@url@remove-from-bar?curriculum_id=@elements.curriculum_id@&@return_url_export@" title="Remove the curriculum from the toolbar">
           <if @elements.completed_p@>Remove</if><else>Drop</else>
         </a>
       </else>
@@ -59,7 +59,7 @@
       <if @elements.completed_p@>Completed</if><else>Ongoing</else>
     </td>
     <td width="15%">
-      <a href="@url@start-over?curriculum_id=@elements.curriculum_id@&@return_url_export@">Refresh</a>
+      <a href="@url@start-over?curriculum_id=@elements.curriculum_id@&@return_url_export@" title="Uncheck the visited elements">Reset</a>
     </else>
     </td>
   </tr>
@@ -71,9 +71,9 @@
   <group column="curriculum_id">
   <if @elements.groupnum@ even><tr bgcolor="#eeeedd"></if><else><tr bgcolor="#eeeeee"></else>
     <td>
-      <li>
-        <a href="@url@element-ave?curriculum_id=@elements.curriculum_id@&element_id=@elements.element_id@" title="Detailed information">@elements.element_name;noquote@</a>
-      </li>
+      &nbsp;
+      &raquo;
+      <a href="@url@element-ave?curriculum_id=@elements.curriculum_id@&element_id=@elements.element_id@" title="Detailed information">@elements.element_name;noquote@</a>
     </td>
     <td width="50%">@elements.element_desc;noquote@
       <if @elements.elem_desc_trunc_p@>
@@ -87,18 +87,18 @@
     </td>
     <td width="15%">
       <if @elements.external_p@>
-        <a href="@url@ext?curriculum_id=@elements.curriculum_id@&element_id=@elements.element_id@&position=@position@">
+        <a href="@url@ext?curriculum_id=@elements.curriculum_id@&element_id=@elements.element_id@&position=@position@" title="Visit this element again">
       </if>
-      <else><a href="@elements.url@"></else>Revisit</a>
+      <else><a href="@elements.url@" title="Visit this element again"></else>Revisit</a>
     </if>
     <else>
       Unvisited
     </td>
     <td width="15%">
       <if @elements.external_p@>
-        <a href="@url@ext?curriculum_id=@elements.curriculum_id@&element_id=@elements.element_id@&position=@position@">
+        <a href="@url@ext?curriculum_id=@elements.curriculum_id@&element_id=@elements.element_id@&position=@position@" title="Visit this element">
       </if>
-      <else><a href="@elements.url@"></else>Visit</a>
+      <else><a href="@elements.url@" title="Visit this element"></else>Visit</a>
     </else>
     </td>
   </tr>
Index: openacs-4/packages/curriculum/tcl/curriculum-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/tcl/curriculum-procs.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/curriculum/tcl/curriculum-procs.tcl	4 Jul 2003 19:15:33 -0000	1.8
+++ openacs-4/packages/curriculum/tcl/curriculum-procs.tcl	8 Jul 2003 09:46:37 -0000	1.9
@@ -306,7 +306,7 @@
             }
             states {
                 authored {
-                    pretty_name "Created"
+                    pretty_name "Pending"
                     hide_fields {}
                 }
                 edited {
Index: openacs-4/packages/curriculum/www/graphics/reset.jpg
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/www/graphics/reset.jpg,v
diff -u
Binary files differ