ajuste de layout no menu protocolo

sapl/templates/protocoloadm/anular_protocoloadm.html

@@ -1,17 +1,8 @@
 {% extends "protocoloadm/protocoloadm_detail.html" %}
 {% load i18n %}
-{% load crispy_forms_tags %}
-
-
-{% block actions %}
-
-  {{ block.super }}
-  <div class="actions btn-group float-right grid-gutter-width-right " role="group">
-    <a href="{% url 'sapl.protocoloadm:protocolo' %}" class="btn btn-outline-primary">{% trans 'Fazer nova pesquisa' %}</a>
-  </div>
-{% endblock %}
 
+{% load crispy_forms_tags %}  
 {% block detail_content %}
-	<div>{{ message }} </div>
+	<div>{{ message }}</div>
     {% crispy form %}
 {% endblock detail_content %}

sapl/templates/protocoloadm/protocolar_documento.html

@@ -1,19 +1,5 @@
 {% extends "protocoloadm/protocoloadm_detail.html" %}
 {% load i18n %}
-{% load crispy_forms_tags %}
-
-
-{% block actions %}
-
-  {{ block.super }}
-      <div class="actions btn-group btn-group-sm mt-2" role="group">
-    <a href="{% url 'sapl.protocoloadm:protocolo' %}" class="btn btn-outline-primary">{% trans 'Fazer nova pesquisa' %}</a>
-  </div>
-{% endblock %}
-
-{% block detail_content %}
-	{% crispy form %}
-{% endblock detail_content %}
 
 {% block extra_js %}
    <script language="Javascript">

sapl/templates/protocoloadm/protocolar_materia.html

@@ -2,13 +2,6 @@
 {% load i18n %}
 {% load crispy_forms_tags %}
 
-{% block actions %}
-  {{ block.super }}
-  <div class="actions btn-group btn-group-sm" role="group">
-    <a href="{% url 'sapl.protocoloadm:protocolo' %}" class="btn btn-outline-primary">{% trans 'Fazer nova pesquisa' %}</a>
-  </div>
-{% endblock %}
-
 {% block detail_content %}
 	{% crispy form %}
 {% endblock detail_content %}

sapl/templates/protocoloadm/protocolo_filter.html

@@ -5,19 +5,13 @@
 {% load static %}
 {% load webpack_static from webpack_loader %}
 
-
+{% block action_newsearch %}
-  {% block actions %}
-
-      {{ block.super }}
-
     {% if show_results %}
-      <div class="actions btn-group btn-group-sm" role="group">
+      <div class="actions mb-3 btn-group" role="group">
         <a href="{% url 'sapl.protocoloadm:protocolo' %}" class="btn btn-outline-primary">{% trans 'Fazer nova pesquisa' %}</a>
       </div>
     {% endif %}
-
+{% endblock %}
-
-  {% endblock %}
 
   {% block detail_content %}
     <br>

sapl/templates/protocoloadm/protocolo_mostrar.html

@@ -1,18 +1,9 @@
 {% extends "protocoloadm/protocoloadm_detail.html" %}
 {% load i18n %}
 {% load tz %}
-{% load crispy_forms_tags %}
 {% load static %}
 {% load webpack_static from webpack_loader %}
 
-{% block actions %}
-
-  {{ block.super }}
-      <div class="actions btn-group btn-group-sm" role="group">
-    <a href="{% url 'sapl.protocoloadm:protocolo' %}" class="btn btn-outline-primary">{% trans 'Fazer nova pesquisa' %}</a>
-  </div>
-{% endblock %}
-
 {% block detail_content %}
         <strong>Protocolo: </strong>{{ protocolo.numero|stringformat:'06d' }}/{{ protocolo.ano }} - 
         <a href="{% url 'sapl.relatorios:relatorio_etiqueta_protocolo' protocolo.numero protocolo.ano %}"><img src="{% webpack_static 'img/etiqueta.png' %}" alt="Etiqueta Individual"></a></br>

sapl/templates/protocoloadm/protocoloadm_detail.html

@@ -1,11 +1,28 @@
 {% extends "crud/detail.html" %}
 {% load i18n %}
-{% block editions %}
+
-  <div class="actions btn-group float-right" role="group">
+{% load crispy_forms_tags %}  
+{% block actions %}
+<div class="btn-toolbar justify-content-between align-items-start" role="toolbar">
+    {% block action_newsearch %}
+      <div class="actions btn-group mb-3" role="group">
+        <a href="{% url 'sapl.protocoloadm:protocolo' %}" class="btn btn-outline-primary">{% trans 'Fazer nova pesquisa' %}</a>
+      </div>
+    {% endblock action_newsearch %}
+    <div class="actions btn-group" role="group">
       <a href="{% url 'sapl.protocoloadm:protocolar_mat' %}" class="btn btn-outline-primary">{% trans 'Protocolar Matéria' %}</a>
       <a href="{% url 'sapl.protocoloadm:protocolar_doc' %}" class="btn btn-outline-primary">{% trans 'Protocolar Documento' %}</a>
-    <a href="{% url 'sapl.protocoloadm:anular_protocolo' %}" class="btn btn-outline-primary btn-outline-danger">{% trans 'Anular Protocolo' %}</a>
+      <a href="{% url 'sapl.protocoloadm:anular_protocolo' %}" class="btn btn-outline-danger">{% trans 'Anular Protocolo' %}</a>
-    <a href="{% url 'sapl.protocoloadm:desvincular_documento' %}" class="btn btn-outline-primary btn-outline-danger">{% trans 'Desvincular Documentos' %}</a>
+      <a href="{% url 'sapl.protocoloadm:desvincular_documento' %}" class="btn btn-outline-danger">{% trans 'Desvincular Documentos' %}</a>
-    <a href="{% url 'sapl.protocoloadm:desvincular_materia' %}" class="btn btn-outline-primary btn-outline-danger">{% trans 'Desvincular Matérias' %}</a>
+      <a href="{% url 'sapl.protocoloadm:desvincular_materia' %}" class="btn btn-outline-danger">{% trans 'Desvincular Matérias' %}</a>
+    </div>
   </div>
-{% endblock editions %}
+{% endblock actions %}
+
+{% block detail_content %}
+{% if form %}
+	{% crispy form %}
+{% else %}
+  {{ block.super }}
+{% endif %}
+{% endblock detail_content %}