Menu
▾
▴
[Plone-cvs] r32150 - Plone/trunk/Products/CMFPlone/profiles/default Plone/trunk/Products/CMFPlone/skins/plone_deprecated Plone/trunk/Products/CMFPlone/skins/plone_prefs Plone/trunk/docs plone.app.controlpanel/trunk plone.app.controlpanel/trunk/plone/app/controlpanel plone.app.controlpanel/trunk/plone/app/controlpanel/tests
|
From: Eric S. <svn...@pl...> - 2009-11-30 02:38:55
|
Author: esteele
Date: Mon Nov 30 02:38:43 2009
New Revision: 32150
Added:
Plone/trunk/Products/CMFPlone/skins/plone_deprecated/prefs_navigation_form.cpt
- copied unchanged from r32146, Plone/trunk/Products/CMFPlone/skins/plone_prefs/prefs_navigation_form.cpt
Plone/trunk/Products/CMFPlone/skins/plone_deprecated/prefs_navigation_form.cpt.metadata
- copied unchanged from r32146, Plone/trunk/Products/CMFPlone/skins/plone_prefs/prefs_navigation_form.cpt.metadata
Plone/trunk/Products/CMFPlone/skins/plone_deprecated/prefs_navigation_set.cpy
- copied unchanged from r32146, Plone/trunk/Products/CMFPlone/skins/plone_prefs/prefs_navigation_set.cpy
Plone/trunk/Products/CMFPlone/skins/plone_deprecated/prefs_navigation_set.cpy.metadata
- copied unchanged from r32146, Plone/trunk/Products/CMFPlone/skins/plone_prefs/prefs_navigation_set.cpy.metadata
plone.app.controlpanel/trunk/plone/app/controlpanel/navigation.py
plone.app.controlpanel/trunk/plone/app/controlpanel/tests/navigation.txt
Removed:
Plone/trunk/Products/CMFPlone/skins/plone_prefs/prefs_navigation_form.cpt
Plone/trunk/Products/CMFPlone/skins/plone_prefs/prefs_navigation_form.cpt.metadata
Plone/trunk/Products/CMFPlone/skins/plone_prefs/prefs_navigation_set.cpy
Plone/trunk/Products/CMFPlone/skins/plone_prefs/prefs_navigation_set.cpy.metadata
Modified:
Plone/trunk/Products/CMFPlone/profiles/default/controlpanel.xml
Plone/trunk/docs/CHANGES.txt
plone.app.controlpanel/trunk/CHANGES.txt
plone.app.controlpanel/trunk/plone/app/controlpanel/configure.zcml
plone.app.controlpanel/trunk/plone/app/controlpanel/tests/test_doctests.py
Log:
prefs_navigation_form has been moved to plone.app.controlpanel as @@navigation-controlpanel. Deprecated the old form and its cpy. Refs #9876
Modified: Plone/trunk/Products/CMFPlone/profiles/default/controlpanel.xml
==============================================================================
--- Plone/trunk/Products/CMFPlone/profiles/default/controlpanel.xml (original)
+++ Plone/trunk/Products/CMFPlone/profiles/default/controlpanel.xml Mon Nov 30 02:38:43 2009
@@ -102,7 +102,7 @@
<configlet title="Navigation" action_id="NavigationSettings"
appId="Plone" category="Plone" condition_expr=""
icon_expr="string:$portal_url/navigation_icon.png"
- url_expr="string:${portal_url}/prefs_navigation_form" visible="True"
+ url_expr="string:${portal_url}/@@navigation-controlpanel" visible="True"
i18n:attributes="title">
<permission>Manage portal</permission>
</configlet>
Modified: Plone/trunk/docs/CHANGES.txt
==============================================================================
--- Plone/trunk/docs/CHANGES.txt (original)
+++ Plone/trunk/docs/CHANGES.txt Mon Nov 30 02:38:43 2009
@@ -8,6 +8,10 @@
4.0a2 - Unreleased
------------------
+- Move prefs_navigation_form to plone.app.controlpanel as
+ @@navigation-controlpanel. The form and its cpy script have been deprecated.
+ [esteele]
+
- Use the @@plone-upgrade view as the default management screen for the
migration tool.
[davisagli]
Modified: plone.app.controlpanel/trunk/CHANGES.txt
==============================================================================
--- plone.app.controlpanel/trunk/CHANGES.txt (original)
+++ plone.app.controlpanel/trunk/CHANGES.txt Mon Nov 30 02:38:43 2009
@@ -4,6 +4,10 @@
2.0b1 - Unreleased
------------------
+- Move prefs_navigation_form to plone.app.controlpanel as
+ @@navigation-controlpanel.
+ [esteele]
+
- "Users", "Groups" and "Settings" configlets' views are polished visually
to follow rest of configlets. Fixes #9825
[spliter]
Modified: plone.app.controlpanel/trunk/plone/app/controlpanel/configure.zcml
==============================================================================
--- plone.app.controlpanel/trunk/plone/app/controlpanel/configure.zcml (original)
+++ plone.app.controlpanel/trunk/plone/app/controlpanel/configure.zcml Mon Nov 30 02:38:43 2009
@@ -8,6 +8,8 @@
<adapter factory=".language.LanguageControlPanelAdapter" />
+ <adapter factory=".navigation.NavigationControlPanelAdapter" />
+
<adapter factory=".mail.MailControlPanelAdapter" />
<adapter factory=".maintenance.MaintenanceControlPanelAdapter" />
@@ -75,6 +77,13 @@
/>
<browser:page
+ name="navigation-controlpanel"
+ for="Products.CMFPlone.interfaces.IPloneSiteRoot"
+ class=".navigation.NavigationControlPanel"
+ permission="cmf.ManagePortal"
+ />
+
+ <browser:page
name="overview-controlpanel"
for="Products.CMFPlone.interfaces.IPloneSiteRoot"
class=".overview.OverviewControlPanel"
Added: plone.app.controlpanel/trunk/plone/app/controlpanel/navigation.py
==============================================================================
--- (empty file)
+++ plone.app.controlpanel/trunk/plone/app/controlpanel/navigation.py Mon Nov 30 02:38:43 2009
@@ -0,0 +1,143 @@
+from Acquisition import aq_base
+from plone.fieldsets.fieldsets import FormFieldsets
+from zope.interface import Interface, implements
+from zope.component import adapts
+from zope.formlib import form
+from zope.interface import implements
+from zope.schema import Bool
+from zope.schema import Choice
+from zope.schema import List
+from zope.schema import Tuple
+from zope.schema.vocabulary import SimpleTerm
+from zope.schema.vocabulary import SimpleVocabulary
+
+from Products.CMFCore.utils import getToolByName
+from Products.CMFDefault.formlib.schema import ProxyFieldProperty
+from Products.CMFDefault.formlib.schema import SchemaAdapterBase
+from Products.CMFPlone import PloneMessageFactory as _
+from Products.CMFPlone.interfaces import IPloneSiteRoot
+
+from form import ControlPanelForm
+from widgets import MultiCheckBoxThreeColumnWidget
+from widgets import MultiCheckBoxVocabularyWidget
+
+from plone.app.vocabularies.types import BAD_TYPES
+
+class INavigationSchema(Interface):
+ """Fields for the navigation control panel."""
+ generate_tabs = Bool(title=_(u"Automatically generate tabs"),
+ description=_(u"By default, all items created at the root level will add to the global section navigation. You can turn this off if you prefer manually constructing this part of the navigation."),
+ default=True,
+ required=False)
+
+ nonfolderish_tabs = Bool(title=_(u"Generate tabs for items other than folders."),
+ description=_(u'By default, any content item in the root of the portal will be shown as a global section. If you turn this option off, only folders will be shown. This only has an effect if "Automatically generate tabs" is enabled.'),
+ default=True,
+ required=False)
+
+ show_excluded_items = Bool(title=_(u"Show items normally excluded from navigation if viewing their children."),
+ description=_(u"If an item has been excluded from navigation should it be shown in navigation when viewing content contained within it or within a subfolder."),
+ default=True,
+ required=False)
+
+ displayed_types = Tuple(
+ title=_(u"Displayed content types"),
+ description=_(u"The content types that should be shown in the navigation and site map."),
+ required=False,
+ missing_value=tuple(),
+ value_type=Choice(
+ vocabulary="plone.app.vocabularies.UserFriendlyTypes")
+ )
+
+ filter_on_workflow = Bool(
+ title=_(u"Filter on workflow state"),
+ description=_(u"The workflow states that should be shown in the navigation tree and the site map."),
+ default=False,
+ required=False)
+
+ workflow_states_to_show = Tuple(
+ required=False,
+ missing_value=tuple(),
+ value_type=Choice(
+ vocabulary="plone.app.vocabularies.WorkflowStates")
+ )
+
+
+class NavigationControlPanelAdapter(SchemaAdapterBase):
+
+ adapts(IPloneSiteRoot)
+ implements(INavigationSchema)
+
+ def __init__(self, context):
+ super(NavigationControlPanelAdapter, self).__init__(context)
+ pprop = getToolByName(context, 'portal_properties')
+ self.siteProps = pprop.site_properties
+ self.navProps = pprop.navtree_properties
+ self.ttool = getToolByName(context, 'portal_types')
+
+ def get_generate_tabs(self):
+ return not self.siteProps.getProperty('disable_folder_sections')
+
+ def set_generate_tabs(self, value):
+ self.siteProps._updateProperty('disable_folder_sections', not value)
+
+ generate_tabs = property(get_generate_tabs, set_generate_tabs)
+
+ def get_nonfolderish_tabs(self):
+ return not self.siteProps.getProperty('disable_nonfolderish_sections')
+
+ def set_nonfolderish_tabs(self, value):
+ self.siteProps._updateProperty('disable_nonfolderish_sections', not value)
+
+ nonfolderish_tabs = property(get_nonfolderish_tabs, set_nonfolderish_tabs)
+
+ def get_show_excluded_items(self):
+ return self.navProps.getProperty('showAllParents')
+
+ def set_show_excluded_items(self, value):
+ self.navProps._updateProperty('showAllParents', value)
+
+ show_excluded_items = property(get_show_excluded_items, set_show_excluded_items)
+
+ def get_displayed_types(self):
+ return [t for t in self.ttool.listContentTypes()
+ if t not in self.navProps.metaTypesNotToList and
+ t not in BAD_TYPES]
+
+ def set_displayed_types(self, value):
+ # The menu pretends to be a whitelist, but we are storing a blacklist so that
+ # new types are searchable by default. Inverse the list.
+ allTypes = self.ttool.listContentTypes()
+ putils = getToolByName(self.context, 'plone_utils')
+ friendlyTypes = putils.getUserFriendlyTypes()
+
+ blacklistedTypes = [t for t in allTypes if t not in value
+ or t not in friendlyTypes]
+ self.navProps._updateProperty('metaTypesNotToList', blacklistedTypes)
+
+ displayed_types = property(get_displayed_types, set_displayed_types)
+
+ def get_filter_on_workflow(self):
+ return self.navProps.getProperty('enable_wf_state_filtering')
+
+ def set_filter_on_workflow(self, value):
+ self.navProps._updateProperty('enable_wf_state_filtering', value)
+
+ filter_on_workflow = property(get_filter_on_workflow, set_filter_on_workflow)
+
+ def get_workflow_states_to_show(self):
+ return self.navProps.getProperty('wf_states_to_show')
+
+ def set_workflow_states_to_show(self, value):
+ self.navProps._updateProperty('wf_states_to_show', value)
+
+ workflow_states_to_show = property(get_workflow_states_to_show, set_workflow_states_to_show)
+
+class NavigationControlPanel(ControlPanelForm):
+
+ label = _("Navigation settings")
+ description = _("""Lets you control how navigation is constructed in your site.Note that to control how the navigation tree is displayed, you should go to "Manage portlets" at the root of the site (or wherever a navigation tree portlet has been added) and change its settings directly.""")
+ form_name = _("Navigation details")
+ form_fields = form.FormFields(INavigationSchema)
+ form_fields['displayed_types'].custom_widget = MultiCheckBoxThreeColumnWidget
+ form_fields['workflow_states_to_show'].custom_widget = MultiCheckBoxVocabularyWidget
\ No newline at end of file
Added: plone.app.controlpanel/trunk/plone/app/controlpanel/tests/navigation.txt
==============================================================================
--- (empty file)
+++ plone.app.controlpanel/trunk/plone/app/controlpanel/tests/navigation.txt Mon Nov 30 02:38:43 2009
@@ -0,0 +1,81 @@
+Mail control panel
+==================
+
+First some initial setup code:
+
+ >>> from Products.CMFCore.utils import getToolByName
+ >>> pprop = getToolByName(self, 'portal_properties')
+ >>> siteProps = pprop['site_properties']
+ >>> navProps = pprop['navtree_properties']
+ >>> self.loginAsManager()
+
+Viewing the mail control panel
+--------------------------------
+
+ >>> self.browser.open('http://nohost/plone/@@navigation-controlpanel')
+ >>> self.browser.url.endswith('navigation-controlpanel')
+ True
+
+Click the cancel button:
+
+ >>> self.browser.getControl(name="form.actions.cancel").click()
+ >>> self.browser.url.endswith('plone_control_panel')
+ True
+
+There should be still no changes:
+
+ >>> 'Changes canceled.' in self.browser.contents
+ True
+
+Make some changes
+-----------------
+
+ >>> self.browser.getLink('Navigation').click()
+ >>> self.browser.url.endswith('navigation-controlpanel')
+ True
+
+ >>> self.browser.getControl('Automatically generate tabs').selected = False
+ >>> self.browser.getControl('Generate tabs for items other than folders').selected = False
+ >>> self.browser.getControl('Show items normally excluded from navigation if viewing their children.').selected = False
+ >>> self.browser.getControl('Collection').selected = False
+ >>> self.browser.getControl('Page').selected = False
+ >>> self.browser.getControl('News Item').selected = False
+ >>> self.browser.getControl('Filter on workflow state').selected = True
+ >>> self.browser.getControl('Private [private]').selected = True
+
+Click the save button:
+
+ >>> self.browser.getControl("Save").click()
+ >>> self.browser.url.endswith('navigation-controlpanel')
+ True
+
+We should be informed that something has changed:
+
+ >>> 'Changes saved.' in self.browser.contents
+ True
+
+Make sure the changes have been applied correctly:
+
+ >>> siteProps.disable_folder_sections
+ True
+
+ >>> siteProps.disable_nonfolderish_sections
+ True
+
+ >>> navProps.showAllParents
+ False
+
+ >>> 'Topic' in navProps.metaTypesNotToList
+ True
+
+ >>> 'Document' in navProps.metaTypesNotToList
+ True
+
+ >>> 'News Item' in navProps.metaTypesNotToList
+ True
+
+ >>> navProps.enable_wf_state_filtering
+ True
+
+ >>> 'private' in navProps.wf_states_to_show
+ True
Modified: plone.app.controlpanel/trunk/plone/app/controlpanel/tests/test_doctests.py
==============================================================================
--- plone.app.controlpanel/trunk/plone/app/controlpanel/tests/test_doctests.py (original)
+++ plone.app.controlpanel/trunk/plone/app/controlpanel/tests/test_doctests.py Mon Nov 30 02:38:43 2009
@@ -22,6 +22,7 @@
'site.txt',
'skins.txt',
'markup.txt',
+ 'navigation.txt',
'types.txt'
]
suite = TestSuite()
|