From 2d959c5a5eac73e00fcf8cf251239b77bf6628a3 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 28 Aug 2013 16:38:19 +0200 Subject: Widgets: use a template for JQueryJqGrid. It is now far clearer... (refs #1219) --- ishtar_common/widgets.py | 134 ++++------------------------------------------- 1 file changed, 11 insertions(+), 123 deletions(-) (limited to 'ishtar_common/widgets.py') diff --git a/ishtar_common/widgets.py b/ishtar_common/widgets.py index b3e366e0d..e94353ec7 100644 --- a/ishtar_common/widgets.py +++ b/ishtar_common/widgets.py @@ -209,15 +209,11 @@ class JQueryJqGrid(forms.RadioSelect): t = loader.get_template('blocks/form_snippet.html') form = self.form() rendered = t.render(Context({'form':form})) - rendered += u"\n\n"\ - u"" % ( - name, unicode(_("Search"))) + dct = {} if self.new: model_name = self.associated_model._meta.object_name.lower() - url_new = reverse('new-' + model_name, args=['0']) - rendered += u'

'\ - u'%s

' % (url_new, unicode(self.new_message)) - rendered += "\n

%s

\n" % unicode(_("Search and select an item")) + dct['url_new'] = reverse('new-' + model_name, args=['0']) + dct['new_message'] = self.new_message extra_cols = [] col_names, col_idx = [], [] for k in form.get_input_ids(): @@ -245,27 +241,11 @@ class JQueryJqGrid(forms.RadioSelect): col_names = col_names and ",\n".join(col_names) or "" col_idx = col_idx and ",\n".join(col_idx) or "" extra_cols = extra_cols and ",\n".join(extra_cols) or "" - rendered += u"
\n"\ - u"
\n"% (name, name) - encoding = settings.ENCODING or 'utf-8' - rendered += u"
\n" % name + dct['encoding'] = settings.ENCODING or 'utf-8' + dct['source'] = unicode(self.source) if unicode(self.source_full) and unicode(self.source_full) != 'None': - rendered += u"%s (%s) %s - "\ - u"%s\n" % ( - unicode(_("Export as CSV")), encoding, unicode(self.source), - unicode(_(u"simple")), unicode(self.source_full), - unicode(_(u"full")),) - else: - rendered += u'%s (%s)\n' % ( - unicode(self.source), unicode(_("Export as CSV")), encoding) - rendered += "
\n" - if self.multiple: - rendered += u''\ - u'\n' % ( - name, unicode(_("Add")), name) - rendered += '\n' % (name, - name) - dct = {'name':name, + dct['source_full'] = unicode(self.source_full) + dct.update({'name':name, 'col_names':col_names, 'extra_cols':extra_cols, 'source':unicode(self.source), @@ -274,102 +254,10 @@ class JQueryJqGrid(forms.RadioSelect): 'loading':unicode(_("Loading...")), 'remove':unicode(_(u"Remove")), 'sname':name.replace('-', ''), + 'multiple':self.multiple, 'multi_cols': ",".join((u'"%d"' % col \ for col in self.multiple_cols)) - } - rendered += """\n" + }) + t = loader.get_template('blocks/JQueryJqGrid.html') + rendered += t.render(Context(dct)) return mark_safe(rendered) - -- cgit v1.2.3