Move search control panel to browser dir.

plone · Feb 21, 2014 · f4745e8 · f4745e8 · mister-roboto · Feb 21, 2014
1 parent 58b794b
commit f4745e8
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/Products/CMFPlone/controlpanel/README.rst b/Products/CMFPlone/controlpanel/README.rst
@@ -11,7 +11,7 @@ can be looked up like this::
   >>> from Products.CMFPlone.interfaces import ISearchSchema
   >>> search_settings = registry.forInterface(ISearchSchema)
 
-  >>> site_settings.enable_livesearch
+  >>> search_settings.enable_livesearch
   True
 
 If you want to change the settings, just change the attribute::

diff --git a/Products/CMFPlone/controlpanel/browser/configure.zcml b/Products/CMFPlone/controlpanel/browser/configure.zcml
@@ -0,0 +1,14 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:five="http://namespaces.zope.org/five"
+    xmlns:browser="http://namespaces.zope.org/browser">
+
+  <!-- Search Control Panel -->
+  <browser:page
+    name="search-controlpanel"
+    for="Products.CMFPlone.interfaces.IPloneSiteRoot"
+    class=".search.SearchControlPanel"
+    permission="plone.app.controlpanel.Search"
+    />
+
+</configure>
diff --git a/Products/CMFPlone/controlpanel/search.py → ...s/CMFPlone/controlpanel/browser/search.py b/Products/CMFPlone/controlpanel/search.py → ...s/CMFPlone/controlpanel/browser/search.py
diff --git a/Products/CMFPlone/controlpanel/configure.zcml b/Products/CMFPlone/controlpanel/configure.zcml
@@ -1,19 +1,10 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
-    xmlns:five="http://namespaces.zope.org/five"
-    xmlns:browser="http://namespaces.zope.org/browser">
+    xmlns:five="http://namespaces.zope.org/five">
 
   <include package="plone.app.registry" />
 
   <include package=".bbb" />
-  <!--<include package=".browser" />-->
-
-  <!-- Search Control Panel -->
-  <browser:page
-      name="search-controlpanel"
-      for="Products.CMFPlone.interfaces.IPloneSiteRoot"
-      class=".search.SearchControlPanel"
-      permission="plone.app.controlpanel.Search"
-      />
+  <include package=".browser" />
 
 </configure>