Index: openacs-4/packages/dotlrn/www/dotlrn-main-portlet-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-main-portlet-oracle.xql,v
diff -u -r1.6 -r1.6.2.1
--- openacs-4/packages/dotlrn/www/dotlrn-main-portlet-oracle.xql 17 Jun 2002 21:57:20 -0000 1.6
+++ openacs-4/packages/dotlrn/www/dotlrn-main-portlet-oracle.xql 17 Oct 2002 12:29:16 -0000 1.6.2.1
@@ -10,11 +10,11 @@
decode(dotlrn_communities.community_type, 'dotlrn_community', 'dotlrn_community',
'dotlrn_club', 'dotlrn_club',
'dotlrn_class_instance') as simple_community_type,
+ decode(dotlrn_community_admin_p(dotlrn_communities.community_id, dotlrn_member_rels_approved.user_id),'f',0,1) as admin_p,
tree.tree_level(dotlrn_communities.tree_sortkey) as tree_level,
nvl((select tree.tree_level(dotlrn_community_types.tree_sortkey)
from dotlrn_community_types
- where dotlrn_community_types.community_type = dotlrn_communities.community_type), 0) as community_type_level,
- acs_permission.permission_p(dotlrn_communities.community_id, :user_id, 'admin') as admin_p
+ where dotlrn_community_types.community_type = dotlrn_communities.community_type), 0) as community_type_level
from dotlrn_communities,
dotlrn_member_rels_approved
where dotlrn_communities.community_id = dotlrn_member_rels_approved.community_id
Index: openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp,v
diff -u -r1.32 -r1.32.2.1
--- openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp 9 Aug 2002 18:39:26 -0000 1.32
+++ openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp 17 Oct 2002 12:29:16 -0000 1.32.2.1
@@ -34,36 +34,46 @@
set new_level 0
set depth 0
%>
-
+
- <%= [parameter::get -parameter class_instances_pretty_plural] %>:
+ <%= [parameter::get -parameter class_instances_pretty_plural] %>:
- <%= [parameter::get -parameter clubs_pretty_plural] %>:
+ <%= [parameter::get -parameter clubs_pretty_plural] %>:
-
+
<% set new_level $communities(tree_level) %>
-<% incr depth -1 %>
+ <% incr depth -1 %>
-
+
+ <% while {$depth > 1} {
+ append close_tags ""
+ incr depth -1
+ }
+ %>
+ @close_tags@
+
+
<% incr depth 1 %>
@communities.pretty_name@
-
- [
- Administer
- ]
-
+
+  
+
+
+
+
@@ -80,3 +90,11 @@
+
+
+
+
+
+
+
+
Index: openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl,v
diff -u -r1.9 -r1.9.2.1
--- openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl 9 Aug 2002 18:39:26 -0000 1.9
+++ openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl 17 Oct 2002 12:29:16 -0000 1.9.2.1
@@ -21,8 +21,13 @@
@author Arjun Sanyal (arjun@openforce.net)
@version $Id$
+} {
}
+if {![exists_and_not_null show_buttons_p]} {
+ set show_buttons_p 0
+}
+
set user_id [ad_conn user_id]
set user_can_browse_p [dotlrn::user_can_browse_p -user_id $user_id]
Index: openacs-4/packages/dotlrn/www/dotlrn-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-master.adp,v
diff -u -r1.10 -r1.10.2.1
--- openacs-4/packages/dotlrn/www/dotlrn-master.adp 14 Aug 2002 19:28:02 -0000 1.10
+++ openacs-4/packages/dotlrn/www/dotlrn-master.adp 17 Oct 2002 12:29:16 -0000 1.10.2.1
@@ -1,8 +1,7 @@
<%
+ # Copyright (C) 2001, 2002 OpenForce, Inc.
#
- # Copyright (C) 2001, 2002 MIT
- #
# This file is part of dotLRN.
#
# dotLRN is free software; you can redistribute it and/or modify it under the
@@ -14,85 +13,77 @@
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
# details.
+
+
+ # /www/dotlrn-default-master.adp
#
+ # This is the 'default-master' template for dotlrn sites.
+ #
+ # Author: Arjun Sanyal (arjun@openforce.net), yon@openforce.net
+ #
+ # $Id$
-%>
-
+%>
+
+
+
@title@
@header_stuff@
+
+
-
-
-
-
-
-
-  |
-
-
- |
-
-
-
-