From fd571d7d6e5a7ae2843a25b70acdae4c88fe8e4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ses=C3=B3stris=20Vieira?= <sesostris@interlegis.leg.br>
Date: Mon, 18 Apr 2022 19:14:59 -0300
Subject: [PATCH] =?UTF-8?q?Corre=C3=A7=C3=B5es=20de=20change=20forms?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/eventos/evento/change_form.html     | 14 ++--
 .../servicos/casaatendida/change_form.html    |  4 +-
 .../servidores/servidor/change_form.html      | 80 ++++++++++---------
 sigi/templates/admin/change_form.html         |  3 +
 sigi/templates/base_change_form.html          | 20 -----
 5 files changed, 56 insertions(+), 65 deletions(-)
 create mode 100644 sigi/templates/admin/change_form.html
 delete mode 100644 sigi/templates/base_change_form.html

diff --git a/sigi/apps/eventos/templates/admin/eventos/evento/change_form.html b/sigi/apps/eventos/templates/admin/eventos/evento/change_form.html
index 5dc8236..b56ae80 100644
--- a/sigi/apps/eventos/templates/admin/eventos/evento/change_form.html
+++ b/sigi/apps/eventos/templates/admin/eventos/evento/change_form.html
@@ -1,10 +1,12 @@
-{% extends "base_change_form.html" %}
+{% extends "admin/change_form.html" %}
 {% load i18n %}
 
 {% block object-tools-items %}
-    <li><a href="declaracao/">
-        <span class="glyphicon glyphicon-print"></span>
-        {% trans 'Declaração' %}
-    </a></li>
-    {{ block.super }}
+  <div class="collection-item">
+    <a href="{% url 'evento-declaracao' object_id %}">
+      <i class="left material-icons" aria-hidden="true">picture_as_pdf</i>
+      {% trans "Declaração" %}
+    </a>
+  </div>
+  {{ block.super }}
 {% endblock %}
diff --git a/sigi/apps/servicos/templates/admin/servicos/casaatendida/change_form.html b/sigi/apps/servicos/templates/admin/servicos/casaatendida/change_form.html
index a9abe48..6195ef5 100644
--- a/sigi/apps/servicos/templates/admin/servicos/casaatendida/change_form.html
+++ b/sigi/apps/servicos/templates/admin/servicos/casaatendida/change_form.html
@@ -1,6 +1,6 @@
-{% extends "base_change_form.html" %}
+{% extends "admin/change_form.html" %}
 {% load i18n admin_modify %}
-{% load static from staticfiles %}
+{% load static %}
 
 {% block after_related_objects %}
 {{ block.super }}
diff --git a/sigi/apps/servidores/templates/admin/servidores/servidor/change_form.html b/sigi/apps/servidores/templates/admin/servidores/servidor/change_form.html
index b8fe1b2..6457b0b 100644
--- a/sigi/apps/servidores/templates/admin/servidores/servidor/change_form.html
+++ b/sigi/apps/servidores/templates/admin/servidores/servidor/change_form.html
@@ -1,44 +1,50 @@
-{% extends 'base_change_form.html' %}
+{% extends 'admin/change_form.html' %}
 {% load i18n %}
 
 {% block form_top %}
-{% if adminform.form.instance.user %}
-<fieldset style="background:transparent" id="fieldset-2" class="_module _aligned">
-    <legend>
-        {% trans 'Dados do LDAP' %}
-    </legend>
-    <div class="fields">
-        <div class="row"><div class="control-group">
-                <div class="col-md-12 form-group ">
-                        <div class="control-label col-md-3">
-                            <label>{% trans 'Primeiro Nome' %}:</label>
-                        </div>
-                        <div class="controls col-md-9">
-                            <p class="form-control-static">{{adminform.form.instance.user.first_name}}</p>
-                        </div>
+  {% if adminform.form.instance.user %}
+    <div class="card">
+      <div class="card-content">
+        <span class="card-title">{% trans 'Dados do LDAP' %}</span>
+        <fieldset id="fieldset-ldap-fields" class="_module _aligned">
+          <div class="fields">
+            <div class="control-group">
+              <div class="form-group">
+                <div class="control-label">
+                  <label>{% trans 'Primeiro Nome' %}:</label>
                 </div>
-        </div></div>
-        <div class="row"><div class="control-group">
-                <div class="col-md-12 form-group ">
-                        <div class="control-label col-md-3">
-                            <label>{% trans 'Último Nome' %}:</label>
-                        </div>
-                        <div class="controls col-md-9">
-                            <p class="form-control-static">{{adminform.form.instance.user.last_name}}</p>
-                        </div>
+                <div class="controls">
+                  <p class="form-control-static">
+                    {{adminform.form.instance.user.first_name}}
+                  </p>
                 </div>
-        </div></div>
-        <div class="row"><div class="control-group">
-                <div class="col-md-12 form-group ">
-                        <div class="control-label col-md-3">
-                            <label>{% trans 'Email Principal' %}:</label>
-                        </div>
-                        <div class="controls col-md-9">
-                            <p class="form-control-static">{{adminform.form.instance.user.email}}</p>
-                        </div>
+              </div>
+            </div>
+            <div class="control-group">
+              <div class="form-group">
+                <div class="control-label">
+                  <label>{% trans 'Último Nome' %}:</label>
                 </div>
-        </div></div>
+                <div class="controls">
+                  <p class="form-control-static">
+                    {{adminform.form.instance.user.last_name}}
+                  </p>
+                </div>
+              </div>
+            </div>
+            <div class="control-group">
+              <div class="form-group">
+                <div class="control-label">
+                  <label>{% trans 'Email Principal' %}:</label>
+                </div>
+                <div class="controls">
+                  <p class="form-control-static">{{adminform.form.instance.user.email}}</p>
+                </div>
+              </div>
+            </div>
+          </div>
+        </fieldset>
+      </div>
     </div>
-</fieldset>
-{% endif %}
-{% endblock %}
+  {% endif %}
+{% endblock %}
\ No newline at end of file
diff --git a/sigi/templates/admin/change_form.html b/sigi/templates/admin/change_form.html
new file mode 100644
index 0000000..6608d52
--- /dev/null
+++ b/sigi/templates/admin/change_form.html
@@ -0,0 +1,3 @@
+{% extends 'admin/change_form.html' %}
+
+{% block breadcrumbs %}{% endblock %}
\ No newline at end of file
diff --git a/sigi/templates/base_change_form.html b/sigi/templates/base_change_form.html
deleted file mode 100644
index 36548e4..0000000
--- a/sigi/templates/base_change_form.html
+++ /dev/null
@@ -1,20 +0,0 @@
-{% extends "admin/change_form.html" %}
-{% load i18n admin_urls %}
-
-{% block object-tools %}
-{% if change %}{% if not is_popup %}
-  <ul class="nav navbar-nav navbar-left">
-    {% block object-tools-items %}
-    <li>
-        {% url opts|admin_urlname:'history' original.pk|admin_urlquote as history_url %}
-        <a href="{% add_preserved_filters history_url %}" class="historylink">
-            <span class="glyphicon glyphicon-book"></span>
-            {% trans "History" %}
-        </a>
-    </li>
-    {% if has_absolute_url %}<li><a href="{% url 'admin:view_on_site' content_type_id original.pk %}" class="viewsitelink">{% trans "View on site" %}</a></li>{% endif%}
-    {% endblock %}
-  </ul>
-{% endif %}{% endif %}
-{% endblock %}
-