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.9 -r1.10
--- openacs-4/packages/dotlrn/tcl/navigation-procs.tcl	21 May 2002 17:30:02 -0000	1.9
+++ openacs-4/packages/dotlrn/tcl/navigation-procs.tcl	29 May 2002 04:45:23 -0000	1.10
@@ -14,15 +14,6 @@
 #  details.
 #
 
-
-#
-# Procs for DOTLRN navigation
-# Copyright 2001 OpenForce, inc.
-# Distributed under the GNU GPL v2
-#
-# November 10th, 2001
-#
-
 ad_library {
 
     Procs for dotLRN navigation
@@ -34,48 +25,43 @@
 
 namespace eval dotlrn {
 
-    ad_proc -public root_url {
-    } {
-	return "/dotlrn"
-    }
-
     ad_proc -public admin_navbar {
-	args
+        args
     } {
-	do an admin navbar
+        do an admin navbar
     } {
-	# Prepend some args
-	set first_args [list [list [root_url] "dotLRN"]]
-	if {[llength $args] > 0} {
-	    lappend first_args [list "[root_url]/admin" Admin]
-	} else {
-	    lappend first_args Admin
-	}
+        # Prepend some args
+        set first_args [list [list [get_url] "dotLRN"]]
+        if {[llength $args] > 0} {
+            lappend first_args [list [get_admin_url] Admin]
+        } else {
+            lappend first_args Admin
+        }
 
-	set args [concat $first_args $args]
+        set args [concat $first_args $args]
 
-	return [raw_navbar $args]
+        return [raw_navbar $args]
     }
 
     ad_proc -public navbar {
-	{ -community_id "" }
-	{ -community_type "" }
-	args
+        { -community_id "" }
+        { -community_type "" }
+        args
     } {
-	Creates a Navigation Bar for dotLRN
+        Creates a Navigation Bar for dotLRN
     } {
-	# 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_community::get_community_id]
-	    set community_type [dotlrn_community::get_community_type]
-	}
+        # 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_community::get_community_id]
+            set community_type [dotlrn_community::get_community_type]
+        }
 
-	if {![empty_string_p $community_id]} {
-	    set community_type [dotlrn_community::get_community_type_from_community_id $community_id]
-	}
+        if {![empty_string_p $community_id]} {
+            set community_type [dotlrn_community::get_community_type_from_community_id $community_id]
+        }
 
-	set first_args []
-	lappend first_args [list [root_url] dotLRN]
+        set first_args []
+        lappend first_args [list [get_url] dotLRN]
 
         if {[string equal ${community_type} "dotlrn_class_instance"] != 0} {
             lappend first_args [list [dotlrn_community::get_community_type_url $community_type] [parameter::get -parameter classes_pretty_plural]]
@@ -86,33 +72,33 @@
             lappend first_args [list [dotlrn_community::get_community_type_url $community_type] [dotlrn_community::get_community_type_name $community_type]]
         }
 
-	if {![empty_string_p $community_id]} {
-	    lappend first_args [list [dotlrn_community::get_community_url $community_id] [dotlrn_community::get_community_name $community_id]]
-	}
+        if {![empty_string_p $community_id]} {
+            lappend first_args [list [dotlrn_community::get_community_url $community_id] [dotlrn_community::get_community_name $community_id]]
+        }
 
-	return [raw_navbar [concat $first_args $args]]
+        return [raw_navbar [concat $first_args $args]]
     }
 
     ad_proc -public raw_navbar {
-	list_of_args
+        list_of_args
     } {
-	do the raw navbar thing (both for admin and such)
+        do the raw navbar thing (both for admin and such)
     } {
-	set args $list_of_args
-	set list_of_links [list]
-	set total_n_args [llength $args]
-	set count 0
+        set args $list_of_args
+        set list_of_links [list]
+        set total_n_args [llength $args]
+        set count 0
 
-	foreach arg $args {
-	    incr count
-	    if {[llength $arg] == 2 && $count < $total_n_args} {
-		lappend list_of_links "<a href=\"[lindex $arg 0]\">[lindex $arg 1]</a>"
-	    } else {
-		lappend list_of_links "$arg"
-	    }
-	}
+        foreach arg $args {
+            incr count
+            if {[llength $arg] == 2 && $count < $total_n_args} {
+                lappend list_of_links "<a href=\"[lindex $arg 0]\">[lindex $arg 1]</a>"
+            } else {
+                lappend list_of_links "$arg"
+            }
+        }
 
-	return "[join $list_of_links " &gt; "]<br>"
+        return "[join $list_of_links " &gt; "]<br>"
     }
-	
+
 }