[Plone-cvs] r5786 - in CMFPlone/branches/Plone-2_0-branch: . skins/plone_templates

[<svn...@pl...>]

Author: shh42
Date: Tue Nov 23 12:09:21 2004
New Revision: 5786

Modified:
   CMFPlone/branches/Plone-2_0-branch/HISTORY.txt
   CMFPlone/branches/Plone-2_0-branch/skins/plone_templates/global_defines.pt
Log:
Restored the ability to override left_slots and right_slots in folders.


Modified: CMFPlone/branches/Plone-2_0-branch/HISTORY.txt
==============================================================================
--- CMFPlone/branches/Plone-2_0-branch/HISTORY.txt	(original)
+++ CMFPlone/branches/Plone-2_0-branch/HISTORY.txt	Tue Nov 23 12:09:21 2004
@@ -2,7 +2,13 @@
 
    (name of developer listed in brackets)
 
-Plone 2.0.5 - Backed Up Willie - RC1 - Released November 22, 2004
+Plone 2.0.5 - Backed Up Willie - (Unreleased)
+
+    - Restored overridablity of left_slots/right_slots in folders by reverting
+      the patch applied to fix http://plone.org/collector/3472
+      [stefan]
+
+   RC1 - Released November 22, 2004
 
     - Fixed it so the .error class no longer causes compression of items in
       forms.
@@ -231,10 +237,6 @@
       edit of a newly created content object. Thanks to zenwryly.
       [stefan]
 
-    - Fixed http://plone.org/collector/3472 - you can now declare portlets on a
-      template. Thanks to acamargo for the patch.
-      [limi]
-
     - Fixed http://plone.org/collector/3457 - review portlet was not showing ID
       for items without Title. Thanks to Sjors for the patch.
       [limi]

Modified: CMFPlone/branches/Plone-2_0-branch/skins/plone_templates/global_defines.pt
==============================================================================
--- CMFPlone/branches/Plone-2_0-branch/skins/plone_templates/global_defines.pt	(original)
+++ CMFPlone/branches/Plone-2_0-branch/skins/plone_templates/global_defines.pt	Tue Nov 23 12:09:21 2004
@@ -33,7 +33,7 @@
         global wf_actions workflow_actions;
         global isFolder python:here.getTypeInfo().getId() in site_properties.use_folder_tabs;
         global template_id options/template_id | template/getId | nothing;
-        global slots_mapping options/slots_mapping|template/prepare_slots|here/prepare_slots|nothing;
+        global slots_mapping options/slots_mapping|here/prepare_slots|nothing;
         global Iterator python:modules['Products.CMFPlone'].IndexIterator;
         global tabindex python:Iterator(pos=30000);
         global here_url here/absolute_url;