Browse Source

Ids em templates deixam de ser formatados segundo locale

producao
Marcio Mazza 10 years ago
parent
commit
52fd34e82f
  1. 20
      sigi/apps/casas/templates/casas/carrinho.html
  2. 28
      sigi/apps/convenios/templates/convenios/carrinho.html
  3. 4
      sigi/apps/diagnosticos/templates/diagnosticos/graficos.html
  4. 12
      sigi/apps/parlamentares/templates/parlamentares/carrinho.html
  5. 2
      sigi/apps/servicos/templates/admin/servicos/casaatendida/change_form.html

20
sigi/apps/casas/templates/casas/carrinho.html

@ -1,10 +1,10 @@
{% extends "admin/carrinho.html" %}
{% load admin_list i18n %}
{% block extrastyle %}
{{ block.super }}
{{ block.super }}
{% include "admin/tabs_style.html" %}
{% endblock %}
{% block title %}Casas legislativas no Carrinho | SIGI{% endblock %}
@ -41,7 +41,7 @@
<tr class="{% cycle 'row1' 'row2' %}">
{%if not carIsEmpty%}
<th><input type="checkbox" name="_selected_action"
value="{{casa.id}}" class="action-select" /></th>
value="{{casa.id|safe}}" class="action-select" /></th>
{% endif %}
<td style="text-align: left;">{{casa.nome}}</td>
<td>{{casa.municipio}}</td>
@ -61,7 +61,7 @@
<li><a href="#tabs-3">Arquivo CSV (Excel, Calc)</a></li>
<li><a href="#tabs-4">Etiqueta Parlamentares</a></li>
</ul>
<div id="tabs-1">
<form action="../labels/{{query_str}}" method="post">{% csrf_token %}
<fieldset><legend>Tipo de etiqueta</legend>
@ -86,7 +86,7 @@
<li><input type="submit" value="Gerar Etiqueta" /></li>
</ul>
</form>
</div>
<div id="tabs-2">
<form action="../reports/{{query_str}}" method="post">{% csrf_token %}
@ -96,7 +96,7 @@
checked="checked"><label>Simples</label></li>
<li><input type="radio" name="tipo_relatorio" value="completo"><label>Completo</label></li>
</ul>
</fieldset>
</fieldset>
<ul class="botoes">
<li><input type="submit" value="Gerar Relatório" /></li>
</ul>
@ -104,7 +104,7 @@
</div>
<div id="tabs-3">
<form action="../csv/{{query_str}}" method="post">{% csrf_token %}
<fieldset><legend>Escolha os atributos para exportar</legend>
<fieldset><legend>Escolha os atributos para exportar</legend>
<ul id="sortable" class="tabs-conteudo">
<li>
<span class="ui-icon ui-icon-arrowthick-2-n-s"></span>
@ -211,7 +211,7 @@
<ul class="botoes">
<li><input type="submit" value="Exportar CSV" /></li>
</ul>
</form>
</form>
</div>
<div id="tabs-4">
<form action="../labels_parlamentar/{{query_str}}" method="post">{% csrf_token %}
@ -227,7 +227,7 @@
<li><input type="submit" value="Gerar Etiqueta" /></li>
</ul>
</form>
</div>
</div>

28
sigi/apps/convenios/templates/convenios/carrinho.html

@ -1,14 +1,14 @@
{% extends "admin/carrinho.html" %}
{% load admin_list i18n %}
{% block extrastyle %}
{{ block.super }}
{{ block.super }}
{% include "admin/tabs_style.html" %}
{% endblock %}
{% block title %}Convênios no Carrinho | SIGI{% endblock %}
{% block content_title %}<h1>Convênios no Carrinho</h1>{% endblock %}
{% block mensagem%}
{% block mensagem%}
<ul class="messagelist">
{%if carIsEmpty%}
<li class="warning">O carrinho está vazio, sendo assim todos os convênios entram na lista para exportação de acordo com os filtros aplicados.</li>
@ -41,7 +41,7 @@
<tr class="{% cycle 'row1' 'row2' %}">
{%if not carIsEmpty%}
<th><input type="checkbox" name="_selected_action"
value="{{convenio.id}}" class="action-select" /></th>
value="{{convenio.id|safe}}" class="action-select" /></th>
{% endif %}
<td style="text-align: left;">{{convenio.num_convenio}}</td>
<td>{{convenio.casa_legislativa}}</td>
@ -57,25 +57,25 @@
{% block botoes %}
<div id="tabs">
<ul>
<ul>
<li><a href="#tabs-1">Relatório</a></li>
<li><a href="#tabs-2">Arquivo CSV (Excel, Calc)</a></li>
</ul>
<div id="tabs-1">
<div id="tabs-1">
<form action="../reports/{{ query_str }}" method="post">
<fieldset>
<legend>Relatório por</legend>
<ul class="tabs-conteudo">
<ul class="tabs-conteudo">
<li>
<input type="radio" name="filtro_casa" value="cm" checked="checked"/>
<label>Câmara Municipal</label>
</li>
<li>
<input type="radio" name="filtro_casa" value="al" />
<input type="radio" name="filtro_casa" value="al" />
<label>Assembléia Legislativa</label>
</li>
</ul>
</li>
</ul>
</fieldset>
<fieldset>
<legend>Com data de aceite? (Equipada)</legend>
@ -87,13 +87,13 @@
<li>
<input type="radio" name="data_aceite" value="nao" />
<label>Não</label>
</li>
</ul>
</li>
</ul>
</fieldset>
<ul class="botoes">
<li><input type="submit" value="Gerar Relatório"></li>
</ul>
</form>
</form>
</div>
<div id="tabs-2">
<form action="../csv/{{query_str}}" method="post">
@ -155,4 +155,4 @@
</form>
</div>
</div>
{% endblock %}
{% endblock %}

4
sigi/apps/diagnosticos/templates/diagnosticos/graficos.html

@ -52,7 +52,7 @@
{% csrf_token %}
<select name="categoria">
{% for categoria in categorias %}
<option value="{{ categoria.id }}" {% if categoria.id == sel_categoria %}selected="selected"{% endif %}>{{ categoria.nome }}</option>
<option value="{{ categoria.id|safe }}" {% if categoria.id == sel_categoria %}selected="selected"{% endif %}>{{ categoria.nome }}</option>
{% endfor %}
</select>
</form>
@ -73,4 +73,4 @@
</ul>
</div>
</div>
{% endblock %}
{% endblock %}

12
sigi/apps/parlamentares/templates/parlamentares/carrinho.html

@ -1,10 +1,10 @@
{% extends "admin/carrinho.html" %}
{% load admin_list i18n %}
{% block extrastyle %}
{{ block.super }}
{{ block.super }}
{% include "admin/tabs_style.html" %}
{% endblock %}
{% block title %}Parlamentares no Carrinho | SIGI{% endblock %}
@ -40,7 +40,7 @@
<tr class="{% cycle 'row1' 'row2' %}">
{%if not carIsEmpty%}
<th><input type="checkbox" name="_selected_action"
value="{{parlamentar.id}}" class="action-select" /></th>
value="{{parlamentar.id|safe}}" class="action-select" /></th>
{% endif %}
<td style="text-align: left;">{{parlamentar.nome_completo}}</td>
<td>{{parlamentar.nome_parlamentar}}</td>
@ -56,7 +56,7 @@
<ul>
<li><a href="#tabs-1">Etiqueta</a></li>
</ul>
<div id="tabs-1">
<form action="../labels/{{query_str}}" method="post">{% csrf_token %}
<fieldset><legend>Formato da Etiqueta</legend>
@ -72,7 +72,7 @@
<li><input type="submit" value="Gerar Etiqueta" /></li>
</ul>
</form>
</div>
{% endblock %}

2
sigi/apps/servicos/templates/admin/servicos/casaatendida/change_form.html

@ -32,7 +32,7 @@
<tr> <td colspan="6">Nenhum serviço cadastrado para esta Casa Legislativa</td> </tr>
{% endfor %}
<tr class="add-row">
<td colspan="6"><a href="{% url 'admin:servicos_servico_add' %}?id_casa={{ original.id | safe }}">Adicionar outro Servico</a></td>
<td colspan="6"><a href="{% url 'admin:servicos_servico_add' %}?id_casa={{ original.id|safe }}">Adicionar outro Servico</a></td>
</tr>
</tbody>
</table>

Loading…
Cancel
Save