From 09df822500d65b82e5263ac2bb0b32e79da92dc5 Mon Sep 17 00:00:00 2001
From: Leandro Roberto <leandroroberto.br@gmail.com>
Date: Wed, 16 Jan 2019 20:50:56 -0200
Subject: [PATCH] ajuste de layout no menu protocolo

---
 sapl/templates/crud/detail.html               |  6 ++--
 .../protocoloadm/anular_protocoloadm.html     | 13 ++------
 .../protocoloadm/protocolar_documento.html    | 14 --------
 .../protocoloadm/protocolar_materia.html      |  7 ----
 .../protocoloadm/protocolo_filter.html        | 12 ++-----
 .../protocoloadm/protocolo_mostrar.html       |  9 -----
 .../protocoloadm/protocoloadm_detail.html     | 33 ++++++++++++++-----
 7 files changed, 33 insertions(+), 61 deletions(-)

diff --git a/sapl/templates/crud/detail.html b/sapl/templates/crud/detail.html
index 5b0710503..0058fc917 100644
--- a/sapl/templates/crud/detail.html
+++ b/sapl/templates/crud/detail.html
@@ -24,9 +24,9 @@
           {% if view.extras_url %}
             <div class="actions btn-group btn-group-sm" role="group">
           {% for href, css_class, text in view.extras_url %}
-            <a href="{{href}}" class="btn btn-outline-primary {{css_class}}">
-                  {{text}}
-                </a>
+              <a href="{{href}}" class="btn btn-outline-primary {{css_class}}">
+                {{text}}
+              </a>
               {% endfor %}
             </div>
           {% endif %}
diff --git a/sapl/templates/protocoloadm/anular_protocoloadm.html b/sapl/templates/protocoloadm/anular_protocoloadm.html
index f5d529e67..332c34923 100644
--- a/sapl/templates/protocoloadm/anular_protocoloadm.html
+++ b/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 %}
diff --git a/sapl/templates/protocoloadm/protocolar_documento.html b/sapl/templates/protocoloadm/protocolar_documento.html
index 7a07ec873..fd2dffb4d 100644
--- a/sapl/templates/protocoloadm/protocolar_documento.html
+++ b/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">
diff --git a/sapl/templates/protocoloadm/protocolar_materia.html b/sapl/templates/protocoloadm/protocolar_materia.html
index 27f8337af..8c918202a 100644
--- a/sapl/templates/protocoloadm/protocolar_materia.html
+++ b/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 %}
diff --git a/sapl/templates/protocoloadm/protocolo_filter.html b/sapl/templates/protocoloadm/protocolo_filter.html
index e0824c8bb..d63de7b48 100644
--- a/sapl/templates/protocoloadm/protocolo_filter.html
+++ b/sapl/templates/protocoloadm/protocolo_filter.html
@@ -5,19 +5,13 @@
 {% load static %}
 {% load webpack_static from webpack_loader %}
 
-
-  {% block actions %}
-
-      {{ block.super }}
-
+{% block action_newsearch %}
     {% 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>
diff --git a/sapl/templates/protocoloadm/protocolo_mostrar.html b/sapl/templates/protocoloadm/protocolo_mostrar.html
index 4d2f23dd7..8c3f669b7 100644
--- a/sapl/templates/protocoloadm/protocolo_mostrar.html
+++ b/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>
diff --git a/sapl/templates/protocoloadm/protocoloadm_detail.html b/sapl/templates/protocoloadm/protocoloadm_detail.html
index ee393731e..0a0a0ac13 100644
--- a/sapl/templates/protocoloadm/protocoloadm_detail.html
+++ b/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">
-    <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:desvincular_documento' %}" class="btn btn-outline-primary 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>
+
+{% 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-danger">{% trans 'Anular Protocolo' %}</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-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 %}