From d6b93b5928f4c6a58099e65daaaf473b251b011f Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Mon, 21 Jan 2019 22:19:13 -0200 Subject: [PATCH] =?UTF-8?q?adequa=20crud=20de=20notas=20de=20compila=C3=A7?= =?UTF-8?q?=C3=A3o=20ao=20form=20do=20django=201.11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/apps/compilacao/js/{ => old}/compilacao.js | 0 .../apps/compilacao/js/{ => old}/compilacao_edit.js | 0 .../apps/compilacao/js/{ => old}/compilacao_notas.js | 0 .../apps/compilacao/js/{ => old}/compilacao_view.js | 0 sapl-frontend/src/apps/compilacao/main.js | 11 ++++++++--- sapl/compilacao/forms.py | 6 +++--- 6 files changed, 11 insertions(+), 6 deletions(-) rename sapl-frontend/src/apps/compilacao/js/{ => old}/compilacao.js (100%) rename sapl-frontend/src/apps/compilacao/js/{ => old}/compilacao_edit.js (100%) rename sapl-frontend/src/apps/compilacao/js/{ => old}/compilacao_notas.js (100%) rename sapl-frontend/src/apps/compilacao/js/{ => old}/compilacao_view.js (100%) diff --git a/sapl-frontend/src/apps/compilacao/js/compilacao.js b/sapl-frontend/src/apps/compilacao/js/old/compilacao.js similarity index 100% rename from sapl-frontend/src/apps/compilacao/js/compilacao.js rename to sapl-frontend/src/apps/compilacao/js/old/compilacao.js diff --git a/sapl-frontend/src/apps/compilacao/js/compilacao_edit.js b/sapl-frontend/src/apps/compilacao/js/old/compilacao_edit.js similarity index 100% rename from sapl-frontend/src/apps/compilacao/js/compilacao_edit.js rename to sapl-frontend/src/apps/compilacao/js/old/compilacao_edit.js diff --git a/sapl-frontend/src/apps/compilacao/js/compilacao_notas.js b/sapl-frontend/src/apps/compilacao/js/old/compilacao_notas.js similarity index 100% rename from sapl-frontend/src/apps/compilacao/js/compilacao_notas.js rename to sapl-frontend/src/apps/compilacao/js/old/compilacao_notas.js diff --git a/sapl-frontend/src/apps/compilacao/js/compilacao_view.js b/sapl-frontend/src/apps/compilacao/js/old/compilacao_view.js similarity index 100% rename from sapl-frontend/src/apps/compilacao/js/compilacao_view.js rename to sapl-frontend/src/apps/compilacao/js/old/compilacao_view.js diff --git a/sapl-frontend/src/apps/compilacao/main.js b/sapl-frontend/src/apps/compilacao/main.js index 45fc0efed..a7b8d5bd4 100644 --- a/sapl-frontend/src/apps/compilacao/main.js +++ b/sapl-frontend/src/apps/compilacao/main.js @@ -1,9 +1,14 @@ // TODO: migrar compilacao para VueJs -import compilacao from "./js/compilacao"; -import compilacao_view from "./js/compilacao_view"; -import compilacao_notas from "./js/compilacao_notas"; + +import "./scss/compilacao.scss"; + +import compilacao from "./js/old/compilacao"; +import compilacao_view from "./js/old/compilacao_view"; +import compilacao_notas from "./js/old/compilacao_notas"; import _ from "lodash"; + + //import "./js/compilacao_edit"; _.forEach(_.merge(_.merge(compilacao, compilacao_notas),compilacao_view), function(func, key) { diff --git a/sapl/compilacao/forms.py b/sapl/compilacao/forms.py index d8e984e3e..f14b8bd73 100644 --- a/sapl/compilacao/forms.py +++ b/sapl/compilacao/forms.py @@ -268,7 +268,7 @@ class NotaForm(ModelForm): self.helper.layout = Layout( Div( - Div(HTML(_('Notas')), css_class='panel-heading'), + Div(HTML(_('Notas')), css_class='card-header bg-bg-light'), Div( row1, to_row([(Field( @@ -279,9 +279,9 @@ class NotaForm(ModelForm): placeholder=_('URL Externa (opcional)')), 12)]), row3, to_row([(buttons, 12)]), - css_class="panel-body" + css_class="card-body" ), - css_class="panel panel-primary" + css_class="card" ) )