diff --git a/sapl/compilacao/views.py b/sapl/compilacao/views.py index 67c37adcd..bfb0903d9 100644 --- a/sapl/compilacao/views.py +++ b/sapl/compilacao/views.py @@ -1154,9 +1154,10 @@ class TextEditView(CompMixin, TemplateView): result = Dispositivo.objects.filter(ta_id=self.kwargs['ta_id']) if not result.exists(): + # FIXME a inserção básica deve ser refatorada para não depender + # das classes css ta = self.object - td = TipoDispositivo.objects.filter(class_css='articulacao')[0] a = Dispositivo() a.nivel = 0 diff --git a/sapl/static/js/app.js b/sapl/static/js/app.js index 9b7f2297d..139806ffb 100644 --- a/sapl/static/js/app.js +++ b/sapl/static/js/app.js @@ -13,9 +13,9 @@ function initTinymce(elements, readonly=false) { } if (readonly) { - config_tinymce.readonly = 1, - config_tinymce.menubar = false, - config_tinymce.toolbar = false + config_tinymce.readonly = 1; + config_tinymce.menubar = false; + config_tinymce.toolbar = false; } if (elements != null) { diff --git a/sapl/static/js/compilacao.js b/sapl/static/js/compilacao.js index 6d797ea41..fb9104917 100644 --- a/sapl/static/js/compilacao.js +++ b/sapl/static/js/compilacao.js @@ -22,12 +22,8 @@ function insertWaitAjax(element) { jQuery(element).append('
'); } - - function DispostivoSearch(opts) { - $(function() { - var container_ds = $('body').children("#container_ds"); if (container_ds.length > 0) $(container_ds).remove(); diff --git a/sapl/static/js/compilacao_view.js b/sapl/static/js/compilacao_view.js index ffb96dd8b..e4860bb76 100644 --- a/sapl/static/js/compilacao_view.js +++ b/sapl/static/js/compilacao_view.js @@ -142,6 +142,7 @@ function textoVigente(item, link) { } $(document).ready(function() { + setTimeout(function() { var href = location.href.split('#') if (href.length == 2) { @@ -155,7 +156,6 @@ $(document).ready(function() { } }, 100); - $("#btn_font_menos").click(function() { $(".dpt").css("font-size", "-=1"); }); @@ -169,4 +169,10 @@ $(document).ready(function() { $(this).css('z-index', 15-nivel) }); + + + /*$(".indent").each(function() { + $(this).removeClass('indent'); + $(this.parentElement).addClass('indent'); + });*/ }); diff --git a/sapl/static/styles/compilacao.scss b/sapl/static/styles/compilacao.scss index ac397b0a8..946852703 100644 --- a/sapl/static/styles/compilacao.scss +++ b/sapl/static/styles/compilacao.scss @@ -165,7 +165,6 @@ a:link:after, a:visited:after { .cp { .desativado { - .dtxt, .dtxt *, .dpt-link, .dpt-link * { text-decoration: line-through; color: #999 !important; @@ -180,6 +179,7 @@ a:link:after, a:visited:after { text-decoration: none; cursor: pointer; } + .diff { .desativado, .desativado * { text-decoration: line-through; @@ -194,7 +194,9 @@ a:link:after, a:visited:after { .dpt { font-size:1em; position: relative; - + &.indent { + padding-left: 1em; + } .ementa { padding: 2em 0em 2em 35%; font-weight: bold; @@ -259,26 +261,22 @@ a:link:after, a:visited:after { } .paragrafo { - padding-left: 1.5em; font-size: 1.1em; margin-top: 0.2222em; } .inciso { font-size: 1.1em; - padding-left: 2.5em; margin-top: 0.1667em; } .alinea { font-size: 1.0em; - padding-left: 3.5em; margin-top: 2px; } .item { font-size: 1.0em; - padding-left: 4.5em; margin-top: 2px; } @@ -294,6 +292,7 @@ a:link:after, a:visited:after { a, table, table td { color: #018 !important; } + } .dn { /* Notas de Dispositivo*/ @@ -376,7 +375,6 @@ a:link:after, a:visited:after { &:hover { display: block; - * { display: block; } @@ -524,6 +522,7 @@ a:link:after, a:visited:after { color: #02baf2 !important; } } + .dpt { display: block; & > .dpt-actions-fixed { @@ -592,6 +591,7 @@ a:link:after, a:visited:after { } } } /* fim .dpt */ + .dpt-alts { margin: 0; margin-bottom: 1em; @@ -768,7 +768,7 @@ a:link:after, a:visited:after { } } -.cp.cpe1 { +.cp.cpe1_old_apagar { margin-bottom: 15em; diff --git a/sapl/templates/compilacao/text_list.html b/sapl/templates/compilacao/text_list.html index b091c70e5..7d3526cc1 100644 --- a/sapl/templates/compilacao/text_list.html +++ b/sapl/templates/compilacao/text_list.html @@ -113,13 +113,15 @@ {% endblock base_content %} - - {% block foot_js %} + {{block.super}} + + {% if perms.compilacao.add_nota %} {% endif %} + {% endblock %} diff --git a/sapl/templates/compilacao/text_list_bloco.html b/sapl/templates/compilacao/text_list_bloco.html index 9ea6f507e..41f6de04b 100644 --- a/sapl/templates/compilacao/text_list_bloco.html +++ b/sapl/templates/compilacao/text_list_bloco.html @@ -13,7 +13,7 @@ {% if forloop.first and not view|isinst:'TextView' %} {% else %} -
+
{% endif%} {% spaceless %}