[CMF-checkins] CVS: CMF - actions_box.pt:1.1 folderContentList.dtml:1.2 main_template.pt:1.3 viewThreadsAtBottom.pt:1.3

[andrew@digicool.com]

Update of /cvs-repository/CMF/CMFDecor/skins/zpt_generic
In directory korak.digicool.com:/tmp/cvs-serv11699

Modified Files:
	folderContentList.dtml main_template.pt viewThreadsAtBottom.pt 
Added Files:
	actions_box.pt 
Log Message:

*added a newly required arguement in viewThreadsAtBottom
showThreads call introduced 07/12/2001
*convereted actions_box to zpt.
*added actions_box as a macro in the main_template
*changes to getting folderContentList factored into python script
and ZPT (nothing special happening yet)



--- Added File actions_box.pt in package CMF ---
<div metal:define-macro="actions">
<div tal:define="isAnon python:here.portal_membership.isAnonymousUser();
                  AuthClass python:isAnon and 'GuestActions' or 'MemberActions';
				  uname python: isAnon and 'Guest' or here.portal_membership.getAuthenticatedMember().getUserName();
				  actions python:here.portal_actions.listFilteredActionsFor(here);
				  user_actions python:actions['user'];
				  folder_actions python:actions['folder'];
				  object_actions python:(actions['object'] + actions['workflow']);
				  global_actions python:actions['global']">
<table class="ActionBox" width="100%">

 <tr class=""
     tal:attributes="class AuthClass">
  <td class="ActionTitle"
      tal:content="uname">
   <img src="" align="left" alt="User"
        tal:attributes="src python:'%s/p_/User_icon' % (here.portal_url())">
   UserName
  </td>
 </tr>
 <tr class=""
     tal:attributes="class AuthClass">
  <td>
   <span tal:repeat="action user_actions"><a href="" tal:attributes="href action/url" tal:content="action/name">Action</a><br></span>
  </td>
 </tr>
 <tr class=""
     tal:attributes="class AuthClass"
	 tal:condition="folder_actions">
  <td> 
    <span tal:repeat="action folder_actions"><a href="" tal:attributes="href action/url" tal:content="action/name">Action</a><br></span>
  </td>
 </tr>
 <tbody tal:condition="object_actions">
 <tr class=""
     tal:attributes="class AuthClass">
  <td class="ActionTitle"
      tal:define="getIcon python:hasattr(here, 'getIcon') and here.getIcon();
	              icon python:getIcon or getattr(here, 'icon', '');
				  typ python:getattr(here, 'Type', '');
				  objID python:here.getId()">
     <img src=""
	      tal:condition="icon" align="left" alt="Type"
		  tal:attributes="src python:'%s/%s' % (here.portal_url(), icon); alt typ" />
     <span tal:replace="structure objID">ObjectID</span>
  </td>
 </tr>
 <tr class=""
     tal:attributes="class AuthClass">
  <td tal:define="review_state python:here.portal_workflow.getInfoFor(here, 'review_state', '')"> 
    <span tal:condition="review_state">Status:  <span tal:replace="review_state">Private</span><br></span>
    <span tal:repeat="action object_actions"><a href="" tal:attributes="href action/url" tal:content="action/name">Action</a><br></span>
  </td>
 </tr>
</tbody>
 <tr class=""
     tal:attributes="class AuthClass"
	 tal:condition="global_actions">
  <td>
   <span tal:repeat="action global_actions"><a href="" tal:attributes="href action/url" tal:content="action/name">Action</a><br></span>

  </td>
 </tr>
</table>
</div>
</div>

--- Updated File folderContentList.dtml in package CMF --
--- folderContentList.dtml	2001/07/10 20:13:22	1.1
+++ folderContentList.dtml	2001/07/12 21:30:51	1.2
@@ -1,7 +1,7 @@
 <dtml-let filterString="REQUEST.get( 'folderfilter', '' )"
           filter="decodeFolderFilter( filterString )"
 >
-<dtml-in expr="listFolderContents( filter=filter )"
+<dtml-in expr="listFolderContents(filter=filter)"
          sort="getId" size="19" start=qs skip_unauthorized>
  <dtml-if next-sequence>
   <dtml-call "REQUEST.set('next-sequence'

--- Updated File main_template.pt in package CMF --
--- main_template.pt	2001/07/10 20:13:22	1.2
+++ main_template.pt	2001/07/12 21:30:51	1.3
@@ -13,8 +13,8 @@
    </tr>
 
    <tr valign="top">
-   <td class="SideBar" width="15%" align="left" valign="top" tal:content="structure container/actions_box">
-   Actions box
+   <td class="SideBar" width="15%" align="left" valign="top">
+   <span metal:use-macro="container/actions_box/macros/actions">Actions box</span>
    </td>
 
    <!-- Horizontal whitespace -->

--- Updated File viewThreadsAtBottom.pt in package CMF --
--- viewThreadsAtBottom.pt	2001/07/11 21:58:33	1.2
+++ viewThreadsAtBottom.pt	2001/07/12 21:30:51	1.3
@@ -1,6 +1,6 @@
-<div tal:condition="here/talkback">
-    <div tal:condition="python: here.talkback.hasReplies( here )">
-      <h4>Comments:</h4>
-      <span tal:replace="structure here/talkback_tree"></span>
-	</div>
-</div>
+<div tal:condition="here/talkback|nothing">
+    <div tal:condition="python: here.talkback.hasReplies(here)">
+      <h4>Comments:</h4>
+      <span tal:replace="structure here/talkback_tree"></span>
+	</div>
+</div>