From a86a0a00199d7543095de1a84786ab2525f0f302 Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Fri, 25 Jan 2019 22:06:31 -0200 Subject: [PATCH] =?UTF-8?q?ajuste=20de=20layout=20para=20Vides=20da=20app?= =?UTF-8?q?=20compila=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apps/compilacao/js/old/compilacao_notas.js | 2 +- sapl/compilacao/forms.py | 18 +++++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/sapl-frontend/src/apps/compilacao/js/old/compilacao_notas.js b/sapl-frontend/src/apps/compilacao/js/old/compilacao_notas.js index 972a7a883..908800cf1 100644 --- a/sapl-frontend/src/apps/compilacao/js/old/compilacao_notas.js +++ b/sapl-frontend/src/apps/compilacao/js/old/compilacao_notas.js @@ -34,7 +34,7 @@ function onSubmitEditNVForm (event) { let idEdit = null let idDispositivo = $('#id_dispositivo').val() - if (idDispositivo === null) { // trata-se de um vide + if (idDispositivo === undefined) { // trata-se de um vide // $('#idDispositivo_ref').remove() idDispositivo = $('#id_dispositivo_base').val() model = 'vide' diff --git a/sapl/compilacao/forms.py b/sapl/compilacao/forms.py index 0e343816d..c3e41b83e 100644 --- a/sapl/compilacao/forms.py +++ b/sapl/compilacao/forms.py @@ -331,13 +331,17 @@ class VideForm(ModelForm): def __init__(self, *args, **kwargs): - buttons = form_actions( - label=_('Salvar'), - more=[ + buttons = FormActions( + *[ HTML('%s' % _('Cancelar')) ], - disabled=False) + Button( + 'submit-form', + 'Salvar', + css_class='btn btn-primary float-right'), + css_class='form-group row justify-content-between mr-1 ml-1' + ) dispositivo_ref = Field( 'dispositivo_ref', @@ -362,15 +366,15 @@ class VideForm(ModelForm): self.helper = FormHelper() self.helper.layout = Layout( Div( - Div(HTML(_('Vides')), css_class='car-header'), + Div(HTML(_('Vides')), css_class='card-header bg-light'), Div( to_column((fields_form[0], 6)), to_column((fields_form[1], 6)), to_column(('dispositivo_base', 0)), to_column(('pk', 0)), - css_class="card-body" + css_class="card-body row" ), - css_class="card bg-light" + css_class="card" ) )