From 4d8888e1975b6fe796a298cc3e70b6c59faa43df Mon Sep 17 00:00:00 2001
From: Marcio Mazza <marciomazza@gmail.com>
Date: Mon, 6 Oct 2014 16:24:41 -0300
Subject: [PATCH] Refator change list templates that include a cart for reuse

---
 .../casas/templates/casas/change_list.html    | 20 +++++++------------
 .../templates/convenios/change_list.html      | 18 +----------------
 .../parlamentar/change_list.html              | 11 +---------
 sigiStatic/css/base_site.css                  |  5 +++++
 templates/change_list_with_cart.html          | 10 ++++++++++
 5 files changed, 24 insertions(+), 40 deletions(-)
 create mode 100644 templates/change_list_with_cart.html

diff --git a/sigi/apps/casas/templates/casas/change_list.html b/sigi/apps/casas/templates/casas/change_list.html
index 5f90262..96da470 100644
--- a/sigi/apps/casas/templates/casas/change_list.html
+++ b/sigi/apps/casas/templates/casas/change_list.html
@@ -1,15 +1,9 @@
-{% extends "admin/change_list.html" %}
-{% load admin_list i18n reporting_tags  %}
+{% extends "change_list_with_cart.html" %}
 
-{% block object-tools %}
-    <ul class="object-tools">        
-        <li><a href="casas_sem_convenio_report/{{query_str}}">Casas sem Processo de Convênio</a></li>
-        <li><a onclick="return showRelatedObjectLookupPopup(this);" href="carrinho/{{query_str}}">Carrinho / Exportar</a></li>
-        <li>
-            <a href="add/{% if is_popup %}?_popup=1{% endif %}" class="addlink">
-                {% blocktrans with cl.opts.verbose_name as name %}Add {{ name }}{% endblocktrans %}
-            </a>
-        </li>        
-    </ul>
-      
+{% block object-tools-items %}
+        <li><a href="casas_sem_convenio_report/{{query_str}}">
+            <span class="glyphicon glyphicon-list"></span>
+            Casas sem Processo de Convênio
+        </a></li>
+        {{ block.super }}
 {% endblock %}
diff --git a/sigi/apps/convenios/templates/convenios/change_list.html b/sigi/apps/convenios/templates/convenios/change_list.html
index ba5abf9..0a31dae 100644
--- a/sigi/apps/convenios/templates/convenios/change_list.html
+++ b/sigi/apps/convenios/templates/convenios/change_list.html
@@ -1,20 +1,4 @@
-{% extends "admin/change_list.html" %}
-{% load i18n reporting_tags  admin_list %}
-
-{% block object-tools %}
-  {% if has_add_permission %}
-
-    <ul class="object-tools">
-        <li><a onclick="return showRelatedObjectLookupPopup(this);" href="carrinho/{{query_str}}">Carrinho / Exportar</a></li>
-        <li>
-            <a href="add/{% if is_popup %}?_popup=1{% endif %}" class="addlink">
-                {% blocktrans with cl.opts.verbose_name as name %}Add {{ name }}{% endblocktrans %}
-            </a>
-        </li>
-    </ul>
-
-  {% endif %}
-{% endblock %}
+{% extends "change_list_with_cart.html" %}
 
 {% block search %}
 <div id="toolbar">
diff --git a/sigi/apps/parlamentares/templates/admin/parlamentares/parlamentar/change_list.html b/sigi/apps/parlamentares/templates/admin/parlamentares/parlamentar/change_list.html
index 103536c..58fe3b7 100644
--- a/sigi/apps/parlamentares/templates/admin/parlamentares/parlamentar/change_list.html
+++ b/sigi/apps/parlamentares/templates/admin/parlamentares/parlamentar/change_list.html
@@ -1,10 +1 @@
-{% extends "admin/change_list.html" %}
-{% load admin_list i18n reporting_tags  %}
-
-{% block object-tools-items %}
-        <li><a class="btn" href="carrinho/{{query_str}}">
-            <span class="glyphicon glyphicon-shopping-cart"></span>
-            Ver Carrinho
-        </a></li>
-        {{ block.super }}
-{% endblock %}
+{% extends "change_list_with_cart.html" %}
diff --git a/sigiStatic/css/base_site.css b/sigiStatic/css/base_site.css
index ec27c6f..3bfdbdd 100644
--- a/sigiStatic/css/base_site.css
+++ b/sigiStatic/css/base_site.css
@@ -195,3 +195,8 @@ div#footer a {
     }
 }
 
+/* GENERAL ADJUSTMENTS */
+
+.glyphicon {
+    margin-right: 3px;
+}
diff --git a/templates/change_list_with_cart.html b/templates/change_list_with_cart.html
new file mode 100644
index 0000000..103536c
--- /dev/null
+++ b/templates/change_list_with_cart.html
@@ -0,0 +1,10 @@
+{% extends "admin/change_list.html" %}
+{% load admin_list i18n reporting_tags  %}
+
+{% block object-tools-items %}
+        <li><a class="btn" href="carrinho/{{query_str}}">
+            <span class="glyphicon glyphicon-shopping-cart"></span>
+            Ver Carrinho
+        </a></li>
+        {{ block.super }}
+{% endblock %}