Author: davisagli
Date: Thu Mar 25 18:09:34 2010
New Revision: 35547
Modified:
Plone/trunk/Products/CMFPlone/skins/plone_prefs/plone_control_panel.pt
Plone/trunk/docs/CHANGES.txt
plonetheme.sunburst/trunk/CHANGES.txt
plonetheme.sunburst/trunk/plonetheme/sunburst/skins/sunburst_templates/prefs_main_template.pt
Log:
fix columns in prefs_main_template
Modified: Plone/trunk/Products/CMFPlone/skins/plone_prefs/plone_control_panel.pt
==============================================================================
--- Plone/trunk/Products/CMFPlone/skins/plone_prefs/plone_control_panel.pt (original)
+++ Plone/trunk/Products/CMFPlone/skins/plone_prefs/plone_control_panel.pt Thu Mar 25 18:09:34 2010
@@ -1,3 +1,5 @@
+<metal:block tal:define="dummy python:request.set('disable_border',1);
+ disable_column_one python:request.set('disable_plone.leftcolumn', 1)" />
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
xmlns:tal="http://xml.zope.org/namespaces/tal"
xmlns:metal="http://xml.zope.org/namespaces/metal"
@@ -6,8 +8,6 @@
metal:use-macro="here/prefs_main_template/macros/master"
i18n:domain="plone">
-<metal:block fill-slot="top_slot"
- tal:define="dummy python:request.set('disable_border',1)" />
<metal:override fill-slot="column_one_slot" />
Modified: Plone/trunk/docs/CHANGES.txt
==============================================================================
--- Plone/trunk/docs/CHANGES.txt (original)
+++ Plone/trunk/docs/CHANGES.txt Thu Mar 25 18:09:34 2010
@@ -8,6 +8,9 @@
4.0b2 - Unreleased
------------------
+- Fix columns in prefs_main_template.
+ [davisagli]
+
- Use zope.app.locales >= 3.6.0, this package have now a configure.zcml
which register the translations, we use it now.
A new version of zope.app.locales is needed to fix
Modified: plonetheme.sunburst/trunk/CHANGES.txt
==============================================================================
--- plonetheme.sunburst/trunk/CHANGES.txt (original)
+++ plonetheme.sunburst/trunk/CHANGES.txt Thu Mar 25 18:09:34 2010
@@ -4,6 +4,9 @@
1.0b3 - unreleased
------------------
+- Fix columns in prefs_main_template.
+ [davisagli]
+
- Pass the current view to getColumnsClass. This is needed if the view is not
the @@plone view and it has different portlets (such as on the portlet
management views). This closes http://dev.plone.org/plone/ticket/10320.
Modified: plonetheme.sunburst/trunk/plonetheme/sunburst/skins/sunburst_templates/prefs_main_template.pt
==============================================================================
--- plonetheme.sunburst/trunk/plonetheme/sunburst/skins/sunburst_templates/prefs_main_template.pt (original)
+++ plonetheme.sunburst/trunk/plonetheme/sunburst/skins/sunburst_templates/prefs_main_template.pt Thu Mar 25 18:09:34 2010
@@ -15,7 +15,6 @@
<metal:override fill-slot="content">
<metal:slot define-slot="prefs_configlet_wrapper">
- <div class="cell position-1:4 width-3:4">
<metal:slot define-slot="prefs_configlet_content">
<metal:block metal:use-macro="context/main_template/macros/content">
@@ -27,7 +26,6 @@
</metal:block>
</metal:slot>
- </div>
</metal:slot>
</metal:override>
|