[Checkins] SVN: zopeorg.theme/trunk/zopeorg/theme/ - moved Feature's blurb to viewlet and placed it above the content according to design

[Denis Mishunov]

Log message for revision 83470:
  - moved Feature's blurb to viewlet and placed it above the content according to design
  - placed contentAction and contentViews above content, but below Feature's blurb

Changed:
  U   zopeorg.theme/trunk/zopeorg/theme/browser/configure.zcml
  U   zopeorg.theme/trunk/zopeorg/theme/profiles/default/viewlets.xml

-=-
Modified: zopeorg.theme/trunk/zopeorg/theme/browser/configure.zcml
===================================================================
--- zopeorg.theme/trunk/zopeorg/theme/browser/configure.zcml	2008-02-03 20:54:15 UTC (rev 83469)
+++ zopeorg.theme/trunk/zopeorg/theme/browser/configure.zcml	2008-02-03 22:47:03 UTC (rev 83470)
@@ -54,8 +54,41 @@
         template="templates/contentviews.pt"
         layer=".interfaces.IThemeSpecific"        
         permission="zope2.View"
-        />  
+        /> 
         
+    <!-- Content actions (menus) 
+        The default version is a blank bar; the one with real menus is
+        registered for the main view + folder contents only.
+    -->
+    <browser:viewlet
+        name="plone.contentactions"
+        for="*"
+        manager="plone.app.layout.viewlets.interfaces.IPortalTop"
+        template="templates/contentactions_blank.pt"
+        layer=".interfaces.IThemeSpecific"
+        permission="zope2.View"
+        />
+
+    <browser:viewlet
+        name="plone.contentactions"
+        for="*"
+        view="plone.app.layout.globals.interfaces.IViewView"
+        manager="plone.app.layout.viewlets.interfaces.IPortalTop"
+        class="plone.app.layout.viewlets.common.ContentActionsViewlet"
+        layer=".interfaces.IThemeSpecific"
+        permission="zope2.View"
+        />
+
+    <browser:viewlet
+        name="plone.contentactions"
+        for="*"
+        view="plone.app.content.browser.interfaces.IFolderContentsView"
+        manager="plone.app.layout.viewlets.interfaces.IPortalTop"
+        class="plone.app.layout.viewlets.common.ContentActionsViewlet"
+        layer=".interfaces.IThemeSpecific"
+        permission="zope2.View"
+        />         
+        
     <!-- The zoperog footer -->
     <browser:viewlet
         name="zopeorg.footer"
@@ -99,5 +132,41 @@
         action="@@view"
         description="Default view for Feature object"
         />
+        
+    <!-- Viewlet to contain Feature's blurb in portal-top -->
+    <browser:viewlet  
+        name="zopeorg.feature.wrapper"
+        manager="plone.app.layout.viewlets.interfaces.IPortalTop"
+        template="templates/feature_wrapper.pt"
+        layer=".interfaces.IThemeSpecific"
+        permission="zope2.View" 
+        />    
+        
+    <!-- New viewlet manager for Feature default view -->
+    <browser:viewletManager
+        name="zopeorg.featureview"
+        provides=".interfaces.IFeatureView"
+        permission="zope2.View"
+        class="plone.app.viewletmanager.manager.OrderedViewletManager"
+        />
 
+    <!-- Feature's blurb viewlet -->
+    <!-- <browser:viewlet  
+        name="zopeorg.feature"
+        for=".interfaces.IFeature"
+        manager=".interfaces.IFeatureView"
+        view="plone.app.layout.globals.interfaces.IViewView"        
+        class=".viewlets.FeatureViewlet"
+        layer=".interfaces.IThemeSpecific"
+        permission="zope2.View" 
+        />  -->          
+    <browser:viewlet  
+        name="zopeorg.feature"
+        for=".interfaces.IFeature"
+        manager=".interfaces.IFeatureView"
+        class=".viewlets.FeatureViewlet"
+        layer=".interfaces.IThemeSpecific"
+        permission="zope2.View" 
+        />
+
 </configure>

Modified: zopeorg.theme/trunk/zopeorg/theme/profiles/default/viewlets.xml
===================================================================
--- zopeorg.theme/trunk/zopeorg/theme/profiles/default/viewlets.xml	2008-02-03 20:54:15 UTC (rev 83469)
+++ zopeorg.theme/trunk/zopeorg/theme/profiles/default/viewlets.xml	2008-02-03 22:47:03 UTC (rev 83470)
@@ -1,16 +1,18 @@
 <?xml version="1.0"?>
 <object>
     <order manager="plone.portaltop" skinname="Zope.org Theme"    
-           based-on="Plone Default">        
+           based-on="Plone Default">  
+      <viewlet name="zopeorg.feature.wrapper" 
+               insert-after="*" />                 
       <viewlet name="plone.contentviews" 
-               insert-after="*" />               
+               insert-after="zopeorg.feature.wrapper" />               
+      <viewlet name="plone.contentactions" 
+               insert-after="plone.contentviews" />               
     </order>  
     <order manager="zopeorg.featureview" skinname="Zope.org Theme"    
            based-on="Plone Default">
       <viewlet name="zopeorg.feature" 
-               insert-before="*" />
-      <viewlet name="zopeorg.header.divider" 
-               insert-after="zopeorg.feature" />                              
+               insert-before="*" />                              
     </order>      
     <order manager="plone.portalheader" skinname="Zope.org Theme"
            based-on="Plone Default">
@@ -37,6 +39,7 @@
     </hidden>
     <hidden manager="plone.contentviews" skinname="Zope.org Theme">
       <viewlet name="plone.contentviews" />    
+      <viewlet name="plone.contentactions" />      
     </hidden>    
     <hidden manager="plone.portalheader" skinname="Zope.org Theme">
       <viewlet name="plone.site_actions" />