[CMF-checkins] CVS: CMF/CMFSetup - skins.py:1.8.2.6 utils.py:1.13.2.6

[Jens Vagelpohl]

Update of /cvs-repository/CMF/CMFSetup
In directory cvs.zope.org:/tmp/cvs-serv4471/CMFSetup

Modified Files:
      Tag: CMF-1_5-branch
	skins.py utils.py 
Log Message:
- CMFSetup.skins: Small featurelet that adds a new keyword to the
  "layer" tag in skins.xml named "remove". If "remove" is
  specified, the named layer will be explicitly removed from the 
  skins path(s).


=== CMF/CMFSetup/skins.py 1.8.2.5 => 1.8.2.6 ===
--- CMF/CMFSetup/skins.py:1.8.2.5	Mon Apr 11 07:32:31 2005
+++ CMF/CMFSetup/skins.py	Sat May  7 08:44:18 2005
@@ -158,7 +158,8 @@
                 except ValueError:
                     pass
 
-        path.append(layer['name'])
+        if not 'remove' in layer:
+            path.append(layer['name'])
 
     return str( ','.join(path) )
 
@@ -282,7 +283,8 @@
               'layer':              {KEY: 'layers', DEFAULT: ()} },
           'layer':
             { 'name':               {},
-              'insert-after' :      {},
-              'insert-before':      {} } }
+              'insert-after':       {},
+              'insert-before':      {},
+              'remove':             {} } }
 
 InitializeClass(SkinsToolConfigurator)


=== CMF/CMFSetup/utils.py 1.13.2.5 => 1.13.2.6 ===
--- CMF/CMFSetup/utils.py:1.13.2.5	Mon Apr 11 07:32:31 2005
+++ CMF/CMFSetup/utils.py	Sat May  7 08:44:18 2005
@@ -219,7 +219,8 @@
             { 'name':            {KEY: 'id'},
               'meta_type':       {},
               'insert-before':   {},
-              'insert-after' :   {},
+              'insert-after':    {},
+              'remove':          {},
               'property':        {KEY: 'properties', DEFAULT: ()},
               'object':          {KEY: 'objects', DEFAULT: ()} },
           'property':