[CMF-checkins] CVS: CMF/CMFDefault/skins/zpt_generic - main_template.pt:1.9 roster.pt:1.3

[Yvo Schubbe]

Update of /cvs-repository/CMF/CMFDefault/skins/zpt_generic
In directory cvs.zope.org:/tmp/cvs-serv30639/CMFDefault/skins/zpt_generic

Modified Files:
	main_template.pt roster.pt 
Log Message:
Merged yuppie-collector128-branch:
- Un-hardwired members folder. (Collector #128)

=== CMF/CMFDefault/skins/zpt_generic/main_template.pt 1.8 => 1.9 ===
--- CMF/CMFDefault/skins/zpt_generic/main_template.pt:1.8	Thu Feb 20 10:16:51 2003
+++ CMF/CMFDefault/skins/zpt_generic/main_template.pt	Fri Feb 21 06:39:28 2003
@@ -8,6 +8,7 @@
                   object_title here/Title;
                   portal_url utool;
                   member mtool/getAuthenticatedMember;
+                  membersfolder mtool/getMembersFolder;
                   isAnon mtool/isAnonymousUser;
                   actions python: atool.listFilteredActionsFor( here );
                   user_actions actions/user;
@@ -60,8 +61,11 @@
 
    <td id="NavBar">
     <a href="." tal:attributes="href string:${portal_url}/">home</a>&nbsp;
+    <span tal:condition="membersfolder" tal:omit-tag="">
     <a href="roster"
-       tal:attributes="href string:${portal_url}/Members">members</a>&nbsp;
+       tal:attributes="href python: membersfolder.absolute_url()"
+       tal:content="python: membersfolder.getId().lower()">members</a>&nbsp;
+    </span>
     <a href="recent_news"
        tal:attributes="href string:${portal_url}/recent_news">news</a>&nbsp;
     <a href="search_form"


=== CMF/CMFDefault/skins/zpt_generic/roster.pt 1.2 => 1.3 ===
--- CMF/CMFDefault/skins/zpt_generic/roster.pt:1.2	Thu Dec  6 17:43:43 2001
+++ CMF/CMFDefault/skins/zpt_generic/roster.pt	Fri Feb 21 06:39:28 2003
@@ -13,21 +13,23 @@
 
 <h3> Portal Members </h3>
 
-<table class="SearchResults">
- <tr>
-  <td width="16"> <br>
-  </td>
+<table class="SearchResults"
+    tal:define="mtool here/portal_membership;
+                isUserManager python: mtool.checkPermission( 'Manage_users',
+                                                  mtool.getMembersFolder() )">
+<tr>
+  <td width="16"> <br /> </td>
   <th>Member</th>
-   <th tal:condition="python: here.portal_membership.checkPermission('Manage_users', here.Members)">Listed?</th>
- </tr>
+  <th tal:condition="isUserManager">Listed?</th>
+</tr>
 <div tal:define="b_start string:0;b_start request/b_start | b_start;
-       members python: here.portal_membership.getRoster();
+                 members mtool/getRoster;
 	   Batch python:modules['ZTUtils'].Batch;
 	   global batch python:Batch(members, 25, int(b_start), orphan=1)">
 <tr tal:repeat="members batch">
-     
- <td> <br> </td>
-  <td tal:define="id members/id; homeUrl python: here.portal_membership.getHomeUrl(id, verifyPermission=1)">
+  <td> <br /> </td>
+  <td tal:define="id members/id;
+                  homeUrl python: mtool.getHomeUrl(id, verifyPermission=1)">
          <a href="www.here.com"
 			tal:condition="homeUrl"
 	    	tal:attributes="href homeUrl"
@@ -35,14 +37,14 @@
        <span tal:condition="not:homeUrl"
 	         tal:replace="id">ID</span>
   </td>
-  <td tal:condition="python: here.portal_membership.checkPermission( 'Manage_users', here.Members )"
+  <td tal:condition="isUserManager"
       tal:define="listed members/listed">
    <span tal:replace="python: listed and 'Yes' or 'No'">Yes...Or No</span>
   </td>
 </tr>
 
 <tr>
-  <td> <br> </td>
+  <td> <br /> </td>
   <td>
   <span tal:define="p batch/previous" tal:condition="p">
     <a href=""