ajuste no preview e print do texto articulado

sapl/templates/compilacao/text_list.html

@@ -7,28 +7,12 @@
   <h2 class="page-header">{% if object.content_object.title_type %}{{object.content_object.title_type}}{%else%}{{object}}{% endif %}{% comment %}<small><i>{% trans 'Texto Multivigente em Edição' %}</i></small>{% endcomment %}</h2>
 {% endblock %}
 
-{% block extra_sections_nav %}
-        <li><a href="{% url 'sapl.compilacao:ta_text' object.pk %}?print">{% trans 'Versão para Impressão' %}</a></li>
-{% endblock %}
 {% block base_content %}
 
   {% block actions %}
     {{block.super}}
   {% endblock %}
 
-  {% comment %}
-
-	{% if perms.compilacao.change_dispositivo_edicao_dinamica %}
-    {% block actions %}
-      <div class="clearfix">
-        <div class="actions btn-group float-right" role="group">
-  		  <a href="{% url 'sapl.compilacao:ta_text_edit' object.pk %}" class="btn btn-outline-primary">{% trans 'Editar Texto' %}</a>
-        </div>
-      </div>
-    {% endblock actions %}
-  {% endif %}
-  {% endcomment %}
-
   {% block detail_content %}
     {{block.super}}
   {% endblock %}

sapl/templates/compilacao/text_list__embedded.html

@@ -68,60 +68,6 @@
       </li>
     {% endif %}
   {% endfor %}
-  {% comment "" %}
-  
-  {% for key, values in view.get_vigencias.items %}
-    {% if forloop.first %}
-      <ul class="nav nav-pills cp-vigencias">
-        {% for dispositivo in values %}
-          <li class="nav-item {% if view.inicio_vigencia == dispositivo.inicio_vigencia %}active{%endif%}">
-            <a class="nav-link" href="{% url 'sapl.compilacao:ta_vigencia' dispositivo.ta_id dispositivo|get_sign_vigencia %}" title="{% trans 'Vigência entre'%} {{dispositivo.inicio_vigencia}} {% trans 'e'%} {{dispositivo.fim_vigencia}}">{% trans 'Texto Original'%}</a>
-          </li>
-        {% endfor %}
-    {% elif forloop.last %}
-      {% for dispositivo in values %}
-        <li class="nav-item {% if not view.inicio_vigencia%}active{% endif %}">
-          <a class="nav-link" href="{% url 'sapl.compilacao:ta_text' dispositivo.ta_id %}" title="{% trans 'Compilação atual'%}.&#013;{% trans 'Vigência a partir de'%} {{dispositivo.inicio_vigencia}}&#013;{% if dispositivo.ta_publicado_id in ta_pub_list %}{{ ta_pub_list|lookup:dispositivo.ta_publicado_id }}{%else%}{%if dispositivo.ta_publicado %}{{dispositivo.ta_publicado}}{%else%}{{dispositivo.ta}}{%endif%}{%endif%}">{% trans 'Texto Atual'%}</a>
-        </li>
-        {% if forloop.parentloop.last %}
-          </ul>
-          <span class="vigencia-active">
-
-            {% if view.inicio_vigencia and view.fim_vigencia %}
-              {% blocktrans with inicio_vigencia=view.inicio_vigencia fim_vigencia=view.fim_vigencia%}
-                Vigência entre <b>{{inicio_vigencia}}</b> e <b>{{fim_vigencia}}</b>.
-              {% endblocktrans%}
-            {% else%}
-              {% blocktrans with inicio_vigencia=dispositivo.inicio_vigencia%}
-                Vigência a partir de <b>{{inicio_vigencia}}</b>.
-              {% endblocktrans%}
-            {% endif %}
-            <br>
-            {% if view.ta_vigencia %}
-                <small>{% trans 'Dada por '%}<a href="{% url 'sapl.compilacao:ta_text' view.ta_vigencia %}">{{ta_pub_list|lookup:view.ta_vigencia}}</a></small>
-            {% elif view.ta_vigencia and view.ta_vigencia != 0%}
-                <small>{% trans 'Dada por '%}<a href="{% url 'sapl.compilacao:ta_text' dispositivo.ta_publicado.pk %}">{{dispositivo.ta_publicado}}</a></small>
-            {% endif %}
-          </span>
-        {% endif%}
-      {% endfor %}
-    {% else %}
-      <li class="nav-item dropdown {% if values.inicio_vigencia.year == key %}active{% endif %}">
-      <a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">{{ key }}</a>
-        <ul class="dropdown-menu" role="menu">
-          <div class="arrow top"></div>
-          {% for dispositivo in values %}
-            <li class="dropdown-item" >
-            {% if not forloop.parentloop.first %}
-              <a href="{% url 'sapl.compilacao:ta_vigencia' dispositivo.ta_id dispositivo|get_sign_vigencia %}" title="{% if dispositivo.ta_publicado_id in ta_pub_list%}{{ ta_pub_list|lookup:dispositivo.ta_publicado_id }}{%else%}{%if dispositivo.ta_publicado %}{{dispositivo.ta_publicado}}{%else%}{{dispositivo.ta}}{%endif%}{%endif%}">{% trans 'Vigência entre'%} {{dispositivo.inicio_vigencia}} {% trans 'e'%} {{dispositivo.fim_vigencia}}</a>
-            {% endif %}
-            </li>
-          {% endfor %}
-        </ul>
-      </li>
-    {% endif %}
-  {% endfor %}
-  {% endcomment %}
   
   <div class="tipo-vigencias d-flex fixed-bottom justify-content-center">
     <div class="btn-group btn-group-sm">

sapl/templates/compilacao/text_list__print_version.html

@@ -11,3 +11,10 @@
 
 {% block detail_content %}{% endblock %}
 {% block footer_container %}{% endblock %}
+
+
+{% block base_content %}
+<div class="cp-print">
+  {{ block.super }}
+</div>
+{% endblock %}

sapl/templates/compilacao/textoarticulado_detail.html

@@ -16,13 +16,15 @@
           <a href="{% url 'sapl.compilacao:ta_edit' object.pk %}" class="btn btn-outline-primary">{% trans 'Editar Metadados do Texto Articulado' %}</a>
         {% endif %}
         {% if object|can_use_dynamic_editing:user %}
-              <a href="{% url 'sapl.compilacao:ta_text_edit' object.pk %}" class="btn btn-outline-primary">{% trans 'Editar Texto' %}</a>
+          <a href="{% url 'sapl.compilacao:ta_text_edit' object.pk %}" class="btn btn-outline-primary">{% trans 'Editar Texto' %}</a>
         {% endif %}
         {% if perms.compilacao.lock_unlock_textoarticulado and not object.editable_only_by_owners%}
-              <a href="{% url 'sapl.compilacao:ta_text_edit' object.pk %}?{% if object.editing_locked %}unlock{%else%}lock{% endif %}" class="btn {% if object.editing_locked %}btn-outline-danger{%else%}btn-outline-primary{% endif %}">{% if object.editing_locked %}{% trans 'Desbloquear Edição' %}{%else%}{% trans 'Publicar Texto' %}{% endif %}</a>
+          <a href="{% url 'sapl.compilacao:ta_text_edit' object.pk %}?{% if object.editing_locked %}unlock{%else%}lock{% endif %}" class="btn {% if object.editing_locked %}btn-outline-danger{%else%}btn-outline-primary{% endif %}">{% if object.editing_locked %}{% trans 'Desbloquear Edição' %}{%else%}{% trans 'Publicar Texto' %}{% endif %}</a>
         {% endif %}
-		<a href="{{base_url}}?print" class="btn btn-outline-primary">Imprimir Texto</a>
-	     </div>
+      </div>
+      <div class="actions btn-group float-right" role="group">
+        <a href="{{base_url}}?print" class="btn btn-outline-primary">{% trans 'Preparar para impressão' %}</a>
+      </div>
     </div>
   {% endblock actions %}
 

sapl/webpack-stats.json

@@ -1 +1 @@
-{"status":"done","publicPath":"/static/sapl/frontend/","chunks":{"chunk-vendors":[{"name":"css/chunk-vendors.3c9fe6b4.css","publicPath":"/static/sapl/frontend/css/chunk-vendors.3c9fe6b4.css","path":"../sapl/sapl/static/sapl/frontend/css/chunk-vendors.3c9fe6b4.css"},{"name":"js/chunk-vendors.0003dc37.js","publicPath":"/static/sapl/frontend/js/chunk-vendors.0003dc37.js","path":"../sapl/sapl/static/sapl/frontend/js/chunk-vendors.0003dc37.js"},{"name":"css/chunk-vendors.3c9fe6b4.css.map","publicPath":"/static/sapl/frontend/css/chunk-vendors.3c9fe6b4.css.map","path":"../sapl/sapl/static/sapl/frontend/css/chunk-vendors.3c9fe6b4.css.map"}],"compilacao":[{"name":"css/compilacao.2c767579.css","publicPath":"/static/sapl/frontend/css/compilacao.2c767579.css","path":"../sapl/sapl/static/sapl/frontend/css/compilacao.2c767579.css"},{"name":"js/compilacao.05427c04.js","publicPath":"/static/sapl/frontend/js/compilacao.05427c04.js","path":"../sapl/sapl/static/sapl/frontend/js/compilacao.05427c04.js"},{"name":"css/compilacao.2c767579.css.map","publicPath":"/static/sapl/frontend/css/compilacao.2c767579.css.map","path":"../sapl/sapl/static/sapl/frontend/css/compilacao.2c767579.css.map"}],"global":[{"name":"css/global.83a4a89d.css","publicPath":"/static/sapl/frontend/css/global.83a4a89d.css","path":"../sapl/sapl/static/sapl/frontend/css/global.83a4a89d.css"},{"name":"js/global.98ec7b90.js","publicPath":"/static/sapl/frontend/js/global.98ec7b90.js","path":"../sapl/sapl/static/sapl/frontend/js/global.98ec7b90.js"},{"name":"css/global.83a4a89d.css.map","publicPath":"/static/sapl/frontend/css/global.83a4a89d.css.map","path":"../sapl/sapl/static/sapl/frontend/css/global.83a4a89d.css.map"}],"painel":[{"name":"css/painel.baa845ab.css","publicPath":"/static/sapl/frontend/css/painel.baa845ab.css","path":"../sapl/sapl/static/sapl/frontend/css/painel.baa845ab.css"},{"name":"js/painel.de2ce2cd.js","publicPath":"/static/sapl/frontend/js/painel.de2ce2cd.js","path":"../sapl/sapl/static/sapl/frontend/js/painel.de2ce2cd.js"},{"name":"css/painel.baa845ab.css.map","publicPath":"/static/sapl/frontend/css/painel.baa845ab.css.map","path":"../sapl/sapl/static/sapl/frontend/css/painel.baa845ab.css.map"}]}}
+{"status":"done","publicPath":"/static/sapl/frontend/","chunks":{"chunk-vendors":[{"name":"css/chunk-vendors.3c9fe6b4.css","publicPath":"/static/sapl/frontend/css/chunk-vendors.3c9fe6b4.css","path":"../sapl/sapl/static/sapl/frontend/css/chunk-vendors.3c9fe6b4.css"},{"name":"js/chunk-vendors.0003dc37.js","publicPath":"/static/sapl/frontend/js/chunk-vendors.0003dc37.js","path":"../sapl/sapl/static/sapl/frontend/js/chunk-vendors.0003dc37.js"},{"name":"css/chunk-vendors.3c9fe6b4.css.map","publicPath":"/static/sapl/frontend/css/chunk-vendors.3c9fe6b4.css.map","path":"../sapl/sapl/static/sapl/frontend/css/chunk-vendors.3c9fe6b4.css.map"}],"compilacao":[{"name":"css/compilacao.1f5fb8cf.css","publicPath":"/static/sapl/frontend/css/compilacao.1f5fb8cf.css","path":"../sapl/sapl/static/sapl/frontend/css/compilacao.1f5fb8cf.css"},{"name":"js/compilacao.411d8643.js","publicPath":"/static/sapl/frontend/js/compilacao.411d8643.js","path":"../sapl/sapl/static/sapl/frontend/js/compilacao.411d8643.js"},{"name":"css/compilacao.1f5fb8cf.css.map","publicPath":"/static/sapl/frontend/css/compilacao.1f5fb8cf.css.map","path":"../sapl/sapl/static/sapl/frontend/css/compilacao.1f5fb8cf.css.map"}],"global":[{"name":"css/global.83a4a89d.css","publicPath":"/static/sapl/frontend/css/global.83a4a89d.css","path":"../sapl/sapl/static/sapl/frontend/css/global.83a4a89d.css"},{"name":"js/global.a87c35c2.js","publicPath":"/static/sapl/frontend/js/global.a87c35c2.js","path":"../sapl/sapl/static/sapl/frontend/js/global.a87c35c2.js"},{"name":"css/global.83a4a89d.css.map","publicPath":"/static/sapl/frontend/css/global.83a4a89d.css.map","path":"../sapl/sapl/static/sapl/frontend/css/global.83a4a89d.css.map"}],"painel":[{"name":"css/painel.baa845ab.css","publicPath":"/static/sapl/frontend/css/painel.baa845ab.css","path":"../sapl/sapl/static/sapl/frontend/css/painel.baa845ab.css"},{"name":"js/painel.de2ce2cd.js","publicPath":"/static/sapl/frontend/js/painel.de2ce2cd.js","path":"../sapl/sapl/static/sapl/frontend/js/painel.de2ce2cd.js"},{"name":"css/painel.baa845ab.css.map","publicPath":"/static/sapl/frontend/css/painel.baa845ab.css.map","path":"../sapl/sapl/static/sapl/frontend/css/painel.baa845ab.css.map"}]}}