diff -r f299ee54d7e0 -r f7fdb5dd82f6 web/formwidgets.py --- a/web/formwidgets.py Thu Apr 29 14:21:59 2010 +0200 +++ b/web/formwidgets.py Fri Apr 30 12:14:15 2010 +0200 @@ -550,7 +550,7 @@ return (u""" """ % (helperid, inputid, year, month, - form._cw.external_resource('CALENDAR_ICON'), + form._cw.vreg.config.uiprops['CALENDAR_ICON'], form._cw._('calendar'), helperid) ) @@ -574,7 +574,7 @@ req.add_onload(u'jqNode("%s").datepicker(' '{buttonImage: "%s", dateFormat: "%s", firstDay: 1,' ' showOn: "button", buttonImageOnly: true})' % ( - domid, req.external_resource('CALENDAR_ICON'), fmt)) + domid, req.vreg.config.uiprops['CALENDAR_ICON'], fmt)) if self.datestr is None: value = self.values(form, field)[0] else: @@ -954,7 +954,7 @@ if self.settabindex and not 'tabindex' in attrs: attrs['tabindex'] = form._cw.next_tabindex() if self.icon: - img = tags.img(src=form._cw.external_resource(self.icon), alt=self.icon) + img = tags.img(src=form._cw.vreg.config.uiprops[self.icon], alt=self.icon) else: img = u'' return tags.button(img + xml_escape(label), escapecontent=False, @@ -985,7 +985,7 @@ def render(self, form, field=None, renderer=None): label = form._cw._(self.label) - imgsrc = form._cw.external_resource(self.imgressource) + imgsrc = form._cw.vreg.config.uiprops[self.imgressource] return ''\ '%(label)s%(label)s' % { 'label': label, 'imgsrc': imgsrc,