[Checkins] SVN: z3ext.formatter/trunk/ z3ext.controlpanel is optional

[Nikolay Kim]

Log message for revision 92769:
  z3ext.controlpanel is optional

Changed:
  U   z3ext.formatter/trunk/CHANGES.txt
  U   z3ext.formatter/trunk/buildout.cfg
  U   z3ext.formatter/trunk/setup.py
  U   z3ext.formatter/trunk/src/z3ext/formatter/configure.zcml

-=-
Modified: z3ext.formatter/trunk/CHANGES.txt
===================================================================
--- z3ext.formatter/trunk/CHANGES.txt	2008-11-04 02:07:11 UTC (rev 92768)
+++ z3ext.formatter/trunk/CHANGES.txt	2008-11-04 05:53:27 UTC (rev 92769)
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+1.2.5 (2008-??-??)
+------------------
+
+- z3ext.controlpanel is optional
+
+
 1.2.4 (2008-10-21)
 ------------------
 

Modified: z3ext.formatter/trunk/buildout.cfg
===================================================================
--- z3ext.formatter/trunk/buildout.cfg	2008-11-04 02:07:11 UTC (rev 92768)
+++ z3ext.formatter/trunk/buildout.cfg	2008-11-04 05:53:27 UTC (rev 92769)
@@ -41,6 +41,7 @@
     <include package="zope.app.authentication" />
 
     <include package="z3c.autoinclude" file="meta.zcml" />
+    <include package="z3ext.controlpanel" />
     <include package="z3ext.formatter" />
   </configure>
 

Modified: z3ext.formatter/trunk/setup.py
===================================================================
--- z3ext.formatter/trunk/setup.py	2008-11-04 02:07:11 UTC (rev 92768)
+++ z3ext.formatter/trunk/setup.py	2008-11-04 05:53:27 UTC (rev 92769)
@@ -66,7 +66,6 @@
                           'zope.app.pagetemplate',
                           'zope.app.publisher',
 			  'z3c.autoinclude',
-			  'z3ext.controlpanel',
                           ],
       extras_require = dict(test=['zope.app.zptpage',
                                   'zope.app.testing',

Modified: z3ext.formatter/trunk/src/z3ext/formatter/configure.zcml
===================================================================
--- z3ext.formatter/trunk/src/z3ext/formatter/configure.zcml	2008-11-04 02:07:11 UTC (rev 92768)
+++ z3ext.formatter/trunk/src/z3ext/formatter/configure.zcml	2008-11-04 05:53:27 UTC (rev 92769)
@@ -22,25 +22,32 @@
   <adapter name="fancyDatetime"
 	   factory=".fancydatetime.FancyDatetimeFormatterFactory" />
 
-  <!-- formatter configlet -->
-  <z3ext:configlet
-     name="system.formatter"
-     schema=".interfaces.IFormatterConfiglet"
-     title="Portal formatters"
-     description="Configure portal formatters.">
-    <allow interface=".interfaces.IFormatterConfiglet" />
-  </z3ext:configlet>
-
-  <browser:icon
-     name="zmi_icon"
-     for=".interfaces.IFormatterConfiglet"
-     file="preferences-formatter.png" />
-
   <!-- vocabularies -->
   <utility
      name="Timezones"
      factory=".vocabulary.Timezones" />
 
+  <!-- formatter configlet -->
+  <configure
+     xmlns:zcml="http://namespaces.zope.org/zcml"
+     xmlns:browser="http://namespaces.zope.org/browser"
+     zcml:condition="installed z3ext.controlpanel">
+    <include package="z3ext.controlpanel" />
+
+    <z3ext:configlet
+       name="system.formatter"
+       schema=".interfaces.IFormatterConfiglet"
+       title="Portal formatters"
+       description="Configure portal formatters.">
+      <allow interface=".interfaces.IFormatterConfiglet" />
+    </z3ext:configlet>
+
+    <browser:icon
+       name="zmi_icon"
+       for=".interfaces.IFormatterConfiglet"
+       file="preferences-formatter.png" />
+  </configure>
+
   <!-- Registering documentation with API doc -->
   <configure
      xmlns:apidoc="http://namespaces.zope.org/apidoc"
@@ -52,7 +59,6 @@
        title="z3ext.formatter - formatter TALES expression"
        doc_path="README.txt"
        parent="z3ext" />
-
   </configure>
 
   <!-- translations -->