Index: openacs-4/packages/dotlrn-lorsm/dotlrn-lorsm.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-lorsm/dotlrn-lorsm.info,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn-lorsm/dotlrn-lorsm.info	8 Oct 2008 13:01:05 -0000	1.7
+++ openacs-4/packages/dotlrn-lorsm/dotlrn-lorsm.info	8 Oct 2008 13:24:32 -0000	1.8
@@ -7,14 +7,14 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="2.4.0d1" url="http://openacs.org/repository/download/apm/dotlrn-lorsm-2.4.0d1.apm">
+    <version name="2.4.1b1" url="http://openacs.org/repository/download/apm/dotlrn-lorsm-2.4.1b1.apm">
         <owner url="mailto:ErnieG@mm.st">Ernie Ghiglione</owner>
-        <release-date>2007-04-22</release-date>
+        <release-date>2008-09-16</release-date>
         <vendor url="http://www.openacs.org">OpenACS</vendor>
 
-        <provides url="dotlrn-lorsm" version="2.4.0d1"/>
-        <requires url="dotlrn" version="2.4.0d1"/>
-        <requires url="lorsm-portlet" version="2.4.0d1"/>
+        <provides url="dotlrn-lorsm" version="2.4.1b1"/>
+        <requires url="dotlrn" version="2.4.1b1"/>
+        <requires url="lorsm-portlet" version="2.4.1b1"/>
 
         <callbacks>
             <callback type="before-uninstall"  proc="dotlrn_lorsm::uninstall"/>
Index: openacs-4/packages/lors/lors.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lors/lors.info,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/lors/lors.info	8 Oct 2008 13:01:05 -0000	1.13
+++ openacs-4/packages/lors/lors.info	8 Oct 2008 13:24:32 -0000	1.14
@@ -16,8 +16,8 @@
         <license_url>http://www.gnu.org/copyleft/gpl.html</license_url>
         <maturity>1</maturity>
         <provides url="lors" version="0.6d4"/>
-        <requires url="dotlrn" version="2.4.0d1"/>
-        <requires url="file-storage" version="5.3.0d1"/>
+        <requires url="dotlrn" version="2.4.1b1"/>
+        <requires url="file-storage" version="5.4.0d7"/>
 
         <callbacks>
         </callbacks>
Index: openacs-4/packages/lors/catalog/lors.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lors/catalog/lors.es_ES.ISO-8859-1.xml,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/lors/catalog/lors.es_ES.ISO-8859-1.xml	8 Oct 2008 13:01:05 -0000	1.6
+++ openacs-4/packages/lors/catalog/lors.es_ES.ISO-8859-1.xml	8 Oct 2008 13:24:32 -0000	1.7
@@ -2,6 +2,7 @@
 <message_catalog package_key="lors" locale="es_ES" charset="ISO-8859-1">
 
   <msg key="_The">El error fue:</msg>
+  <msg key="Down">Abajo</msg>
   <msg key="lt_dont_know_how_to_extr">No puede extraerse</msg>
   <msg key="lt_Error_inserting_folde">Error al insertar carpeta</msg>
   <msg key="lt_this_thing_is_open_no">Ahora est� abierto</msg>
@@ -11,4 +12,5 @@
   <msg key="lt_Transaction_Error_whi">Error de transacci�n al a�adir metadatos</msg>
   <msg key="The_error_was">El error fue:</msg>
   <msg key="The_error_was_errmsg">El error fue: $errmsg</msg>
+  <msg key="Up">Arriba</msg>
 </message_catalog>
Index: openacs-4/packages/lorsm/lorsm.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/lorsm.info,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/lorsm/lorsm.info	8 Oct 2008 13:01:05 -0000	1.16
+++ openacs-4/packages/lorsm/lorsm.info	8 Oct 2008 13:24:32 -0000	1.17
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
 <!-- Generated by the OpenACS Package Manager -->
 
-<package key="lorsm" url="http://openacs.org/repository/apm/packages/lors-management" type="apm_application">
+<package key="lorsm" url="http://openacs.org/repository/apm/packages/lorm" type="apm_application">
     <package-name>LORS Management</package-name>
     <pretty-plural>LORS Management</pretty-plural>
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
 
-    <version name="0.8de" url="http://openacs.org/repository/download/apm/lorsm-0.8de.apm">
+    <version name="0.8d3" url="http://openacs.org/repository/download/apm/lorsm-0.8d3.apm">
         <owner url="mailto:ernieg@mm.st">Ernie Ghiglione</owner>
         <summary>Application to manage the services from the Learning Object Repository. </summary>
         <release-date>2007-07-17</release-date>
@@ -16,7 +16,7 @@
         <provides url="lorsm" version="0.8d3"/>
         <requires url="acs-datetime" version="5.2.2"/>
         <requires url="lors" version="0.6d4"/>
-        <requires url="views" version="0.1d"/>
+        <requires url="views" version="0.1d3"/>
 
         <callbacks>
             <callback type="after-install"  proc="lorsm::install::package_install"/>
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 -r1.19 -r1.20
--- openacs-4/packages/lorsm/catalog/lorsm.en_US.ISO-8859-1.xml	8 Oct 2008 13:01:05 -0000	1.19
+++ openacs-4/packages/lorsm/catalog/lorsm.en_US.ISO-8859-1.xml	8 Oct 2008 13:24:32 -0000	1.20
@@ -858,5 +858,6 @@
   <msg key="Welcome_to_LEON">Welcome to LEON</msg>
   <msg key="Yes">Yes</msg>
   <msg key="You_can">You can</msg>
+  <msg key="Your_session_has_expired">Your session has expired.</msg>
   <msg key="Your_Stats">Your Stats:</msg>
 </message_catalog>
Index: openacs-4/packages/lorsm/catalog/lorsm.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/catalog/lorsm.es_ES.ISO-8859-1.xml,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/lorsm/catalog/lorsm.es_ES.ISO-8859-1.xml	8 Oct 2008 13:01:05 -0000	1.8
+++ openacs-4/packages/lorsm/catalog/lorsm.es_ES.ISO-8859-1.xml	8 Oct 2008 13:24:32 -0000	1.9
@@ -32,6 +32,7 @@
   <msg key="Add_another_title">Agregar otro T�tulo</msg>
   <msg key="Add_Catalog-Entry">Agregar Entrada de Cat�logo</msg>
   <msg key="Add_Classification">Agregar Clasificaci�n</msg>
+  <msg key="Add_Content">A�adir contenido</msg>
   <msg key="Add_Context">Agregar Contexto</msg>
   <msg key="Add_Contributor">Agregar Contribuyente</msg>
   <msg key="Add_Contributors">Agregar Contribuyentes</msg>
@@ -92,6 +93,7 @@
   <msg key="Annotator">Anotador</msg>
   <msg key="Assets">Activos</msg>
   <msg key="Available_Courses">Cursos Disponibles</msg>
+  <msg key="Begin">Empezar</msg>
   <msg key="Browse">Buscar...</msg>
   <msg key="Catalog">Cat�logo:</msg>
   <msg key="Catalog-Entries">Entradas de Catalogo:</msg>
@@ -121,6 +123,7 @@
   <msg key="Course_Name">Nombre del Curso:</msg>
   <msg key="Course_Name_1">Nombre del Curso</msg>
   <msg key="Course_Structure">Estructura del Curso</msg>
+  <msg key="Course_Versions">Version %version%</msg>
   <msg key="Coverage">Cobertura:</msg>
   <msg key="Coverage_1">Cobertura</msg>
   <msg key="Created_By">Creado Por:</msg>
@@ -224,6 +227,7 @@
   <msg key="Location_1">Localizaci�n:</msg>
   <msg key="Locations">Localizaciones:</msg>
   <msg key="Log_Out">Salir</msg>
+  <msg key="LORS_Management">LORS</msg>
   <msg key="lt_Add_a_IMSSCORM_Compli">Agregar Curso Compatible con IMS/SCORM</msg>
   <msg key="lt_Add_Aggregation_Level">Agregar Nivel de Agregaci�n</msg>
   <msg key="lt_Add_Annotation_MD_Des">Agregar Anotaci�n de Descripci�n de MD</msg>
@@ -442,6 +446,8 @@
   <msg key="lt_Course_Presentation_S">Estilo de presentaci�n</msg>
   <msg key="lt_Courses_in_your_Repos">Cursos en su Repositorio</msg>
   <msg key="lt_Date_and_Time_descrip">Descripci�n de Fecha y Hora</msg>
+  <msg key="lt_Default_end_page_content">Curso completado</msg>
+  <msg key="lt_Default_start_page_content">Empezar curso</msg>
   <msg key="lt_Deleting_temporary_fo">Borrando folder temporal...</msg>
   <msg key="lt_Describes_contributio">Describe la Contribuci�n</msg>
   <msg key="lt_Describes_learning_ob">Describe el contenido de los Objetos de Aprendizaje</msg>
@@ -683,6 +689,7 @@
   <msg key="lt_Whether_copyright_or_">Si derechos reservados u otra restriccion se aplique</msg>
   <msg key="lt_Whether_use_of_the_re">Si el uso de este recurso requiere pago</msg>
   <msg key="lt_With_Bottom_Navigatio">Con barra de navegaci�n abajo</msg>
+  <msg key="lt_With_Progress_Bar">Mostrar con barra de progreso</msg>
   <msg key="lt_Without_LORSM_Index_S">Estilo Sin �ndice</msg>
   <msg key="lt_You_are_about_to_add_">Usted esta apunto de agregar a su clase el curso %course_name%</msg>
   <msg key="lt_You_can_add_courses_a">Puede agregar cursos que y� existan en el repositorio</msg>
@@ -705,6 +712,7 @@
   <msg key="Name">Nombre</msg>
   <msg key="Name_1">Nombre:</msg>
   <msg key="Name_of_the_catalog">Nombre del cat�logo</msg>
+  <msg key="Next">Siguiente</msg>
   <msg key="No">No</msg>
   <msg key="No_Context_Available">No hay contexto Disponible</msg>
   <msg key="No_Cost_Available">No hay Costo Disponible</msg>
@@ -849,5 +857,6 @@
   <msg key="Welcome_to_LEON">Bienvenido a LEON</msg>
   <msg key="Yes">S�</msg>
   <msg key="You_can">Usted puede</msg>
+  <msg key="Your_session_has_expired">Su sesi�n ha expirado</msg>
   <msg key="Your_Stats">Sus estad�sticas</msg>
 </message_catalog>
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 -r1.22 -r1.23
--- openacs-4/packages/lorsm/lib/user-lorsm.tcl	8 Oct 2008 13:01:05 -0000	1.22
+++ openacs-4/packages/lorsm/lib/user-lorsm.tcl	8 Oct 2008 13:24:32 -0000	1.23
@@ -200,16 +200,16 @@
 								limit 1" ] 	} {	
 								#item has no track for the user
 								#the icon should be the same as per "not yet visited"
-								append icon "<img src=\"/lorsm/resources/icons/flag_white.gif\" alt=\"Not attempted\">" 
+								append icon "<img src=\"/resources/lorsm/icons/flag_white.gif\" alt=\"Not attempted\">" 
 								} else {											
 								switch -regexp $lesson_status {
-									null { append icon "<img src=\"/lorsm/resources/icons/flag_white.gif\" alt=\"Not attempted\">" }
-									incomplete { append icon "<img src=\"/lorsm/resources/icons/flag_orange.gif\" alt=\"Incomplete\">" }
-									complete { append icon "<img src=\"/lorsm/resources/icons/flag_green.gif\" alt=\"Completed\">" }
-									failed { append icon "<img src=\"/lorsm/resources/icons/flag_red.gif\" alt=\"Failed\">" }
-									"not attempted" { append icon "<img src=\"/lorsm/resources/icons/flag_white.gif\" alt=\"Not attempted\">" }
-									passed { append icon "<img src=\"/lorsm/resources/icons/icon_accept.gif\" alt=\"Passed\">" }
-									default { append icon "<FONT COLOR=#ffffff> $lesson_status ** <img src=\"/lorsm/resources/icons/flag_blue.gif\" alt=\"$lesson_status\">"}
+									null { append icon "<img src=\"/resources/lorsm/icons/flag_white.gif\" alt=\"Not attempted\">" }
+									incomplete { append icon "<img src=\"/resources/lorsm/icons/flag_orange.gif\" alt=\"Incomplete\">" }
+									complete { append icon "<img src=\"/resources/lorsm/icons/flag_green.gif\" alt=\"Completed\">" }
+									failed { append icon "<img src=\"/resources/lorsm/icons/flag_red.gif\" alt=\"Failed\">" }
+									"not attempted" { append icon "<img src=\"/resources/lorsm/icons/flag_white.gif\" alt=\"Not attempted\">" }
+									passed { append icon "<img src=\"/resources/lorsm/icons/icon_accept.gif\" alt=\"Passed\">" }
+									default { append icon "<FONT COLOR=#ffffff> $lesson_status ** <img src=\"/resources/lorsm/icons/flag_blue.gif\" alt=\"$lesson_status\">"}
 									}
 								}
 	set lesson_status $icon
Index: openacs-4/packages/lorsm/www/admin/course-add-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/course-add-3.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/lorsm/www/admin/course-add-3.tcl	8 Oct 2008 13:01:05 -0000	1.7
+++ openacs-4/packages/lorsm/www/admin/course-add-3.tcl	8 Oct 2008 13:24:32 -0000	1.8
@@ -529,7 +529,7 @@
 	    # to refine the search a bit more.
 	    set found_file [lsearch -all -regexp -exact $all_files $tmp_dir/$filename]
 	}
-
+		
 	if {![empty_string_p $found_file]} {
 	    set file_id [lindex [lindex $all_files $found_file] 3]
             set file_rev_id [content::item::get_live_revision -item_id $file_id]
Index: openacs-4/packages/lorsm/www/delivery/menu-mk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery/menu-mk.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/lorsm/www/delivery/menu-mk.adp	8 Oct 2008 13:01:06 -0000	1.7
+++ openacs-4/packages/lorsm/www/delivery/menu-mk.adp	8 Oct 2008 13:24:32 -0000	1.8
@@ -7,6 +7,12 @@
 <link rel="stylesheet" type="text/css" href="/resources/acs-templating/mktree.css" media="all"> 
 <link rel="stylesheet" type="text/css" href="scorm.css" media="all">
 
+<script type="text/javascript">
+//<!--
+var mktree_remember = true;
+//-->
+</script>
+
 <script type="text/javascript" src="/resources/acs-templating/mktree.js"></script>
 
 <script type="text/javascript">
@@ -62,13 +68,13 @@
 <if @tree_items.indent@ lt @tree_items.last_indent@></ul></if>
 <if @tree_items.indent@ eq @tree_items.last_indent@ and @tree_items.rownum@ ne 1></if>
 <if @tree_items.link@ not nil>
-	<li id="@man_id@-@return_url@-@tree_items.rownum@" remember="1">@tree_items.icon;noquote@
+	<li id="lorsm-@man_id@-@tree_items.rownum@">@tree_items.icon;noquote@
 	<a href="@tree_items.link@" 
 	<if @tree_items.target@ not nil>target="@tree_items.target@"</if>>@tree_items.label@ </a></if>
 <else>
 	</ul>
-	<ul class="mktree" id="@man_id@-@return_url@-@tree_items.rownum@">
-	<li id="@man_id@-@return_url@-@tree_items.rownum@" remember="1">@tree_items.icon;noquote@
+	<ul class="mktree">
+	<li id="lorsm-@man_id@-@tree_items.rownum@">@tree_items.icon;noquote@
 	<span class="organization_class">@tree_items.label@</span>
 </else>
 	<if @tree_items.rownum@ eq @tree_items:rowcount@></li></ul></if>
Index: openacs-4/packages/lorsm/www/doc/lorsm_installation.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/doc/lorsm_installation.html,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/lorsm/www/doc/lorsm_installation.html	8 Oct 2008 13:01:06 -0000	1.5
+++ openacs-4/packages/lorsm/www/doc/lorsm_installation.html	8 Oct 2008 13:24:32 -0000	1.6
@@ -71,17 +71,17 @@
 <blockquote>
 <code>
 <font color="grey">
-&lt;application name=&quot;dotlrn&quot; pretty-name=&quot;.LRN&quot; home=&quot;http://openacs.org/projects/dotlrn&quot; min_stack_size=&quot;512&quot;&gt;&lt;b&gt;<br />
-&nbsp; &lt;actions&gt;<br />
+&lt;application name=&quot;dotlrn&quot; pretty-name=&quot;.LRN&quot; home=&quot;http://openacs.org/projects/dotlrn&quot; min_stack_size=&quot;512&quot;&gt;&lt;b&gt;<br>
+&nbsp; &lt;actions&gt;<br>
 &nbsp;&nbsp;...<br>
 </font>
 
-<font size="+1"<b>&nbsp; &nbsp;  &lt;install package=&quot;dotlrn-lorsm&quot;/&gt;&lt;br&gt;</b><br /></font>
+<font size="+1"<b>&nbsp; &nbsp;  &lt;install package=&quot;dotlrn-lorsm&quot;/&gt;&lt;br&gt;</b><br></font>
 
 <font color="grey">
 &nbsp;&nbsp;...<br>
 
-&nbsp; &lt;/actions&gt;<br />
+&nbsp; &lt;/actions&gt;<br>
 &lt;application&gt;</font>
 </blockquote>
 <p>Again, double-check that the four packages that you got from cvs are in the right directory: <code>yourlrndirectory/packages</code>.</p>
Index: openacs-4/packages/lorsm-portlet/lorsm-portlet.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm-portlet/lorsm-portlet.info,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/lorsm-portlet/lorsm-portlet.info	8 Oct 2008 13:01:06 -0000	1.7
+++ openacs-4/packages/lorsm-portlet/lorsm-portlet.info	8 Oct 2008 13:24:32 -0000	1.8
@@ -7,14 +7,14 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="2.4.0d1" url="http://openacs.org/repository/download/apm/lorsm-portlet-2.4.0d1.apm">
+    <version name="2.4.1b1" url="http://openacs.org/repository/download/apm/lorsm-portlet-2.4.1b1.apm">
         <owner url="mailto:ErnieG@mm.st">Ernie Ghiglione</owner>
-        <release-date>2008-01-08</release-date>
+        <release-date>2008-09-16</release-date>
         <vendor url="http://www.openacs.org">OpenACS</vendor>
 
-        <provides url="lorsm-portlet" version="2.4.0d1"/>
-        <requires url="lorsm" version="0.8d"/>
-        <requires url="new-portal" version="2.4.0d1"/>
+        <provides url="lorsm-portlet" version="2.4.1b1"/>
+        <requires url="lorsm" version="0.8d3"/>
+        <requires url="new-portal" version="2.4.1b1"/>
 
         <callbacks>
         </callbacks>
Index: openacs-4/packages/lorsm-portlet/www/lorsm-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm-portlet/www/lorsm-portlet.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/lorsm-portlet/www/lorsm-portlet.adp	8 Oct 2008 13:01:06 -0000	1.5
+++ openacs-4/packages/lorsm-portlet/www/lorsm-portlet.adp	8 Oct 2008 13:24:32 -0000	1.6
@@ -1,16 +1,6 @@
 <if @shaded_p@ false>
-<if @one_instance_p@ true>
    <include src="/packages/lorsm/lib/user-lorsm" package_id="@list_of_package_ids@" />
 </if>
 <else>
-
-<list name="list_of_package_ids">
-  <include src="/packages/lorsm/lib/user-lorsm" package_id="@list_of_package_ids:item@" />
-</list>
-
-</else>
-
-</if>
-<else>
   &nbsp;
 </else>
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/views/catalog/views.es_ES.ISO-8859-1.xml'.
Fisheye: No comparison available.  Pass `N' to diff?