[commits] r129 - in selinux-site/trunk: selinux.policy/selinux/policy/profiles/default selinux.theme/selinux/theme selinux.theme/selinux/theme/browser selinux.theme/selinux/theme/profiles/default

[tim at mail.se.linux.org]

Author: tim
Date: 2007-11-11 15:02:35 +0100 (Sun, 11 Nov 2007)
New Revision: 129

Added:
   selinux-site/trunk/selinux.policy/selinux/policy/profiles/default/skins.xml
   selinux-site/trunk/selinux.theme/selinux/theme/browser/interfaces.py
Removed:
   selinux-site/trunk/selinux.theme/selinux/theme/browser/overrides.zcml
   selinux-site/trunk/selinux.theme/selinux/theme/overrides.zcml
Modified:
   selinux-site/trunk/selinux.theme/selinux/theme/browser/configure.zcml
   selinux-site/trunk/selinux.theme/selinux/theme/profiles/default/skins.xml
   selinux-site/trunk/selinux.theme/selinux/theme/profiles/default/viewlets.xml
Log:
Change the themeing story to be more robust. Now we can change between NuPlone, our own theme and others without them interfering with each other. Our viewlets won't be used by NuPlone because of the ISeLinuxTheme layer. Yay!


Added: selinux-site/trunk/selinux.policy/selinux/policy/profiles/default/skins.xml
===================================================================
--- selinux-site/trunk/selinux.policy/selinux/policy/profiles/default/skins.xml	                        (rev 0)
+++ selinux-site/trunk/selinux.policy/selinux/policy/profiles/default/skins.xml	2007-11-11 14:02:35 UTC (rev 129)
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<object name="portal_skins" allow_any="False" cookie_persistence="False"
+  default_skin="SeLinux Theme">
+
+  <skin-path name="SeLinux Theme" based-on="Plone Default">
+    <layer name="selinuxtheme" insert-after="custom"/>
+  </skin-path>
+
+</object>

Modified: selinux-site/trunk/selinux.theme/selinux/theme/browser/configure.zcml
===================================================================
--- selinux-site/trunk/selinux.theme/selinux/theme/browser/configure.zcml	2007-11-11 13:56:42 UTC (rev 128)
+++ selinux-site/trunk/selinux.theme/selinux/theme/browser/configure.zcml	2007-11-11 14:02:35 UTC (rev 129)
@@ -2,12 +2,21 @@
     xmlns="http://namespaces.zope.org/zope"
     xmlns:browser="http://namespaces.zope.org/browser">
 
+  <!-- Zope 3 skin layer, makes all request get the ISeLinuxTheme interface applied
+       if the current theme is SeLinux Theme  -->
+  <interface
+      interface=".interfaces.ISeLinuxTheme"
+      type="zope.publisher.interfaces.browser.IBrowserSkinType"
+      name="SeLinux Theme"
+      />
+
   <!-- portal title -->
   <browser:viewlet
       name="selinux.portaltitle"
       manager="plone.app.layout.viewlets.interfaces.IPortalHeader"
       class=".viewlets.TitleViewlet"
       permission="zope2.View"
+      layer=".interfaces.ISeLinuxTheme"
       />
 
   <!-- portal logo -->
@@ -16,6 +25,18 @@
       manager="plone.app.layout.viewlets.interfaces.IPortalHeader"
       class=".viewlets.LogoViewlet"
       permission="zope2.View"
+      layer=".interfaces.ISeLinuxTheme"
       />
 
+  <!-- Footer -->
+  <browser:viewlet
+      name="plone.footer"
+      for="*"
+      manager="plone.app.layout.viewlets.interfaces.IPortalFooter"
+      class=".viewlets.FooterViewlet"
+      template="footer.pt"
+      permission="zope.Public"
+      layer=".interfaces.ISeLinuxTheme"
+      />
+
 </configure>

Added: selinux-site/trunk/selinux.theme/selinux/theme/browser/interfaces.py
===================================================================
--- selinux-site/trunk/selinux.theme/selinux/theme/browser/interfaces.py	                        (rev 0)
+++ selinux-site/trunk/selinux.theme/selinux/theme/browser/interfaces.py	2007-11-11 14:02:35 UTC (rev 129)
@@ -0,0 +1,4 @@
+from Products.CMFDefault.interfaces import ICMFDefaultSkin
+
+class ISeLinuxTheme(ICMFDefaultSkin):
+    """ Marker interface for our skin layer. """


Property changes on: selinux-site/trunk/selinux.theme/selinux/theme/browser/interfaces.py
___________________________________________________________________
Name: svn:keywords
   + Id

Deleted: selinux-site/trunk/selinux.theme/selinux/theme/browser/overrides.zcml
===================================================================
--- selinux-site/trunk/selinux.theme/selinux/theme/browser/overrides.zcml	2007-11-11 13:56:42 UTC (rev 128)
+++ selinux-site/trunk/selinux.theme/selinux/theme/browser/overrides.zcml	2007-11-11 14:02:35 UTC (rev 129)
@@ -1,14 +0,0 @@
-<configure
-    xmlns="http://namespaces.zope.org/zope"
-    xmlns:browser="http://namespaces.zope.org/browser">
-
-  <!-- Footer -->
-  <browser:viewlet
-      name="plone.footer"
-      for="*"
-      manager="plone.app.layout.viewlets.interfaces.IPortalFooter"
-      template="footer.pt"
-      permission="zope.Public"
-      />
-
-</configure>

Deleted: selinux-site/trunk/selinux.theme/selinux/theme/overrides.zcml
===================================================================
--- selinux-site/trunk/selinux.theme/selinux/theme/overrides.zcml	2007-11-11 13:56:42 UTC (rev 128)
+++ selinux-site/trunk/selinux.theme/selinux/theme/overrides.zcml	2007-11-11 14:02:35 UTC (rev 129)
@@ -1,5 +0,0 @@
-<configure xmlns="http://namespaces.zope.org/zope">
-
-  <include package=".browser" file="overrides.zcml" />
-
-</configure>

Modified: selinux-site/trunk/selinux.theme/selinux/theme/profiles/default/skins.xml
===================================================================
--- selinux-site/trunk/selinux.theme/selinux/theme/profiles/default/skins.xml	2007-11-11 13:56:42 UTC (rev 128)
+++ selinux-site/trunk/selinux.theme/selinux/theme/profiles/default/skins.xml	2007-11-11 14:02:35 UTC (rev 129)
@@ -1,8 +1,7 @@
 <?xml version="1.0"?>
 <object name="portal_skins" meta_type="Plone Skins Tool">
+
   <object name="selinuxtheme" meta_type="Filesystem Directory View"
          directory="selinux.theme:skins/selinuxtheme"/>
-  <skin-path name="*">
-    <layer name="selinuxtheme" insert-after="custom"/>
-  </skin-path>
+
 </object>

Modified: selinux-site/trunk/selinux.theme/selinux/theme/profiles/default/viewlets.xml
===================================================================
--- selinux-site/trunk/selinux.theme/selinux/theme/profiles/default/viewlets.xml	2007-11-11 13:56:42 UTC (rev 128)
+++ selinux-site/trunk/selinux.theme/selinux/theme/profiles/default/viewlets.xml	2007-11-11 14:02:35 UTC (rev 129)
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <object>
-  <order manager="plone.portalheader" skinname="Plone Default">
+  <order manager="plone.portalheader" skinname="SeLinux Theme">
     <viewlet name="plone.skip_links" />
     <viewlet name="plone.site_actions" />
     <viewlet name="plone.searchbox" />
@@ -8,7 +8,7 @@
     <viewlet name="plone.global_sections" />
   </order>
 
-  <hidden manager="plone.portalheader" skinname="Plone Default">
+  <hidden manager="plone.portalheader" skinname="SeLinux Theme">
     <viewlet name="plone.logo" />
   </hidden>
 </object>