Index: openacs-4/packages/dotlrn-catalog/catalog/dotlrn-catalog.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-catalog/catalog/dotlrn-catalog.en_US.ISO-8859-1.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn-catalog/catalog/dotlrn-catalog.en_US.ISO-8859-1.xml 16 Feb 2005 00:39:09 -0000 1.3
+++ openacs-4/packages/dotlrn-catalog/catalog/dotlrn-catalog.en_US.ISO-8859-1.xml 16 Feb 2005 15:28:32 -0000 1.4
@@ -21,6 +21,7 @@
<msg key="confirm_delete">Confirm Delete Of </msg>
<msg key="course_admin">Course Administration</msg>
<msg key="course_catalog">DotLRN Catalog Index</msg>
+ <msg key="course_details">Course Details</msg>
<msg key="course_info">Description:</msg>
<msg key="course_key">Course Key:</msg>
<msg key="course_list">Your Course List</msg>
@@ -51,7 +52,7 @@
<msg key="has_no">and has <b>No</b> associations to dotLRN class or community</msg>
<msg key="has_one">has one association to dotLRN class or community</msg>
<msg key="info">Course Information</msg>
- <msg key="is_assoc">is associated to:</msg>
+ <msg key="is_assoc">is associated with:</msg>
<msg key="label_title">Check/uncheck all rows</msg>
<msg key="make_live">Make This Course Live</msg>
<msg key="manage_per">Manage Permissions</msg>
@@ -88,6 +89,5 @@
<msg key="version">Version</msg>
<msg key="versions">Versions</msg>
<msg key="watch">Watch</msg>
- <msg key="watch_assoc">Watch Association</msg>
<msg key="yes">Yes</msg>
</message_catalog>
Index: openacs-4/packages/dotlrn-catalog/catalog/dotlrn-catalog.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-catalog/catalog/dotlrn-catalog.es_ES.ISO-8859-1.xml,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn-catalog/catalog/dotlrn-catalog.es_ES.ISO-8859-1.xml 16 Feb 2005 00:22:46 -0000 1.1
+++ openacs-4/packages/dotlrn-catalog/catalog/dotlrn-catalog.es_ES.ISO-8859-1.xml 16 Feb 2005 15:28:32 -0000 1.2
@@ -21,6 +21,7 @@
<msg key="confirm_delete">Corfirmar borrado de</msg>
<msg key="course_admin">Administracion de Cursos</msg>
<msg key="course_catalog">Indice del Catalogo dotLRN</msg>
+ <msg key="course_details">Detalles del Curso</msg>
<msg key="course_info">Informacion del Curso:</msg>
<msg key="course_key">Llave del Curso:</msg>
<msg key="course_list">Su listado de Cursos</msg>
@@ -34,6 +35,7 @@
<msg key="description">Descripcion</msg>
<msg key="do_you_still">Aun quiere borrarlo?</msg>
<msg key="dotlrn">dotLRN</msg>
+ <msg key="dotlrn_assoc">Asociaciones con dotLRN</msg>
<msg key="dotlrn_classes">Clases de dotLRN</msg>
<msg key="dotlrn_com">Comunidades de dotLRN</msg>
<msg key="dotlrn_list">Listado de dotLRN</msg>
@@ -49,6 +51,7 @@
<msg key="grantrevoke">Otorgar/Remover</msg>
<msg key="has_no">y <b>No</b> posee asociaciones a clases o comunidades de dotLRN</msg>
<msg key="has_one">posee una asociacion a una clase o comunidad de dotLRN</msg>
+ <msg key="info">Informacion del curso</msg>
<msg key="is_assoc">esta asociado a:</msg>
<msg key="label_title">Marcar/Desmarcar todas las filas</msg>
<msg key="make_live">Hacer este Curso Disponible</msg>
@@ -86,8 +89,5 @@
<msg key="version">Version</msg>
<msg key="versions">Versiones</msg>
<msg key="watch">Observar</msg>
- <msg key="watch_assoc">Observar Asociaciones</msg>
<msg key="yes">Si</msg>
</message_catalog>
-
-
Index: openacs-4/packages/dotlrn-catalog/lib/course-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-catalog/lib/course-chunk.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn-catalog/lib/course-chunk.adp 16 Feb 2005 00:22:12 -0000 1.3
+++ openacs-4/packages/dotlrn-catalog/lib/course-chunk.adp 16 Feb 2005 15:28:32 -0000 1.4
@@ -38,10 +38,10 @@
</if>
<else>
<if @index@ eq "yes">
- #dotlrn-catalog.yes# (<a href="dt-admin/watch-association?course_id=@course_id@&course_key=@course_key@&return_url=@return_url@&course_name=@name@" title="#dotlrn-catalog.watch_assoc#"><i>#dotlrn-catalog.watch#</i></a>)
+ #dotlrn-catalog.yes# (<a href="dt-admin/course-details?course_id=@course_id@&course_key=@course_key@&return_url=@return_url@&course_name=@name@" title="#dotlrn-catalog.course_details#"><i>#dotlrn-catalog.watch#</i></a>)
</if>
<else>
- #dotlrn-catalog.yes# (<a href="watch-association?course_id=@course_id@&course_key=@course_key@&return_url=@return_url@&course_name=@name@" title="#dotlrn-catalog.watch_assoc#"><i>#dotlrn-catalog.watch#</i></a>)
+ #dotlrn-catalog.yes# (<a href="course-details?course_id=@course_id@&course_key=@course_key@&return_url=@return_url@&course_name=@name@" title="#dotlrn-catalog.course_details#"><i>#dotlrn-catalog.watch#</i></a>)
</else>
</else>
</td>
Index: openacs-4/packages/dotlrn-catalog/www/dt-admin/course-add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-catalog/www/dt-admin/course-add-edit.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn-catalog/www/dt-admin/course-add-edit.tcl 16 Feb 2005 00:44:25 -0000 1.3
+++ openacs-4/packages/dotlrn-catalog/www/dt-admin/course-add-edit.tcl 16 Feb 2005 15:28:32 -0000 1.4
@@ -106,8 +106,8 @@
}
if { [catch { set item_id [content::item::new -name $course_key -parent_id $folder_id \
-content_type "dotlrn_catalog" -creation_user $user_id \
- -attributes $form_attributes -is_live t] } errmsg] } {
- ad_return_complaint 1 "\#dotlrn-catalog.name_already\# $errmsg"
+ -attributes $form_attributes -is_live t -title $course_key] } errmsg] } {
+ ad_return_complaint 1 "\#dotlrn-catalog.name_already\#"
}
# Grant admin privileges to the user over the item in the CR
permission::grant -party_id $user_id -object_id $item_id -privilege "admin"
Index: openacs-4/packages/dotlrn-catalog/www/dt-admin/course-details.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-catalog/www/dt-admin/course-details.adp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn-catalog/www/dt-admin/course-details.adp 16 Feb 2005 15:28:32 -0000 1.1
@@ -0,0 +1,16 @@
+<master>
+<property name=title>@page_title@</property>
+<property name="context">@context;noquote@</property>
+
+
+<h2>@course_key;noquote@ (@course_name@) #dotlrn-catalog.is_assoc#</h2>
+
+<multiple name="relations">
+ <if @relations.type@ eq "dotlrn_catalog_class_rel">
+ <include src="/packages/dotlrn-catalog/lib/dotlrn-chunk" class_id=@relations.object_id@>
+ </if>
+ <else>
+ <include src="/packages/dotlrn-catalog/lib/community-chunk" community_id=@relations.object_id@>
+ </else>
+</multiple>
+
Index: openacs-4/packages/dotlrn-catalog/www/dt-admin/course-details.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-catalog/www/dt-admin/course-details.tcl,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn-catalog/www/dt-admin/course-details.tcl 16 Feb 2005 15:28:32 -0000 1.1
@@ -0,0 +1,23 @@
+ad_page_contract {
+ Shows all associations that course_id has
+ @author Miguel Marin (miguelmarin@viaro.net)
+ @author Viaro Networks www.viaro.net
+ @creation date 28-01-2005
+} {
+ { return_url "" }
+ course_id:notnull
+ course_key:notnull
+ { course_name "" }
+}
+
+if { [string equal $return_url "index"] } {
+ set context [list [list ../course-info?course_id=$course_id&course_key=$course_key&course_name=$course_name "[_ dotlrn-catalog.one_course_info]"] "[_ dotlrn-catalog.course_details]"]
+} else {
+ set context [list [list course-list "[_ dotlrn-catalog.course_list]"] "[_ dotlrn-catalog.course_details]"]
+}
+
+set page_title "[_ dotlrn-catalog.course_details]"
+set user_id [ad_conn user_id]
+
+db_multirow relations relation { }
+
Index: openacs-4/packages/dotlrn-catalog/www/dt-admin/course-details.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-catalog/www/dt-admin/course-details.xql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn-catalog/www/dt-admin/course-details.xql 16 Feb 2005 15:28:32 -0000 1.1
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<queryset>
+
+ <fullquery name="get_class_info">
+ <querytext>
+ select department_name, term_name, class_name, pretty_name, description, url
+ from dotlrn_class_instances_full
+ where class_instance_id = :class_id
+ </querytext>
+ </fullquery>
+
+ <fullquery name="relation">
+ <querytext>
+ select object_id_two as object_id, rel_type as type from acs_rels
+ where object_id_one = :course_id order by type
+ </querytext>
+ </fullquery>
+
+</queryset>
\ No newline at end of file
Index: openacs-4/packages/dotlrn-catalog/www/dt-admin/course-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-catalog/www/dt-admin/course-list.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn-catalog/www/dt-admin/course-list.tcl 16 Feb 2005 00:22:12 -0000 1.2
+++ openacs-4/packages/dotlrn-catalog/www/dt-admin/course-list.tcl 16 Feb 2005 15:28:32 -0000 1.3
@@ -81,7 +81,7 @@
#dotlrn-catalog.no# (<a href="dotlrn-list?course_id=@course_list.course_id@&course_key=@course_list.course_key@&return_url=$return_url&course_name=@course_list.course_name@" title="\#dotlrn-catalog.associate_this\#"><i>#dotlrn-catalog.associate#</i></a>)
</if>
<else>
- #dotlrn-catalog.yes# (<a href="watch-association?course_id=@course_list.course_id@&course_key=@course_list.course_key@&return_url=$return_url&course_name=@course_list.course_name@" title="\#dotlrn-catalog.watch_assoc#"><i>#dotlrn-catalog.watch#</i></a>)
+ #dotlrn-catalog.yes# (<a href="course-details?course_id=@course_list.course_id@&course_key=@course_list.course_key@&return_url=$return_url&course_name=@course_list.course_name@" title="\#dotlrn-catalog.course_details#"><i>#dotlrn-catalog.watch#</i></a>)
</else>
}
}