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

migra componente alert para bootstrap 4

pull/2485/head
Leandro Roberto 7 years ago
parent
cdb93fd1aa
commit
ced52a3d0c
13 changed files with 23 additions and 23 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. 2
      sapl-frontend/src/apps/compilacao/js/old/compilacao.js
  2. 4
      sapl/crud/tests/stub_app/templates/base.html
  3. 2
      sapl/templates/compilacao/dispositivo_form_search_fragment.html
  4. 4
      sapl/templates/compilacao/messages.html
  5. 4
      sapl/templates/materia/proposicao_detail.html
  6. 2
      sapl/templates/materia/relatoria_form.html
  7. 10
      sapl/templates/parlamentares/composicaomesa_form.html
  8. 2
      sapl/templates/protocoloadm/MateriaTemplate.html
  9. 2
      sapl/templates/sessao/expediente.html
  10. 8
      sapl/templates/sessao/mesa.html
  11. 2
      sapl/templates/sessao/votacao/nominal.html
  12. 2
      sapl/templates/sessao/votacao/votacao_nominal_bloco.html
  13. 2
      sapl/templates/sessao/votacao/votacao_simbolica_bloco.html

2
sapl-frontend/src/apps/compilacao/js/old/compilacao.js
View File

@ -54,7 +54,7 @@ function DispositivoSearch (opts) {
dpts.attr('type', 'hidden')
$('<a class="text-danger">')
.insertBefore(dpts)
.append($('<span class="glyphicon glyphicon-remove" aria-hidden="true"></span>'))
.append($('<span aria-hidden="true">&times;</span>'))
.on('click', function () {
if ($(this).closest('ul').find('li').length === 2) {
$(this).closest('ul').remove()

4
sapl/crud/tests/stub_app/templates/base.html
View File

@ -12,9 +12,9 @@
{# Feedback messages #}
{% for message in messages %}
<div class="alert alert-{% if message.tags == 'error' %}danger{% else %}{{ message.tags }}{% endif %} alert-dismissible fade in" role="alert">
<div class="alert alert-{% if message.tags == 'error' %}danger{% else %}{{ message.tags }}{% endif %} alert-dismissible " role="alert">
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
<span class="glyphicon glyphicon-remove" aria-hidden="true"></span>
<span aria-hidden="true">&times;</span>
</button>
{{ message|safe }}
</div>

2
sapl/templates/compilacao/dispositivo_form_search_fragment.html
View File

@ -1,7 +1,7 @@
{% load i18n compilacao_filters %}
{% for message in messages %}
<div class="alert alert-{% if message.tags == 'error' %}danger{% else %}{{ message.tags }}{% endif %} alert-dismissible fade in" role="alert">
<div class="alert alert-{% if message.tags == 'error' %}danger{% else %}{{ message.tags }}{% endif %} alert-dismissible " role="alert">
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
<span class="glyphicon glyphicon-remove" aria-hidden="true"></span>
</button>

4
sapl/templates/compilacao/messages.html
View File

@ -1,9 +1,9 @@
{% load i18n compilacao_filters %}
{% for message in messages %}
<div class="alert alert-{% if message.tags == 'error' %}danger{% else %}{{ message.tags }}{% endif %} alert-dismissible fade in" role="alert">
<div class="alert alert-{% if message.tags == 'error' %}danger{% else %}{{ message.tags }}{% endif %} alert-dismissible " role="alert">
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
<span class="glyphicon glyphicon-remove" aria-hidden="true"></span>
<span aria-hidden="true">&times;</span>
</button>
{{ message|safe }}
</div>

4
sapl/templates/materia/proposicao_detail.html
View File

@ -62,7 +62,7 @@
{% if object.data_devolucao %}
<div class="col-sm-9">
<div class="alert alert-danger alert-dismissible fade in" role="alert">
<div class="alert alert-danger alert-dismissible " role="alert">
<strong>{% trans "Proposição devolvida em:" %} {{ object.data_devolucao}}</strong>
<div >{% trans "Justificativa:" %} {{object.justificativa_devolucao}}</div>
</div>
@ -92,7 +92,7 @@
</div>
{% elif object.data_envio %}
<div class="col-sm-6">
<div class="alert alert-info alert-dismissible fade in" role="alert">
<div class="alert alert-info alert-dismissible " role="alert">
<div >{% trans "Proposição aguardando recebimento" %}</div>
</div>
</div>

2
sapl/templates/materia/relatoria_form.html
View File

@ -5,7 +5,7 @@
{% block base_content %}
{% if form.comissao.value == 0 %}
<div class="alert alert-danger alert-dismissible fade in" role="alert">
<div class="alert alert-danger alert-dismissible " role="alert">
A localização atual deve ser uma comissão e a Unidade de Destino da última tramitação não pode ser vazia.
</div>
{% else %}

10
sapl/templates/parlamentares/composicaomesa_form.html
View File

@ -4,22 +4,22 @@
{% block detail_content %}
{% if sessoes|length == 0 %}
<div class="alert alert-danger alert-dismissible fade in" role="alert">
<div class="alert alert-danger alert-dismissible" role="alert">
<b>{{legislatura_selecionada}}</b> não possui nenhuma Sessão Legislativa cadastrada.<br />
Clique <a href="{% url 'sapl.parlamentares:sessaolegislativa_create' %}">aqui</a> para cadastrar uma nova.
</div>
{% else %}
<div class="alert alert-danger alert-dismissible fade in" id="div-error" role="alert" style="display: none">
<div class="alert alert-danger alert-dismissible" id="div-error" role="alert" style="display: none">
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
<span class="glyphicon glyphicon-remove" aria-hidden="true"></span>
<span aria-hidden="true">&times;</span>
</button>
<b><span id="error-message"></span></b>
</div>
<div class="alert alert-success alert-dismissible fade in" id="div-success" style="display: none" role="alert">
<div class="alert alert-success alert-dismissible" id="div-success" style="display: none" role="alert">
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
<span class="glyphicon glyphicon-remove" aria-hidden="true"></span>
<span aria-hidden="true">&times;</span>
</button>
<b><span id="success-message"></span></b>
</div>

2
sapl/templates/protocoloadm/MateriaTemplate.html
View File

@ -2,7 +2,7 @@
{% load i18n common_tags%}
{% block base_content %}
<div class="alert alert-success alert-dismissible fade in" role="alert">
<div class="alert alert-success alert-dismissible " role="alert">
<p align="center"><b><font color="green">Matéria protocolada com sucesso!</font></b></p>
</div>

2
sapl/templates/sessao/expediente.html
View File

@ -9,7 +9,7 @@
{% if perms|get_add_perm:view %}
{% if expedientes|length == 0 %}
<div class="alert alert-danger alert-dismissible fade in" role="alert">
<div class="alert alert-danger alert-dismissible " role="alert">
Não há nenhum expediente cadastrado. <br />
Cique <a href="{% url 'sapl.sessao:tipoexpediente_create'%}">aqui</a> para cadastrar um novo.
</div>

8
sapl/templates/sessao/mesa.html
View File

@ -53,17 +53,17 @@
</fieldset>
{% endif %}
<div class="alert alert-danger alert-dismissible fade in" id="div-error" role="alert" style="display: none">
<div class="alert alert-danger alert-dismissible" id="div-error" role="alert" style="display: none">
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
<span class="glyphicon glyphicon-remove" aria-hidden="true"></span>
<span aria-hidden="true">&times;</span>
</button>
<b><span id="error-message"></span></b>
</div>
<!-- Success and errors messages div end -->
<div class="alert alert-success alert-dismissible fade in" id="div-success" style="display: none" role="alert">
<div class="alert alert-success alert-dismissible " id="div-success" style="display: none" role="alert">
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
<span class="glyphicon glyphicon-remove" aria-hidden="true"></span>
<span aria-hidden="true">&times;</span>
</button>
<b><span id="success-message"></span></b>
</div>

2
sapl/templates/sessao/votacao/nominal.html
View File

@ -14,7 +14,7 @@
</div>
<br />
{% if total == 0 %}
<div class="alert alert-info alert-dismissible fade in" role="alert">
<div class="alert alert-info alert-dismissible " role="alert">
<div>Não existe nenhum parlamentar presente para que a votação ocorra.</div>
</div>
<a href="{% url 'sapl.sessao:sessaoplenaria_detail' object.pk %}" class="btn btn-warning">Voltar</a>

2
sapl/templates/sessao/votacao/votacao_nominal_bloco.html
View File

@ -29,7 +29,7 @@
{% endfor %}
{% endif %}
{% if total_presentes == 0 %}
<div class="alert alert-info alert-dismissible fade in" role="alert">
<div class="alert alert-info alert-dismissible " role="alert">
<div>Não existe nenhum parlamentar presente para que a votação ocorra.</div>
</div>
<a href="{% url 'sapl.sessao:sessaoplenaria_detail' pk %}" class="btn btn-warning">Voltar</a>

2
sapl/templates/sessao/votacao/votacao_simbolica_bloco.html
View File

@ -31,7 +31,7 @@
</div>
<br />
{% if total_presentes == 0 %}
<div class="alert alert-info alert-dismissible fade in" role="alert">
<div class="alert alert-info alert-dismissible " role="alert">
<div>Não existe nenhum parlamentar presente para que a votação ocorra.</div>
</div>
<a href="{% url 'sapl.sessao:sessaoplenaria_detail' pk %}" class="btn btn-warning">Voltar</a>

Write Preview
Loading…
Cancel
Save