--- a/web/views/formrenderers.py Mon Sep 28 21:32:10 2009 +0200
+++ b/web/views/formrenderers.py Tue Sep 29 10:39:02 2009 +0200
@@ -371,16 +371,19 @@
# needs some additional points in some case (XXX explain cases)
__select__ = EntityBaseFormRenderer.__select__ & yes()
- _options = FormRenderer._options + ('display_relations_form',)
+ _options = FormRenderer._options + ('display_relations_form', 'main_form_title')
display_relations_form = True
+ main_form_title = _('main information')
def render(self, form, values):
rendered = super(EntityFormRenderer, self).render(form, values)
return rendered + u'</div>' # close extra div introducted by open_form
def open_form(self, form, values):
- attrs_fs_label = ('<div class="iformTitle"><span>%s</span></div>'
- % self.req._('main informations'))
+ attrs_fs_label = ''
+ if self.main_form_title:
+ attrs_fs_label += ('<div class="iformTitle"><span>%s</span></div>'
+ % self.req._(self.main_form_title))
attrs_fs_label += '<div class="formBody">'
return attrs_fs_label + super(EntityFormRenderer, self).open_form(form, values)
--- a/web/views/massmailing.py Mon Sep 28 21:32:10 2009 +0200
+++ b/web/views/massmailing.py Tue Sep 29 10:39:02 2009 +0200
@@ -13,18 +13,16 @@
from cubicweb.interfaces import IEmailable
from cubicweb.selectors import implements, match_user_groups
from cubicweb.view import EntityView
-from cubicweb.web import stdmsgs
-from cubicweb.web.action import Action
-from cubicweb.web.form import FormViewMixIn
-from cubicweb.web.formfields import StringField
+from cubicweb.web import stdmsgs, action, form, formfields as ff
from cubicweb.web.formwidgets import CheckBox, TextInput, AjaxWidget, ImgButton
from cubicweb.web.views import forms, formrenderers
-class SendEmailAction(Action):
+class SendEmailAction(action.Action):
id = 'sendemail'
# XXX should check email is set as well
- __select__ = implements(IEmailable) & match_user_groups('managers', 'users')
+ __select__ = (action.Action.__select__ & implements(IEmailable)
+ & match_user_groups('managers', 'users'))
title = _('send email')
category = 'mainactions'
@@ -40,11 +38,12 @@
class MassMailingForm(forms.FieldsForm):
id = 'massmailing'
- sender = StringField(widget=TextInput({'disabled': 'disabled'}), label=_('From:'))
- recipient = StringField(widget=CheckBox(), label=_('Recipients:'))
- subject = StringField(label=_('Subject:'), max_length=256)
- mailbody = StringField(widget=AjaxWidget(wdgtype='TemplateTextField',
- inputid='mailbody'))
+ sender = ff.StringField(widget=TextInput({'disabled': 'disabled'}),
+ label=_('From:'))
+ recipient = ff.StringField(widget=CheckBox(), label=_('Recipients:'))
+ subject = ff.StringField(label=_('Subject:'), max_length=256)
+ mailbody = ff.StringField(widget=AjaxWidget(wdgtype='TemplateTextField',
+ inputid='mailbody'))
form_buttons = [ImgButton('sendbutton', "javascript: $('#sendmail').submit()",
_('send email'), 'SEND_EMAIL_ICON'),
@@ -117,7 +116,7 @@
def render_buttons(self, w, form):
pass
-class MassMailingFormView(FormViewMixIn, EntityView):
+class MassMailingFormView(form.FormViewMixIn, EntityView):
id = 'massmailing'
__select__ = implements(IEmailable) & match_user_groups('managers', 'users')