Index: openacs-4/packages/imsld/tcl/imsld-instance-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-instance-procs.tcl,v
diff -u -r1.13.4.3 -r1.13.4.4
--- openacs-4/packages/imsld/tcl/imsld-instance-procs.tcl	26 Jun 2007 15:57:31 -0000	1.13.4.3
+++ openacs-4/packages/imsld/tcl/imsld-instance-procs.tcl	26 Jun 2007 16:34:05 -0000	1.13.4.4
@@ -169,7 +169,7 @@
             where property_id = :property_id
 	    and identifier = :identifier
 	    and run_id = :run_id
-	    and content_revision__is_live(property_id) = 't'
+	    and content_revision__is_live(instance_id) = 't'
         }] } {
             set instance_id [imsld::item_revision_new -attributes [list [list run_id $run_id] \
 								       [list value $initial_value] \
@@ -217,7 +217,7 @@
 		and identifier = :identifier
                 and party_id = :party_id
 		and run_id = :run_id
-		and content_revision__is_live(property_id) = 't'
+		and content_revision__is_live(instance_id) = 't'
             }] } {
 		set instance_id [imsld::item_revision_new -attributes [list [list run_id $run_id] \
 									   [list value $initial_value] \
@@ -266,7 +266,7 @@
 		and identifier = :identifier
                 and party_id = :party_id
 		and run_id = :run_id
-		and content_revision__is_live(property_id) = 't'
+		and content_revision__is_live(instance_id) = 't'
             }] } {
 		
 		set instance_id [imsld::item_revision_new -attributes [list [list run_id $run_id] \
@@ -322,7 +322,7 @@
                 from imsld_property_instances
                 where identifier = :identifier
                 and party_id = :party_id
-		and content_revision__is_live(property_id) = 't'
+		and content_revision__is_live(instance_id) = 't'
             }] } {
                 # not instantiated... is it already defined (existing href)? or must we use the one of the global definition?
                 if { ![string eq $existing_href ""] } {
@@ -367,7 +367,7 @@
             select 1 
             from imsld_property_instances
             where identifier = :identifier
-	    and content_revision__is_live(property_id) = 't'
+	    and content_revision__is_live(instance_id) = 't'
         }] } {
             # not instantiated... is it already defined (existing href)? or must we use the one of the global definition?
             if { ![string eq $existing_href ""] } {
Index: openacs-4/packages/imsld/tcl/imsld-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-procs.tcl,v
diff -u -r1.95.2.3 -r1.95.2.4
--- openacs-4/packages/imsld/tcl/imsld-procs.tcl	26 Jun 2007 15:57:31 -0000	1.95.2.3
+++ openacs-4/packages/imsld/tcl/imsld-procs.tcl	26 Jun 2007 16:34:05 -0000	1.95.2.4
@@ -2496,7 +2496,7 @@
     $feedback_head_node appendChild $text
     $feedback_node appendChild $feedback_head_node
     if { [db_0or1row completed_activity { *SQL* }] } {
-        if { ![string eq "" $on_completion_item_id] && [db_0or1row is_feedback { *SQL* }] } {
+        if { ![string eq "" $on_completion_item_id] && [db_string is_feedback { *SQL* }] > 0 } {
             # the feedback is not processed to ckeck if all the activity resources have been finished
             # so we don't need to store the result
             imsld::process_feedback_as_ul -on_completion_item_id $on_completion_item_id \
Index: openacs-4/packages/imsld/tcl/imsld-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-procs.xql,v
diff -u -r1.37.4.1 -r1.37.4.2
--- openacs-4/packages/imsld/tcl/imsld-procs.xql	26 Jun 2007 15:57:31 -0000	1.37.4.1
+++ openacs-4/packages/imsld/tcl/imsld-procs.xql	26 Jun 2007 16:34:05 -0000	1.37.4.2
@@ -1672,7 +1672,7 @@
 	<fullquery name="imsld::process_learning_activity_as_ul.is_feedback">
 		<querytext>
     
-	select 1 from acs_rels where object_id_one = :on_completion_item_id and rel_type = 'imsld_feedback_rel'
+	select count(*) from acs_rels where object_id_one = :on_completion_item_id and rel_type = 'imsld_feedback_rel'
 
    		</querytext>
 	</fullquery>
Index: openacs-4/packages/imsld/tcl/imsld-runtime-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-runtime-procs.tcl,v
diff -u -r1.16.4.2 -r1.16.4.3
--- openacs-4/packages/imsld/tcl/imsld-runtime-procs.tcl	26 Jun 2007 10:27:55 -0000	1.16.4.2
+++ openacs-4/packages/imsld/tcl/imsld-runtime-procs.tcl	26 Jun 2007 16:34:05 -0000	1.16.4.3
@@ -40,7 +40,7 @@
 	imsld_properties prop
 	where ins.instance_id = :instance_id
 	and ins.property_id = prop.property_id
-	and content_revision__is_live(ins.property_id) = 't'
+	and content_revision__is_live(ins.instance_id) = 't'
     }
 
     #	db_dml update_instance_value { *SQL* }
Index: openacs-4/packages/imsld/www/properties-value-set.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/properties-value-set.tcl,v
diff -u -r1.4.4.2 -r1.4.4.3
--- openacs-4/packages/imsld/www/properties-value-set.tcl	26 Jun 2007 10:27:55 -0000	1.4.4.2
+++ openacs-4/packages/imsld/www/properties-value-set.tcl	26 Jun 2007 16:34:06 -0000	1.4.4.3
@@ -26,7 +26,7 @@
 	    imsld_properties prop
             where ins.instance_id = :instance_id
 	    and ins.property_id = prop.property_id
-	    and content_revision__is_live(ins.property_id) = 't'
+	    and content_revision__is_live(ins.instance_id) = 't'
         }
 	
 	if { [string eq "file" $datatype] } {
Index: openacs-4/packages/imsld/www/admin/imsld-admin-roles.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/imsld-admin-roles.adp,v
diff -u -r1.3.4.2 -r1.3.4.3
--- openacs-4/packages/imsld/www/admin/imsld-admin-roles.adp	14 Jun 2007 14:31:29 -0000	1.3.4.2
+++ openacs-4/packages/imsld/www/admin/imsld-admin-roles.adp	26 Jun 2007 16:34:06 -0000	1.3.4.3
@@ -2,8 +2,23 @@
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
   <property name="header_stuff">
-   <link rel="stylesheet" type="text/css" media="all" href="/resources/imsld/imsld.css">
 <style type="text/css">
+
+.one-row {
+  clear:both;
+  padding-right:20px;
+}
+.one-element {
+  float:left;
+  display:inline;
+  margin:0px;
+  padding-right:30px;
+}
+.roles-confirm {
+  float:left;
+  text-indent:-180px;
+  margin-top:40px;
+}
 ul {
   text-indent: 0px;
 }
Index: openacs-4/packages/imsld/www/admin/monitor/monitor-tree.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/monitor/monitor-tree.tcl,v
diff -u -r1.2.4.2 -r1.2.4.3
--- openacs-4/packages/imsld/www/admin/monitor/monitor-tree.tcl	26 Jun 2007 10:27:55 -0000	1.2.4.2
+++ openacs-4/packages/imsld/www/admin/monitor/monitor-tree.tcl	26 Jun 2007 16:34:06 -0000	1.2.4.3
@@ -31,7 +31,7 @@
     from imsld_property_instances
     where run_id = :run_id
     or run_id is null
-    and content_revision__is_live(property_id) = 't'
+    and content_revision__is_live(instance_id) = 't'
 }] } {
     # there is at least one property
     dom createDocument ul props_doc
Index: openacs-4/packages/imsld/www/resources/imsld.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/resources/imsld.css,v
diff -u -r1.1.2.4 -r1.1.2.5
--- openacs-4/packages/imsld/www/resources/imsld.css	25 Jun 2007 17:46:55 -0000	1.1.2.4
+++ openacs-4/packages/imsld/www/resources/imsld.css	26 Jun 2007 16:34:06 -0000	1.1.2.5
@@ -15,22 +15,6 @@
   margin-left:20px;
 }
 
-.one-row {
-  clear:both;
-  padding-right:20px;
-}
-.one-element {
-  float:left;
-  display:inline;
-  margin:0px;
-  padding-right:30px;
-}
-.roles-confirm {
-  float:left;
-  text-indent:-180px;
-  margin-top:40px;
-}
-
 a.finish {
   font-size:9px;
   font-family:Tahoma,sans-serif;