From 16bf3718acadda4363599c824ed100411976332a Mon Sep 17 00:00:00 2001
From: Marcio Mazza <mazza@interlegis.leg.br>
Date: Wed, 8 Oct 2014 16:43:08 -0300
Subject: [PATCH] Redesign change_form of local parliament

---
 .../casas/templates/casas/change_form.html    | 28 +++++++++++--------
 sigi/apps/metas/templates/metas/mapa.html     |  2 +-
 templates/base_change_form.html               | 20 +++++++++++++
 3 files changed, 37 insertions(+), 13 deletions(-)
 create mode 100644 templates/base_change_form.html

diff --git a/sigi/apps/casas/templates/casas/change_form.html b/sigi/apps/casas/templates/casas/change_form.html
index b59cb99..a3a43fb 100644
--- a/sigi/apps/casas/templates/casas/change_form.html
+++ b/sigi/apps/casas/templates/casas/change_form.html
@@ -1,14 +1,18 @@
-{% extends "admin/change_form.html" %}
-{% load i18n reporting_tags %}
+{% extends "base_change_form.html" %}
+{% load i18n %}
 
-{% block object-tools %}
-{% if change %}{% if not is_popup %}
-  <ul class="object-tools">
-      <li><a href="report_complete/">Relatório</a></li>
-      <li><a href="labels/">Etiqueta</a></li>
-      <li><a href="labels_sem_presidente/">Etiqueta sem presidente</a></li>
-      <li><a href="history/" class="historylink">{% trans "History" %}</a></li>
-  {% if has_absolute_url %}<li><a href="../../../r/{{ content_type_id }}/{{ object_id }}/" class="viewsitelink">{% trans "View on site" %}</a></li>{% endif%}
-  </ul>
-{% endif %}{% endif %}
+{% block object-tools-items %}
+    <li><a href="report_complete/">
+        <span class="glyphicon glyphicon-list-alt"></span>
+        Relatório
+    </a></li>
+    <li><a href="labels/">
+        <span class="glyphicon glyphicon-th"></span>
+        Etiqueta
+    </a></li>
+    <li><a href="labels_sem_presidente/">
+        <span class="glyphicon glyphicon-th-large"></span>
+        Etiqueta sem presidente
+    </a></li>
+    {{ block.super }}
 {% endblock %}
diff --git a/sigi/apps/metas/templates/metas/mapa.html b/sigi/apps/metas/templates/metas/mapa.html
index e77b56d..e1222b4 100644
--- a/sigi/apps/metas/templates/metas/mapa.html
+++ b/sigi/apps/metas/templates/metas/mapa.html
@@ -44,7 +44,7 @@
 
 {% block object-tools-items %}
 	<li><a href="/dashboard/mapsum/" id="summary_report" onclick="return false;">
-        <span class="glyphicon glyphicon-th-large"></span>
+        <span class="glyphicon glyphicon-list-alt"></span>
 		Relatório resumo
 	</a></li>
 	<li><a href="/dashboard/maplist/" id="list_report" onclick="return false;">
diff --git a/templates/base_change_form.html b/templates/base_change_form.html
new file mode 100644
index 0000000..36548e4
--- /dev/null
+++ b/templates/base_change_form.html
@@ -0,0 +1,20 @@
+{% 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 %}
+