From dd7fe59f9b291a5b27ed81c17a9aabeb62c085a6 Mon Sep 17 00:00:00 2001
From: LeandroJatai <leandroroberto.br@gmail.com>
Date: Thu, 1 Sep 2022 10:37:40 -0300
Subject: [PATCH] =?UTF-8?q?HOT-FIX:=20ajuste=20o=20c=C3=B3digo=20de=20usu?=
 =?UTF-8?q?=C3=A1rio=20do=20TinyMCE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/__apps/compilacao/scss/compilacao.scss  | 17 ++++++++++++-----
 frontend/src/__global/js/tinymce/index.js       |  8 ++------
 sapl/templates/compilacao/text_list_bloco.html  |  2 +-
 .../blocos_sessao_plenaria/expedientes.html     |  2 +-
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/frontend/src/__apps/compilacao/scss/compilacao.scss b/frontend/src/__apps/compilacao/scss/compilacao.scss
index b6b4c9fbf..91bc67b4c 100644
--- a/frontend/src/__apps/compilacao/scss/compilacao.scss
+++ b/frontend/src/__apps/compilacao/scss/compilacao.scss
@@ -367,6 +367,14 @@ a:link:after, a:visited:after {
         max-width: 100%;
       }
     }
+
+    .dtxt {
+      display: inline;
+      :first-child {
+        display: inline !important;
+      }
+    }
+    
     .ementa {
       padding: 2em 0em 2em 35%;
       font-weight: bold;
@@ -424,10 +432,7 @@ a:link:after, a:visited:after {
       float:left;
       .dptt {
         position: relative;
-        p {
-          
-          display: inline !important;
-        }
+
       }
     }
 
@@ -494,7 +499,6 @@ a:link:after, a:visited:after {
         }
       }
     }
-
     .card-header {
       font-size: 1.7rem;
     }
@@ -676,6 +680,9 @@ a:link:after, a:visited:after {
         }
       }
     }
+
+
+
   } /* and dpt */
 
   .tipo-vigencias {
diff --git a/frontend/src/__global/js/tinymce/index.js b/frontend/src/__global/js/tinymce/index.js
index 1bd5588af..bfb854396 100644
--- a/frontend/src/__global/js/tinymce/index.js
+++ b/frontend/src/__global/js/tinymce/index.js
@@ -12,18 +12,14 @@ import 'tinymce/plugins/lists'
 import 'tinymce/plugins/table'
 
 import './langs/pt_BR.js'
-// import contentUiCss from 'tinymce/skins/ui/oxide/content.css'
-// import contentCss from 'tinymce/skins/content/default/content.css'
 
 window.tinymce = tinymce
 window.initTextRichEditor = function (elements, readonly = false) {
   const configTinymce = {
     selector: elements === null || elements === undefined ? 'textarea' : elements,
     language: 'pt_BR',
-    // skin: false,
-    // content_css: false,
-    forced_root_block: 'div',
-    // content_style: contentUiCss.toString() + '\n' + contentCss.toString(),
+    branding: false,
+    forced_root_block: 'p',
     plugins: 'table lists advlist link code',
     toolbar: 'undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link | code',
     menubar: 'file edit view insert format table'
diff --git a/sapl/templates/compilacao/text_list_bloco.html b/sapl/templates/compilacao/text_list_bloco.html
index d2108a0e5..41c6112a1 100644
--- a/sapl/templates/compilacao/text_list_bloco.html
+++ b/sapl/templates/compilacao/text_list_bloco.html
@@ -32,7 +32,7 @@
 
           {% endif %}
 
-          <span class="dtxt" id="d{% if not dpt.dispositivo_subsequente_id and dpt.dispositivo_substituido_id %}a{% endif %}{{dpt.pk}}" pks="{{dpt.dispositivo_substituido_id|default:''}}" pk="{{dpt.pk}}">{{ dpt.tipo_dispositivo.texto_prefixo_html|safe }}{%if dpt.texto %}{{ dpt.texto|safe }}{%else%}{%if not dpt.tipo_dispositivo.dispositivo_de_articulacao %}&nbsp;{% endif %}{% endif %}</span>
+          <div class="dtxt" id="d{% if not dpt.dispositivo_subsequente_id and dpt.dispositivo_substituido_id %}a{% endif %}{{dpt.pk}}" pks="{{dpt.dispositivo_substituido_id|default:''}}" pk="{{dpt.pk}}">{{ dpt.tipo_dispositivo.texto_prefixo_html|safe }}{%if dpt.texto %}{{ dpt.texto|safe }}{%else%}{%if not dpt.tipo_dispositivo.dispositivo_de_articulacao %}&nbsp;{% endif %}{% endif %}</div>
           {% if dpt.ta_publicado_id %}
             <a class="nota-alteracao" href="{%url 'sapl.compilacao:ta_text' dpt.ta_publicado.pk %}#{{dpt.dispositivo_atualizador_id}}">
               {{ dpt.tipo_dispositivo.nota_automatica_prefixo_html|safe }}
diff --git a/sapl/templates/relatorios/blocos_sessao_plenaria/expedientes.html b/sapl/templates/relatorios/blocos_sessao_plenaria/expedientes.html
index b78d5e038..aa42d97b5 100644
--- a/sapl/templates/relatorios/blocos_sessao_plenaria/expedientes.html
+++ b/sapl/templates/relatorios/blocos_sessao_plenaria/expedientes.html
@@ -1,5 +1,5 @@
     <h2 class="gray-title">Expedientes</h2>
     {% for expediente in lst_expedientes%}
             <h3>{{expediente.nom_expediente}}</h3>
-            <p style="margin-bottom: 1cm">{{expediente.txt_expediente|safe}}</p>
+            <div style="margin-bottom: 1cm">{{expediente.txt_expediente|safe}}</div>
     {% endfor%}