Repository: plone.app.controlpanel
Branch: refs/heads/master
Date: 2014-11-19T16:17:44+01:00
Author: Timo Stollenwerk (tisto) <tisto@plone.org>
Commit: https://github.com/plone/plone.app.controlpanel/commit/c1bfb053a17c314b79031b661dd13454b31e17f4

Delete adapter and browser view registrations that already have been commented out.

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

diff --git a/plone/app/controlpanel/configure.zcml b/plone/app/controlpanel/configure.zcml
index b74abd5..d6fb56e 100644
--- a/plone/app/controlpanel/configure.zcml
+++ b/plone/app/controlpanel/configure.zcml
@@ -7,40 +7,20 @@
 
   <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"
@@ -62,40 +42,6 @@
       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"
@@ -103,15 +49,6 @@
       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"
@@ -119,15 +56,6 @@
       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"
@@ -135,13 +63,6 @@
       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-06T15:48:16+01:00
Author: Timo Stollenwerk (tisto) <tisto@plone.org>
Commit: https://github.com/plone/plone.app.controlpanel/commit/0199c2e17288115d98726ec41bcbacde8013da39

Remove filter controlpanel and adpater.

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

diff --git a/plone/app/controlpanel/configure.zcml b/plone/app/controlpanel/configure.zcml
index d6fb56e..053ddb7 100644
--- a/plone/app/controlpanel/configure.zcml
+++ b/plone/app/controlpanel/configure.zcml
@@ -7,8 +7,6 @@
 
   <include file="permissions.zcml" />
 
-  <adapter factory=".filter.FilterControlPanelAdapter" />
-
   <adapter factory=".language.LanguageControlPanelAdapter" />
 
   <adapter factory=".mail.MailControlPanelAdapter" />
@@ -22,13 +20,6 @@
   <adapter factory=".usergroups.UserGroupsSettingsControlPanelAdapter" />
 
   <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"
       class=".language.LanguageControlPanel"


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

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

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 b74abd5..053ddb7 100644
--- a/plone/app/controlpanel/configure.zcml
+++ b/plone/app/controlpanel/configure.zcml
@@ -7,47 +7,18 @@
 
   <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"
@@ -62,40 +33,6 @@
       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"
@@ -103,15 +40,6 @@
       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"
@@ -119,15 +47,6 @@
       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"
@@ -135,13 +54,6 @@
       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"