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

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

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

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

@ -52,7 +52,7 @@
{% csrf_token %} {% csrf_token %}
<select name="categoria"> <select name="categoria">
{% for categoria in categorias %} {% 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 %} {% endfor %}
</select> </select>
</form> </form>
@ -73,4 +73,4 @@
</ul> </ul>
</div> </div>
</div> </div>
{% endblock %} {% endblock %}

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

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

Loading…
Cancel
Save