misc: adjust code in a way that black can reformat

This commit is contained in:
Frédéric Péters 2021-02-04 10:34:44 +01:00
parent c3e414e918
commit 7c38158c33
1 changed files with 31 additions and 26 deletions

View File

@ -2342,6 +2342,18 @@ class PasswordEntryWidget(CompositeWidget):
return CompositeWidget.render_content(self)
r = TemplateIO(html=True)
r += CompositeWidget.render_content(self)
ctx = {
'form_id': self.get_widget('pwd1').get_name(),
'min_length': self.min_length,
'veryweak': _('Very weak'),
'weak': _('Weak'),
'moderate': _('Moderate'),
'good': _('Good'),
'strong': _('Strong'),
'verystrong': _('Very strong'),
'password_strength': _('Password strength:'),
'tooshort': _('Too short'),
}
r += htmltext('''<script>
$(function() {
$('input[id="form_%(form_id)s"]').passStrengthify({
@ -2353,16 +2365,7 @@ $(function() {
}
});
});
</script>''') % {'form_id': self.get_widget('pwd1').get_name(),
'min_length': self.min_length,
'veryweak': _('Very weak'),
'weak': _('Weak'),
'moderate': _('Moderate'),
'good': _('Good'),
'strong': _('Strong'),
'verystrong': _('Very strong'),
'password_strength': _('Password strength:'),
'tooshort': _('Too short')}
</script>''') % ctx
return r.getvalue()
def _parse(self, request):
@ -2570,6 +2573,16 @@ class ComputedExpressionWidget(CompositeWidget):
attrs={'data-dynamic-display-parent': 'true'})
def render_content(self):
ctx = {
'name': self.name,
'text_label': _('Text'),
'template_label': _('Template'),
'python_label': _('Python'),
'value_text': self.get_widget('value_text').render_content(),
'value_template': self.get_widget('value_template').render_content(),
'value_python': self.get_widget('value_python').render_content(),
'type': self.get_widget('type').render_content(),
}
return htmltext('''
<style>
span[data-name="%(name)s"].text::after { content: "%(text_label)s"; }
@ -2591,16 +2604,7 @@ class ComputedExpressionWidget(CompositeWidget):
data-dynamic-display-value="python"
data-dynamic-display-child-of="%(name)s$type"
>%(value_python)s</span
>%(type)s''') % {
'name': self.name,
'text_label': _('Text'),
'template_label': _('Template'),
'python_label': _('Python'),
'value_text': self.get_widget('value_text').render_content(),
'value_template': self.get_widget('value_template').render_content(),
'value_python': self.get_widget('value_python').render_content(),
'type': self.get_widget('type').render_content()
}
>%(type)s''') % ctx
@classmethod
def validate_template(cls, template):
@ -2689,6 +2693,12 @@ class ConditionWidget(CompositeWidget):
self.value = None
def render_content(self):
ctx = {
'name': self.name,
'value_django': self.get_widget('value_django').render_content(),
'value_python': self.get_widget('value_python').render_content(),
'type': self.get_widget('type').render_content(),
}
return htmltext('''
<span class="django"
data-dynamic-display-value="django"
@ -2698,12 +2708,7 @@ class ConditionWidget(CompositeWidget):
data-dynamic-display-value="python"
data-dynamic-display-child-of="%(name)s$type"
>%(value_python)s</span
>%(type)s''') % {
'name': self.name,
'value_django': self.get_widget('value_django').render_content(),
'value_python': self.get_widget('value_python').render_content(),
'type': self.get_widget('type').render_content()
}
>%(type)s''') % ctx
class DjangoConditionWidget(StringWidget):