SPDT
/
sapl
mirror of https://github.com/interlegis/sapl.git
5
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Ajusta comissões ao layout do bootstrap

pull/237/head
Eduardo Edson Batista Cordeiro Alves 9 years ago
parent
2487837b16
commit
ef6f75e6d9
5 changed files with 64 additions and 59 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 29
      templates/comissoes/comissao_list.html
  2. 4
      templates/comissoes/comissao_parlamentar.html
  3. 4
      templates/comissoes/comissao_parlamentar_edit.html
  4. 82
      templates/comissoes/composicao.html
  5. 4
      templates/comissoes/materias_em_tramitacao.html

29
templates/comissoes/comissao_list.html
View File

@ -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 %}
{% endblock %}

4
templates/comissoes/comissao_parlamentar.html
View File

@ -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 %}
{% endblock detail_content %}

4
templates/comissoes/comissao_parlamentar_edit.html
View File

@ -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 %}
{% endblock detail_content %}

82
templates/comissoes/composicao.html
View File

@ -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 %}
{% endblock detail_content %}

4
templates/comissoes/materias_em_tramitacao.html
View File

@ -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 %}
{% endblock detail_content %}

Write Preview
Loading…
Cancel
Save