[Checkins] SVN: z3c.reference/branches/flash/src/z3c/reference/ Improve view reference editor

[Roger Ineichen]

Log message for revision 79504:
  Improve view reference editor
  Move flash movie to the browser resource location

Changed:
  U   z3c.reference/branches/flash/src/z3c/reference/browser/README.txt
  U   z3c.reference/branches/flash/src/z3c/reference/browser/configure.zcml
  A   z3c.reference/branches/flash/src/z3c/reference/browser/resources/imagetool.swf
  U   z3c.reference/branches/flash/src/z3c/reference/browser/resources/reference.editor.js
  U   z3c.reference/branches/flash/src/z3c/reference/browser/views.py
  U   z3c.reference/branches/flash/src/z3c/reference/demo/browser/configure.zcml
  D   z3c.reference/branches/flash/src/z3c/reference/demo/browser/swf/imagetool.swf

-=-
Modified: z3c.reference/branches/flash/src/z3c/reference/browser/README.txt
===================================================================
--- z3c.reference/branches/flash/src/z3c/reference/browser/README.txt	2007-09-06 17:06:40 UTC (rev 79503)
+++ z3c.reference/branches/flash/src/z3c/reference/browser/README.txt	2007-09-06 18:05:23 UTC (rev 79504)
@@ -34,7 +34,6 @@
   >>> from zope.publisher.browser import TestRequest
   >>> from z3c.reference.interfaces import IViewReferenceField
   >>> from z3c.reference.schema import ViewReferenceField
-  >>> from z3c.reference.browser.widget import ViewReferenceWidget
   >>> from zope.app.form.interfaces import IInputWidget
 
 Let's define a request and...
@@ -79,3 +78,19 @@
   ...     zope.interface.implements(IText)
 
   >>> text = Text()
+
+Register the object in the intids util:
+
+  >>> from zope.app.intid.interfaces import IIntIds
+  >>> intids = zope.component.getUtility(IIntIds)
+  >>> oid = intids.register(text)
+
+Now we can setup a test request and set the values for the widget:
+
+  >>> request = TestRequest(HTTP_ACCEPT_LANGUAGE='pl',
+  ...    form={'field.intro.target': oid,
+  ...          'field.intro.view': 'ratio=16x9',
+  ...          'field.intro.title': 'My reference',
+  ...          'field.intro.description': 'This is a reference'})
+  >>> widget = ViewReferenceWidget(field, request)
+  >>> widget._toFieldValue()

Modified: z3c.reference/branches/flash/src/z3c/reference/browser/configure.zcml
===================================================================
--- z3c.reference/branches/flash/src/z3c/reference/browser/configure.zcml	2007-09-06 17:06:40 UTC (rev 79503)
+++ z3c.reference/branches/flash/src/z3c/reference/browser/configure.zcml	2007-09-06 18:05:23 UTC (rev 79504)
@@ -2,6 +2,11 @@
     xmlns="http://namespaces.zope.org/zope"
     xmlns:browser="http://namespaces.zope.org/browser">
 
+  <browser:resource
+      name="imagetool.swf"
+      file="resources/imagetool.swf"
+      />
+
   <view
       type="zope.publisher.interfaces.browser.IBrowserRequest"
       for="..interfaces.IViewReferenceField"

Added: z3c.reference/branches/flash/src/z3c/reference/browser/resources/imagetool.swf
===================================================================
(Binary files differ)


Property changes on: z3c.reference/branches/flash/src/z3c/reference/browser/resources/imagetool.swf
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: z3c.reference/branches/flash/src/z3c/reference/browser/resources/reference.editor.js
===================================================================
--- z3c.reference/branches/flash/src/z3c/reference/browser/resources/reference.editor.js	2007-09-06 17:06:40 UTC (rev 79503)
+++ z3c.reference/branches/flash/src/z3c/reference/browser/resources/reference.editor.js	2007-09-06 18:05:23 UTC (rev 79504)
@@ -21,9 +21,9 @@
     });
 }
 
-function loadEditorEdit(tStr) {
+function loadEditorEdit(targetStr) {
     settings = {'settingName': settingNameStr,
-                'target': tStr,
+                'target': targetStr,
                 'view': viewStr,
                 'title': titleStr,
                 'description': descriptionStr}

Modified: z3c.reference/branches/flash/src/z3c/reference/browser/views.py
===================================================================
--- z3c.reference/branches/flash/src/z3c/reference/browser/views.py	2007-09-06 17:06:40 UTC (rev 79503)
+++ z3c.reference/branches/flash/src/z3c/reference/browser/views.py	2007-09-06 18:05:23 UTC (rev 79504)
@@ -131,6 +131,7 @@
         self.request = request
 
     def __call__(self):
+        self.settingNameStr = self.request.get('settingName', u'')
         if self.settingNameStr:
             view = component.queryMultiAdapter((self.context, self.request),
                 interfaces.IViewReferenceEditorSearch, name=self.settingNameStr)
@@ -153,6 +154,12 @@
         self.request = request
 
     def __call__(self):
+        import pdb;pdb.set_trace()
+        self.settingNameStr = self.request.get('settingName', u'')
+        self.targetStr = self.request.get('target', u'')
+        self.viewStr = self.request.get('view', u'')
+        self.titleStr = self.request.get('title', u'')
+        self.descriptionStr = self.request.get('description', u'')
         if not self.targetStr:
             return u''
         intids = component.getUtility(IIntIds)
@@ -161,5 +168,7 @@
             view = component.queryMultiAdapter((obj, self.request),
                 interfaces.IViewReferenceEditorEdit, name=self.settingNameStr)
             if view is not None:
+                print ""
+                print "Show edit view for obj %s" % obj.__name__
                 return view()
         return u''

Modified: z3c.reference/branches/flash/src/z3c/reference/demo/browser/configure.zcml
===================================================================
--- z3c.reference/branches/flash/src/z3c/reference/demo/browser/configure.zcml	2007-09-06 17:06:40 UTC (rev 79503)
+++ z3c.reference/branches/flash/src/z3c/reference/demo/browser/configure.zcml	2007-09-06 18:05:23 UTC (rev 79504)
@@ -9,11 +9,6 @@
       />
 
   <resource
-      name="imagetool.swf"
-      file="swf/imagetool.swf"
-      />
-
-  <resource
       name="img.jpg"
       file="swf/testimage.jpg"
       />

Deleted: z3c.reference/branches/flash/src/z3c/reference/demo/browser/swf/imagetool.swf
===================================================================
(Binary files differ)