Index: openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl,v
diff -u -r1.43 -r1.44
--- openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl	16 Apr 2002 13:53:52 -0000	1.43
+++ openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl	18 Apr 2002 04:06:34 -0000	1.44
@@ -286,20 +286,18 @@
     ad_proc -public render_page {
 	{-workspace_p ""}
 	{-hide_links_p  "f"}
-	{-user_id  ""}
         {-render_style "individual"}
         {-page_num ""}
 	portal_id
     } {
 	render a page in a user's favorite style
     } {
-	if {[empty_string_p $user_id]} {
-	    set user_id [ad_conn user_id]
-	}
-
-        set theme_id [get_user_theme $user_id]
-
-	return [portal::render -page_num $page_num -hide_links_p $hide_links_p -render_style $render_style $portal_id $theme_id ]
+	return [portal::render \
+                -page_num $page_num \
+                -hide_links_p $hide_links_p \
+                -render_style $render_style \
+                $portal_id
+        ]
     }
 
     ad_proc -public get_group_id_from_user_type {
Index: openacs-4/packages/dotlrn/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/index.tcl,v
diff -u -r1.29 -r1.30
--- openacs-4/packages/dotlrn/www/index.tcl	15 Apr 2002 22:06:04 -0000	1.29
+++ openacs-4/packages/dotlrn/www/index.tcl	18 Apr 2002 04:06:34 -0000	1.30
@@ -76,7 +76,6 @@
 # O glorious portal page!
 set rendered_page \
         [dotlrn::render_page \
-            -user_id $user_id \
             -page_num $page_num \
             -hide_links_p "t" \
             $portal_id
Index: openacs-4/packages/dotlrn/www/admin/portal-templates.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/portal-templates.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/admin/portal-templates.adp	16 Apr 2002 13:53:52 -0000	1.1
+++ openacs-4/packages/dotlrn/www/admin/portal-templates.adp	18 Apr 2002 04:06:34 -0000	1.2
@@ -18,7 +18,10 @@
 
 %>
 
-<master>
+<master src="dotlrn-admin-master">
+<property name="title">@title@</property>
+<property name="context_bar">@context_bar@</property>
+
   <ul>
     <multiple name=templates>
       <li>@templates.name@ [<a href="@url@/portal-show.tcl?portal_id=@templates.portal_id@&referer=@referer@">view</a>|<a href="@url@/portal-config?portal_id=@templates.portal_id@&referer=@referer@">edit</a>]</li>
Index: openacs-4/packages/dotlrn/www/admin/portal-templates.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/portal-templates.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/admin/portal-templates.tcl	16 Apr 2002 13:53:52 -0000	1.1
+++ openacs-4/packages/dotlrn/www/admin/portal-templates.tcl	18 Apr 2002 04:06:34 -0000	1.2
@@ -26,7 +26,7 @@
     departments:multirow
 }
 
-set title "Portal Templates"
+set title {Templates}
 set context_bar $title
 set url "[portal::mount_point]admin"
 set referer [ad_conn url]