From 5b36f7f3281ba01188cdeb5a1c14b7d2ab344f90 Mon Sep 17 00:00:00 2001
From: Leandro Roberto <leandroroberto.br@gmail.com>
Date: Sun, 27 Jan 2019 18:12:02 -0200
Subject: [PATCH] ajusta TAs embedded de normas para sapl-frontend

---
 .../compilacao/text_list__embedded.html       | 22 ++---------------
 .../templates/norma/normajuridica_detail.html | 24 ++++++++++++++++++-
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/sapl/templates/compilacao/text_list__embedded.html b/sapl/templates/compilacao/text_list__embedded.html
index ec9216952..908f8a039 100644
--- a/sapl/templates/compilacao/text_list__embedded.html
+++ b/sapl/templates/compilacao/text_list__embedded.html
@@ -1,15 +1,8 @@
 {% load i18n %}
 {% load compilacao_filters %}
 {% load common_tags %}
-{% load staticfiles %}
-{% load sass_tags %}
-
-{% block head_content %}
-  <link rel="stylesheet" href="{% sass_src 'styles/compilacao.scss' %}" type="text/css">
-{% endblock %}
-
-  <div class="cp">
 
+<div class="cp">
   {% if object_list %}
     <div class="clearfix">
       <div class="actions btn-group float-right" role="group">
@@ -77,15 +70,4 @@
       <li><a onclick="textoVigente(this, false);" title="{% trans 'Texto Vigente'%}">{% trans 'TVT'%}</a></li>
   </ul>
   {% include 'compilacao/text_list_bloco.html'%}
-  </div>
-
-
-{% block extra_js %}
-  <script type="text/javascript" src="{% static 'js/compilacao.js' %}"></script>
-  <script type="text/javascript" src="{% static 'js/compilacao_view.js' %}"></script>
-
-  {% if perms.compilacao.add_nota %}
-  <script type="text/javascript" src="{% static 'js/compilacao_notas.js' %}"></script>
-  {% endif %}
-
-{% endblock %}
\ No newline at end of file
+</div>
diff --git a/sapl/templates/norma/normajuridica_detail.html b/sapl/templates/norma/normajuridica_detail.html
index edba18737..6ad7bf5aa 100644
--- a/sapl/templates/norma/normajuridica_detail.html
+++ b/sapl/templates/norma/normajuridica_detail.html
@@ -1,5 +1,16 @@
 {% extends "crud/detail.html" %}
-{% load i18n common_tags staticfiles%}
+{% load i18n common_tags %}
+{% load render_bundle from webpack_loader %}
+
+{% block webpack_loader_css %}
+    {% render_bundle 'global' 'css' %}
+    {% if object.texto_articulado.exists and object.texto_articulado.first.has_view_permission  %}
+      {% render_bundle 'compilacao' 'css' %}
+    {% endif %}
+    {% render_bundle THEME_CUSTOM 'css' %}
+{% endblock %}
+
+
 
 {% block detail_content %}
       {% for fieldset in view.layout_display %}
@@ -89,6 +100,16 @@
   {% endif %}
 {% endblock detail_content %}
 
+
+{% block webpack_loader_js %}
+    {% render_bundle 'global' 'js' %}
+    {% if object.texto_articulado.exists and object.texto_articulado.first.has_view_permission  %}
+      {% render_bundle 'compilacao' 'js' %}
+    {% endif %}
+    {% render_bundle THEME_CUSTOM 'js' %}
+{% endblock %}
+
+
 {% block extra_js %}
 {% if object.texto_articulado.exists and object.texto_articulado.first.has_view_permission  %}
   <script language="Javascript">
@@ -98,6 +119,7 @@
         $('#textomultivigente').html(data)
         $('cp a[data-toggle="dropdown"]').dropdown()
         $('.dne').remove()
+        $('.dnli ul').remove()
       });
     }
   </script>