From 4437d2c9d445b6076d2e4769dc5e3feffd0e8334 Mon Sep 17 00:00:00 2001 From: helmutm Date: Tue, 25 Nov 2008 12:57:47 +0000 Subject: [PATCH] prepare use of grid field git-svn-id: svn://svn.cy55.de/Zope3/src/loops/trunk@3008 fd906abe-77d9-0310-91a1-e0d9ade77398 --- browser/common.py | 14 +++++++++++--- browser/form.py | 2 ++ configure.zcml | 2 ++ layout/browser/concept.py | 3 ++- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/browser/common.py b/browser/common.py index c806aec..d953191 100644 --- a/browser/common.py +++ b/browser/common.py @@ -549,12 +549,20 @@ class BaseView(GenericView, I18NView): def registerDojoFormAll(self): self.registerDojo() + cm = self.controller.macros jsCall = ('dojo.require("dijit.form.Form"); ' 'dojo.require("dijit.form.DateTextBox"); ' - 'dojo.require("dijit.form.TimeTextBox");' + 'dojo.require("dijit.form.TimeTextBox"); ' 'dojo.require("dijit.form.FilteringSelect"); ' - 'dojo.require("dojox.data.QueryReadStore");') - self.controller.macros.register('js-execute', 'dojo.form.all', jsCall=jsCall) + 'dojo.require("dojox.grid.DataGrid"); ' + 'dojo.require("dojo.data.ItemFileWriteStore"); ' + 'dojo.require("dojox.data.QueryReadStore"); ') + cm.register('js-execute', 'dojo.form.all', jsCall=jsCall) + cm.register('css', identifier='dojox.grid.css', position=0, + resourceName='ajax.dojo/dojox/grid/resources/Grid.css', media='all') + cm.register('css', identifier='dojox.grid_tundra.css', position=0, + resourceName='ajax.dojo/dojox/grid/resources/tundraGrid.css', + media='all') # vocabulary stuff diff --git a/browser/form.py b/browser/form.py index e5b5344..872f4fa 100644 --- a/browser/form.py +++ b/browser/form.py @@ -42,6 +42,7 @@ from cybertools.ajax import innerHtml from cybertools.browser.form import FormController from cybertools.browser.view import popupTemplate from cybertools.composer.interfaces import IInstance +from cybertools.composer.schema.grid.field import grid_macros from cybertools.composer.schema.interfaces import ISchemaFactory from cybertools.composer.schema.browser.common import schema_macros, schema_edit_macros from cybertools.composer.schema.schema import FormState @@ -110,6 +111,7 @@ class ObjectForm(NodeView): renderers = dict(schema_macros.macros) # replace HTML edit widget with Dojo Editor renderers['input_html'] = self.template.macros['input_html'] + renderers['input_grid'] = grid_macros.macros['input_grid'] return renderers @Lazy diff --git a/configure.zcml b/configure.zcml index 3c7541f..9fcea79 100644 --- a/configure.zcml +++ b/configure.zcml @@ -340,6 +340,8 @@ name="list" /> + diff --git a/layout/browser/concept.py b/layout/browser/concept.py index b41fb03..62c92aa 100644 --- a/layout/browser/concept.py +++ b/layout/browser/concept.py @@ -51,7 +51,8 @@ class ConceptView(object): @Lazy def url(self): - return '%s/.%s-%s' % (absoluteURL(self.node, self.request), self.context.uid, normalize(self.context.title)) + return '%s/.%s-%s' % (absoluteURL(self.node, self.request), + self.context.uid, normalize(self.context.title)) @property def children(self):