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

Ajusta layout, das telas relacionadas a parlamentare,' ao tema do bootstrap

pull/237/head
Eduardo Edson Batista Cordeiro Alves 9 years ago
parent
67a2241b53
commit
f4449ea893
6 changed files with 64 additions and 56 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      parlamentares/forms.py
  2. 26
      templates/parlamentares/parlamentares_dependentes.html
  3. 2
      templates/parlamentares/parlamentares_detail.html
  4. 26
      templates/parlamentares/parlamentares_filiacao.html
  5. 28
      templates/parlamentares/parlamentares_list.html
  6. 32
      templates/parlamentares/parlamentares_mandato.html

2
parlamentares/forms.py
View File

@ -167,7 +167,7 @@ class ParlamentaresForm (ModelForm):
<input type="submit" <input type="submit"
name="remover" name="remover"
id="remover" id="remover"
class="button primary" class="btn btn-warning"
value="Remover Foto"/> value="Remover Foto"/>
{% endif %}""", ), {% endif %}""", ),
row14, row14,

26
templates/parlamentares/parlamentares_dependentes.html
View File

@ -4,17 +4,19 @@
{% block actions %}{% endblock %} {% block actions %}{% endblock %}
{% block detail_content %} {% block detail_content %}
<strong>Parlamentar: </strong>{{ parlamentar.nome_parlamentar }} <h2><strong>Parlamentar: </strong>{{ object.nome_parlamentar }}</h2>
<fieldset> <fieldset>
<legend>Dependentes</legend> <legend>Dependentes</legend>
<table> <table class="table table-striped table-bordered">
<tr> <thead class="thead-default">
<th><strong>Nome Dependente</strong></th> <tr>
<th><strong>Tipo</strong></th> <th><strong>Nome Dependente</strong></th>
<th><strong>Data de Nascimento</strong></th> <th><strong>Tipo</strong></th>
</tr> <th><strong>Data de Nascimento</strong></th>
</tr>
</thead>
{% for d in dependentes %} {% for d in dependentes %}
<tr> <tr>
<td><a href="{% url 'parlamentares_dependentes_edit' object.id d.id %}">{{d.nome}}</a></td> <td><a href="{% url 'parlamentares_dependentes_edit' object.id d.id %}">{{d.nome}}</a></td>
@ -22,9 +24,9 @@
<td>{{d.data_nascimento|default_if_none:""}}</td> <td>{{d.data_nascimento|default_if_none:""}}</td>
</tr> </tr>
{% endfor %} {% endfor %}
</table> </table>
</fieldset> </fieldset>
{% crispy form %} {% crispy form %}
{% endblock detail_content %} {% endblock detail_content %}

2
templates/parlamentares/parlamentares_detail.html
View File

@ -3,7 +3,7 @@
{% block actions %} {% block actions %}
<div class="actions btn-group pull-right" role="group"> <div class="actions btn-group pull-right" role="group">
{% if legislatura_id != 0 %} {% if legislatura_id != 0 %}
<a href="{% url 'parlamentares_cadastro' legislatura_id %}" id="incluir-parlamentar" class="btn btn-default">{% trans 'Incluir Parlamentar' %}</a> <a href="{% url 'parlamentares_cadastro' legislatura_id %}" id="incluir-parlamentar" class="btn btn-default">{% trans 'Incluir Parlamentar' %}</a>
{% endif %} {% endif %}
</div> </div>
{% endblock actions %} {% endblock actions %}

26
templates/parlamentares/parlamentares_filiacao.html
View File

@ -4,17 +4,19 @@
{% block actions %}{% endblock %} {% block actions %}{% endblock %}
{% block detail_content %} {% block detail_content %}
<strong>Parlamentar: </strong>{{ parlamentar.nome_parlamentar }} <h2><strong>Parlamentar: </strong>{{ object.nome_parlamentar }}</h2>
<fieldset> <fieldset>
<legend>Filiações</legend> <legend>Filiações</legend>
<table> <table class="table table-striped table-bordered">
<tr> <thead class="thead-default">
<th><strong>Partido</strong></th> <tr>
<th><strong>Data Filiação</strong></th> <th><strong>Partido</strong></th>
<th><strong>Data Desfiliação</strong></th> <th><strong>Data Filiação</strong></th>
</tr> <th><strong>Data Desfiliação</strong></th>
</tr>
</thead>
{% for f in filiacoes %} {% for f in filiacoes %}
<tr> <tr>
<td><a href="{% url 'parlamentares_filiacao_edit' object.id f.id %}">{{f.partido.sigla}}</a></td> <td><a href="{% url 'parlamentares_filiacao_edit' object.id f.id %}">{{f.partido.sigla}}</a></td>
@ -22,7 +24,7 @@
<td>{{f.data_desfiliacao|default_if_none:""}}</td> <td>{{f.data_desfiliacao|default_if_none:""}}</td>
</tr> </tr>
{% endfor %} {% endfor %}
</table> </table>
</fieldset> </fieldset>
{% crispy form %} {% crispy form %}
{% endblock detail_content %} {% endblock detail_content %}

28
templates/parlamentares/parlamentares_list.html
View File

@ -2,11 +2,11 @@
{% load i18n %} {% load i18n %}
{% load crispy_forms_tags %} {% load crispy_forms_tags %}
{% block detail_content %} {% block detail_content %}
<fieldset> <fieldset class="form-group">
<legend>Selecione o Período</legend> <legend>Selecione o Período</legend>
<form method="POST"> <form method="POST">
{% csrf_token %} {% csrf_token %}
<select name="periodo" onChange="form.submit();"> <select name="periodo" class="form-control" onChange="form.submit();">
{% for l in legislaturas %} {% for l in legislaturas %}
<option value="{{l.id}}" {% if l.id == legislatura_id %} selected {% endif %}> <option value="{{l.id}}" {% if l.id == legislatura_id %} selected {% endif %}>
{{l}} {{l}}
@ -15,21 +15,23 @@
</select> </select>
</form> </form>
</fieldset> </fieldset>
<br/>
<fieldset> <fieldset class="form-group">
<legend>Parlamentares</legend> <legend>Parlamentares</legend>
<table> <table class="table table-striped table-bordered">
<tr> <thead class="thead-default">
<th>Nome do Parlamentar</th> <tr>
<th>Partido</th> <th>Nome do Parlamentar</th>
<th>Ativo?</th> <th>Partido</th>
</tr> <th>Ativo?</th>
</tr>
</thead>
{% for p in parlamentares %} {% for p in parlamentares %}
<tr> <tr>
<td><a href="{% url 'parlamentares_editar' p.id %}"> <td>
{{p.nome}} <a href="{% url 'parlamentares_editar' p.id %}"> {{p.nome}}</a>
</a></td> </td>
<td>{{p.partido}}</td> <td>{{p.partido}}</td>
<td>{{p.ativo|yesno:"Sim,Não"}}</td> <td>{{p.ativo|yesno:"Sim,Não"}}</td>
</tr> </tr>

32
templates/parlamentares/parlamentares_mandato.html
View File

@ -4,20 +4,22 @@
{% block actions %}{% endblock %} {% block actions %}{% endblock %}
{% block detail_content %} {% block detail_content %}
<strong>Parlamentar: </strong>{{ parlamentar.nome_parlamentar }} <h2><strong>Parlamentar: </strong>{{ object.nome_parlamentar }}</h2>
<fieldset> <fieldset>
<legend>Mandatos</legend> <legend>Mandatos</legend>
<table> <table class="table table-striped table-bordered">
<tr> <thead class="thead-default">
<th><strong>Legislatura</strong></th> <tr>
<th><strong>Coligação</strong></th> <th><strong>Legislatura</strong></th>
<th><strong>Fim Mandato</strong></th> <th><strong>Coligação</strong></th>
<th><strong>Exp. Diploma</strong></th> <th><strong>Fim Mandato</strong></th>
<th><strong>Nº Votos</strong></th> <th><strong>Exp. Diploma</strong></th>
<th><strong>Observação</strong></th> <th><strong>Nº Votos</strong></th>
</tr> <th><strong>Observação</strong></th>
</tr>
</thead>
{% for m in mandatos %} {% for m in mandatos %}
<tr> <tr>
<td><a href="{% url 'parlamentares_mandato_edit' object.id m.id %}">{{m.legislatura}}</a></td> <td><a href="{% url 'parlamentares_mandato_edit' object.id m.id %}">{{m.legislatura}}</a></td>
@ -28,9 +30,9 @@
<td>{{m.observacao|default_if_none:""}}</td> <td>{{m.observacao|default_if_none:""}}</td>
</tr> </tr>
{% endfor %} {% endfor %}
</table> </table>
</fieldset> </fieldset>
{% crispy form %} {% crispy form %}
{% endblock detail_content %} {% endblock detail_content %}

Write Preview
Loading…
Cancel
Save