Index: openacs-4/packages/imsld/catalog/imsld.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/catalog/imsld.en_US.ISO-8859-1.xml,v
diff -u -N -r1.44 -r1.44.2.1
--- openacs-4/packages/imsld/catalog/imsld.en_US.ISO-8859-1.xml	6 Jul 2009 12:42:46 -0000	1.44
+++ openacs-4/packages/imsld/catalog/imsld.en_US.ISO-8859-1.xml	28 Jul 2009 19:52:33 -0000	1.44.2.1
@@ -53,11 +53,22 @@
   <msg key="Existing_href">Existing href</msg>
   <msg key="Exit">Exit UoL</msg>
   <msg key="Exit_Cockpit">Exit Cockpit</msg>
+  <msg key="export_files">Files</msg>
+  <msg key="export_heading">Export UoL</msg>
+  <msg key="export_intro">You are about to export an UoL. Check all associated resources before exporting it or</msg>
+  <msg key="export_no">No</msg>
+  <msg key="export_repository">Repository</msg>
+  <msg key="export_resources_question">Export files not associated to resources?</msg>
+  <msg key="export_uol_name">UoL Name</msg>
+  <msg key="export_warning_msg1">Not associated to any resource</msg>
+  <msg key="export_warnings">Warnings</msg>
+  <msg key="export_yes">Yes</msg>
   <msg key="Expression">Expression</msg>
   <msg key="Extra_Activities">Extra Activities</msg>
-  <msg key="Feedback_Title">Feedback Title</msg>
   <msg key="Feedback">Feedback</msg>
+  <msg key="Feedback_Title">Feedback Title</msg>
   <msg key="File_name">File name</msg>
+  <msg key="Finish">Finish</msg>
   <msg key="finish">(finish)</msg>
   <msg key="finish_activity">finish activity</msg>
   <msg key="Finish_Date">Finish Date</msg>
@@ -66,6 +77,7 @@
   <msg key="Global_Properties">Global Properties</msg>
   <msg key="Go_back">Go back</msg>
   <msg key="go_back">go back</msg>
+  <msg key="Go_back_to_admin">Go back to admin</msg>
   <msg key="Go_to_UoL_page">Go to UoL page</msg>
   <msg key="Group_members">Group members</msg>
   <msg key="Group_name">Group name</msg>
@@ -77,10 +89,6 @@
   <msg key="Identifier_Reference">Identifier Reference</msg>
   <msg key="Identifierref">Identifierref</msg>
   <msg key="If_Identifier">If Identifier</msg>
-  <msg key="IMS-LD_Environment">IMS-LD Environment</msg>
-  <msg key="IMS-LD_Environments">IMS-LD Environments</msg>
-  <msg key="IMS-LD_Level">IMS LD Level</msg>
-  <msg key="IMS-LD_Title">IMS LD Title</msg>
   <msg key="IMS-LD_Act">IMS-LD Act</msg>
   <msg key="IMS-LD_Acts">IMS-LD Acts</msg>
   <msg key="IMS-LD_Class">IMS-LD Class</msg>
@@ -96,10 +104,13 @@
   <msg key="IMS-LD_CP_Manifests">IMS-LD CP Manifests</msg>
   <msg key="IMS-LD_CP_Resource">IMS-LD CP Resource</msg>
   <msg key="IMS-LD_CP_Resources">IMS-LD CP Resources</msg>
+  <msg key="IMS-LD_Environment">IMS-LD Environment</msg>
+  <msg key="IMS-LD_Environments">IMS-LD Environments</msg>
   <msg key="IMS-LD_Identifier">IMS-LD Identifier</msg>
   <msg key="IMS-LD_Intifier">IMS-LD Intifier</msg>
   <msg key="IMS-LD_Item">IMS-LD Item</msg>
   <msg key="IMS-LD_Items">IMS-LD Items</msg>
+  <msg key="IMS-LD_Level">IMS LD Level</msg>
   <msg key="IMS-LD_Method">IMS-LD Method</msg>
   <msg key="IMS-LD_Methods">IMS-LD Methods</msg>
   <msg key="IMS-LD_On_Completion">IMS-LD On Completion</msg>
@@ -118,6 +129,7 @@
   <msg key="IMS-LD_Sendmail_Data">IMS-LD Sendmail Data</msg>
   <msg key="IMS-LD_Service">IMS-LD Service</msg>
   <msg key="IMS-LD_Services">IMS-LD Services</msg>
+  <msg key="IMS-LD_Title">IMS LD Title</msg>
   <msg key="IMS-LDs">IMS-LDs</msg>
   <msg key="IMS-LDs_1">IMS Learning Designs</msg>
   <msg key="IMS_LD_Name">Unit of Learning Name</msg>
@@ -148,8 +160,8 @@
   <msg key="lt_Confirm_roles_assignm">Confirm roles assignments</msg>
   <msg key="lt_Could_not_determine_w">Could not determine with what program uncompress the file %upload_file% has. Aborting</msg>
   <msg key="lt_Couldnt_determine_if_">Couldn't determine if this is a well formed IMS-LD: %message%</msg>
-  <msg key="lt_Creating_new_IMS-L">Creating new IMS-LD</msg>
   <msg key="lt_Create_a_new_instance">Create a new instance of a role</msg>
+  <msg key="lt_Creating_new_IMS-L">Creating new IMS-LD</msg>
   <msg key="lt_Current_Unit_of_Learn">Current Unit of Learning does not allow creation of multiple instances of this role.</msg>
   <msg key="lt_Current_UoL_does_not_">Current UoL does not allow to include them in more than one subroles of the role.</msg>
   <msg key="lt_Dear_recepient_name_b">Dear %recepient_name%. &lt;br&gt; 
@@ -413,9 +425,9 @@
   <msg key="Total_Activities">Total Activities</msg>
   <msg key="Total_Roles">Parent Roles</msg>
   <msg key="Type">Type</msg>
-  <msg key="Unknown_type">Unknown type</msg>
   <msg key="units-of-learning">Learning Units</msg>
   <msg key="units-of-learning_Administration">Units of learning Administration</msg>
+  <msg key="Unknown_type">Unknown type</msg>
   <msg key="Uploading_IMS_LD">Uploading IMS LD</msg>
   <msg key="URI">URI</msg>
   <msg key="user">user</msg>
@@ -429,16 +441,4 @@
   <msg key="View_Roles">View Roles</msg>
   <msg key="waiting">waiting</msg>
   <msg key="When_Condition_True">When Condition True</msg>
-  <msg key="export_heading">Export UoL</msg>
-  <msg key="export_intro">You are about to export an UoL. Check all associated resources before exporting it or</msg>
-  <msg key="export_files">Files</msg>
-  <msg key="export_warnings">Warnings</msg>
-  <msg key="export_warning_msg1">Not associated to any resource</msg>
-  <msg key="export_uol_name">UoL Name</msg>
-  <msg key="export_repository">Repository</msg>
-  <msg key="export_resources_question">Export files not associated to resources?</msg>
-  <msg key="export_yes">Yes</msg>
-  <msg key="export_no">No</msg>
-  <msg key="Go_back_to_admin">Go back to admin</msg>
-
 </message_catalog>
Index: openacs-4/packages/imsld/catalog/imsld.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/catalog/imsld.es_ES.ISO-8859-1.xml,v
diff -u -N -r1.8 -r1.8.2.1
--- openacs-4/packages/imsld/catalog/imsld.es_ES.ISO-8859-1.xml	17 Jun 2009 08:00:01 -0000	1.8
+++ openacs-4/packages/imsld/catalog/imsld.es_ES.ISO-8859-1.xml	28 Jul 2009 19:52:33 -0000	1.8.2.1
@@ -52,11 +52,22 @@
   <msg key="Existing_href">Href existente</msg>
   <msg key="Exit">Salir de UoL</msg>
   <msg key="Exit_Cockpit">Salir de Cockpit</msg>
+  <msg key="export_files">Archivos</msg>
+  <msg key="export_heading">Exportar UoL</msg>
+  <msg key="export_intro">Usted va a exportar una UoL. Revise todos los recursos asociados a dicha UoL o</msg>
+  <msg key="export_no">No</msg>
+  <msg key="export_repository">Repositorio</msg>
+  <msg key="export_resources_question">Desea exportar archivos no asociados a recursos?</msg>
+  <msg key="export_uol_name">Nombre UoL</msg>
+  <msg key="export_warning_msg1">No asociado a recurso</msg>
+  <msg key="export_warnings">Advertencias</msg>
+  <msg key="export_yes">S�</msg>
   <msg key="Expression">Expresion</msg>
   <msg key="Extra_Activities">Actividades extra</msg>
-  <msg key="Feedback_Title">Feedback Title</msg>
   <msg key="Feedback">Realimentacion</msg>
+  <msg key="Feedback_Title">Feedback Title</msg>
   <msg key="File_name">Nombre fichero</msg>
+  <msg key="Finish">Finalizar</msg>
   <msg key="finish">(terminar)</msg>
   <msg key="finish_activity">terminar actividad</msg>
   <msg key="Finish_Date">Fecha de fin</msg>
@@ -65,6 +76,7 @@
   <msg key="Global_Properties">Propiedades globales</msg>
   <msg key="Go_back">Ir atr�s</msg>
   <msg key="go_back">ir atr�s</msg>
+  <msg key="Go_back_to_admin">Volver a administraci�n</msg>
   <msg key="Go_to_UoL_page">Ir a pagina de UoL</msg>
   <msg key="Group_members">Miembros del grupo</msg>
   <msg key="Group_name">Nombre del grupo</msg>
@@ -75,10 +87,6 @@
   <msg key="Identifier">Identificador</msg>
   <msg key="Identifier_Reference">Referencia de identificador</msg>
   <msg key="Identifierref">Identifierref</msg>
-  <msg key="IMS-LD_Environment">Entorno IMS-LD</msg>
-  <msg key="IMS-LD_Environments">Entornos IMS-LD</msg>
-  <msg key="IMS-LD_Level">Nivel IMS LD</msg>
-  <msg key="IMS-LD_Title">T�tulo IMS LD</msg>
   <msg key="IMS-LD_Act">Acto IMS-LD</msg>
   <msg key="IMS-LD_Acts">Actos IMS-LD</msg>
   <msg key="IMS-LD_Class">Clase IMS-LD</msg>
@@ -94,9 +102,12 @@
   <msg key="IMS-LD_CP_Manifests">Manifiestos CP IMS-LD</msg>
   <msg key="IMS-LD_CP_Resource">Recurso CP IMS-LD</msg>
   <msg key="IMS-LD_CP_Resources">Recursos CP IMS-LD</msg>
+  <msg key="IMS-LD_Environment">Entorno IMS-LD</msg>
+  <msg key="IMS-LD_Environments">Entornos IMS-LD</msg>
   <msg key="IMS-LD_Identifier">Identificador IMS-LD</msg>
   <msg key="IMS-LD_Item">Item IMS-LD</msg>
   <msg key="IMS-LD_Items">Items IMS-LD</msg>
+  <msg key="IMS-LD_Level">Nivel IMS LD</msg>
   <msg key="IMS-LD_Method">M�todo IMS-LD</msg>
   <msg key="IMS-LD_Methods">M�todos IMS-LD</msg>
   <msg key="IMS-LD_On_Completion">IMS-LD On Completion</msg>
@@ -115,6 +126,7 @@
   <msg key="IMS-LD_Sendmail_Data">Datos de env�o de email IMS-LD</msg>
   <msg key="IMS-LD_Service">Servicio IMS-LD</msg>
   <msg key="IMS-LD_Services">Servicios IMS-LD</msg>
+  <msg key="IMS-LD_Title">T�tulo IMS LD</msg>
   <msg key="IMS-LDs">IMS-LDs</msg>
   <msg key="IMS-LDs_1">Dise�os de aprendizaje IMS</msg>
   <msg key="IMS_LD_Name">Nombre de la unidad de aprendizaje</msg>
@@ -145,8 +157,8 @@
   <msg key="lt_Confirm_roles_assignm">Confirmar tareas de los roles</msg>
   <msg key="lt_Could_not_determine_w">No se puede determinar con que programa descomprimir el fichero %upload_file% has. Abortando</msg>
   <msg key="lt_Couldnt_determine_if_">No se puede determindar si IMS-LD est� bien formado: %message%</msg>
-  <msg key="lt_Creating_new_IMS-L">Creando nuevo IMS-LD</msg>
   <msg key="lt_Create_a_new_instance">Crear una nueva instancia de un rol</msg>
+  <msg key="lt_Creating_new_IMS-L">Creando nuevo IMS-LD</msg>
   <msg key="lt_Current_Unit_of_Learn">La unidad de aprendizaje no permite la creaci�n de multiples instancias de este rol.</msg>
   <msg key="lt_Current_UoL_does_not_">La unidad de aprendizaje no permite incluirlos en m�s de un subrol del rol.</msg>
   <msg key="lt_Dear_recepient_name_b">Estimado %recepient_name%. &lt;br&gt; 
@@ -410,8 +422,8 @@
   <msg key="Total_Activities">Total Actividades</msg>
   <msg key="Total_Roles">Roles padre</msg>
   <msg key="Type">Tipo</msg>
-  <msg key="Unknown_type">Tipo desconocido</msg>
   <msg key="units-of-learning">Unidades de Aprendizaje</msg>
+  <msg key="Unknown_type">Tipo desconocido</msg>
   <msg key="Uploading_IMS_LD">Subiendo IMS LD</msg>
   <msg key="URI">URI</msg>
   <msg key="user">usuario</msg>
@@ -425,16 +437,4 @@
   <msg key="View_Roles">Vista de roles</msg>
   <msg key="waiting">esperando</msg>
   <msg key="When_Condition_True">Cuando condici�n se cumpla</msg>
-  <msg key="export_heading">Exportar UoL</msg>
-  <msg key="export_intro">Usted va a exportar una UoL. Revise todos los recursos asociados a dicha UoL o</msg>
-  <msg key="export_files">Archivos</msg>
-  <msg key="export_warnings">Advertencias</msg>
-  <msg key="export_warning_msg1">No asociado a recurso</msg>
-  <msg key="export_uol_name">Nombre UoL</msg>
-  <msg key="export_repository">Repositorio</msg>
-  <msg key="export_resources_question">Desea exportar archivos no asociados a recursos?</msg>
-  <msg key="export_yes">S�</msg>
-  <msg key="export_no">No</msg>
-  <msg key="Go_back_to_admin">Volver a administraci�n</msg>
-
 </message_catalog>
Index: openacs-4/packages/imsld/lib/activity-tree.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/lib/activity-tree.adp,v
diff -u -N -r1.3 -r1.3.2.1
--- openacs-4/packages/imsld/lib/activity-tree.adp	23 Jun 2009 17:04:17 -0000	1.3
+++ openacs-4/packages/imsld/lib/activity-tree.adp	28 Jul 2009 19:52:33 -0000	1.3.2.1
@@ -3,20 +3,14 @@
     @imsld_title@
     <ul class="mktree">
       <multiple name="activities">
-        <li><include src="play" play_id="@activities.play_id@" />
+        <li><include src="act" act_id="@activities.act_id@" />
           <ul>
-            <group column="play_id">
-              <li><include src="act" act_id="@activities.act_id@" />
-                <ul>
-                  <group column="act_id">
-                    <include src="activity" run_id="@run_id@" type="@activities.type@"
-                      user_id="@user_id@" activity_id="@activities.activity_id@"
-                      next_activity_id_list="@next_activity_id_list@" imsld_id="@imsld_id@"
-                      play_id="@activities.play_id@" act_id="@activities.act_id@"
-                      role_part_id="@activities.role_part_id@" />
-                  </group>
-                </ul>
-              </li>
+            <group column="act_id">
+              <include src="activity" run_id="@run_id@" type="@activities.type@"
+                user_id="@user_id@" activity_id="@activities.activity_id@"
+                next_activity_id_list="@next_activity_id_list@" imsld_id="@imsld_id@"
+                play_id="@activities.play_id@" act_id="@activities.act_id@"
+                role_part_id="@activities.role_part_id@" />
             </group>
           </ul>
         </li>
Index: openacs-4/packages/imsld/lib/activity-tree.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/lib/activity-tree.tcl,v
diff -u -N -r1.2 -r1.2.2.1
--- openacs-4/packages/imsld/lib/activity-tree.tcl	23 Jun 2009 17:04:17 -0000	1.2
+++ openacs-4/packages/imsld/lib/activity-tree.tcl	28 Jul 2009 19:52:33 -0000	1.2.2.1
@@ -35,8 +35,21 @@
     set play_id [lindex $role_part_list 5]
 
     if {$type ne {structure}} {
-	multirow append activities $activity_id $type $play_id $act_id $role_part_id
+	set visible_p [db_string get_visible {
+	    select attr.is_visible_p
+	    from imsld_attribute_instances attr
+	    where attr.owner_id = :activity_id
+	    and attr.run_id = :run_id
+	    and attr.user_id = :user_id
+	    and attr.type = 'isvisible'
+	}]
+
+	if { $visible_p } {
+	    multirow append activities $activity_id $type $play_id $act_id $role_part_id
+	}
+
     } else {
+
 	set started_p [db_0or1row as_started_p { *SQL* }]
 	if { $started_p } {
 	    multirow append activities $activity_id $type $play_id $act_id $role_part_id
Index: openacs-4/packages/imsld/lib/activity-tree.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/lib/activity-tree.xql,v
diff -u -N -r1.1 -r1.1.2.1
--- openacs-4/packages/imsld/lib/activity-tree.xql	18 Feb 2009 19:01:13 -0000	1.1
+++ openacs-4/packages/imsld/lib/activity-tree.xql	28 Jul 2009 19:52:33 -0000	1.1.2.1
@@ -64,7 +64,7 @@
       and content_item__get_live_revision(coalesce(irp.learning_activity_id,irp.support_activity_id,irp.activity_structure_id))
       is not null
       order by ip.sort_order, ia.sort_order, irp.sort_order
-      
+
     </querytext>
   </fullquery>
   
Index: openacs-4/packages/imsld/lib/activity.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/lib/activity.adp,v
diff -u -N -r1.4 -r1.4.2.1
--- openacs-4/packages/imsld/lib/activity.adp	17 Jun 2009 08:00:01 -0000	1.4
+++ openacs-4/packages/imsld/lib/activity.adp	28 Jul 2009 19:52:33 -0000	1.4.2.1
@@ -46,25 +46,23 @@
   </case>
 
   <case value="structure">
-    <if @started_p@>
+    <if @started_p@ and @referenced_activities:rowcount@>
       <li class="@class@">
         <a href="@href@"
           onclick="return(loadContent('@div@'))">
           @activity_title@
         </a>
-        <if @referenced_activities:rowcount@>
-          <ul>
-            <multiple name="referenced_activities">
-              <include src="activity" run_id="@run_id@"
-                type="@referenced_activities.activity_type@" user_id="@user_id@"
-                activity_id="@referenced_activities.activity_id@"
-                next_activity_id_list="@next_activity_id_list@"
-                imsld_id="@imsld_id@" play_id="@play_id@" act_id="@act_id@"
-                role_part_id="@role_part_id@"
-                structure_item_id="@structure_item_id@" />
-            </multiple>
-          </ul>
-        </if>
+        <ul>
+          <multiple name="referenced_activities">
+            <include src="activity" run_id="@run_id@"
+              type="@referenced_activities.activity_type@" user_id="@user_id@"
+              activity_id="@referenced_activities.activity_id@"
+              next_activity_id_list="@next_activity_id_list@"
+              imsld_id="@imsld_id@" play_id="@play_id@" act_id="@act_id@"
+              role_part_id="@role_part_id@"
+              structure_item_id="@structure_item_id@" />
+          </multiple>
+        </ul>
       </li>
     </if>
   </case>
Index: openacs-4/packages/imsld/lib/activity.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/lib/activity.tcl,v
diff -u -N -r1.5 -r1.5.2.1
--- openacs-4/packages/imsld/lib/activity.tcl	27 Apr 2009 09:55:30 -0000	1.5
+++ openacs-4/packages/imsld/lib/activity.tcl	28 Jul 2009 19:52:33 -0000	1.5.2.1
@@ -123,6 +123,7 @@
 	db_1row get_activity_structure_info { *SQL* }
 	set started_p [db_0or1row as_started_p { *SQL* }]
 	set completed_p [db_0or1row as_completed_p { *SQL* }]
+
 	if { $started_p } {
 	    if { $completed_p } {
 		set href [imsld::activity_url -activity_id $structure_id -run_id $run_id -user_id $user_id]
@@ -136,10 +137,29 @@
 		set class "liOpen has_focus"
 	    }
 
-#	    set activity_item_id [content::revision::item_id -revision_id $activity_id]
+	    multirow create referenced_activities object_id_two rel_type rel_id sort_order activity_type activity_id
 
-	    db_multirow -extend {activity_id} referenced_activities struct_referenced_activities { *SQL* } {
+	    db_foreach struct_referenced_activities { *SQL* } {
+
 		set activity_id [content::item::get_live_revision -item_id $object_id_two]
+
+		if { $activity_type ne "imsld_as_as_rel" } {
+		    set visible_p [db_string get_visible {
+			select attr.is_visible_p
+			from imsld_attribute_instances attr
+			where attr.owner_id = :activity_id
+			and attr.run_id = :run_id
+			and attr.user_id = :user_id
+			and attr.type = 'isvisible'
+		    } -default 0]
+		} else {
+		    set visible_p t
+		}
+
+		if { $visible_p } {
+		    multirow append referenced_activities $object_id_two $rel_type $rel_id $sort_order $activity_type $activity_id
+		}
+		
 	    }
 
 # 	    set nested_list [imsld::generate_structure_activities_list -imsld_id $imsld_id \
Index: openacs-4/packages/imsld/lib/monitor/activity-tree.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/lib/monitor/activity-tree.adp,v
diff -u -N -r1.2 -r1.2.2.1
--- openacs-4/packages/imsld/lib/monitor/activity-tree.adp	17 Jun 2009 08:00:01 -0000	1.2
+++ openacs-4/packages/imsld/lib/monitor/activity-tree.adp	28 Jul 2009 19:52:33 -0000	1.2.2.1
@@ -4,22 +4,25 @@
     @imsld_title@
     <ul>
       <multiple name="activities">
-        <li class="liOpen"><include src="../play" play_id="@activities.play_id@" />
+        <li><include src="../act" act_id="@activities.act_id@" />
+          [
+          <a href="#no" onclick="return(editActivity(@activities.act_id@, @run_id@, 'test'))">
+            <img src="/resources/acs-subsite/Edit16.gif" alt="#imsld.Edit#" >
+          </a>
+          <a href="#no" onclick="return(loadTree('test'))">
+            <img src="/resources/acs-subsite/Delete16.gif" alt="#imsld.Delete#" >
+          </a>
+          ]
+          
           <ul>
-            <group column="play_id">
-                <li><include src="../act" act_id="@activities.act_id@" />
-                    <ul>
-                      <group column="act_id">
-                        <li id="activity_@activities.activity_id@">
-                          <include src="activity" run_id="@run_id@" type="@activities.type@"
-                            activity_id="@activities.activity_id@" imsld_id="@imsld_id@"
-                            play_id="@activities.play_id@" act_id="@activities.act_id@" />
-                        </li>
-                      </group>
-                    </ul>
-                </li>
-              </group>
-            </ul>
+            <group column="act_id">
+              <li id="activity_@activities.activity_id@">
+                <include src="activity" run_id="@run_id@" type="@activities.type@"
+                  activity_id="@activities.activity_id@" imsld_id="@imsld_id@"
+                  play_id="@activities.play_id@" act_id="@activities.act_id@" />
+              </li>
+            </group>
+          </ul>
         </li>
       </multiple>
     </ul>
Index: openacs-4/packages/imsld/tcl/imsld-parse-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-parse-procs.tcl,v
diff -u -N -r1.77 -r1.77.2.1
--- openacs-4/packages/imsld/tcl/imsld-parse-procs.tcl	1 Jul 2009 11:05:40 -0000	1.77
+++ openacs-4/packages/imsld/tcl/imsld-parse-procs.tcl	28 Jul 2009 19:52:33 -0000	1.77.2.1
@@ -1189,11 +1189,21 @@
     set identifier [imsld::parse::get_attribute -node $property_group_node -attr_name identifier]
     set title [imsld::parse::get_title -node $property_group_node -prefix imsld]
 
-    set property_group_id [imsld::item_revision_new -attributes [list [list identifier $identifier] \
-                                                                     [list component_id $component_id]] \
-                               -content_type imsld_property_group \
-                               -title $title \
-                               -parent_id $parent_id]
+    if { [db_0or1row get_group_property_id {
+	select property_group_id
+	from imsld_property_groupsi 
+	where identifier = :identifier
+	and content_revision__is_live(property_group_id) = 't' 
+	and component_id = :component_id
+    }] } {
+	return $property_group_id
+    } else {
+	set property_group_id [imsld::item_revision_new -attributes [list [list identifier $identifier] \
+									 [list component_id $component_id]] \
+				   -content_type imsld_property_group \
+				   -title $title \
+				   -parent_id $parent_id]
+    }
 
     set property_refs [$property_group_node selectNodes "*\[local-name()='property-ref'\]"]
     foreach property $property_refs {
@@ -1217,9 +1227,9 @@
         set ref [imsld::parse::get_attribute -node $property_group -attr_name ref]
         if { ![db_0or1row get_group_property_id {
             select item_id as group_property_item_id 
-            from imsld_propertiesi 
+            from imsld_property_groupsi 
             where identifier = :ref 
-            and content_revision__is_live(property_id) = 't' 
+            and content_revision__is_live(property_group_id) = 't' 
             and component_id = :component_id
         }] } {
             # there is no propety group with that identifier. search in the rest of non-created property-groups
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 -N -r1.117 -r1.117.2.1
--- openacs-4/packages/imsld/tcl/imsld-procs.tcl	17 Jun 2009 08:00:01 -0000	1.117
+++ openacs-4/packages/imsld/tcl/imsld-procs.tcl	28 Jul 2009 19:52:33 -0000	1.117.2.1
@@ -2134,6 +2134,7 @@
                 set file_url [export_vars -base "[dotlrn_community::get_community_url [dotlrn_community::get_community_id]]imsld/monitor-frame" { monitor_id role_id}]
                 $a_node setAttribute href [export_vars -base "[lindex [site_node::get_url_from_object_id -object_id $imsld_package_id] 0]imsld-finish-resource" {file_url $file_url resource_item_id $resource_item_id run_id $run_id}]
                 set service_title [$dom_doc createTextNode "$monitor_service_title"]
+		$a_node setAttribute onclick "return loadContent(this.href)"
                 $a_node appendChild $service_title
                 $monitor_node_li appendChild $a_node
                 $dom_node appendChild $monitor_node_li
@@ -2213,13 +2214,13 @@
                                                   -run_id $run_id \
                                                   -dom_node $environment_node \
                                                   -dom_doc $dom_doc \
-						  -li_mode]
+						  -li_mode -no_title]
 
                 # in order to behave like CopperCore, we decide to replace the images with the learning object title
                 set img_nodes [$environment_node selectNodes {.//img}]
                 foreach img_node $img_nodes {
                     set parent_node [$img_node parentNode]
-                    set lo_title_node [$dom_doc createTextNode "$lo_title: "]
+                    set lo_title_node [$dom_doc createTextNode "$lo_title"]
                     $parent_node replaceChild $lo_title_node $img_node 
                 }
                 if { ![string eq "" $one_learning_object_list] } {
@@ -2466,6 +2467,7 @@
     -dom_doc
     -li_mode:boolean
     -monitor:boolean
+    -no_title:boolean
     -plain:boolean
     {-user_id ""}} {
     @param resource_item_id
@@ -2513,7 +2515,9 @@
             set file_node [$dom_doc createElement li]
             $file_node appendChild $a_node
             $dom_node appendChild $file_node
-	    $a_node appendChild [$dom_doc createTextNode $object_title]
+	    if { !$no_title_p} {
+		$a_node appendChild [$dom_doc createTextNode $object_title]
+	    }
 	    if { $monitor_p } {
 		set choose_node [$dom_doc createElement a]
 		$choose_node appendChild [$dom_doc createTextNode "Choose"]
@@ -2571,7 +2575,9 @@
                 set file_node [$dom_doc createElement li]
                 $file_node appendChild $a_node
                 $dom_node appendChild $file_node
-		$a_node appendChild [$dom_doc createTextNode $file_name]
+		if { !$no_title_p} {
+		    $a_node appendChild [$dom_doc createTextNode $file_name]
+		}
 		if { $monitor_p } {
 		    set choose_node [$dom_doc createElement a]
 		    $choose_node appendChild [$dom_doc createTextNode "Choose"]
@@ -2628,7 +2634,9 @@
                 set file_node [$dom_doc createElement li]
                 $file_node appendChild $a_node
                 $dom_node appendChild $file_node
-		$a_node appendChild [$dom_doc createTextNode $file_name]
+		if { !$no_title_p} {
+		    $a_node appendChild [$dom_doc createTextNode $file_name]
+		}
 		if { $monitor_p } {
 		    set choose_node [$dom_doc createElement a]
 		    $choose_node appendChild [$dom_doc createTextNode "Choose"]
Index: openacs-4/packages/imsld/www/imsld-tree.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/imsld-tree.adp,v
diff -u -N -r1.20 -r1.20.2.1
--- openacs-4/packages/imsld/www/imsld-tree.adp	17 Jun 2009 08:00:01 -0000	1.20
+++ openacs-4/packages/imsld/www/imsld-tree.adp	28 Jul 2009 19:52:33 -0000	1.20.2.1
@@ -1,6 +1,6 @@
   <div class="float-left">
     <a href="@community_url@" class="button" 
-       title="#imsld.Exit#">#imsld.Exit#</a>
+       title="#imsld.Finish#">#imsld.Finish#</a>
   </div>
 
   <div class="role_menu">
Index: openacs-4/packages/imsld/www/monitor-frame.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/monitor-frame.adp,v
diff -u -N -r1.7 -r1.7.2.1
--- openacs-4/packages/imsld/www/monitor-frame.adp	17 Jun 2009 08:00:01 -0000	1.7
+++ openacs-4/packages/imsld/www/monitor-frame.adp	28 Jul 2009 19:52:33 -0000	1.7.2.1
@@ -3,8 +3,9 @@
 #imsld.Monitoring#: @monitoring_user_name@
 
 <if @users_in_role:rowcount@ gt 0>
-<form name="choose-user" action="">
-<select name="monitoring_user_id" id="users-in-role" onChange="confirmValue(this.form)">
+<form name="choose-user" action="monitor-frame">
+<select name="monitoring_user_id" id="users-in-role"
+        onChange="submitForm(this.form, 'imsld_content')">
     <option value="select">#imsld.Select#</option>
     <multiple name="users_in_role">
         <if @users_in_role.role_user_id@ eq @monitoring_user_id@>
@@ -22,42 +23,8 @@
 </if>
 
 <div class="hide">
-<a href="@monitor_service_url;noquote@" title="<# Monitor service #>"></a>
+<a id="monitor_service_url" href="@monitor_service_url;noquote@" title="<# Monitor service #>"></a>
 </div>
 
 <iframe id="object" name="object"></iframe>
 
-<script type="text/javascript">
-function resizeobject() {
-f = document.forms[0];
-o = document.getElementById('object');
-o.height = window.innerHeight - o.style.top - 50;
-o.width = window.innerWidth - o.style.left - 30;
-}
-resizeobject();
-window.onresize = resizeobject;
-
-function objecturl(url) {
-var o = document.getElementById('object');
-o.src = url;
-}
-
-</script>
-
-<script type="text/javascript">
-var as = document.getElementsByTagName("a");
-for (var i = 0; i < as.length; i++) {
-  var a = as[i];
-  a.setAttribute('target', 'object');
-}
-if (as[0].getAttribute('href') != '') {
-  document.getElementById('object').src = as[0].getAttribute('href');
-}
-</script>
-
-<script type="text/javascript">
-  if (document.forms['choose-user']) {
-    document.forms['choose-user'].elements['ok'].style.display="none";
-  }
-</script>
-
Index: openacs-4/packages/imsld/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/index.adp,v
diff -u -N -r1.5 -r1.5.2.1
--- openacs-4/packages/imsld/www/admin/index.adp	17 Apr 2008 17:17:54 -0000	1.5
+++ openacs-4/packages/imsld/www/admin/index.adp	28 Jul 2009 19:52:33 -0000	1.5.2.1
@@ -3,7 +3,7 @@
   <property name="context">@context;noquote@</property>
   <property name="header_stuff"><link rel="stylesheet" type="text/css" media="all" href="/resources/imsld/imsld.css" /></property>
 
-  <p><formtemplate id="upload_file_form"></formtemplate></p>
+  <div><formtemplate id="upload_file_form"></formtemplate></div>
 
   <h2 class="center">#imsld.IMS-LDs_1#</h2>
   <div class="centered-table"><listtemplate name="imslds"></listtemplate></div>
Index: openacs-4/packages/imsld/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/index.tcl,v
diff -u -N -r1.21 -r1.21.2.1
--- openacs-4/packages/imsld/www/admin/index.tcl	17 Jun 2009 08:00:01 -0000	1.21
+++ openacs-4/packages/imsld/www/admin/index.tcl	28 Jul 2009 19:52:33 -0000	1.21.2.1
@@ -69,14 +69,14 @@
         create_run {
             label {}
             display_template {<if @imslds.live_revision@ not nil>
-		<a href="run-new?run_imsld_id=@imslds.imsld_id@&return_url=@return_url@" title="[_ imsld.create_new_run]"> [_ imsld.create_new_run] </a>
+		<a href="run-new?run_imsld_id=@imslds.imsld_id@&amp;return_url=@return_url@" title="[_ imsld.create_new_run]"> [_ imsld.create_new_run] </a>
 		</if>} 
         }
         export {
             label {}
             sub_class narrow
             display_template {
-              <a href="imsld-export?imsld_id=@imslds.imsld_id@"><img src="/resources/imsld/export.png" title="Export" alt="Export" /></a>
+              <a href="imsld-export?imsld_id=@imslds.imsld_id@"><img src="/resources/imsld/export.png" title="Export" alt="Export" ></a>
             }
         }
         delete {
@@ -86,7 +86,7 @@
 		<span class="alert" style="display:inline;">[_ imsld.Deleted]</span> <a href="index?set_imsld_id_live=@imslds.item_id@" title="[_ imsld.Make_it_live]">[_ imsld.Make_it_live]</a>
 		</if>
 		<else>
-		<a href="imsld-delete?imsld_id=@imslds.imsld_id@&return_url=@return_url@" title="[_ imsld.Delete]"><img src="/resources/acs-subsite/Delete16.gif" width="16" height="16" border="0" alt="[_ imsld.Delete]" title="[_ imsld.Delete]"></a>
+		<a href="imsld-delete?imsld_id=@imslds.imsld_id@&amp;return_url=@return_url@" title="[_ imsld.Delete]"><img src="/resources/acs-subsite/Delete16.gif" width="16" height="16" alt="[_ imsld.Delete]" title="[_ imsld.Delete]"></a>
 		</else>} 
             link_html { title "[_ imsld.Delete_IMS_LD]" }
         }
@@ -120,7 +120,7 @@
             orderby_asc {status asc}
             orderby_desc {status desc}
             display_template {<if @imsld_runs.status@ ne "deleted">
-		<img src="@imsld_runs.image_path;noquote@" alt="@imsld_runs.image_alt@" title="@imsld_runs.image_title@" border="0" alt="[_ imsld.Status]"></a>
+		<img src="@imsld_runs.image_path;noquote@" alt="@imsld_runs.image_alt@" title="@imsld_runs.image_title@">
 	    </if>}
         }
         creation_date {
@@ -149,7 +149,7 @@
 		<span class="alert" style="display:inline;">[_ imsld.Deleted]</span> <a href="index?set_run_id_live=@imsld_runs.run_id@" title="[_ imsld.Make_it_live]">[_ imsld.Make_it_live]</a>
 		</if>
 		<else>
-		<a href="run-delete?run_id=@imsld_runs.run_id@&return_url=@return_url@" title="[_ imsld.Delete]"><img src="/resources/acs-subsite/Delete16.gif" width="16" height="16" border="0" alt="[_ imsld.Delete]" title="[_ imsld.Delete]"></a>
+		<a href="run-delete?run_id=@imsld_runs.run_id@&amp;return_url=@return_url@" title="[_ imsld.Delete]"><img src="/resources/acs-subsite/Delete16.gif" width="16" height="16" alt="[_ imsld.Delete]" title="[_ imsld.Delete]"></a>
 		</else>}
             link_html { title "[_ imsld.Delete_Run]" }
         }
Index: openacs-4/packages/imsld/www/resources/imsld.js
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/resources/imsld.js,v
diff -u -N -r1.11 -r1.11.2.1
--- openacs-4/packages/imsld/www/resources/imsld.js	17 Jun 2009 08:00:02 -0000	1.11
+++ openacs-4/packages/imsld/www/resources/imsld.js	28 Jul 2009 19:52:33 -0000	1.11.2.1
@@ -1,3 +1,4 @@
+
 function confirmValue(myform) {
   myform.submit();
 }
@@ -128,10 +129,21 @@
       if (unescape(url).match(/activity_id=|activity_item_id=/i)) {
         var env_url = url.replace(/[^\?]+/, "environment-frame");
         loadEnvironment(env_url);
-      } else {
-	if ( !(unescape(url).match(/service_id=|learning_object_id=/i))) {
-	  document.getElementById('imsld_environment').innerHTML = '';
-        }
+      } else if ( unescape(url).match(/monitor-frame/i) ) {
+	resizeobject();
+	window.onresize = resizeobject;
+	var a = document.getElementById("monitor_service_url");
+	if ( a ) {
+	  a.setAttribute('target', 'object');
+	  if (a.getAttribute('href') != '') {
+	    document.getElementById('object').src = a.getAttribute('href');
+	  }
+	}
+	if (document.forms['choose-user']) {
+	  document.forms['choose-user'].elements['ok'].style.display="none";
+	}
+      } else if ( !(unescape(url).match(/service_id=|learning_object_id=|imsld-finish-resource/i))) {
+	document.getElementById('imsld_environment').innerHTML = '';
       }
       // tabberAutomatic();
     }
@@ -279,7 +291,21 @@
 	  }
 	  convertTrees();
 	}
+        if ( unescape(url).match(/monitor-frame/i) ) {
+	  resizeobject();
+	  window.onresize = resizeobject;
+	  var a = document.getElementById("monitor_service_url");
+	  if ( a ) {
+	    a.setAttribute('target', 'object');
+	    if (a.getAttribute('href') != '') {
+	      document.getElementById('object').src = a.getAttribute('href');
+	    }
+	  }
+	  if (document.forms['choose-user']) {
+	    document.forms['choose-user'].elements['ok'].style.display="none";
+	  }
       }
+      }
     }
   }