diff --git a/sapl/compilacao/views.py b/sapl/compilacao/views.py index a9ebf3fa4..5d4a81ef2 100644 --- a/sapl/compilacao/views.py +++ b/sapl/compilacao/views.py @@ -900,6 +900,8 @@ class TextView(CompMixin, ListView): def get(self, request, *args, **kwargs): if 'print' in request.GET: self.template_name = 'compilacao/text_list__print_version.html' + if 'embedded' in request.GET: + self.template_name = 'compilacao/text_list__embedded.html' return ListView.get(self, request, *args, **kwargs) def get_context_data(self, **kwargs): diff --git a/sapl/templates/compilacao/text_list__embedded.html b/sapl/templates/compilacao/text_list__embedded.html new file mode 100644 index 000000000..f5235751b --- /dev/null +++ b/sapl/templates/compilacao/text_list__embedded.html @@ -0,0 +1,105 @@ +{% extends "base.html" %} +{% load i18n %} +{% load compilacao_filters %} +{% load common_tags %} +{% load staticfiles %} +{% load sass_tags %} + +{% block head_content %} + +{% endblock %} + +{% block navigation %}{% endblock %} + +{% block main_header %}{% endblock %} +{% block title %}{% endblock %} +{% block sections_nav %}{% endblock %} +{% block extra_sections_nav %}{% endblock %} +{% block actions %}{% endblock %} +{% block dsp_actions %}{% endblock %} + +{% block detail_content %}{% endblock %} +{% block footer_container %}{% endblock %} + +{% block base_content %} + +
+ + {% if object_list %} +
+
+ a + A +
+
+ {% endif %} + + {% for key, values in view.get_vigencias.items %} + {% if forloop.first %} + + + + {% if view.inicio_vigencia and view.fim_vigencia %} + {% blocktrans with inicio_vigencia=view.inicio_vigencia fim_vigencia=view.fim_vigencia%} + Vigência entre {{inicio_vigencia}} e {{fim_vigencia}}. + {% endblocktrans%} + {% else%} + {% blocktrans with inicio_vigencia=dispositivo.inicio_vigencia%} + Vigência a partir de {{inicio_vigencia}}. + {% endblocktrans%} + {% endif %} +
+ {% if view.ta_vigencia %} + {% trans 'Dada por '%}{{ta_pub_list|lookup:view.ta_vigencia}} + {% elif view.ta_vigencia and view.ta_vigencia != 0%} + {% trans 'Dada por '%}{{dispositivo.ta_publicado}} + {% endif %} + + {% endif%} + {% endfor %} + {% else %} +
  • + +
    • + {% endif %} + {% endfor %} + + + {% include 'compilacao/text_list_bloco.html'%} +
    +{% endblock base_content %} + +{% block foot_js %} + + + + {% if perms.compilacao.add_nota %} + + {% endif %} +{% endblock %} diff --git a/sapl/templates/norma/normajuridica_detail.html b/sapl/templates/norma/normajuridica_detail.html index c2d236a96..9ff25494e 100644 --- a/sapl/templates/norma/normajuridica_detail.html +++ b/sapl/templates/norma/normajuridica_detail.html @@ -1,5 +1,5 @@ {% extends "crud/detail.html" %} -{% load i18n common_tags%} +{% load i18n common_tags staticfiles%} {% block detail_content %} {% for fieldset in view.layout_display %} @@ -76,4 +76,30 @@ {% endif %} + + {% if object.texto_articulado.exists %} +
    +
    +
    +
    +

    {%trans 'Texto Multivigente' %}

    +
    +
    +
    + {% endif %} {% endblock detail_content %} + +{% block extra_js %} +{% if object.texto_articulado.exists %} + +{% endif %} +{% endblock extra_js %}