[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/ - display add actions in the main_template

[Yvo Schubbe]

Log message for revision 91418:
  - display add actions in the main_template
  - removed 'New...' button from folder_contants

Changed:
  U   Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/folder.py
  U   Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/folder_contents.py
  U   Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/main_template.pt

-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt	2008-09-24 11:02:32 UTC (rev 91417)
+++ Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt	2008-09-24 11:11:37 UTC (rev 91418)
@@ -4,6 +4,9 @@
 2.2.0 (unreleased)
 ------------------
 
+- skins: Display add actions in the main_template.
+  Using folder_factories is now deprecated.
+
 - views: Added FallbackAddView.
   This add form works with any portal type. It just asks for the ID.
 

Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/folder.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/folder.py	2008-09-24 11:02:32 UTC (rev 91417)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/folder.py	2008-09-24 11:11:37 UTC (rev 91418)
@@ -299,12 +299,7 @@
     """Contents view for IFolderish.
     """
 
-    _BUTTONS = ({'id': 'items_new',
-                 'title': _(u'New...'),
-                 'permissions': (ViewManagementScreens, AddPortalContent),
-                 'conditions': ('checkAllowedContentTypes',),
-                 'redirect': ('portal_types', 'object/new')},
-                {'id': 'items_rename',
+    _BUTTONS = ({'id': 'items_rename',
                  'title': _(u'Rename...'),
                  'permissions': (ViewManagementScreens, AddPortalContent),
                  'conditions': ('checkItems', 'checkAllowedContentTypes'),

Modified: Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/folder_contents.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/folder_contents.py	2008-09-24 11:02:32 UTC (rev 91417)
+++ Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/folder_contents.py	2008-09-24 11:11:37 UTC (rev 91418)
@@ -1,4 +1,4 @@
-##parameters=b_start=0, key='', reverse=0, ids=(), delta=1, items_copy='', items_cut='', items_delete='', items_new='', items_paste='', items_rename='', items_up='', items_down='', items_top='', items_bottom='', items_sort=''
+##parameters=b_start=0, key='', reverse=0, ids=(), delta=1, items_copy='', items_cut='', items_delete='', items_paste='', items_rename='', items_up='', items_down='', items_top='', items_bottom='', items_sort=''
 ##
 from ZTUtils import Batch
 from ZTUtils import make_query
@@ -35,9 +35,6 @@
         context.folder_delete_control(**form) and \
         context.setRedirect(context, default_target, **default_kw):
     return
-elif items_new and \
-        context.setRedirect(context, 'object/new'):
-    return
 elif items_paste and \
         context.validateClipboardData(**form) and \
         context.folder_paste_control(**form) and \
@@ -168,11 +165,8 @@
     hidden_vars.append( {'name': name, 'value': value} )
 buttons = []
 if items_manage_allowed:
-    if items_add_allowed and context.allowedContentTypes():
-        buttons.append( {'name': 'items_new', 'value': _(u'New...')} )
-        if items:
-            buttons.append( {'name': 'items_rename',
-                             'value': _(u'Rename...')} )
+    if items and items_add_allowed and context.allowedContentTypes():
+        buttons.append( {'name': 'items_rename', 'value': _(u'Rename...')} )
     if items:
         buttons.append( {'name': 'items_cut', 'value': _(u'Cut')} )
         buttons.append( {'name': 'items_copy', 'value': _(u'Copy')} )

Modified: Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/main_template.pt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/main_template.pt	2008-09-24 11:02:32 UTC (rev 91417)
+++ Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/main_template.pt	2008-09-24 11:11:37 UTC (rev 91418)
@@ -19,6 +19,7 @@
                   object_actions actions/object;
                   workflow_actions actions/workflow;
                   folder_actions actions/folder;
+                  add_actions python: actions.get('folder/add', {});
                   global_actions actions/global;
                   wf_state globals/wf_state;
                   show_actionicons globals/show_actionicons;
@@ -252,6 +253,31 @@
     </td>
    </tr>
 
+   <!-- add actions -->
+   <tr class="ContextActionsRow"
+       tal:condition="add_actions"
+   >
+    <td class="ActionLink">
+      <span class="ObjectStatus">
+       <span tal:omit-tag=""
+             i18n:translate="">Add...</span><br />
+      </span>
+
+      <span tal:repeat="action add_actions">
+       <img src="" alt="" title=""
+            tal:define="icon_url action/icon|nothing"
+            tal:condition="python: show_actionicons and icon_url"
+            tal:attributes="src icon_url;
+                            alt action/title;
+                            title action/title"/>
+       <a href="+Document"
+          tal:attributes="href action/url"
+          tal:content="action/title"
+          i18n:translate="">Document</a><br />
+      </span>
+    </td>
+   </tr>
+
    <!-- global actions -->
    <tr class="ContextActionsRow"
        tal:condition="global_actions"