[Checkins] SVN: zope.file/trunk/ Merge changes from ulif-fix-menus.

[Ulrich Fouquet]

Log message for revision 126560:
  Merge changes from ulif-fix-menus.

Changed:
  U   zope.file/trunk/CHANGES.txt
  U   zope.file/trunk/src/zope/file/browser.zcml
  A   zope.file/trunk/src/zope/file/menus.zcml

-=-
Modified: zope.file/trunk/CHANGES.txt
===================================================================
--- zope.file/trunk/CHANGES.txt	2012-06-02 23:53:59 UTC (rev 126559)
+++ zope.file/trunk/CHANGES.txt	2012-06-04 13:04:33 UTC (rev 126560)
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+0.6.2 (unreleased)
+------------------
+
+- Moved menu-oriented registrations into new menus.zcml. This is now
+  loaded if zope.app.zcmlfiles is available only.
+
 0.6.1 (2012-01-26)
 ------------------
 

Modified: zope.file/trunk/src/zope/file/browser.zcml
===================================================================
--- zope.file/trunk/src/zope/file/browser.zcml	2012-06-02 23:53:59 UTC (rev 126559)
+++ zope.file/trunk/src/zope/file/browser.zcml	2012-06-04 13:04:33 UTC (rev 126560)
@@ -1,6 +1,7 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
     xmlns:browser="http://namespaces.zope.org/browser"
+    xmlns:zcml="http://namespaces.zope.org/zcml"
     i18n_domain="zope.file"
     >
 
@@ -26,33 +27,17 @@
       />
 
   <browser:view
-      for=".interfaces.IFile"
-      menu="zmi_views" title="Upload"
-      name="edit.html"
-      class=".upload.Reupload"
-      permission="zope.ManageContent"
-      />
-
-  <browser:view
-      for=".interfaces.IFile"
-      menu="zmi_views" title="Content Type"
-      name="contenttype.html"
-      class=".contenttype.ContentTypeForm"
-      permission="zope.ManageContent"
-      />
-
-  <browser:view
       for="zope.browser.interfaces.IAdding"
       name="zope.file.File"
       class=".upload.Upload"
       permission="zope.ManageContent"
       />
 
-  <browser:addMenuItem
-      for="zope.browser.interfaces.IAdding"
-      view="zope.file.File"
-      title="Zope File"
-      class="zope.file.file.File"
-      permission="zope.ManageContent"
+  <!-- Register menu related stuff if z.a.zcmlfiles is available only -->
+  <include
+      zcml:condition="installed zope.app.zcmlfiles"
+      package="zope.file"
+      file="menus.zcml"
       />
+
 </configure>

Copied: zope.file/trunk/src/zope/file/menus.zcml (from rev 126559, zope.file/branches/ulif-fix-menus/src/zope/file/menus.zcml)
===================================================================
--- zope.file/trunk/src/zope/file/menus.zcml	                        (rev 0)
+++ zope.file/trunk/src/zope/file/menus.zcml	2012-06-04 13:04:33 UTC (rev 126560)
@@ -0,0 +1,35 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:browser="http://namespaces.zope.org/browser"
+    i18n_domain="zope.file"
+    >
+
+  <!--
+      Menu related configuration.
+      Loaded from configure.zcml only if zope.app.zcmlfiles is available.
+  -->
+  <browser:view
+      for=".interfaces.IFile"
+      menu="zmi_views" title="Upload"
+      name="edit.html"
+      class=".upload.Reupload"
+      permission="zope.ManageContent"
+      />
+
+  <browser:view
+      for=".interfaces.IFile"
+      menu="zmi_views" title="Content Type"
+      name="contenttype.html"
+      class=".contenttype.ContentTypeForm"
+      permission="zope.ManageContent"
+      />
+
+  <browser:addMenuItem
+      for="zope.browser.interfaces.IAdding"
+      view="zope.file.File"
+      title="Zope File"
+      class="zope.file.file.File"
+      permission="zope.ManageContent"
+      />
+
+</configure>