[Checkins] SVN: z3c.reference/branches/flash/src/z3c/reference/
Make the view reference edit view a target view.
Roger Ineichen
roger at projekt01.ch
Thu Sep 6 07:03:50 EDT 2007
Log message for revision 79497:
Make the view reference edit view a target view.
Changed:
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
U z3c.reference/branches/flash/src/z3c/reference/demo/browser/editor_edit.pt
U z3c.reference/branches/flash/src/z3c/reference/demo/browser/editor_search.pt
U z3c.reference/branches/flash/src/z3c/reference/demo/browser/ftesting.zcml
U z3c.reference/branches/flash/src/z3c/reference/demo/browser/views.py
U z3c.reference/branches/flash/src/z3c/reference/demo/configure.zcml
U z3c.reference/branches/flash/src/z3c/reference/demo/interfaces.py
-=-
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 10:51:30 UTC (rev 79496)
+++ z3c.reference/branches/flash/src/z3c/reference/browser/resources/reference.editor.js 2007-09-06 11:03:49 UTC (rev 79497)
@@ -1,14 +1,14 @@
// user selects an item
-function setIntId(uid) {
- // reset values
- $("textarea").val("");
- $("input[@type=text]").val("");
- // set initid of selected item
- $("input[@name=intid]").val(uid);
- // highlight selected item
- $("a").attr("style", "");
- $("a[@href*=" + uid + "]").attr("style","background-color: #888");
-}
+//function setIntId(uid) {
+// // reset values
+// $("textarea").val("");
+// $("input[@type=text]").val("");
+// // set initid of selected item
+// $("input[@name=intid]").val(uid);
+// // highlight selected item
+// $("a").attr("style", "");
+// $("a[@href*=" + uid + "]").attr("style","background-color: #888");
+//}
function loadEditorSearch() {
settings = {'settingName':settingName,
@@ -19,10 +19,10 @@
});
}
-function loadEditorEdit(target, view) {
+function loadEditorEdit(tStr) {
settings = {'settingName':settingName,
- 'target': target,
- 'view': view}
+ 'target': tStr,
+ 'view': viewStr}
$.get("viewReferenceEditorEdit", settings, function () {
$("#editorEdit").append($(data));
});
@@ -34,5 +34,7 @@
loadEditorSearch();
// load edit form
- loadEditorEdit(targetStr, viewStr);
+ if (targetStr) {
+ loadEditorEdit(targetStr);
+ }
});
\ No newline at end of file
Modified: z3c.reference/branches/flash/src/z3c/reference/browser/views.py
===================================================================
--- z3c.reference/branches/flash/src/z3c/reference/browser/views.py 2007-09-06 10:51:30 UTC (rev 79496)
+++ z3c.reference/branches/flash/src/z3c/reference/browser/views.py 2007-09-06 11:03:49 UTC (rev 79497)
@@ -139,8 +139,11 @@
def __call__(self):
settingName = self.request.get('settingName')
- if settingName is not None:
- view = component.queryMultiAdapter((self.context, self.request),
+ target = self.request.get('target')
+ intids = component.getUtility(IIntIds)
+ obj = intids.queryObject(int(target))
+ if obj is not None and settingName is not None:
+ view = component.queryMultiAdapter((obj, self.request),
interfaces.IViewReferenceEditorEdit, name=settingName)
if view is not None:
return view()
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 10:51:30 UTC (rev 79496)
+++ z3c.reference/branches/flash/src/z3c/reference/demo/browser/configure.zcml 2007-09-06 11:03:49 UTC (rev 79497)
@@ -72,7 +72,7 @@
<zope:adapter
name=""
- for="z3c.reference.demo.interfaces.IDemoFolder
+ for="z3c.reference.demo.interfaces.IDemoImage
zope.publisher.interfaces.browser.IDefaultBrowserLayer"
provides="z3c.reference.interfaces.IViewReferenceEditorEdit"
factory=".views.ViewReferenceEditorEdit"
Modified: z3c.reference/branches/flash/src/z3c/reference/demo/browser/editor_edit.pt
===================================================================
--- z3c.reference/branches/flash/src/z3c/reference/demo/browser/editor_edit.pt 2007-09-06 10:51:30 UTC (rev 79496)
+++ z3c.reference/branches/flash/src/z3c/reference/demo/browser/editor_edit.pt 2007-09-06 11:03:49 UTC (rev 79497)
@@ -2,7 +2,7 @@
tal:content="string:
function loadFlash() {
var url='${context/++resource++imagetool.swf}';
- var img='${context/++resource++img.jpg}';
+ var img='${context/@@absolute_url}';
url = url + '?url=' + img;
var so = new SWFObject(url, 'image-tool-target', '100%', '490px', '8', 0x000000);
so.addParam('allowScriptAccess', 'sameDomain');
@@ -20,9 +20,6 @@
}
">
</script>
-<h1> Image-Tool 2
- <a href="#" class="ex2">>></a>
-</h1>
<div id="flash-target">
</div>
<div class="image-tool">
Modified: z3c.reference/branches/flash/src/z3c/reference/demo/browser/editor_search.pt
===================================================================
--- z3c.reference/branches/flash/src/z3c/reference/demo/browser/editor_search.pt 2007-09-06 10:51:30 UTC (rev 79496)
+++ z3c.reference/branches/flash/src/z3c/reference/demo/browser/editor_search.pt 2007-09-06 11:03:49 UTC (rev 79497)
@@ -1,8 +1,7 @@
<tal:block repeat="item view/items">
<a href="#" class="target"
- tal:attributes="onclick string:setIntId(${item/uid})">
+ tal:attributes="onclick string:loadEditorEdit(${item/uid})">
<span tal:replace="item/name" />
</a>
<br />
</tal:block>
-<input name="intid" type="hidden" value="" />
Modified: z3c.reference/branches/flash/src/z3c/reference/demo/browser/ftesting.zcml
===================================================================
--- z3c.reference/branches/flash/src/z3c/reference/demo/browser/ftesting.zcml 2007-09-06 10:51:30 UTC (rev 79496)
+++ z3c.reference/branches/flash/src/z3c/reference/demo/browser/ftesting.zcml 2007-09-06 11:03:49 UTC (rev 79497)
@@ -61,6 +61,7 @@
<include package="zope.app.intid" />
<include package="zope.app.keyreference" />
<include package="zope.formlib"/>
+ <include package="zope.app.file"/>
<include package="zc.resourcelibrary" />
<include package="z3c.javascript.jquery"/>
Modified: z3c.reference/branches/flash/src/z3c/reference/demo/browser/views.py
===================================================================
--- z3c.reference/branches/flash/src/z3c/reference/demo/browser/views.py 2007-09-06 10:51:30 UTC (rev 79496)
+++ z3c.reference/branches/flash/src/z3c/reference/demo/browser/views.py 2007-09-06 11:03:49 UTC (rev 79497)
@@ -123,7 +123,4 @@
self.request = request
def __call__(self):
- self.settingName = self.request.get('settingName')
- self.targetStr = self.request.get('target')
- self.viewStr = self.request.get('view')
return self.template()
Modified: z3c.reference/branches/flash/src/z3c/reference/demo/configure.zcml
===================================================================
--- z3c.reference/branches/flash/src/z3c/reference/demo/configure.zcml 2007-09-06 10:51:30 UTC (rev 79496)
+++ z3c.reference/branches/flash/src/z3c/reference/demo/configure.zcml 2007-09-06 11:03:49 UTC (rev 79497)
@@ -14,6 +14,10 @@
<implements
interface="zope.annotation.interfaces.IAttributeAnnotatable" />
<allow interface=".interfaces.IDemoImage"/>
+ <require
+ permission="zope.ManageContent"
+ set_schema=".interfaces.IDemoImage"
+ />
</class>
<include package=".browser"/>
Modified: z3c.reference/branches/flash/src/z3c/reference/demo/interfaces.py
===================================================================
--- z3c.reference/branches/flash/src/z3c/reference/demo/interfaces.py 2007-09-06 10:51:30 UTC (rev 79496)
+++ z3c.reference/branches/flash/src/z3c/reference/demo/interfaces.py 2007-09-06 11:03:49 UTC (rev 79497)
@@ -19,6 +19,7 @@
from zope import interface, schema
from z3c.reference.schema import ViewReferenceField
+from zope.app.file.interfaces import IImage
class IDemoFolder(interface.Interface):
@@ -40,7 +41,7 @@
default=[])
-class IDemoImage(interface.Interface):
+class IDemoImage(IImage):
""" demo image"""
More information about the Checkins
mailing list