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 -r1.12 -r1.13
--- openacs-4/packages/imsld/catalog/imsld.en_US.ISO-8859-1.xml	1 Feb 2006 12:31:32 -0000	1.12
+++ openacs-4/packages/imsld/catalog/imsld.en_US.ISO-8859-1.xml	1 Feb 2006 15:20:47 -0000	1.13
@@ -16,6 +16,7 @@
   <msg key="Create_New">Create New?</msg>
   <msg key="Creating_new_IMS-LD">Creating new IMS-LD...</msg>
   <msg key="Data_Type">Data Type</msg>
+  <msg key="Delete_IMS_LD">Delete IMS LD</msg>
   <msg key="Else_Identifier">Else Identifier</msg>
   <msg key="Error_parsing_file">Error parsing file</msg>
   <msg key="Existing_href">Existing href</msg>
@@ -77,6 +78,7 @@
   <msg key="IMS-LD_Time_Limits">IMS-LD Time Limits</msg>
   <msg key="IMS-LD_ZIP_File">IMS-LD ZIP File</msg>
   <msg key="IMS-LDs">IMS-LDs</msg>
+  <msg key="IMS_LD_Name">IMS LD Name</msg>
   <msg key="Initial_Value">Initial Value</msg>
   <msg key="Is_shared">Is shared?</msg>
   <msg key="Is_Visible">Is Visible?</msg>
@@ -101,10 +103,12 @@
   <msg key="lt_Email_Propery_Identif">Email Propery Identifier</msg>
   <msg key="lt_Environment_Identifie">Environment Identifier</msg>
   <msg key="lt_Error_creating_folder">Error creating folder</msg>
+  <msg key="lt_Error_deleting_IMS_LD">Error deleting IMS LD</msg>
   <msg key="lt_Error_parsing_manifes">Error parsing manifest.</msg>
   <msg key="lt_Expression_Identifier">Expression Identifier</msg>
   <msg key="lt_Expression_One_Identi">Expression One Identifier</msg>
   <msg key="lt_Expression_Two_Identi">Expression Two Identifer</msg>
+  <msg key="lt_Import_IMS-LD_ZIP_Fil">Import IMS-LD ZIP File</msg>
   <msg key="lt_IMS-LD_Activity_Descr">IMS-LD Activity Description</msg>
   <msg key="lt_IMS-LD_Activity_Descr_1">IMS-LD Activity Descriptions</msg>
   <msg key="lt_IMS-LD_Activity_Struc">IMS-LD Activity Structure</msg>
@@ -202,6 +206,7 @@
   <msg key="lt_There_must_be_exactly">There must be exactly %multiplicity% %element_name% and there are %tree_length%. This is not supported, sorry.</msg>
   <msg key="lt_There_was_an_error_cr">There was an error creating the folder. Aborting.</msg>
   <msg key="lt_There_was_an_error_cr_1">There was an error creating the tmp_dir to unzip the file.</msg>
+  <msg key="lt_There_was_an_error_de">There was an error deleting the IMS LD $imsld_id. This is the error: &lt;pre&gt;%errmsg%&lt;/pre&gt;</msg>
   <msg key="lt_There_was_an_error_ge">There was an error generating the tmp_dir to unzip the file.</msg>
   <msg key="lt_There_was_an_error_pa">There was an error parsing the manifest. Please correct it and try again. &lt;br /&gt;&lt;code&gt;%errmsg%&lt;/code&gt;</msg>
   <msg key="lt_There_was_an_error_tr">There was an error trying to delete the dir %dir%.</msg>
@@ -217,6 +222,7 @@
   <msg key="lt_When_Last_Act_Complet">When Last Act Completed?</msg>
   <msg key="lt_When_Property_Value_i">When Property Value is Set Identifier</msg>
   <msg key="Mail_Data">Mail Data</msg>
+  <msg key="Make_it_live">Make it live</msg>
   <msg key="Manager_Identifier">Manager Identifier</msg>
   <msg key="Manifest_Identifier">Manifest Identifier</msg>
   <msg key="Match_Persons">Match Persons?</msg>
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.22 -r1.23
--- openacs-4/packages/imsld/tcl/imsld-procs.tcl	1 Feb 2006 12:31:32 -0000	1.22
+++ openacs-4/packages/imsld/tcl/imsld-procs.tcl	1 Feb 2006 15:20:47 -0000	1.23
@@ -1628,7 +1628,8 @@
     }
     set files_urls ""
 
-    if { [string eq $resource_type "forum"] || [string eq $resource_type "imsqti_xmlv1p0"] || [string eq $resource_type "imsqti_xmlv1p1"] || [string eq $resource_type "imsqti_item_xmlv2p0"] } {
+    if { ![string eq $resource_type "webcontent"] } {
+###[string eq $resource_type "imsqti_xmlv1p0"] || [string eq $resource_type "imsqti_xmlv1p1"] || [string eq $resource_type "imsqti_item_xmlv2p0"]
         if { [db_0or1row is_cr_item {
             select live_revision from cr_items where item_id = :acs_object_id
         }] } {
@@ -1645,9 +1646,9 @@
         set file_url [acs_sc::invoke -contract FtsContentProvider -operation url -impl $object_type -call_args [list $acs_object_id]]
         set image_path [imsld::object_type_image_path -object_type $object_type]
         append files_urls "<a href=[export_vars -base imsld/imsld-finish-resource {file_url $file_url resource_item_id $resource_item_id}] target=\"_blank\"><img src=\"$image_path\" border=0 alt=\"$object_title\"></a> "
-    }
+    } else {
 
-    if { [string eq $resource_type "webcontent"] || [string eq $files_urls ""] } {
+###[string eq $resource_type "webcontent"] || [string eq $files_urls ""]
         # Get file-storage root folder_id
         set fs_package_id [site_node_apm_integration::get_child_package_id \
                                -package_id [dotlrn_community::get_package_id $community_id] \
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/imsld/www/admin/imsld-delete-2.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/imsld/www/admin/imsld-delete-2.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/imsld/www/admin/imsld-delete.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/imsld/www/admin/imsld-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/imsld-delete.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/imsld/www/admin/imsld-delete.tcl	25 Nov 2005 14:45:23 -0000	1.1
+++ openacs-4/packages/imsld/www/admin/imsld-delete.tcl	1 Feb 2006 15:20:47 -0000	1.2
@@ -1,30 +1,28 @@
 # /packages/imsld/www/admin/imsld-delete.tcl
 
 ad_page_contract {
-
-	Deletes a imsld after confirmation
-
-    @author jopez@inv.it.uc3m.es
+    Deletes imsld
+    
+    @author jopez@galileo.edu
     @creation-date Nov 2005
     @cvs-id $Id$
-
 } {
-	imsld_id:integer,notnull
-	{return_url "index"}
-}
+    imsld_id:integer,notnull
+    return_url
+} 
 
-set user_id [ad_conn user_id]
-
-set page_title "Delete IMS LD"
-
-set context [list [list "index" "Admin IMS LD"] "Delete IMS LD"]
-
-db_1row get_grade_info {
-    select title as imsld_title
-    from imsld_imsldsi
-	where imsld_id = :imsld_id
+db_transaction {
+    
+    db_dml delete_imsld {
+        update cr_items 
+        set live_revision = NULL
+        where item_id = (select item_id from cr_items where live_revision = :imsld_id)
+    }
+} on_error {
+    ad_return_error "[_ imsld.lt_Error_deleting_IMS_LD]" "[_ imsld.lt_There_was_an_error_de]"
+    ad_script_abort
 }
 
-set export_vars [export_form_vars imsld_id return_url]
+db_release_unused_handles
 
-ad_return_template
+ad_returnredirect $return_url
Index: openacs-4/packages/imsld/www/admin/imsld-delete.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/imsld-delete.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/imsld/www/admin/imsld-delete.xql	1 Feb 2006 11:38:23 -0000	1.1
+++ openacs-4/packages/imsld/www/admin/imsld-delete.xql	1 Feb 2006 15:20:47 -0000	1.2
@@ -3,12 +3,14 @@
 
 
 
-	<fullquery name="get_grade_info">
+	<fullquery name="delete_imsld">
 		<querytext>
-    select title as imsld_title
-    from imsld_imsldsi
-	where imsld_id = :imsld_id
+            update cr_items 
+            set live_revision = NULL
+            where item_id = (select item_id from cr_items where live_revision = :imsld_id)
+        
 		</querytext>
 	</fullquery>
+
 </queryset>
 
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 -r1.3 -r1.4
--- openacs-4/packages/imsld/www/admin/index.tcl	12 Dec 2005 15:50:38 -0000	1.3
+++ openacs-4/packages/imsld/www/admin/index.tcl	1 Feb 2006 15:20:47 -0000	1.4
@@ -28,7 +28,7 @@
 # form to upload an IMS LD ZIP file
 
 ad_form -name upload_file_form -html {enctype multipart/form-data} -cancel_url $return_url -action imsld-new -form {
-    {upload_file:file {label "Import IMS-LD ZIP File"}}
+    {upload_file:file {label "[_ imsld.lt_Import_IMS-LD_ZIP_Fil]"}}
     {return_url:text {widget hidden} {value $return_url}}
     {manifest_id:integer {widget hidden} {value $manifest_id}}
 } 
@@ -40,15 +40,15 @@
     -key imsld_id \
     -elements {
         imsld_title {
-            label "IMS LD Name"
+            label "[_ imsld.IMS_LD_Name]"
             orderby_asc {imsld_title asc}
             orderby_desc {imsld_title desc}
         }
         delete {
             label {}
             sub_class narrow
             display_template {@imslds.delete_template;noquote@} 
-            link_html { title "Delete IMS LD" }
+            link_html { title "[_ imsld.Delete_IMS_LD]" }
         }
     }
 
@@ -77,7 +77,7 @@
     and cr3.item_id = imsld.item_id
 } {
     if { [empty_string_p $live_revision] } {
-        set delete_template "<span style=\"font-style: italic; color: red; font-size: 9pt;\">Deleted</span> <a href=[export_vars -base "index" { {set_imsld_id_live $item_id} }]>Make it live</a>"
+        set delete_template "<span style=\"font-style: italic; color: red; font-size: 9pt;\">Deleted</span> <a href=[export_vars -base "index" { {set_imsld_id_live $item_id} }]>[_ imsld.Make_it_live]</a>"
     } else {
         set delete_template "<a href=\"[export_vars -base "imsld-delete" { imsld_id return_url }]\"><img src=\"/resources/acs-subsite/Delete16.gif\" width=\"16\" height=\"16\" border=\"0\"></a>"
     }
Index: openacs-4/packages/imsld/www/resources/lors.png
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/resources/lors.png,v
diff -u
Binary files differ