Index: openacs-4/packages/lors/lib/course-structure.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lors/lib/course-structure.adp,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/lors/lib/course-structure.adp	3 Dec 2008 12:36:41 -0000	1.10
+++ openacs-4/packages/lors/lib/course-structure.adp	16 Apr 2010 19:25:49 -0000	1.11
@@ -1,27 +1,15 @@
 
-<table class="list" cellpadding="3" cellspacing="1" width="90%">
-    <tr class="list-header">
-        <th class="list" valign="top" style="background-color: #e0e0e0; font-weight: bold;" colspan="2">#lorsm.Course_Information#</th>
-    </tr>
+<h2>#lorsm.Course_Information#</h2>
 
+<table class="list" cellpadding="3" cellspacing="1" width="90%">
     <tr class="list-odd">
         <td class="list" valign="top" style="background-color: #e0e0e0; font-weight: bold; width:20%;" >#lorsm.Course_Name#</td>
         <td class="list" valign="top" style="background-color: #f0f0f0; font-weight: bold;">
-            @course_name;noquote@(@identifier@)#lorsm.Course_Versions#<br />
-            <a href="@rename_url@">#lors.Rename_Course#</a>
+            @course_name;noquote@
+            <br>(@identifier@)
+            <br>#lorsm.Course_Versions#
         </td>
     </tr>
-
-    <tr class="list-even">
-        <td class="list"  style="background-color: #e0e0e0; font-weight: bold; width:20%" >
-            <a href="javascript:void(0)" onClick="document.getElementById('lors-advanced-course-structure').style.display='';">More Info</a>
-        </td>
-        <td class="list">&nbsp;</td>
-    </tr>
-</table>
-
-<div id="lors-advanced-course-structure" style="display:none;">
-    <table class="list" cellpadding="3" cellspacing="1" width="90%">
         <tr class="list-even">
             <td class="list" valign="top" style="background-color: #e0e0e0; font-weight: bold; width:20%">#lorsm.Metadata#</td>
             <td class="list" valign="top" style="background-color: #f0f0f0">
@@ -95,10 +83,13 @@
                 <div style="float: right;"><a href="@formater_url@" class="button">#lorsm.Change#</a></div>
             </td>
         </tr>
+
+       <if @extra_admin_html@ not nil>
+          @extra_admin_html;noquote@
+       </if>
+
     </table>
 </div>
 
-<if @extra_admin_html@ not nil>@extra_admin_html;noquote@</if>
-<hr>
-@orgs_list;noquote@
+<h2>#lorsm.Contents#</h2>
 <listtemplate name="items"></listtemplate>
Index: openacs-4/packages/lors/lib/course-structure.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lors/lib/course-structure.tcl,v
diff -u -N -r1.16 -r1.17
--- openacs-4/packages/lors/lib/course-structure.tcl	24 Nov 2009 20:03:58 -0000	1.16
+++ openacs-4/packages/lors/lib/course-structure.tcl	16 Apr 2010 19:25:49 -0000	1.17
@@ -58,9 +58,8 @@
         set instance [lorsm::get_course_name -manifest_id $man_id]
 
         # Folder
-        # This supports LORS Central but breaks lorsm so its commented out
-        #        set root_folder [lorsm::get_root_folder_id]
-        #        set folder_id [db_string get_folder_id { }]
+        set root_folder [lorsm::get_root_folder_id]
+        set folder_id [db_string get_folder_id { }]
         set folder [apm_package_url_from_id $fs_package_id]?[export_vars folder_id]
     }
 
@@ -81,9 +80,6 @@
 }
 
 
-append orgs_list \
-    "<table class=\"list\" cellpadding=\"3\" cellspacing=\"1\" width=\"100%\">"
-
 set pretty_types_map {}
 if { [apm_package_installed_p assessment] } {
     append pretty_types_map "as_sections Questions"
@@ -136,14 +132,8 @@
         set down [export_vars -base reorder-items {item_id {dir down} return_url}]
     }
 
-    append orgs_list "<tr class=\"list-even\">"
-
-} if_no_rows {
-    append orgs_list "<tr class=\"list-odd\"><td></td></tr>"
 }
 
-append orgs_list "</table>"
-
 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}]
@@ -194,5 +184,3 @@
             }
         }
     }
-
-set rename_url [export_vars -base course-rename {man_id}]