From cd7e5f45f20488548e1c6bc0a07159ae5002d60e Mon Sep 17 00:00:00 2001
From: Eduardo Calil <dudusaid@gmail.com>
Date: Tue, 29 Mar 2016 13:55:51 -0300
Subject: [PATCH] Altera o template

---
 .../materia/materialegislativa_filter.html    | 45 +++++++++++++++++--
 .../materia/proposicao/proposicao_list.html   |  9 ++--
 2 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/templates/materia/materialegislativa_filter.html b/templates/materia/materialegislativa_filter.html
index 48432cf56..fe7840650 100644
--- a/templates/materia/materialegislativa_filter.html
+++ b/templates/materia/materialegislativa_filter.html
@@ -2,12 +2,15 @@
 {% load i18n %}
 {% load crispy_forms_tags %}
 {% block actions %}{% endblock %}
+
 {% block sections_nav %} {% endblock %}
-{% block detail_content %}
 
+{% block detail_content %}
+  <h1><b>Pesquisar Matéria</b></h1>
+  <br></br>
   <form action="" method="get">
       {{ filter.form.as_p }}
-      <input type="submit" />
+      <input type="submit" value="Pesquisar" />
   </form>
   <p></p>
   <table class="table table-striped table-bordered">
@@ -24,6 +27,42 @@
             </tr>
         {% endfor %}
     </table>
-{% include "paginacao.html" %}
 
+{% if is_paginated %}
+<nav class="text-center">
+  <ul class="pagination">
+    {% if page_obj.has_previous %}
+    <li class="page-item">
+      <a class="page-link" href="?page={{ page_obj.previous_page_number }}">
+        <span class="pager-prev">Anterior</span>
+      </a>
+    </li>
+    {% else %}
+    <li class="pager-prev disabled"><a href="">Anterior</a></li>
+    {% endif %}
+
+    {% for page in page_range %}
+    {% if page == None or page == 'None' %}
+    <li class="page-item disabled">
+      <a class="page-link" href="">...</a>
+    </li>
+    {% else %}
+    <li {% if page == page_obj.number %} class="page-item active" {% endif %}>
+      <a class="page-link" href="?page={{ page }}">{{ page }}</a>
+    </li>
+    {% endif %}
+    {% endfor %}
+
+    {% if page_obj.has_next %}
+    <li class="page-item">
+      <a class="page-link" href="?page={{ page_obj.next_page_number }}">
+        <span class="pager-next">Próxima</span>
+      </a>
+    </li>
+    {% else %}
+    <li class="pager-next disabled"><a href="">Próxima</a></li>
+    {% endif %}
+  </ul>
+</nav>
+{% endif %}
 {% endblock detail_content %}
\ No newline at end of file
diff --git a/templates/materia/proposicao/proposicao_list.html b/templates/materia/proposicao/proposicao_list.html
index d666badbe..c81e8ffa3 100644
--- a/templates/materia/proposicao/proposicao_list.html
+++ b/templates/materia/proposicao/proposicao_list.html
@@ -5,14 +5,13 @@
 {% block actions %}<!-- Remvoer botões 'Editar' e 'Excluir' -->{% endblock %}
 
 {% block sections_nav %}
-	<h2><b>Proposições</b></h2>
-	<br />
-  <div class="actions btn-group pull-right" role="group">
-    <a href="{% url 'adicionar_proposicao' %}" class="btn btn-default">Nova Proposição</a>
-  </div>
 {% endblock %}
 
 {% block detail_content %}
+<h2><b>Proposições</b></h2>
+<div class="actions btn-group pull-right" role="group">
+    <a href="{% url 'adicionar_proposicao' %}" class="btn btn-default">Nova Proposição</a>
+  </div>
 	<table class="table table-striped table-bordered">
 		<thead class="thead-default">
 			<tr>