[Zope3-checkins] SVN: Zope3/branches/philikon-simplify-skinning/src/zope/app/ Provide the "Browser Skins" vocabulary (in contradiction to the proposal which

[Philipp von Weitershausen]

Log message for revision 65508:
  Provide the "Browser Skins" vocabulary (in contradiction to the proposal which
  promises a "Browser Skin Names" vocabulary which would be nameOnly=True).
  

Changed:
  U   Zope3/branches/philikon-simplify-skinning/src/zope/app/demo/skinpref/configure.zcml
  U   Zope3/branches/philikon-simplify-skinning/src/zope/app/demo/skinpref/interfaces.py
  U   Zope3/branches/philikon-simplify-skinning/src/zope/app/publisher/browser/configure.zcml

-=-
Modified: Zope3/branches/philikon-simplify-skinning/src/zope/app/demo/skinpref/configure.zcml
===================================================================
--- Zope3/branches/philikon-simplify-skinning/src/zope/app/demo/skinpref/configure.zcml	2006-02-27 03:55:58 UTC (rev 65507)
+++ Zope3/branches/philikon-simplify-skinning/src/zope/app/demo/skinpref/configure.zcml	2006-02-27 04:49:31 UTC (rev 65508)
@@ -7,13 +7,6 @@
       handler=".skin.applySkin"
       />
 
-  <!-- TODO Browser Skin Names vocabulary can take over -->
-  <vocabulary
-      name="Skins"
-      factory="zope.app.component.vocabulary.UtilityVocabulary"
-      interface="zope.publisher.interfaces.browser.IBrowserSkinType"
-      />
-
   <preferenceGroup
       id="zmi"
       title="ZMI Settings"

Modified: Zope3/branches/philikon-simplify-skinning/src/zope/app/demo/skinpref/interfaces.py
===================================================================
--- Zope3/branches/philikon-simplify-skinning/src/zope/app/demo/skinpref/interfaces.py	2006-02-27 03:55:58 UTC (rev 65507)
+++ Zope3/branches/philikon-simplify-skinning/src/zope/app/demo/skinpref/interfaces.py	2006-02-27 04:49:31 UTC (rev 65508)
@@ -31,6 +31,6 @@
             Note: You have to reload the page again for the setting to show an
             effect.
             """,
-        vocabulary="Skins",
+        vocabulary="Browser Skins",
         default=None,
         required=False)

Modified: Zope3/branches/philikon-simplify-skinning/src/zope/app/publisher/browser/configure.zcml
===================================================================
--- Zope3/branches/philikon-simplify-skinning/src/zope/app/publisher/browser/configure.zcml	2006-02-27 03:55:58 UTC (rev 65507)
+++ Zope3/branches/philikon-simplify-skinning/src/zope/app/publisher/browser/configure.zcml	2006-02-27 04:49:31 UTC (rev 65508)
@@ -3,11 +3,17 @@
    xmlns:browser="http://namespaces.zope.org/browser">
 
 <interface
-  interface="zope.publisher.interfaces.browser.IBrowserSkinType" />
+  interface="zope.app.publisher.interfaces.browser.IMenuItemType" />
 
 <interface
-  interface="zope.app.publisher.interfaces.browser.IMenuItemType" />
+  interface="zope.publisher.interfaces.browser.IBrowserSkinType" />
 
+<vocabulary
+    name="Browser Skins"
+    factory="zope.app.component.vocabulary.UtilityVocabulary"
+    interface="zope.publisher.interfaces.browser.IBrowserSkinType"
+    />
+
 <!-- BBB 2006/02/18, to be removed after 12 months -->
 <browser:layer
     name="default"