From ef6f75e6d9fa52e8ef9079a37bf19670dc37e03e Mon Sep 17 00:00:00 2001
From: Eduardo Edson Batista Cordeiro Alves <eduardoalves@interlegis.leg.br>
Date: Wed, 24 Feb 2016 12:11:37 -0300
Subject: [PATCH] =?UTF-8?q?Ajusta=20comiss=C3=B5es=20ao=20layout=20do=20bo?=
 =?UTF-8?q?otstrap?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/comissoes/comissao_list.html        | 29 ++++---
 templates/comissoes/comissao_parlamentar.html |  4 +-
 .../comissoes/comissao_parlamentar_edit.html  |  4 +-
 templates/comissoes/composicao.html           | 82 ++++++++++---------
 .../comissoes/materias_em_tramitacao.html     |  4 +-
 5 files changed, 64 insertions(+), 59 deletions(-)

diff --git a/templates/comissoes/comissao_list.html b/templates/comissoes/comissao_list.html
index 24cae06ef..a2eefb4ff 100644
--- a/templates/comissoes/comissao_list.html
+++ b/templates/comissoes/comissao_list.html
@@ -3,19 +3,22 @@
 {% load crispy_forms_tags %}
 
 {% block base_content %}
-<div class="actions btn-group pull-right" role="group">
-  <a href="{% url 'comissao:cadastrar_comissao' %}" class="btn btn-default">
-    {% blocktrans with verbose_name=view.verbose_name %} Adicionar Comissão {% endblocktrans %}
-  </a>
-</div>
+  <div class="actions btn-group pull-right" role="group">
+    <a href="{% url 'comissao:cadastrar_comissao' %}" class="btn btn-default">
+      {% blocktrans with verbose_name=view.verbose_name %} Adicionar Comissão {% endblocktrans %}
+    </a>
+  </div>
+  <br /><br /><br />
 	{% block detail_content %}
-		<table width="100%">
-			<tr>
-				<th>Nome</th>
-				<th>Sigla</th>
-				<th>Tipo</th>
-				<th>Data de Criação</th>
-			</tr>
+    <table class="table table-striped table-bordered">
+      <thead class="thead-default">
+  			<tr>
+  				<th>Nome</th>
+  				<th>Sigla</th>
+  				<th>Tipo</th>
+  				<th>Data de Criação</th>
+  			</tr>
+      </thead>
 			{% for comissao in page_obj %}
 				<tr>
 					<td>
@@ -29,4 +32,4 @@
 		</table>
 	    {% include "paginacao.html" %}
 	{% endblock %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/templates/comissoes/comissao_parlamentar.html b/templates/comissoes/comissao_parlamentar.html
index 56840d2ff..9682c56d5 100644
--- a/templates/comissoes/comissao_parlamentar.html
+++ b/templates/comissoes/comissao_parlamentar.html
@@ -1,7 +1,7 @@
-{% extends "comissoes/comissao_detail.html" %}
+{% extends "crud/detail.html" %}
 {% load i18n %}
 {% load crispy_forms_tags %}
 {% block actions %}{% endblock %}
 {% block detail_content %}
 	{% crispy form %}
-{% endblock detail_content %}
\ No newline at end of file
+{% endblock detail_content %}
diff --git a/templates/comissoes/comissao_parlamentar_edit.html b/templates/comissoes/comissao_parlamentar_edit.html
index 56840d2ff..9682c56d5 100644
--- a/templates/comissoes/comissao_parlamentar_edit.html
+++ b/templates/comissoes/comissao_parlamentar_edit.html
@@ -1,7 +1,7 @@
-{% extends "comissoes/comissao_detail.html" %}
+{% extends "crud/detail.html" %}
 {% load i18n %}
 {% load crispy_forms_tags %}
 {% block actions %}{% endblock %}
 {% block detail_content %}
 	{% crispy form %}
-{% endblock detail_content %}
\ No newline at end of file
+{% endblock detail_content %}
diff --git a/templates/comissoes/composicao.html b/templates/comissoes/composicao.html
index b340b2c3b..ffc69a81d 100644
--- a/templates/comissoes/composicao.html
+++ b/templates/comissoes/composicao.html
@@ -1,50 +1,52 @@
-{% extends "comissoes/comissao_detail.html" %}
+{% extends "crud/detail.html" %}
 {% load i18n %}
 {% load crispy_forms_tags %}
 {% block actions %} {% endblock %}
 {% block detail_content %}
 
-{% if composicao_id != 0 %}
-	<table>
-		<tr>
-			<th>Nome</th>
-			<th>Cargo</th>
-			<th>Titular</th>
-			<th>Designação</th>
-			<th>Desligamento</th>
-			<th>Motivo</th>
-			<th>Observação</th>
-		</tr>
-
-		<form method="POST">
-
-			{% csrf_token %}
-			<select id="periodo" name="periodo" onChange="form.submit();">
-				{% for c in composicoes %}
-					<option value="{{c.id}}" {% if composicao_id == c.id %} selected {% endif %}>
-						{{ c.periodo.data_inicio|date:"d/m/Y" }} - {{ c.periodo.data_fim|date:"d/m/Y" }}
-					</option>
-				{% endfor %}
-			</select>
-		</form>
-
-		{% for participacao in participacoes %}
-			{% if participacao.composicao_id == composicao_id %}
+	{% if composicao_id != 0 %}
+		<table class="table table-striped table-bordered">
+			<thead class="thead-default">
 				<tr>
-					<td><a href="{% url 'comissao:comissao_parlamentar_edit' pk composicao_id participacao.id %}">{{participacao.parlamentar.nome_parlamentar}}</a></td>
-					<td>{{participacao.cargo}}</td>
-					<td>{{participacao.titular|yesno:"Sim,Não"}}</td>	
-					<td>{{participacao.data_designacao|date:"d/m/Y"}}</td>
-					<td>{{participacao.data_desligamento|date:"d/m/Y"|default:"-"}}</td>
-					<td>{{participacao.motivo_desligamento|default:"-"}}</td>
-					<td>{{participacao.observacao|default:"-"}}</td>
+					<th>Nome</th>
+					<th>Cargo</th>
+					<th>Titular</th>
+					<th>Designação</th>
+					<th>Desligamento</th>
+					<th>Motivo</th>
+					<th>Observação</th>
 				</tr>
-			{% endif %}
-		{% endfor %}
+			</thead>
+
+			<form method="POST">
+
+				{% csrf_token %}
+				<select id="periodo" name="periodo" class="form-control" onChange="form.submit();">
+					{% for c in composicoes %}
+						<option value="{{c.id}}" {% if composicao_id == c.id %} selected {% endif %}>
+							{{ c.periodo.data_inicio|date:"d/m/Y" }} - {{ c.periodo.data_fim|date:"d/m/Y" }}
+						</option>
+					{% endfor %}
+				</select>
+			</form>
+			<br />
+			{% for participacao in participacoes %}
+				{% if participacao.composicao_id == composicao_id %}
+					<tr>
+						<td><a href="{% url 'comissao:comissao_parlamentar_edit' pk composicao_id participacao.id %}">{{participacao.parlamentar.nome_parlamentar}}</a></td>
+						<td>{{participacao.cargo}}</td>
+						<td>{{participacao.titular|yesno:"Sim,Não"}}</td>
+						<td>{{participacao.data_designacao|date:"d/m/Y"}}</td>
+						<td>{{participacao.data_desligamento|date:"d/m/Y"|default:"-"}}</td>
+						<td>{{participacao.motivo_desligamento|default:"-"}}</td>
+						<td>{{participacao.observacao|default:"-"}}</td>
+					</tr>
+				{% endif %}
+			{% endfor %}
 
-	</table>
+		</table>
 
-	<a href="{% url 'comissao:comissao_parlamentar' pk composicao_id %}" class="button primary">Incluir Parlamentar</a>
-{% endif %}
+		<a href="{% url 'comissao:comissao_parlamentar' pk composicao_id %}" class="btn btn-primary">Incluir Parlamentar</a>
+	{% endif %}
 
-{% endblock detail_content %}
\ No newline at end of file
+{% endblock detail_content %}
diff --git a/templates/comissoes/materias_em_tramitacao.html b/templates/comissoes/materias_em_tramitacao.html
index b76aae7d2..90fa19418 100644
--- a/templates/comissoes/materias_em_tramitacao.html
+++ b/templates/comissoes/materias_em_tramitacao.html
@@ -1,4 +1,4 @@
-{% extends "comissoes/comissao_detail.html" %}
+{% extends "crud/detail.html" %}
 {% load i18n %}
 {% load crispy_forms_tags %}
 {% block actions %} {% endblock %}
@@ -21,4 +21,4 @@
 
 	</fieldset>
 
-{% endblock detail_content %}
\ No newline at end of file
+{% endblock detail_content %}