Index: openacs-4/packages/lorsm/catalog/lorsm.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/catalog/lorsm.en_US.ISO-8859-1.xml,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/lorsm/catalog/lorsm.en_US.ISO-8859-1.xml	3 Dec 2004 17:52:47 -0000	1.2
+++ openacs-4/packages/lorsm/catalog/lorsm.en_US.ISO-8859-1.xml	21 Apr 2005 16:03:52 -0000	1.3
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="lorsm" package_version="0.5d" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="lorsm" package_version="0.6d2" locale="en_US" charset="ISO-8859-1">
 
   <msg key="_Add">Classification</msg>
   <msg key="_Add_1">Intended End User Role</msg>
@@ -97,6 +97,7 @@
   <msg key="Catalog-Entries">Catalog-Entries:</msg>
   <msg key="Catalog_1">Catalog</msg>
   <msg key="Change">Change</msg>
+  <msg key="Classic_Style">Classic Style</msg>
   <msg key="Classification_Entry">Classification Entry</msg>
   <msg key="Classification_MD">Classification MD</msg>
   <msg key="Classifications">Classifications:</msg>
@@ -111,6 +112,7 @@
   <msg key="Copyright_Info">Copyright Info</msg>
   <msg key="Cost">Cost:</msg>
   <msg key="Cost_1">Cost</msg>
+  <msg key="Course">Presentation Format:</msg>
   <msg key="course">course.</msg>
   <msg key="course_id">course_id</msg>
   <msg key="Course_Index">Course Index</msg>
@@ -123,6 +125,7 @@
   <msg key="Coverage_1">Coverage</msg>
   <msg key="Created_By">Created By:</msg>
   <msg key="Creation_Date">Creation Date</msg>
+  <msg key="Current_Format">Current Format</msg>
   <msg key="Current_Status">Current Status:</msg>
   <msg key="Date">Date:</msg>
   <msg key="Date_1">Date</msg>
@@ -435,6 +438,7 @@
   <msg key="lt_Copyrighted_Descripti">Copyrighted Description:</msg>
   <msg key="lt_Course_already_part_o">Course already part of your class</msg>
   <msg key="lt_Course_Delivery_Syste">Course Delivery System for LORS</msg>
+  <msg key="lt_Course_Presentation_S">Course Presentation Style</msg>
   <msg key="lt_Courses_in_your_Repos">Courses in your Repository</msg>
   <msg key="lt_Date_and_Time_descrip">Date and Time description</msg>
   <msg key="lt_Deleting_temporary_fo">Deleting temporary folder...</msg>
@@ -614,6 +618,7 @@
   <msg key="lt_SCORM_complaint_packa">SCORM complaint package</msg>
   <msg key="lt_Search_for_Learninng_">Search for Learninng Objects in the Repository</msg>
   <msg key="lt_Search_Learning_Objec">Search Learning Objects</msg>
+  <msg key="lt_Set_Course_Presentati">Set Course Presentation Format</msg>
   <msg key="lt_Set_Course_Track_Opti">Set Course Track Options</msg>
   <msg key="lt_Share_CourseLearning_">Share Course/Learning Object</msg>
   <msg key="lt_Shared_Courses_in_the">Shared Courses in the Repository</msg>
@@ -654,7 +659,8 @@
   <msg key="lt_Upload_an_IMSSCORM_Co">Upload an IMS/SCORM Content Package Course</msg>
   <msg key="lt_Upload_IMS_Content_Pa">Upload IMS Content Package</msg>
   <msg key="lt_Uploading_and_process">Uploading and processing your course, please wait ...</msg>
-  <msg key="lt_Use_the_Browse_button">Use the \&quot;Browse...\&quot; button to locate your file, then click \&quot;Open\&quot;</msg>
+  <msg key="lt_Use_the_Browse_button">Use the &quot;Browse...&quot; button to locate your file, then click &quot;Open&quot;</msg>
+  <msg key="lt_Use_the_Classic_Style">Use the Classic Style if your course does not provide an index by itself and you want us to provide it. Otherwise use the Without LORSM Index Style.</msg>
   <msg key="lt_valigntop_alignleftis">valign=&quot;top&quot; align=&quot;left&quot;&gt;%isscorm;noquote%</msg>
   <msg key="lt_Version_of_the_Schema">Version of the Schema. i.e.: '1.2.1'</msg>
   <msg key="lt_View_Annotation_Metad">View Annotation Metadata</msg>
@@ -675,6 +681,7 @@
   <msg key="lt_Were_sorry_but_it_app">We're sorry, but it appears that you do not have the permission to perform this operation.</msg>
   <msg key="lt_Whether_copyright_or_">Whether copyright or other restrictions apply</msg>
   <msg key="lt_Whether_use_of_the_re">Whether use of the resource requires payment</msg>
+  <msg key="lt_Without_LORSM_Index_S">Without LORSM Index Style</msg>
   <msg key="lt_You_are_about_to_add_">You are about to add %course_name% to your class.</msg>
   <msg key="lt_You_can_add_courses_a">You can add courses already existing in the repository</msg>
   <msg key="lt_You_have_seen_this_co">You have seen this course</msg>
Index: openacs-4/packages/lorsm/lib/user-lorsm.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/lib/user-lorsm.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/lorsm/lib/user-lorsm.tcl	24 Feb 2005 08:58:36 -0000	1.5
+++ openacs-4/packages/lorsm/lib/user-lorsm.tcl	21 Apr 2005 16:03:52 -0000	1.6
@@ -29,11 +29,8 @@
         course_name {
             label "[_ lorsm.Course_Name_1]"
             display_col course_name
-	    html { width 70% }
-            
-	    link_url_eval {javascript:void  window.open('[site_node::get_url_from_object_id -object_id $lorsm_instance_id]$delivery_folder/?[export_vars man_id]','lorsm','directories=0,width='+(screen.width-10)+',height='+(screen.height-77)+',status=no,toolbar=no,resizable=yes,location=no,left=0,top=0,menubar=no,scrollbars=yes');}
-
-	    
+			html { width 70% }
+            link_url_eval {[site_node::get_url_from_object_id -object_id $lorsm_instance_id]${folder_name}/?[export_vars man_id]}
             link_html {title "[_ lorsm.Access_Course]"}
         }
         subject {
@@ -69,11 +66,12 @@
            cp.folder_id,
 	   acs.creation_user,
 	   acs.creation_date,
+	   pf.folder_name,
 	   acs.context_id,
            cpmc.community_id,
            cpmc.lorsm_instance_id
 	from
-           ims_cp_manifests cp, acs_objects acs, ims_cp_manifest_class cpmc
+           ims_cp_manifests cp, acs_objects acs, ims_cp_manifest_class cpmc, lorsm_course_presentation_formats pf
 	where 
            cp.man_id = acs.object_id
 	and
@@ -83,9 +81,12 @@
            cpmc.lorsm_instance_id = :package
 	and
            cpmc.isenabled = 't'
+	and
+		   cp.course_presentation_format = pf.format_id
 	order by acs.creation_date desc
     } {
         set ims_md_id $man_id
+		
         # DEDS: these are expensive
         # and for demo purposes only
         db_0or1row get_last_viewed {
@@ -117,9 +118,5 @@
         set viewed_item_count [llength $viewed_items]
         set viewed_percent [expr [expr $viewed_item_count * 1.00] / $total_item_count * 100]
     
-	if { [ db_0or1row get_folder "
-        select folder_name as delivery_folder from lors_available_presentation_formats as a, ims_cp_manifests as c where c.presentation_id=a.presentation_id and c.man_id=:man_id;
-	"] } { } else { set delivery_folder "delivery"}
-
+	}
 }
-}
Index: openacs-4/packages/lorsm/sql/postgresql/lorsm-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/sql/postgresql/lorsm-create.sql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/lorsm/sql/postgresql/lorsm-create.sql	4 Sep 2004 14:51:20 -0000	1.1
+++ openacs-4/packages/lorsm/sql/postgresql/lorsm-create.sql	21 Apr 2005 16:03:52 -0000	1.2
@@ -89,4 +89,23 @@
 Multiplicity: One bookmark per course/class/student
 ';
 
+-- Course presentation formats
+
+create table lorsm_course_presentation_formats (
+	format_id  			integer
+						constraint lorsm_cpformats_pk
+						primary key,
+	format_pretty_name	varchar(200),
+	format_name 		varchar(100),
+	folder_name			varchar(100)
+);
+
+create index lorsm_cpformats__format_id_idx on lorsm_course_presentation_formats (format_id);
+
+comment on table lorsm_course_presentation_formats is '
+This table stores the available presentation formats for the courses. Its contains the pretty name
+for the format, an id, and the folder in packages/lorsm/www/ where the presentation format is stored.
+Currently just two presentation formats exists, delivery and delivery-wihout-index, which we store on creation';
+
+
 \i lorsm-packages.sql
Index: openacs-4/packages/lorsm/tcl/lorsm-install-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/tcl/lorsm-install-procs.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/lorsm/tcl/lorsm-install-procs.tcl	27 Oct 2004 07:45:07 -0000	1.2
+++ openacs-4/packages/lorsm/tcl/lorsm-install-procs.tcl	21 Apr 2005 16:03:52 -0000	1.3
@@ -46,11 +46,22 @@
 
     }
 
-    foreach file [glob -nocomplain [file join $temp_location lors-*]] {
+    foreach file [glob -nocomplain [file join $temp_location lorsm-*]] {
 
 	file copy -force $file $temp_dir
 
     }
 
+	set pretty_name "[_ lorsm.Classic_Style]"
+	# Insert default values for the course presentation formats
+	db_dml create_default_format {
+		insert into lorsm_course_presentation_formats values (-1,:pretty_name,'default','delivery')
+	}
 
+	set pretty_name "[_ lorsm.lt_Without_LORSM_Index_S]"
+	db_dml create_no_index_format {
+		insert into lorsm_course_presentation_formats values (-2,:pretty_name,'without_index','delivery-without-index')
+	}
+
+
 }
Index: openacs-4/packages/lorsm/tcl/lorsm-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/tcl/lorsm-procs.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/lorsm/tcl/lorsm-procs.tcl	3 Dec 2004 17:52:49 -0000	1.4
+++ openacs-4/packages/lorsm/tcl/lorsm-procs.tcl	21 Apr 2005 16:03:53 -0000	1.5
@@ -334,7 +334,113 @@
  
 }
 
+ad_proc -public get_item_list { man_id user_id } {
+	set item_list [list]
+	db_foreach organizations {
+		select 
+		org.org_id,
+		org.title as org_title,
+		org.hasmetadata,
+		tree_level(o.tree_sortkey) as indent
+		from
+		ims_cp_organizations org, acs_objects o
+		where
+		org.org_id = o.object_id
+		and
+		man_id = :man_id
+		order by
+		org_id
+	} {
 
+		db_foreach sql {		   
+			SELECT
+			(tree_level(tree_sortkey) - :indent) as indent,
+			i.item_id,
+			i.title as item_title
+			FROM 
+			acs_objects o, ims_cp_items i
+			WHERE 
+			o.object_type = 'ims_item'
+			AND
+			i.org_id = :org_id
+			AND
+			o.object_id = i.item_id
+			AND 
+			EXISTS
+			(select 1
+			 from acs_object_party_privilege_map p
+			 where p.object_id = i.item_id 
+			 and p.party_id = :user_id
+			 and p.privilege = 'read')
+
+			ORDER BY 
+			o.object_id, tree_sortkey
+		} {
+			lappend item_list $item_id
+		}
+	}
+	return $item_list
+}
+
+ad_proc -public record_view { item_id man_id } {
+
+	set viewer_id [ad_conn user_id]
+
+	set views [views::record_view -object_id $item_id -viewer_id $viewer_id]
+
+	set revision_id [item::get_best_revision $item_id]
+
+	db_1row manifest_info "select fs_package_id, folder_id from ims_cp_manifests where man_id = :man_id"
+	set content_root [fs::get_root_folder -package_id $fs_package_id]
+
+	set url2 "[db_string select_folder_key {select key from fs_folders where folder_id = :folder_id}]/"
+
+	set href [db_string href "select href from ims_cp_resources r, ims_cp_items_to_resources ir where ir.item_id = :item_id and ir.res_id = r.res_id" -default ""]
+
+	db_1row item_info "select title from ims_cp_items where item_id = :item_id"
+
+	set fs_item_id [fs::get_item_id -folder_id $folder_id -name $href]
+
+	# If no fs_item_id, this item is probably a folder
+	# Else deliver the page
+	if { ![empty_string_p $fs_item_id] } {
+
+		set fs_revision_id [item::get_best_revision $fs_item_id]
+		set fs_item_mime [item::get_mime_info $fs_revision_id mime_info]
+		
+		
+		if { [string equal -length 4 "text" $mime_info(mime_type)] } {
+			
+			set imsitem_id $item_id
+			
+			#    lorsm::set_content_root content_root
+			lorsm::set_ims_item_id $item_id
+			
+			# we use nsv variables to set the delivery environment this is a
+			# temporary solution until we find something a bit better
+			
+			if {[nsv_exists delivery_vars [ad_conn session_id]]} {
+				nsv_unset delivery_vars [ad_conn session_id]
+			}
+			
+			nsv_set delivery_vars [ad_conn session_id] [list]
+			
+			nsv_lappend delivery_vars [ad_conn session_id] $content_root
+			
+		}
+	} else {
+		lorsm::set_ims_item_id $item_id
+		
+		# We have no content, so wipe item_id from the lorsm namespace
+		# This fixes a strange bug if you click a 'no content' menu item
+		# repeatedly and different content appears!
+		if { [info exists lorsm::item_id] } {
+			set lorsm::item_id ""
+		}
+	}
+	
+}
+
 ad_proc -public init { urlvar rootvar {content_root ""} {template_root ""} {context "public"} {rev_id ""} {content_type ""} } {
     
     upvar $urlvar url $rootvar root_path 
Index: openacs-4/packages/lorsm/templates/lorsm-default.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/templates/lorsm-default.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/lorsm/templates/lorsm-default.adp	25 Nov 2004 20:16:57 -0000	1.2
+++ openacs-4/packages/lorsm/templates/lorsm-default.adp	21 Apr 2005 16:03:53 -0000	1.3
@@ -1,6 +1,6 @@
+<if @html_document_p@ eq 0 >
 <master  src="/www/blank-master">
   <property name="title">@title;noquote@</property>
-
   <if @imsitem_id@ ne "">
     <script type="text/javascript">
       <!--
@@ -22,9 +22,6 @@
     <a href="@community_url@/lorsm/tracking?man_id=@man_id@<if @return_url@ defined>&@return_url;noquote@</if>" target="_top"><img src="/resources/ZoomIn16.gif" border=0 align="right" alt="image"></a>
   </if>
 
-
-  <h3><img src="/resources/Open16.gif">@title;noquote@</h3>
-  
   <blockquote>
 
     <if @text@ defined>
@@ -38,8 +35,11 @@
     </ul>
 
     <br>
-      
   </blockquote>
   <if @parent_item@>
     <a href="@parent_href@"><img border="0" src="/resources/right.gif" align="right" alt="Back to Parent"></a>
-  </if>
\ No newline at end of file
+  </if>
+</if>
+<else>
+@text;noquote@
+</else>
\ No newline at end of file
Index: openacs-4/packages/lorsm/templates/lorsm-default.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/templates/lorsm-default.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/lorsm/templates/lorsm-default.tcl	24 Feb 2005 13:33:21 -0000	1.4
+++ openacs-4/packages/lorsm/templates/lorsm-default.tcl	21 Apr 2005 16:03:53 -0000	1.5
@@ -8,7 +8,7 @@
 	# It's a file.
 	cr_write_content -revision_id $content(revision_id)
 	ad_script_abort
-    } elseif { [string equal "text/css" $content(mime_type)]} {
+    } elseif { [string equal "text/css" $content(mime_type)] || [string equal "text/xml" $content(mime_type) ]} {
 	# we treat CSS files as if they would be binaries and deliver
 	# them straight to the browser (maybe we should do the same
 	# thing for XML files (?)
@@ -19,17 +19,22 @@
     # Ordinary text/* mime type.
     template::util::array_to_vars content
 
-
-
     set text [cr_write_content -string -revision_id $revision_id]
-
-    if { ![string equal "text/html" $content(mime_type)] &&  ![string equal "text/xml" $content(mime_type)] } {
-	set text [ad_html_text_convert -from $mime_type -to text/html $text]
+	
+    if { ![string equal "text/html" $content(mime_type)] || ![string equal "text/xml" $content(mime_type)]} {
+		set text [ad_html_text_convert -from $mime_type -to text/html $text]
     }
 }
 
 set imsitem_id [lorsm::get_ims_item_id] 
 
+set html_document_p 0
+if { [string eq $content(mime_type) "text/html"] && [regexp -nocase {<html>} $text match] } {
+	set html_document_p 1
+	# parent window
+ 	regsub -all -nocase {target=[^ |^>]+} $text {target="_parent"} text
+} 
+
 # We set all this blank variables in the case that the ims_item does
 # not have a resource id
 
Index: openacs-4/packages/lorsm/templates/lorsm-no-index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/templates/lorsm-no-index.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/lorsm/templates/lorsm-no-index.adp	21 Apr 2005 16:03:53 -0000	1.1
@@ -0,0 +1,2 @@
+@text;noquote@
+
Index: openacs-4/packages/lorsm/templates/lorsm-no-index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/templates/lorsm-no-index.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/lorsm/templates/lorsm-no-index.tcl	21 Apr 2005 16:03:53 -0000	1.1
@@ -0,0 +1,50 @@
+# Put the current revision's attributes in a onerow datasource named "content".
+# The detected content type is "content_revision".
+
+lorsm::get_content content_revision
+
+if { [info exists content(item_id)] } {
+    if { ![string equal -length 4 "text" $content(mime_type)] } {
+		# It's a file.
+		cr_write_content -revision_id $content(revision_id)
+		ad_script_abort
+	} elseif { [string equal "text/css" $content(mime_type)] || [string equal "text/xml" $content(mime_type) ]} {
+		# we treat CSS files as if they would be binaries and deliver
+		# them straight to the browser (maybe we should do the same
+		# thing for XML files (?)
+		cr_write_content -revision_id $content(revision_id)
+		ad_script_abort
+    }
+	
+
+    # Ordinary text/* mime type.
+    template::util::array_to_vars content
+	
+    set text [cr_write_content -string -revision_id $revision_id]
+	
+    if { ![string equal "text/html" $content(mime_type)] || ![string equal "text/xml" $content(mime_type)]} {
+		set text [ad_html_text_convert -from $mime_type -to text/html $text]
+    }
+}
+
+if { [string eq $content(mime_type) "text/html"] && [regexp -nocase {<html>} $text match] } {
+		
+	if { [db_0or1row get_imsitem_id {
+		select map.item_id as viewed_item_id, o.man_id
+		from ims_cp_items_to_resources map, ims_cp_files f, ims_cp_organizations o, ims_cp_items i
+		where f.file_id = :item_id
+		and f.res_id = map.res_id
+		and map.item_id = i.item_id 
+		and i.org_id = o.org_id
+	}] } {
+		# record view
+		set item_list [lorsm::get_item_list $man_id [ad_conn user_id]]
+		set viewed_item_id [lindex $item_list [expr [lsearch -exact $item_list $viewed_item_id] - 1]]
+		lorsm::record_view $viewed_item_id $man_id
+	}
+
+	# parent window
+ 	regsub -all -nocase {target=[^ |^>]+} $text {target="_parent"} text
+}
+
+ad_return_template
Index: openacs-4/packages/lorsm/www/change_presentation_format.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/Attic/change_presentation_format.tcl,v
diff -u -N
--- openacs-4/packages/lorsm/www/change_presentation_format.tcl	25 Feb 2005 08:49:58 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,31 +0,0 @@
-# packages/lorsm/www/change_presentation_format.tcl
-
-ad_page_contract {
-
-	Update course presentations.
-
-	@author Jonatan Tierno (jonatantierno@inv.it.uc3m.es)
-	@creation-date 2004-03-31
-	@arch-tag 208f2801-d110-45d3-9401-d5eae1f72c93
-	@cvs-id  $Id: change_presentation_format.tcl,v 1.1 2005/02/25 08:49:58 jonatan Exp $
-    } {
-	    man_id:integer,notnull
-	    selected_presentation:integer,notnull
-    } -properties {
-    } -validate {
-    } -errors {
-}
-						    
-
-if { [ db_0or1row get_selected "
-        select presentation_id from ims_cp_manifests where man_id=:man_id and presentation_id is not null limit 1
-	"] } {\
-	set message #lorsm.Presentation_format_modified#
-} else {\
-	set message #lorsm.Presentation_format_added#
-} 
-	
-db_dml change_update "update ims_cp_manifests set presentation_id = :selected_presentation where man_id = :man_id" 
-
-ad_returnredirect -message $message course-structure?man_id=$man_id
-						   
Index: openacs-4/packages/lorsm/www/choose_presentation_format.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/Attic/choose_presentation_format.adp,v
diff -u -N
--- openacs-4/packages/lorsm/www/choose_presentation_format.adp	25 Feb 2005 08:49:30 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-<master>
-  <property name="title">@title;noquote@</property>
-  <property name="context">@context;noquote@</property>
-
-<form name="input" action="change_presentation_format" method="get">
-<input type="hidden" name="man_id" value="@man_id@">
-<listtemplate name="available_presentation_formats"></listtemplate>
-<input type="submit" value="Change format">
-</form>
Index: openacs-4/packages/lorsm/www/choose_presentation_format.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/Attic/choose_presentation_format.tcl,v
diff -u -N
--- openacs-4/packages/lorsm/www/choose_presentation_format.tcl	25 Feb 2005 08:49:30 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,54 +0,0 @@
-# packages/lorsm/www/choose_presentation_format.tcl
-
-ad_page_contract {
-
-	Show a list of available presentation formats so that user can choose one.
-
-	@author Jonatan Tierno (jonatantierno@inv.it.uc3m.es)
-	@creation-date 2004-03-31
-	@arch-tag 208f2801-d110-45d3-9401-d5eae1f72c93
-	@cvs-id  $Id: choose_presentation_format.tcl,v 1.1 2005/02/25 08:49:30 jonatan Exp $
-} {
-	man_id:integer,notnull
-} -properties {
-	context:onevalue
-} -validate {
-} -errors {
-}
-
-
-if { [ db_0or1row get_selected "
-	select presentation_id as selected_presentation from ims_cp_manifests where man_id=:man_id;
-"] } {} else { set selected_presentation "0"}
-
- template::list::create \
- 	-name available_presentation_formats \
-	-multirow apf \
-	-key presentation_id \
-	-pass_properties selected_presentation \
-	-elements {
-		selected {
-			label #lorsm.Selected#
-
-		        display_template { 
-				   <input name="selected_presentation" value="@apf.presentation_id@" type="radio" <if @selected_presentation@ eq @apf.presentation_id@>checked="checked"</if>>
-			}
-		}
-		presentation_id {
-			hide_p 1
-		}	
-		presentation_name {
-			label #lorsm.Presentation_name#
-			display_col presentation_name
-		}
-		
-	}
-	
-db_multirow apf apf_sql "
-	select pf.presentation_id as presentation_id, pf.presentation_name as presentation_name from lors_available_presentation_formats as pf;
-" 
-# set context & title
-set context [list "[_ lorsm.Course_Structure]"]
-set title "[_ lorsm.Course_Structure]"
-
-		
Index: openacs-4/packages/lorsm/www/course-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/Attic/course-add-2.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/lorsm/www/course-add-2.tcl	3 Dec 2004 17:52:49 -0000	1.4
+++ openacs-4/packages/lorsm/www/course-add-2.tcl	21 Apr 2005 16:03:53 -0000	1.5
@@ -340,6 +340,10 @@
   -label "[_ lorsm.Course_Name]" -datatype text -widget text -help_text "[_ lorsm.lt_This_is_the_name_the_]" \
   -maxlength 200
 
+template::element create course_upload format_id  \
+	-label "[_ lorsm.lt_Course_Presentation_S]" -datatype text -widget select -options [db_list_of_lists select_formats_for_select_widget {}] \
+	-help_text "[_ lorsm.lt_Use_the_Classic_Style]" -value [db_string default_format {}]
+
 template::element create course_upload course_id  \
   -label "[_ lorsm.course_id]" -datatype integer -widget hidden 
 
Index: openacs-4/packages/lorsm/www/course-add-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/Attic/course-add-3.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/lorsm/www/course-add-3.tcl	10 Dec 2004 19:03:33 -0000	1.6
+++ openacs-4/packages/lorsm/www/course-add-3.tcl	21 Apr 2005 16:03:53 -0000	1.7
@@ -13,6 +13,7 @@
     @cvs-id $Id$
 } {
     folder_id:integer,notnull
+	format_id:integer,notnull
     tmp_dir:optional,notnull
     course_id:integer,notnull
     course_name:notnull
@@ -289,6 +290,7 @@
 			-version $man_version \
 			-orgs_default $man_orgs_default \
 			-hasmetadata $man_hasmetadata \
+			-course_presentation_format $format_id \
 			-isscorm $man_isscorm \
 			-folder_id $new_parent_id \
                         -fs_package_id $fs_package_id \
Index: openacs-4/packages/lorsm/www/course-structure.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/Attic/course-structure.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/lorsm/www/course-structure.adp	3 Dec 2004 17:52:49 -0000	1.4
+++ openacs-4/packages/lorsm/www/course-structure.adp	21 Apr 2005 16:03:53 -0000	1.5
@@ -128,7 +128,7 @@
               </td>
           </tr>
           </tr>
-              <tr class="list-even last">
+              <tr class="list-even">
               <td class="list" valign="top" style="background-color: #e0e0e0; font-weight: bold;" width="20%">
                 #lorsm.Is_shared#
               </td>
@@ -144,6 +144,17 @@
                      </div>
               </td>
           </tr>
+              <tr class="list-odd last">
+              <td class="list" valign="top" style="background-color: #e0e0e0; font-weight: bold;">
+                #lorsm.Course#
+              </td>
+              <td class="list" valign="top" style="background-color: #f0f0f0">
+                 <b>@format_pretty_name@</b>
+                 <div style="float: right;">
+	             <a href="@formater_url@" class="button">#lorsm.Change#</a>
+                 </div>
+              </td>
+          </tr>
     <tr class="list-header">
         <th class="list" valign="top" style="background-color: #e0e0e0; font-weight: bold;" colspan="2">
          #lorsm.Organizations#
Index: openacs-4/packages/lorsm/www/course-structure.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/Attic/course-structure.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/lorsm/www/course-structure.tcl	24 Feb 2005 11:07:05 -0000	1.5
+++ openacs-4/packages/lorsm/www/course-structure.tcl	21 Apr 2005 16:03:53 -0000	1.6
@@ -56,15 +56,17 @@
 	   acs.creation_date,
 	   acs.context_id,
            cpmc.isenabled,
+       pf.format_pretty_name,
            cpmc.istrackable
     from
-           ims_cp_manifests cp, acs_objects acs, ims_cp_manifest_class cpmc
+           ims_cp_manifests cp, acs_objects acs, ims_cp_manifest_class cpmc, lorsm_course_presentation_formats pf
     where 
            cp.man_id = acs.object_id
 	   and  cp.man_id = :man_id
            and  cp.man_id = cpmc.man_id
            and  cpmc.lorsm_instance_id = :package_id
-           and  cp.parent_man_id = 0"]} {
+           and  cp.parent_man_id = 0
+		   and  cp.course_presentation_format = pf.format_id"]} {
 
     # Sets the variable for display. 
     set display 1
@@ -228,10 +230,5 @@
 set enabler_url [export_vars -base enabler {man_id}]
 set tracker_url [export_vars -base tracker {man_id}]
 set sharer_url  [export_vars -base sharer {man_id folder_id return_url}]
+set formater_url  [export_vars -base formater {man_id return_url}]
 
-#Presentation-related fields
-if {[db_0or1row course_presentation_format "
-    select presentation_name as pformat from lors_available_presentation_formats where presentation_id=(select presentation_id from ims_cp_manifests where man_id=:man_id);
-" ] } { } else {
-	set pformat #lorsm.None#
-}
Index: openacs-4/packages/lorsm/www/formater.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/Attic/formater.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/lorsm/www/formater.adp	21 Apr 2005 16:03:53 -0000	1.1
@@ -0,0 +1,5 @@
+<master>
+  <property name="title">@title@</property>
+  <property name="context">@context@</property>
+
+  <formtemplate id="formater"></formtemplate>
Index: openacs-4/packages/lorsm/www/formater.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/Attic/formater.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/lorsm/www/formater.tcl	21 Apr 2005 16:03:53 -0000	1.1
@@ -0,0 +1,71 @@
+# packages/lorsm/www/formater.tcl
+
+ad_page_contract {
+    
+    Change course format presentation
+    
+    @author jopezku@gmail.com
+    @cvs-id $Id: formater.tcl,v 1.1 2005/04/21 16:03:53 josee Exp $
+} {
+    man_id:integer
+    return_url
+} -properties {
+} -validate {
+} -errors {
+}
+
+set user_id [ad_conn user_id]
+set community_id [dotlrn_community::get_community_id]
+
+# check admin permisssion for the community
+set admin_p [dotlrn::user_can_admin_community_p  \
+				 -user_id $user_id  \
+		 -community_id $community_id ]
+
+# Permissions
+dotlrn::require_user_admin_community -user_id $user_id -community_id $community_id
+
+# check write permisssion for the learning object/manifest
+permission::require_write_permission -object_id $man_id -creation_user $user_id
+
+
+set title "[_ lorsm.lt_Set_Course_Presentati]"
+set context [list "[_ lorsm.lt_Set_Course_Presentati]"]
+
+ad_form -name formater \
+    -export {return_url} \
+    -form {
+		{man_id:key}
+		{project:text(inform)
+			{label "[_ lorsm.Course_Name]"}
+			{value {[lorsm::get_course_name -manifest_id $man_id]}}
+		}
+		{format_pretty_name:text(inform)
+			{label "[_ lorsm.Current_Format]"}
+		}
+		{format:text(select)
+			{label "[_ lorsm.Format_1]"}
+			{options {[db_list_of_lists select_formats_for_select_widget {select format_pretty_name,
+				format_id
+				from lorsm_course_presentation_formats
+				order by format_pretty_name}]}}
+		}
+	} -select_query {
+		select cp.course_presentation_format as format, pf.format_pretty_name
+		from ims_cp_manifests cp, lorsm_course_presentation_formats pf
+		where cp.man_id = :man_id
+		and cp.course_presentation_format = pf.format_id
+	} -edit_data {
+		db_transaction {
+			db_dml do_update {
+				update ims_cp_manifests
+				set course_presentation_format = :format
+				where man_id = :man_id }
+		}	
+	} -after_submit {
+		ad_returnredirect $return_url
+	}
+
+
+
+
Index: openacs-4/packages/lorsm/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/index.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/lorsm/www/index.tcl	29 Nov 2004 17:48:11 -0000	1.4
+++ openacs-4/packages/lorsm/www/index.tcl	21 Apr 2005 16:03:53 -0000	1.5
@@ -47,7 +47,7 @@
         course_name {
             label "[_ lorsm.Available_Courses]"
             display_col course_name
-            link_url_eval {delivery/?[export_vars man_id]}
+            link_url_eval {${folder_name}/?[export_vars man_id]}
             link_html {title "[_ lorsm.Access_Course]"}
 
         }
@@ -115,6 +115,7 @@
            cp.folder_id,
 	   acs.creation_user,
 	   acs.creation_date,
+	   pf.folder_name,
 	   acs.context_id,
            case
               when cpmc.isenabled = 't' then 'Enabled'
@@ -126,13 +127,15 @@
            end as istrackable
               
     from
-           ims_cp_manifests cp, acs_objects acs, ims_cp_manifest_class cpmc
+           ims_cp_manifests cp, acs_objects acs, ims_cp_manifest_class cpmc, lorsm_course_presentation_formats pf
     where 
            cp.man_id = acs.object_id
     and
            cp.man_id = cpmc.man_id
     and
            cpmc.community_id = :community_id
+	and
+	       cp.course_presentation_format = pf.format_id
     order by acs.creation_date desc
 } {
     set ims_md_id $man_id