[Checkins] SVN: z3c.boston/ Ensured that this skin works with z3c.formjs.

Kevin Gill kevin at movieextras.ie
Mon Oct 20 07:33:11 EDT 2008


Log message for revision 92396:
  Ensured that this skin works with z3c.formjs.
  
  

Changed:
  U   z3c.boston/setup.py
  U   z3c.boston/z3c/boston/README.txt
  U   z3c.boston/z3c/boston/__init__.py
  U   z3c.boston/z3c/boston/configure.zcml
  U   z3c.boston/z3c/boston/demo.py
  U   z3c.boston/z3c/boston/ftesting.zcml
  A   z3c.boston/z3c/boston/resources/
  A   z3c.boston/z3c/boston/resources/demo.css
  A   z3c.boston/z3c/boston/resources/demo.js
  U   z3c.boston/z3c/boston/templates/layout.pt
  U   z3c.boston/z3c.boston.egg-info/PKG-INFO
  U   z3c.boston/z3c.boston.egg-info/SOURCES.txt
  U   z3c.boston/z3c.boston.egg-info/requires.txt

-=-
Modified: z3c.boston/setup.py
===================================================================
--- z3c.boston/setup.py	2008-10-20 09:34:32 UTC (rev 92395)
+++ z3c.boston/setup.py	2008-10-20 11:33:10 UTC (rev 92396)
@@ -31,9 +31,29 @@
           'z3c.layer',
           'jquery.layer',
           'z3c.template',
+          'z3c.viewlet',
+          'z3c.form',
+          'z3c.formjs',
+          'z3c.zrtresource',
+          'jquery.javascript',
+          'jquery.layer',
+
+          # required for testing
+          'zope.app.testing',
+          'zope.testbrowser',
+          'zope.app.dtmlpage',
+          'zope.app.onlinehelp',
+          'zope.app.securitypolicy',
+          'zope.app.zcmlfiles'
       ],
       extras_require = dict(
           test = [
+            'zope.app.testing',
+            'zope.testbrowser',
+            'zope.app.dtmlpage',
+            'zope.app.onlinehelp',
+            'zope.app.securitypolicy',
+            'zope.app.zcmlfiles'
           ]
       ),
       entry_points="""

Modified: z3c.boston/z3c/boston/README.txt
===================================================================
--- z3c.boston/z3c/boston/README.txt	2008-10-20 09:34:32 UTC (rev 92395)
+++ z3c.boston/z3c/boston/README.txt	2008-10-20 11:33:10 UTC (rev 92396)
@@ -74,3 +74,27 @@
     >>> browser.open('http://localhost/++skin++z3c_boston/@@demo.html')
     >>> browser.contents
     '...PAGELET CONTENT...'
+
+Verify standard viewlets 
+
+    >>> browser.open('http://localhost/++skin++z3c_boston/@@demo.html')
+    >>> browser.contents
+    '...demo.css...'
+    >>> browser.contents
+    '...demo.js...'
+
+Verify that the CSS for forms is included
+
+    >>> browser.open('http://localhost/++skin++z3c_boston/@@demo_form.html')
+    >>> browser.contents
+    '...div-form.css...'
+
+Verify that formjs works
+
+    >>> browser.open('http://localhost/++skin++z3c_boston/@@demo_formjs.html')
+    >>> browser.contents
+    '...div-form.css...'
+    >>> browser.contents
+    '...jquery.js...'
+    >>> browser.contents
+    '...alert...'

Modified: z3c.boston/z3c/boston/__init__.py
===================================================================
--- z3c.boston/z3c/boston/__init__.py	2008-10-20 09:34:32 UTC (rev 92395)
+++ z3c.boston/z3c/boston/__init__.py	2008-10-20 11:33:10 UTC (rev 92396)
@@ -22,6 +22,7 @@
 import z3c.layer.pagelet
 import z3c.form.interfaces
 import z3c.formui.interfaces
+import z3c.formjs.interfaces
 from jquery.layer import IJQueryJavaScriptBrowserLayer    # required for formjs
 
 class IPageletLayer(z3c.form.interfaces.IFormLayer,
@@ -35,3 +36,12 @@
                                                           # use the table layer
             IPageletLayer):
     pass
+
+class ICSS(z3c.formui.interfaces.ICSS, zope.app.boston.ICSS):
+    """CSS viewlet manager."""
+
+class IJavaScript(
+        IJQueryJavaScriptBrowserLayer,
+        z3c.formjs.interfaces.IDynamicJavaScript,
+        zope.app.boston.IJavaScript):
+    """JavaScript viewlet manager."""

Modified: z3c.boston/z3c/boston/configure.zcml
===================================================================
--- z3c.boston/z3c/boston/configure.zcml	2008-10-20 09:34:32 UTC (rev 92395)
+++ z3c.boston/z3c/boston/configure.zcml	2008-10-20 11:33:10 UTC (rev 92396)
@@ -10,10 +10,20 @@
   <include package="zope.app.boston" />
 
   <!-- dependencies for z3c.boston -->
+  <include package="z3c.zrtresource" file="meta.zcml"/>
+  <include package="z3c.form" file="meta.zcml" />
+  <include package="z3c.pagelet" file="meta.zcml" />
+  <include package="z3c.macro" file="meta.zcml" />
   <include package="z3c.template" file="meta.zcml" />
 
-  <!-- Configure for the z3c.boston skin -->
+  <include package="z3c.pagelet" />
+  <include package="z3c.formui" />
+  <include package="z3c.form" />
+  <include package="jquery.layer" />
+  <include package="z3c.formjs"/>
 
+  <!-- Configuration the z3c.boston skin -->
+
   <interface
       interface=".IPageletLayer"
       type="zope.publisher.interfaces.browser.IBrowserSkinType"
@@ -39,4 +49,20 @@
       layer=".Boston"
       />
 
+  <browser:viewletManager
+      name="ICSS"
+      provides=".ICSS"
+      class="zope.viewlet.manager.WeightOrderedViewletManager"
+      layer=".Boston"
+      permission="zope.Public"
+      />
+
+  <browser:viewletManager
+      name="IJavaScript"
+      provides=".IJavaScript"
+      class="zope.viewlet.manager.WeightOrderedViewletManager"
+      layer=".Boston"
+      permission="zope.Public"
+      />
+
 </configure>

Modified: z3c.boston/z3c/boston/demo.py
===================================================================
--- z3c.boston/z3c/boston/demo.py	2008-10-20 09:34:32 UTC (rev 92395)
+++ z3c.boston/z3c/boston/demo.py	2008-10-20 11:33:10 UTC (rev 92396)
@@ -17,9 +17,46 @@
 """
 
 from z3c.pagelet.browser import BrowserPagelet
+import zope.interface
+import zope.schema
+import z3c.form 
+import z3c.formui.form 
+from z3c.formjs import ajax, jsaction
+import z3c.form.form
 
+from z3c.pagelet.browser import BrowserPagelet
+from zope.viewlet.viewlet import CSSViewlet, JavaScriptViewlet
+
 class DemoPagelet(BrowserPagelet):
     def update(self):
         pass
     def render(self):
         return 'PAGELET CONTENT'
+
+DemoCSSViewlet = CSSViewlet('demo.css')
+DemoJSViewlet = JavaScriptViewlet('demo.js')
+
+class IDemoForm(zope.interface.Interface):
+    field1 = zope.schema.TextLine(title=u'Field 1')
+
+class DemoForm(z3c.formui.form.EditForm):
+    label="Demo Form"
+    fields = z3c.form.field.Fields(IDemoForm)
+    ignoreContext = True
+
+    def getContent(self):
+        return {
+            'field1': None
+        }
+        
+class DemoFormJS(ajax.AJAXRequestHandler, DemoForm):
+    z3c.form.form.extends(DemoForm)
+
+    @jsaction.buttonAndHandler(u'Alert')
+    def setupAlert(self, event, selecter):
+        return """
+            alert('CANCEL');
+            return(false);
+        """
+
+

Modified: z3c.boston/z3c/boston/ftesting.zcml
===================================================================
--- z3c.boston/z3c/boston/ftesting.zcml	2008-10-20 09:34:32 UTC (rev 92395)
+++ z3c.boston/z3c/boston/ftesting.zcml	2008-10-20 11:33:10 UTC (rev 92396)
@@ -1,5 +1,6 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
+    xmlns:browser="http://namespaces.zope.org/browser"
     xmlns:z3c="http://namespaces.zope.org/z3c"
     i18n_domain="z3c.boston"
     package="z3c.boston"
@@ -32,8 +33,48 @@
     permission="zope.Public"
     />
 
+  <browser:resource
+      name="demo.css"
+      file="resources/demo.css"
+      />
 
+  <browser:resource
+      name="demo.js"
+      file="resources/demo.js"
+      />
 
+  <browser:viewlet
+      name="demo.css"
+      for="*"
+      manager=".ICSS"
+      class=".demo.DemoCSSViewlet"
+      permission="zope.Public"
+      />
+
+  <browser:viewlet
+      name="demo.js"
+      for="*"
+      manager=".IJavaScript"
+      class=".demo.DemoJSViewlet"
+      permission="zope.Public"
+      />
+
+  <z3c:pagelet
+      name="demo_form.html"
+      for="*"
+      class=".demo.DemoForm"
+      permission="zope.Public"
+      />
+
+  <z3c:pagelet
+      name="demo_formjs.html"
+      for="*"
+      class=".demo.DemoFormJS"
+      permission="zope.Public"
+      />
+
+
+
   <securityPolicy
       component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
 

Added: z3c.boston/z3c/boston/resources/demo.css
===================================================================


Property changes on: z3c.boston/z3c/boston/resources/demo.css
___________________________________________________________________
Name: svn:eol-style
   + native

Added: z3c.boston/z3c/boston/resources/demo.js
===================================================================


Property changes on: z3c.boston/z3c/boston/resources/demo.js
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: z3c.boston/z3c/boston/templates/layout.pt
===================================================================
--- z3c.boston/z3c/boston/templates/layout.pt	2008-10-20 09:34:32 UTC (rev 92395)
+++ z3c.boston/z3c/boston/templates/layout.pt	2008-10-20 11:33:10 UTC (rev 92396)
@@ -15,11 +15,11 @@
   <metal:block define-slot="headers"></metal:block>
 
   <!-- css viewlets -->
-  <tal:block replace="structure provider:zope.app.boston.ICSS" />
+  <tal:block replace="structure provider:ICSS" />
   <metal:block define-slot="style_slot"></metal:block>
 
   <!-- javascripts viewlets -->
-  <tal:block replace="structure provider:zope.app.boston.IJavaScript" />
+  <tal:block replace="structure provider:IJavaScript" />
   <metal:block define-slot="ecmascript_slot"></metal:block>
 
   <link rel="icon" type="image/png"

Modified: z3c.boston/z3c.boston.egg-info/PKG-INFO
===================================================================
--- z3c.boston/z3c.boston.egg-info/PKG-INFO	2008-10-20 09:34:32 UTC (rev 92395)
+++ z3c.boston/z3c.boston.egg-info/PKG-INFO	2008-10-20 11:33:10 UTC (rev 92396)
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: z3c.boston
-Version: 1.0.1devdev
+Version: 1.0.1devdev-r92389
 Summary: A version of the zope.app.boston skin which support pagelets.
 Home-page: http://pypi.python.org/pypi/z3c.boston
 Author: Kevin Gill and the Zope Community
@@ -9,7 +9,8 @@
 Description: Introduction
         ============
         
-        z3c.pagelet is a skin built on top of zope.app.boston in order to support pagelets, z3c.form and z3c.formjs.
+        z3c.pagelet is a skin built on top of zope.app.boston in order to support
+        pagelets, z3c.form and z3c.formjs.
         
         Changelog
         =========

Modified: z3c.boston/z3c.boston.egg-info/SOURCES.txt
===================================================================
--- z3c.boston/z3c.boston.egg-info/SOURCES.txt	2008-10-20 09:34:32 UTC (rev 92395)
+++ z3c.boston/z3c.boston.egg-info/SOURCES.txt	2008-10-20 11:33:10 UTC (rev 92396)
@@ -1,6 +1,7 @@
 README.txt
 setup.cfg
 setup.py
+docs/HISTORY.txt
 z3c/__init__.py
 z3c.boston.egg-info/PKG-INFO
 z3c.boston.egg-info/SOURCES.txt
@@ -10,7 +11,12 @@
 z3c.boston.egg-info/not-zip-safe
 z3c.boston.egg-info/requires.txt
 z3c.boston.egg-info/top_level.txt
+z3c/boston/README.txt
 z3c/boston/__init__.py
+z3c/boston/configure.zcml
+z3c/boston/default_skin.zcml
 z3c/boston/demo.py
+z3c/boston/ftesting.zcml
 z3c/boston/testing.py
-z3c/boston/tests.py
\ No newline at end of file
+z3c/boston/tests.py
+z3c/boston/templates/layout.pt
\ No newline at end of file

Modified: z3c.boston/z3c.boston.egg-info/requires.txt
===================================================================
--- z3c.boston/z3c.boston.egg-info/requires.txt	2008-10-20 09:34:32 UTC (rev 92395)
+++ z3c.boston/z3c.boston.egg-info/requires.txt	2008-10-20 11:33:10 UTC (rev 92396)
@@ -5,5 +5,21 @@
 z3c.layer
 jquery.layer
 z3c.template
+z3c.viewlet
+z3c.form
+z3c.formjs
+z3c.zrtresource
+jquery.javascript
+jquery.layer
+zope.testbrowser
+zope.app.dtmlpage
+zope.app.onlinehelp
+zope.app.securitypolicy
+zope.app.zcmlfiles
 
 [test]
+zope.testbrowser
+zope.app.dtmlpage
+zope.app.onlinehelp
+zope.app.securitypolicy
+zope.app.zcmlfiles
\ No newline at end of file



More information about the Checkins mailing list