From 2443e8b3fac6206b7dc4bce1ed749e3f5142a38c Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Thu, 17 Jan 2019 22:08:33 -0200 Subject: [PATCH] ajusta painel ao sapl-frontend --- sapl-frontend/src/global/main.js | 3 +-- sapl/templates/painel/index.html | 15 +++++++++------ sapl/templates/painel/mensagem.html | 8 ++++++-- sapl/templates/painel/parlamentares.html | 9 +++++++-- sapl/templates/painel/votacao.html | 9 +++++++-- sapl/templates/painel/voto_nominal.html | 10 ++++++---- 6 files changed, 36 insertions(+), 18 deletions(-) diff --git a/sapl-frontend/src/global/main.js b/sapl-frontend/src/global/main.js index d5c1ec2c7..d36ff11d2 100644 --- a/sapl-frontend/src/global/main.js +++ b/sapl-frontend/src/global/main.js @@ -1,5 +1,4 @@ import jQuery from "jquery"; -window.$ = window.jQuery = jQuery; require('imports-loader?window.jQuery=jquery!./jquery.runner.js'); @@ -9,7 +8,7 @@ import "webpack-jquery-ui/dialog"; import "webpack-jquery-ui/sortable"; import "./functions"; - +window.$ = window.jQuery = jQuery; window.autorModal(); window.refreshMask(); diff --git a/sapl/templates/painel/index.html b/sapl/templates/painel/index.html index 67f60716b..bb7eac77e 100644 --- a/sapl/templates/painel/index.html +++ b/sapl/templates/painel/index.html @@ -1,7 +1,9 @@ {% load i18n %} -{% load staticfiles sass_tags %} {% load common_tags %} +{% load render_bundle from webpack_loader %} +{% load webpack_static from webpack_loader %} + @@ -9,12 +11,13 @@ + - {% block head_title %}{% trans 'SAPL - Sistema de Apoio ao Processo Legislativo' %}{% endblock %} - - - + + + {% render_bundle 'global'%} + {% render_bundle THEME_CUSTOM %}