Index: openacs-4/packages/dotlrn/dotlrn.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/dotlrn.info,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/dotlrn/dotlrn.info 10 Nov 2001 02:37:55 -0000 1.13
+++ openacs-4/packages/dotlrn/dotlrn.info 13 Nov 2001 16:21:01 -0000 1.14
@@ -61,6 +61,7 @@
+
@@ -89,7 +90,9 @@
+
+
@@ -102,6 +105,10 @@
+
+
+
+
@@ -120,19 +127,22 @@
+
+
+
-
+
Index: openacs-4/packages/dotlrn/tcl/community-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs-oracle.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/tcl/community-procs-oracle.xql 9 Nov 2001 03:56:43 -0000 1.2
+++ openacs-4/packages/dotlrn/tcl/community-procs-oracle.xql 13 Nov 2001 16:21:01 -0000 1.3
@@ -44,8 +44,14 @@
-
+
+select site_node.url(node_id) from site_nodes where object_id= :package_id
+
+
+
+
+
select object_type from acs_object_types where supertype='dotlrn_community' start with object_type = (select community_type from dotlrn_communities where community_id=:community_id) connect by object_type= prior supertype
Index: openacs-4/packages/dotlrn/tcl/community-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.tcl,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/dotlrn/tcl/community-procs.tcl 11 Nov 2001 18:48:01 -0000 1.21
+++ openacs-4/packages/dotlrn/tcl/community-procs.tcl 13 Nov 2001 16:21:01 -0000 1.22
@@ -85,6 +85,14 @@
return [db_string select_node_url {} -default ""]
}
+
+ ad_proc -public get_url_from_package_id {
+ {-package_id ""}
+ } {
+ This gets the relative URL for a package_id.
+ } {
+ return [db_string select_node_url {} -default ""]
+ }
ad_proc set_attribute {
community_id
@@ -281,6 +289,14 @@
return [db_list_of_lists select_all_communities {}]
}
+ ad_proc -public get_toplevel_community_type_from_community_id {
+ community_id
+ } {
+ returns the community type from community_id
+ } {
+ return [db_string select_community_type {}]
+ }
+
ad_proc -public get_community_type_from_community_id {
community_id
} {
@@ -312,15 +328,15 @@
} {
Get the URL for a community type
} {
- return [get_url -package_id [get_community_type_package_id $community_type]]
+ return [get_url_from_package_id -package_id [get_community_type_package_id $community_type]]
}
ad_proc -public get_community_url {
community_id
} {
Get the URL for a community
} {
- return [get_url -package_id [get_package_id $community_id]]
+ return [get_url_from_package_id -package_id [get_package_id $community_id]]
}
ad_proc -public get_community_type_package_id {
Index: openacs-4/packages/dotlrn/tcl/community-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.xql,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/dotlrn/tcl/community-procs.xql 11 Nov 2001 18:48:01 -0000 1.9
+++ openacs-4/packages/dotlrn/tcl/community-procs.xql 13 Nov 2001 16:21:01 -0000 1.10
@@ -107,6 +107,12 @@
+
+
+select community_type from dotlrn_communities where community_id=:community_id
+
+
+
select community_id from dotlrn_communities where package_id= :package_id
@@ -133,7 +139,13 @@
+select pretty_name from dotlrn_community_types where community_type= :community_type
+
+
+
+
+select pretty_name from dotlrn_communities where community_id= :community_id
Index: openacs-4/packages/dotlrn/tcl/navigation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/navigation-procs.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/tcl/navigation-procs.tcl 11 Nov 2001 18:48:01 -0000 1.1
+++ openacs-4/packages/dotlrn/tcl/navigation-procs.tcl 13 Nov 2001 16:21:01 -0000 1.2
@@ -32,8 +32,8 @@
} {
# Fetch community_id and community_type if they're not there
if {[empty_string_p $community_id] && [empty_string_p $community_type]} {
- set community_id [dotlrn::get_community_id]
- set community_type [dotlrn::get_community_type]
+ set community_id [dotlrn_community::get_community_id]
+ set community_type [dotlrn_community::get_community_type]
}
if {![empty_string_p $community_id]} {
@@ -49,10 +49,14 @@
}
foreach arg $args {
- lappend list_of_links "[lindex $arg 1]"
+ if {[llength $arg] == 2} {
+ lappend list_of_links "[lindex $arg 1]"
+ } else {
+ lappend list_of_links "$arg"
+ }
}
- return "[join $list_of_links " > "] >
"
+ return "[join $list_of_links " > "]
"
}
}
Index: openacs-4/packages/dotlrn/www/master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/master.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/master.adp 9 Oct 2001 14:47:01 -0000 1.3
+++ openacs-4/packages/dotlrn/www/master.adp 13 Nov 2001 16:21:01 -0000 1.4
@@ -20,7 +20,7 @@
@title@
- <%= [eval ad_context_bar $context_bar] %>
+ <%= [eval dotlrn::navbar $context_bar] %>
Index: openacs-4/packages/dotlrn/www/one-community-type.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community-type.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/one-community-type.tcl 9 Oct 2001 14:35:58 -0000 1.3
+++ openacs-4/packages/dotlrn/www/one-community-type.tcl 13 Nov 2001 16:21:01 -0000 1.4
@@ -44,6 +44,6 @@
template::multirow append active_communities [lindex $comm 0] [lindex $comm 1] [lindex $comm 2] [lindex $comm 3] [lindex $comm 4]
}
-set context_bar {One Community Type}
+set context_bar {View}
ad_return_template