cco/loops
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

minor adjustments...

Browse source 
git-svn-id: svn://svn.cy55.de/Zope3/src/loops/trunk@2770 fd906abe-77d9-0310-91a1-e0d9ade77398
This commit is contained in:
helmutm 2008-07-25 22:11:28 +00:00
parent 09d6b668ef
commit 3e481104cb
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
browser/common.py
View file

@ -276,8 +276,8 @@ class BaseView(GenericView, I18NView):
typeKey = util.renderingFactories.get(contentType, None) typeKey = util.renderingFactories.get(contentType, None)
if typeKey is None: if typeKey is None:
if contentType == u'text/html': if contentType == u'text/html':
return text return util.toUnicode(text)
return u'<pre>%s</pre>' % util.html_quote(text) return u'<pre>%s</pre>' % util.html_quote(util.toUnicode(text))
source = component.createObject(typeKey, text) source = component.createObject(typeKey, text)
view = component.getMultiAdapter((removeAllProxies(source), self.request)) view = component.getMultiAdapter((removeAllProxies(source), self.request))
return view.render() return view.render()
@ -499,6 +499,8 @@ class BaseView(GenericView, I18NView):
self.registerDojo() self.registerDojo()
jsCall = 'dojo.require("dijit.Editor");' jsCall = 'dojo.require("dijit.Editor");'
self.controller.macros.register('js-execute', jsCall, jsCall=jsCall) self.controller.macros.register('js-execute', jsCall, jsCall=jsCall)
jsCall = 'dojo.require("dijit._editor.plugins.LinkDialog");'
self.controller.macros.register('js-execute', jsCall, jsCall=jsCall)
# vocabulary stuff # vocabulary stuff

1
browser/form_macros.pt
View file

@ -262,6 +262,7 @@
<metal:html define-macro="input_html"> <metal:html define-macro="input_html">
<textarea name="field" rows="3" style="width: 450px" <textarea name="field" rows="3" style="width: 450px"
dojoType="dijit.Editor" dojoType="dijit.Editor"
extraPlugins="['insertHorizontalRule','createLink']"
tal:define="width field/width|nothing; tal:define="width field/width|nothing;
height field/height|python:3" height field/height|python:3"
tal:attributes="name name; id name; tal:attributes="name name; id name;

6
browser/skin/body.pt
View file

@ -15,9 +15,11 @@
<a href="#" <a href="#"
tal:attributes="href view/popupCreateObjectForm">Create loops Note</a> tal:attributes="href view/popupCreateObjectForm">Create loops Note</a>
</div> </div>
Powered by <b><a href="http://www.python.org">Python</a></b> &middot; Powered by
<b><a href="http://loops.cy55.de">loops</a></b> &middot;
<b><a href="http://wiki.zope.org/zope3">Zope 3</a></b> &middot; <b><a href="http://wiki.zope.org/zope3">Zope 3</a></b> &middot;
<b><a href="http://loops.cy55.de">loops</a></b>. <b><a href="http://www.python.org">Python</a></b> &middot;
<b><a href="http://www.dojotoolkit.org">Dojo</a></b>.
</metal:footer> </metal:footer>