Conjunto de mudanças 6489 no repositório publico

Timestamp:

13/06/2012 15:56:36 (9 anos atrás)

Autor:

mazza

Mensagem:

boxes: campo Text com WysiwygFieldWidget?

Localização:

PortalInterlegis/produtos/il.portalinterlegis/trunk

Arquivos:

• setup.py (modificado) (1 diff)
• src/il/portalinterlegis/browser/boxes.py (modificado) (4 diffs)
• src/il/portalinterlegis/browser/boxform.pt (adicionado)
• src/il/portalinterlegis/browser/interfaces.py (modificado) (3 diffs)
• src/il/portalinterlegis/static/box_form.html (adicionado)
• src/il/portalinterlegis/static/js/editable-box.js (modificado) (1 diff)
• src/il/portalinterlegis/static/rules.xml (modificado) (2 diffs)

PortalInterlegis/produtos/il.portalinterlegis/trunk/setup.py

@@ -31 +31 @@
           'five.grok',
           'plone.app.theming',
-          # -*- Extra requirements: -*-
+          'z3c.form',
+          'plone.directives.form',
       ],
       extras_require={'test': ['plone.app.testing', 'mock']},

PortalInterlegis/produtos/il.portalinterlegis/trunk/src/il/portalinterlegis/browser/boxes.py

@@ -6 +6 @@
 from five.grok.components import ZopeTwoPageTemplate
 from persistent.dict import PersistentDict
-from z3c.form import form, field, datamanager
+from plone.autoform.form import AutoExtensibleForm
+from z3c.form import form, datamanager
 from z3c.form.interfaces import IDataManager
 from zope.annotation import IAnnotations
@@ -20 +21 @@
     implements(IDataManager)
 provideAdapter(PersistentDictionaryField)
+
 
 class BoxManager(object):
@@ -35 +37 @@
         # is from https://mail.zope.org/pipermail/grok-dev/2008-July/005999.html
         # (plone.directives.form.EditForm did not work well)
-        class BoxEditForm(form.EditForm, grok.View):
+        class BoxEditForm(AutoExtensibleForm, form.EditForm, grok.View):
             grok.context(IFolderish)
             grok.name(self._box_name_for_url(number))
@@ -41 +43 @@
 
             label = self.form_label
-            fields = field.Fields(self.schema)
+            schema = self.schema
 
             def getContent(form_self):
                 return self.box_content(form_self.context, number)
+
+            def render(self):
+                # we cannot simply associtate this template in the class level
+                # because form.EditForm has a ".render()" method and grok.View
+                # assumes you cannot have both "template = ..." and ".render()".
+                # No problem, we make a method that simply renders the template
+                template = ZopeTwoPageTemplate(filename="boxform.pt")
+                return template.render(self)
 
         globals()['BoxEditForm_%s' % self._box_key(number)] = BoxEditForm

PortalInterlegis/produtos/il.portalinterlegis/trunk/src/il/portalinterlegis/browser/interfaces.py

@@ -1 +1 @@
 # -*- coding: utf-8 -*-
+from plone.app.z3cform.wysiwyg import WysiwygFieldWidget
+from plone.autoform.interfaces import WIDGETS_KEY
+from plone.directives import form
 from zope import schema
 from zope.interface import Interface
 
+
 # TODO: tive de mover isso pra ca (veio de boxes) por causa de um import circular
 template_dict = {}
+
+# decorator
 def template(t):
     def f(cls):
         template_dict[cls] = t
+        return cls
+    return f
+
+# decorator
+def with_widget(**kwargs):
+    def f(cls):
+        cls.setTaggedValue(WIDGETS_KEY, kwargs)
         return cls
     return f
@@ -37 +50 @@
 # BOX INTERFACES
 
+
 @template('''
       <div class="simple-box">
@@ -45 +59 @@
         </p>
       </div>''')
-class ISimpleBox(Interface):
+@with_widget(text=WysiwygFieldWidget)
+class ISimpleBox(form.Schema):
     title = schema.TextLine(title=u"Título", required=True)
     subtitle = schema.TextLine(title=u"Subtítulo", required=True)
-    text = schema.TextLine(title=u"Texto", required=True)
+    text = schema.Text(title=u"Texto", required=False)
 
 @template('''

PortalInterlegis/produtos/il.portalinterlegis/trunk/src/il/portalinterlegis/static/js/editable-box.js

@@ -22 +22 @@
         .appendTo($(this))
         .prepOverlay({
-            subtype: 'ajax',
+            subtype: 'iframe',
             filter: '#content',
             formselector: 'form',

PortalInterlegis/produtos/il.portalinterlegis/trunk/src/il/portalinterlegis/static/rules.xml

@@ -5 +5 @@
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     css:if-content="#visual-portal-wrapper">
-
-    <theme href="index.html" />
 
         <!-- as pointed out in https://dev.plone.org/ticket/11829 -->
@@ -15 +13 @@
     <notheme if-path="table.htm"/>
     <notheme if-path="attributes.htm"/>
+
+    <theme href="box_form.html" css:if-content="#box-preview"/>
+    <theme href="index.html" />
 
     <before theme-children='/html/head' content-children='/html/head'/>