Muda estilo da listagem e detalhe da pauta da sessão

sapl/templates/sessao/pauta_sessao_detail.html

@@ -7,7 +7,7 @@
 <div align=right><a href="{% url 'sapl.relatorios:relatorio_sessao_plenaria' object.id %}">> PDF</a></li></div>
 <fieldset>
 	<legend>Identificação Básica</legend>
-	<table class="table table-striped table-bordered">
+	<table class="table">
 		<thead class="thead-default">
 			<tr>
     		{% for b in basica %}
@@ -20,12 +20,14 @@
 
 <fieldset>
 	<legend>Expedientes</legend>
-	<table class="table table-striped table-bordered">
+	<table class="table">
 		<thead class="thead-default">
     	{% for e in expedientes %}
 				<tr>
-			    <td><b>{{e.tipo}}:</b></td>
+			    <td>
-			    <td>{{e.conteudo|safe}}</td>
+						<b>{{e.tipo}}: </b> <br />
+						<p style="text-indent: 50px;">{{e.conteudo}}</p>
+					</td>
 				</tr>
 		  {% endfor %}
 		</thead>
@@ -34,7 +36,7 @@
 
 <fieldset>
 	<legend>Matérias do Expediente</legend>
-	<table class="table table-striped table-bordered">
+	<table class="table table-striped">
 		<thead class="thead-default">
 			<tr>
 	      <th>Matéria</th>
@@ -58,7 +60,7 @@
 
 <fieldset>
 	<legend>Oradores do Expediente</legend>
-	<table class="table table-striped table-bordered">
+	<table class="table table-striped">
 		<thead class="thead-default">
 			<tr>
 	      <th>Parlamentar</th>
@@ -76,7 +78,7 @@
 
 <fieldset>
 	<legend>Matérias da Ordem do Dia</legend>
-	<table class="table table-striped table-bordered">
+	<table class="table table-striped">
 		<thead class="thead-default">
 			<tr>
 				<th>Matéria</th>

sapl/templates/sessao/pauta_sessao_list.html

@@ -1,20 +1,34 @@
-{% extends "crud/list.html" %}
+{% extends "base.html" %}
-{% load i18n %}
+{% load i18n staticfiles %}
-{% load crispy_forms_tags %}
 
 {% block base_content %}
-	{% block detail_content %}
+
-		<table width="100%">
+	{% if not page_obj %}
-			{% for sessao in page_obj %}
+	  <p>Não há pautas.</p>
-				<tr>
+	{% else %}
-					<th>
+	  <table class="table table-striped table-hover">
-						<a href="{% url 'sapl.sessao:pauta_sessao_detail' sessao.id %}">{{sessao}}</a>
+	    <thead>
-						<br />
+	      <tr>
-						Data: {{sessao.data_inicio}} - Abertura {{sessao.hora_inicio}}
+					<th>Data</th>
-					</th>
+					<th>Sessão</th>
-				</tr>
+					<th>PDF</th>
-			{% endfor %}
+	      </tr>
-		</table>
+	    </thead>
-	    {% include "paginacao.html" %}
+	    <tbody>
-	{% endblock %}
+				{% for sessao in page_obj %}
+					<tr>
+						<td><a href="{% url 'sapl.sessao:pauta_sessao_detail' sessao.id %}">
+							{{sessao.data_inicio}} - {{sessao.hora_inicio}}
+						</a></td>
+						<td>{{sessao}}</td>
+						<td><a href="{% url 'sapl.relatorios:relatorio_sessao_plenaria' sessao.id %}">
+							<img src="{% static 'img/file.png' %}">
+						</a></td>
+					</tr>
+				{% endfor %}
+	  	</tbody>
+	  </table>
+	{% endif %}
+
+	{% include "paginacao.html" %}
 {% endblock %}