[CMF-checkins] CVS: CMF/CMFDefault/skins/generic - logged_in.dtml:1.4 roster.dtml:1.3
Yvo Schubbe
schubbe@web.de
Fri, 21 Feb 2003 06:39:16 -0500
Update of /cvs-repository/CMF/CMFDefault/skins/generic
In directory cvs.zope.org:/tmp/cvs-serv30593/CMFDefault/skins/generic
Modified Files:
logged_in.dtml roster.dtml
Log Message:
Merged yuppie-collector128-branch:
- Un-hardwired members folder. (Collector #128)
=== CMF/CMFDefault/skins/generic/logged_in.dtml 1.3 => 1.4 ===
--- CMF/CMFDefault/skins/generic/logged_in.dtml:1.3 Thu Oct 17 15:38:36 2002
+++ CMF/CMFDefault/skins/generic/logged_in.dtml Fri Feb 21 06:39:15 2003
@@ -88,9 +88,6 @@
<h1 class="DesktopTitle">Login success</h1>
<p class="Desktop">Welcome. You are currently logged in.
-<!--Don't forget to take a look at your
-<a href="<!--#var SCRIPT_NAME-->/Members/<!--#var "member.getId()" url_quote-->/update_html">personalization
-page</a>.-->
</p>
</dtml-if>
=== CMF/CMFDefault/skins/generic/roster.dtml 1.2 => 1.3 ===
--- CMF/CMFDefault/skins/generic/roster.dtml:1.2 Tue Mar 27 17:51:01 2001
+++ CMF/CMFDefault/skins/generic/roster.dtml Fri Feb 21 06:39:15 2003
@@ -9,7 +9,8 @@
<h1> Portal Members </h1>
<dtml-let roster="portal_membership.getRoster()"
- userMgr="portal_membership.checkPermission( 'Manage_users', Members )"
+ isUserManager="portal_membership.checkPermission( 'Manage_users',
+ portal_membership.getMembersFolder() )"
>
<table class="SearchResults">
@@ -18,7 +19,7 @@
</td>
<th> Member
</th>
- <dtml-if userMgr>
+ <dtml-if isUserManager>
<th> Listed?
</th>
<dtml-comment> We don't have a good interface for querying/setting roles
@@ -38,7 +39,7 @@
&dtml-id;
</dtml-if>
</td>
- <dtml-if userMgr>
+ <dtml-if isUserManager>
<td>
<dtml-if listed> Yes <dtml-else> No </dtml-if>
</td>