Repository: plone.app.controlpanel
Branch: refs/heads/master
Date: 2014-12-12T13:35:19+01:00
Author: Timo Stollenwerk (tisto) <tisto@plone.org>
Commit: https://github.com/plone/plone.app.controlpanel/commit/9712ece05709f2efa09a15f359c2877c1c2cf8dc

Revert "Plip10359: Move filter controlpanel to z3cform"

Files changed:
M plone/app/controlpanel/configure.zcml

diff --git a/plone/app/controlpanel/configure.zcml b/plone/app/controlpanel/configure.zcml
index 053ddb7..b74abd5 100644
--- a/plone/app/controlpanel/configure.zcml
+++ b/plone/app/controlpanel/configure.zcml
@@ -7,18 +7,47 @@
 
   <include file="permissions.zcml" />
 
+  <!--<adapter for="*"
+           factory=".editing.EditingControlPanelAdapter" />-->
+
+  <adapter factory=".filter.FilterControlPanelAdapter" />
+
   <adapter factory=".language.LanguageControlPanelAdapter" />
 
+  <!--<adapter factory=".navigation.NavigationControlPanelAdapter" />-->
+
   <adapter factory=".mail.MailControlPanelAdapter" />
 
+  <!--<adapter factory=".maintenance.MaintenanceControlPanelAdapter" />-->
+
+  <!-- adapter factory=".markup.MarkupControlPanelAdapter" /-->
+
   <adapter factory=".ram.RAMCacheControlPanelAdapter" />
 
+  <!--<adapter factory=".search.SearchControlPanelAdapter" />-->
+
   <adapter factory=".security.SecurityControlPanelAdapter" />
 
+  <!--<adapter factory=".site.SiteControlPanelAdapter" />-->
+
   <adapter factory=".skins.SkinsControlPanelAdapter" />
 
   <adapter factory=".usergroups.UserGroupsSettingsControlPanelAdapter" />
 
+  <!--<browser:page
+      name="editing-controlpanel"
+      for="Products.CMFPlone.interfaces.IPloneSiteRoot"
+      class=".editing.EditingControlPanel"
+      permission="plone.app.controlpanel.Editing"
+      />-->
+
+  <browser:page
+      name="filter-controlpanel"
+      for="Products.CMFPlone.interfaces.IPloneSiteRoot"
+      class=".filter.FilterControlPanel"
+      permission="plone.app.controlpanel.Filtering"
+      />
+
   <browser:page
       name="language-controlpanel"
       for="Products.CMFPlone.interfaces.IPloneSiteRoot"
@@ -33,6 +62,40 @@
       permission="plone.app.controlpanel.Mail"
       />
 
+  <!-- browser:page
+      name="markup-controlpanel"
+      for="Products.CMFPlone.interfaces.IPloneSiteRoot"
+      class=".markup.MarkupControlPanel"
+      permission="plone.app.controlpanel.Markup"
+      /-->
+
+  <!--
+  <browser:page
+      name="maintenance-controlpanel"
+      for="Products.CMFPlone.interfaces.IPloneSiteRoot"
+      class=".maintenance.MaintenanceControlPanel"
+      permission="cmf.ManagePortal"
+      />
+  -->
+
+  <!--
+  <browser:page
+      name="navigation-controlpanel"
+      for="Products.CMFPlone.interfaces.IPloneSiteRoot"
+      class=".navigation.NavigationControlPanel"
+      permission="plone.app.controlpanel.Navigation"
+      />
+  -->
+
+  <!--
+  <browser:page
+      name="overview-controlpanel"
+      for="Products.CMFPlone.interfaces.IPloneSiteRoot"
+      class=".overview.OverviewControlPanel"
+      permission="plone.app.controlpanel.Overview"
+      />
+  -->
+
   <browser:page
       name="ramcache-controlpanel"
       for="Products.CMFPlone.interfaces.IPloneSiteRoot"
@@ -40,6 +103,15 @@
       permission="cmf.ManagePortal"
       />
 
+  <!--
+  <browser:page
+      name="search-controlpanel"
+      for="Products.CMFPlone.interfaces.IPloneSiteRoot"
+      class=".search.SearchControlPanel"
+      permission="plone.app.controlpanel.Search"
+      />
+  -->
+
   <browser:page
       name="security-controlpanel"
       for="Products.CMFPlone.interfaces.IPloneSiteRoot"
@@ -47,6 +119,15 @@
       permission="plone.app.controlpanel.Security"
       />
 
+  <!--
+  <browser:page
+      name="site-controlpanel"
+      for="Products.CMFPlone.interfaces.IPloneSiteRoot"
+      class=".site.SiteControlPanel"
+      permission="plone.app.controlpanel.Site"
+      />
+  -->
+
   <browser:page
       name="skins-controlpanel"
       for="Products.CMFPlone.interfaces.IPloneSiteRoot"
@@ -54,6 +135,13 @@
       permission="plone.app.controlpanel.Themes"
       />
 
+ <!--  <browser:page
+      name="types-controlpanel"
+      for="Products.CMFPlone.interfaces.IPloneSiteRoot"
+      class=".types.TypesControlPanel"
+      permission="plone.app.controlpanel.Types"
+      /> -->
+
   <browser:page
       name="usergroup-userprefs"
       for="Products.CMFPlone.interfaces.IPloneSiteRoot"


Repository: plone.app.controlpanel
Branch: refs/heads/master
Date: 2014-12-12T13:35:30+01:00
Author: Timo Stollenwerk (tisto) <tisto@plone.org>
Commit: https://github.com/plone/plone.app.controlpanel/commit/a8a2ea413eb614abc57c132c847144b365e4f42c

Merge pull request #34 from plone/revert-33-plip10359-filter-controlpanel

Revert "Plip10359: Move filter controlpanel to z3cform"

Files changed:
M plone/app/controlpanel/configure.zcml

diff --git a/plone/app/controlpanel/configure.zcml b/plone/app/controlpanel/configure.zcml
index 053ddb7..b74abd5 100644
--- a/plone/app/controlpanel/configure.zcml
+++ b/plone/app/controlpanel/configure.zcml
@@ -7,18 +7,47 @@
 
   <include file="permissions.zcml" />
 
+  <!--<adapter for="*"
+           factory=".editing.EditingControlPanelAdapter" />-->
+
+  <adapter factory=".filter.FilterControlPanelAdapter" />
+
   <adapter factory=".language.LanguageControlPanelAdapter" />
 
+  <!--<adapter factory=".navigation.NavigationControlPanelAdapter" />-->
+
   <adapter factory=".mail.MailControlPanelAdapter" />
 
+  <!--<adapter factory=".maintenance.MaintenanceControlPanelAdapter" />-->
+
+  <!-- adapter factory=".markup.MarkupControlPanelAdapter" /-->
+
   <adapter factory=".ram.RAMCacheControlPanelAdapter" />
 
+  <!--<adapter factory=".search.SearchControlPanelAdapter" />-->
+
   <adapter factory=".security.SecurityControlPanelAdapter" />
 
+  <!--<adapter factory=".site.SiteControlPanelAdapter" />-->
+
   <adapter factory=".skins.SkinsControlPanelAdapter" />
 
   <adapter factory=".usergroups.UserGroupsSettingsControlPanelAdapter" />
 
+  <!--<browser:page
+      name="editing-controlpanel"
+      for="Products.CMFPlone.interfaces.IPloneSiteRoot"
+      class=".editing.EditingControlPanel"
+      permission="plone.app.controlpanel.Editing"
+      />-->
+
+  <browser:page
+      name="filter-controlpanel"
+      for="Products.CMFPlone.interfaces.IPloneSiteRoot"
+      class=".filter.FilterControlPanel"
+      permission="plone.app.controlpanel.Filtering"
+      />
+
   <browser:page
       name="language-controlpanel"
       for="Products.CMFPlone.interfaces.IPloneSiteRoot"
@@ -33,6 +62,40 @@
       permission="plone.app.controlpanel.Mail"
       />
 
+  <!-- browser:page
+      name="markup-controlpanel"
+      for="Products.CMFPlone.interfaces.IPloneSiteRoot"
+      class=".markup.MarkupControlPanel"
+      permission="plone.app.controlpanel.Markup"
+      /-->
+
+  <!--
+  <browser:page
+      name="maintenance-controlpanel"
+      for="Products.CMFPlone.interfaces.IPloneSiteRoot"
+      class=".maintenance.MaintenanceControlPanel"
+      permission="cmf.ManagePortal"
+      />
+  -->
+
+  <!--
+  <browser:page
+      name="navigation-controlpanel"
+      for="Products.CMFPlone.interfaces.IPloneSiteRoot"
+      class=".navigation.NavigationControlPanel"
+      permission="plone.app.controlpanel.Navigation"
+      />
+  -->
+
+  <!--
+  <browser:page
+      name="overview-controlpanel"
+      for="Products.CMFPlone.interfaces.IPloneSiteRoot"
+      class=".overview.OverviewControlPanel"
+      permission="plone.app.controlpanel.Overview"
+      />
+  -->
+
   <browser:page
       name="ramcache-controlpanel"
       for="Products.CMFPlone.interfaces.IPloneSiteRoot"
@@ -40,6 +103,15 @@
       permission="cmf.ManagePortal"
       />
 
+  <!--
+  <browser:page
+      name="search-controlpanel"
+      for="Products.CMFPlone.interfaces.IPloneSiteRoot"
+      class=".search.SearchControlPanel"
+      permission="plone.app.controlpanel.Search"
+      />
+  -->
+
   <browser:page
       name="security-controlpanel"
       for="Products.CMFPlone.interfaces.IPloneSiteRoot"
@@ -47,6 +119,15 @@
       permission="plone.app.controlpanel.Security"
       />
 
+  <!--
+  <browser:page
+      name="site-controlpanel"
+      for="Products.CMFPlone.interfaces.IPloneSiteRoot"
+      class=".site.SiteControlPanel"
+      permission="plone.app.controlpanel.Site"
+      />
+  -->
+
   <browser:page
       name="skins-controlpanel"
       for="Products.CMFPlone.interfaces.IPloneSiteRoot"
@@ -54,6 +135,13 @@
       permission="plone.app.controlpanel.Themes"
       />
 
+ <!--  <browser:page
+      name="types-controlpanel"
+      for="Products.CMFPlone.interfaces.IPloneSiteRoot"
+      class=".types.TypesControlPanel"
+      permission="plone.app.controlpanel.Types"
+      /> -->
+
   <browser:page
       name="usergroup-userprefs"
       for="Products.CMFPlone.interfaces.IPloneSiteRoot"