- {% if perms.compilacao.change_dispositivo %}- Ed
{% endif %}
+ {% if perms.compilacao.change_dispositivo %}- Ed
{% endif %}
{% if perms.compilacao.add_nota %}- N
{% endif %}
{% if perms.compilacao.add_vide %}- V
{% endif %}
@@ -74,9 +74,9 @@
Vide:
@@ -102,9 +102,9 @@
Citado em:
diff --git a/templates/compilacao/text_list_blocoalteracao.html b/sapl/templates/compilacao/text_list_blocoalteracao.html
similarity index 67%
rename from templates/compilacao/text_list_blocoalteracao.html
rename to sapl/templates/compilacao/text_list_blocoalteracao.html
index 402859487..fcce49e3c 100644
--- a/templates/compilacao/text_list_blocoalteracao.html
+++ b/sapl/templates/compilacao/text_list_blocoalteracao.html
@@ -5,7 +5,7 @@
{% if ch.visibilidade %}
- {{ ch.tipo_dispositivo.rotulo_prefixo_html|safe }}
{{ ch.rotulo }}{{ ch.tipo_dispositivo.rotulo_sufixo_html|safe }}{{ ch.tipo_dispositivo.texto_prefixo_html|safe }}{{ ch.texto|safe }}
+ {{ ch.tipo_dispositivo.rotulo_prefixo_html|safe }}
{{ ch.rotulo }}{{ ch.tipo_dispositivo.rotulo_sufixo_html|safe }}{{ ch.tipo_dispositivo.texto_prefixo_html|safe }}{{ ch.texto|safe }}
{%endif%}
diff --git a/templates/compilacao/text_notificacoes.html b/sapl/templates/compilacao/text_notificacoes.html
similarity index 88%
rename from templates/compilacao/text_notificacoes.html
rename to sapl/templates/compilacao/text_notificacoes.html
index c46aa757e..cb45e47ba 100644
--- a/templates/compilacao/text_notificacoes.html
+++ b/sapl/templates/compilacao/text_notificacoes.html
@@ -24,7 +24,7 @@
{{ dpt.tipo_dispositivo.rotulo_prefixo_html|safe }}
-
{% if dpt.rotulo or dpt.nivel = 1 %}{{ dpt.rotulo }}{%else%}[{{ dpt|nomenclatura}}{% if dpt.dispositivo_pai_id %} {% trans "de" %} {{ dpt.dispositivo_pai.rotulo }}{% endif %}] - {% endif %}
+
{% if dpt.rotulo or dpt.nivel = 1 %}{{ dpt.rotulo }}{%else%}[{{ dpt|nomenclatura}}{% if dpt.dispositivo_pai_id %} {% trans "de" %} {{ dpt.dispositivo_pai.rotulo }}{% endif %}] - {% endif %}
{{ dpt.tipo_dispositivo.rotulo_sufixo_html|safe }}
Início
{%else%}
- {% trans 'Início' %}
+ {% trans 'Início' %}
{%endif%}
- {% model_verbose_name_plural 'compilacao.models.Publicacao' %}
- {% trans 'Notificações' %}
- {% trans 'Texto' %}
+ {% model_verbose_name_plural 'sapl.compilacao.models.Publicacao' %}
+ {% trans 'Notificações' %}
+ {% trans 'Texto' %}
{%endif %}
{% endblock %}
@@ -25,8 +25,8 @@
{% block actions %}
{% endblock actions %}
diff --git a/templates/compilacao/textoarticulado_list.html b/sapl/templates/compilacao/textoarticulado_list.html
similarity index 56%
rename from templates/compilacao/textoarticulado_list.html
rename to sapl/templates/compilacao/textoarticulado_list.html
index 7381af217..c6e1642f1 100644
--- a/templates/compilacao/textoarticulado_list.html
+++ b/sapl/templates/compilacao/textoarticulado_list.html
@@ -10,7 +10,7 @@
{% block actions %}
@@ -19,17 +19,17 @@
- {% fieldclass_verbose_name 'compilacao.models.TextoArticulado' 'tipo_ta' %} |
- {% fieldclass_verbose_name 'compilacao.models.TextoArticulado' 'numero' %} |
- {% fieldclass_verbose_name 'compilacao.models.TextoArticulado' 'ano' %} |
- {% fieldclass_verbose_name 'compilacao.models.TextoArticulado' 'data' %} |
- {% fieldclass_verbose_name 'compilacao.models.TextoArticulado' 'ementa' %} |
+ {% fieldclass_verbose_name 'sapl.compilacao.models.TextoArticulado' 'tipo_ta' %} |
+ {% fieldclass_verbose_name 'sapl.compilacao.models.TextoArticulado' 'numero' %} |
+ {% fieldclass_verbose_name 'sapl.compilacao.models.TextoArticulado' 'ano' %} |
+ {% fieldclass_verbose_name 'sapl.compilacao.models.TextoArticulado' 'data' %} |
+ {% fieldclass_verbose_name 'sapl.compilacao.models.TextoArticulado' 'ementa' %} |
{% for ta in object_list %}
- {{ ta.tipo_ta }} |
+ {{ ta.tipo_ta }} |
{{ ta.numero }} |
{{ ta.ano }} |
{{ ta.data }} |
diff --git a/sapl/templates/compilacao/textoarticulado_menu_config.html b/sapl/templates/compilacao/textoarticulado_menu_config.html
new file mode 100644
index 000000000..f7e336b11
--- /dev/null
+++ b/sapl/templates/compilacao/textoarticulado_menu_config.html
@@ -0,0 +1,16 @@
+{% load i18n %}
+{% load common_tags %}
+
+
+
+
diff --git a/templates/compilacao/tipotextoarticulado_detail.html b/sapl/templates/compilacao/tipotextoarticulado_detail.html
similarity index 86%
rename from templates/compilacao/tipotextoarticulado_detail.html
rename to sapl/templates/compilacao/tipotextoarticulado_detail.html
index 62089a736..177c2e06a 100644
--- a/templates/compilacao/tipotextoarticulado_detail.html
+++ b/sapl/templates/compilacao/tipotextoarticulado_detail.html
@@ -9,8 +9,8 @@
{% block actions %}
{% endblock actions %}
diff --git a/templates/compilacao/tipotextoarticulado_list.html b/sapl/templates/compilacao/tipotextoarticulado_list.html
similarity index 60%
rename from templates/compilacao/tipotextoarticulado_list.html
rename to sapl/templates/compilacao/tipotextoarticulado_list.html
index 189cea406..28e4d7886 100644
--- a/templates/compilacao/tipotextoarticulado_list.html
+++ b/sapl/templates/compilacao/tipotextoarticulado_list.html
@@ -7,7 +7,7 @@
{% block actions %}
{% endblock actions %}
@@ -18,15 +18,15 @@
- {% fieldclass_verbose_name 'compilacao.models.TipoTextoArticulado' 'sigla' %} |
- {% fieldclass_verbose_name 'compilacao.models.TipoTextoArticulado' 'descricao' %} |
- {% fieldclass_verbose_name 'compilacao.models.TipoTextoArticulado' 'content_type' %} |
+ {% fieldclass_verbose_name 'sapl.compilacao.models.TipoTextoArticulado' 'sigla' %} |
+ {% fieldclass_verbose_name 'sapl.compilacao.models.TipoTextoArticulado' 'descricao' %} |
+ {% fieldclass_verbose_name 'sapl.compilacao.models.TipoTextoArticulado' 'content_type' %} |
{% for tipo_ta in object_list %}
- {{ tipo_ta.sigla }} |
+ {{ tipo_ta.sigla }} |
{{ tipo_ta.descricao }} |
{{ tipo_ta.content_type }} |
diff --git a/templates/crud/confirm_delete.html b/sapl/templates/crud/confirm_delete.html
similarity index 100%
rename from templates/crud/confirm_delete.html
rename to sapl/templates/crud/confirm_delete.html
diff --git a/templates/crud/detail.html b/sapl/templates/crud/detail.html
similarity index 100%
rename from templates/crud/detail.html
rename to sapl/templates/crud/detail.html
diff --git a/templates/crud/form.html b/sapl/templates/crud/form.html
similarity index 100%
rename from templates/crud/form.html
rename to sapl/templates/crud/form.html
diff --git a/templates/crud/list.html b/sapl/templates/crud/list.html
similarity index 100%
rename from templates/crud/list.html
rename to sapl/templates/crud/list.html
diff --git a/templates/email/acompanhar.html b/sapl/templates/email/acompanhar.html
similarity index 100%
rename from templates/email/acompanhar.html
rename to sapl/templates/email/acompanhar.html
diff --git a/templates/email/acompanhar.txt b/sapl/templates/email/acompanhar.txt
similarity index 100%
rename from templates/email/acompanhar.txt
rename to sapl/templates/email/acompanhar.txt
diff --git a/templates/email/test_tramitacao.html b/sapl/templates/email/test_tramitacao.html
similarity index 100%
rename from templates/email/test_tramitacao.html
rename to sapl/templates/email/test_tramitacao.html
diff --git a/templates/email/tramitacao.html b/sapl/templates/email/tramitacao.html
similarity index 100%
rename from templates/email/tramitacao.html
rename to sapl/templates/email/tramitacao.html
diff --git a/templates/email/tramitacao.txt b/sapl/templates/email/tramitacao.txt
similarity index 100%
rename from templates/email/tramitacao.txt
rename to sapl/templates/email/tramitacao.txt
diff --git a/templates/floppyforms/image_thumbnail.html b/sapl/templates/floppyforms/image_thumbnail.html
similarity index 100%
rename from templates/floppyforms/image_thumbnail.html
rename to sapl/templates/floppyforms/image_thumbnail.html
diff --git a/templates/index.html b/sapl/templates/index.html
similarity index 100%
rename from templates/index.html
rename to sapl/templates/index.html
diff --git a/templates/materia/acompanhamento_materia.html b/sapl/templates/materia/acompanhamento_materia.html
similarity index 100%
rename from templates/materia/acompanhamento_materia.html
rename to sapl/templates/materia/acompanhamento_materia.html
diff --git a/templates/materia/documentoacessorio_form.html b/sapl/templates/materia/documentoacessorio_form.html
similarity index 100%
rename from templates/materia/documentoacessorio_form.html
rename to sapl/templates/materia/documentoacessorio_form.html
diff --git a/templates/materia/formulario_cadastro.html b/sapl/templates/materia/formulario_cadastro.html
similarity index 100%
rename from templates/materia/formulario_cadastro.html
rename to sapl/templates/materia/formulario_cadastro.html
diff --git a/templates/materia/formulario_simplificado.html b/sapl/templates/materia/formulario_simplificado.html
similarity index 100%
rename from templates/materia/formulario_simplificado.html
rename to sapl/templates/materia/formulario_simplificado.html
diff --git a/templates/materia/materialegislativa_filter.html b/sapl/templates/materia/materialegislativa_filter.html
similarity index 87%
rename from templates/materia/materialegislativa_filter.html
rename to sapl/templates/materia/materialegislativa_filter.html
index afaa8cfa9..86673d7cf 100644
--- a/templates/materia/materialegislativa_filter.html
+++ b/sapl/templates/materia/materialegislativa_filter.html
@@ -11,7 +11,7 @@
{% if filter_url %}
{% endif %}
@@ -35,7 +35,7 @@
- {{m.tipo.sigla}} {{m.numero}}/{{m.ano}} - {{m.tipo}}
+ {{m.tipo.sigla}} {{m.numero}}/{{m.ano}} - {{m.tipo}}
Autores:
{% for a in m.autoria_set.all %}
{% if not forloop.first %}
diff --git a/templates/materia/materialegislativa_list.html b/sapl/templates/materia/materialegislativa_list.html
similarity index 71%
rename from templates/materia/materialegislativa_list.html
rename to sapl/templates/materia/materialegislativa_list.html
index fcc271872..16c6cdf8d 100644
--- a/templates/materia/materialegislativa_list.html
+++ b/sapl/templates/materia/materialegislativa_list.html
@@ -1,7 +1,7 @@
{% extends "crud/list.html" %}
{% load i18n %}
{% block more_buttons %}
-
+
{% blocktrans with verbose_name=view.verbose_name %} Pesquisar {{ verbose_name }} {% endblocktrans %}
{% endblock %}
diff --git a/templates/materia/proposicao_detail.html b/sapl/templates/materia/proposicao_detail.html
similarity index 100%
rename from templates/materia/proposicao_detail.html
rename to sapl/templates/materia/proposicao_detail.html
diff --git a/templates/materia/proposicao_form.html b/sapl/templates/materia/proposicao_form.html
similarity index 100%
rename from templates/materia/proposicao_form.html
rename to sapl/templates/materia/proposicao_form.html
diff --git a/templates/materia/resumo_detail_materia.html b/sapl/templates/materia/resumo_detail_materia.html
similarity index 100%
rename from templates/materia/resumo_detail_materia.html
rename to sapl/templates/materia/resumo_detail_materia.html
diff --git a/templates/materia/subnav.yaml b/sapl/templates/materia/subnav.yaml
similarity index 100%
rename from templates/materia/subnav.yaml
rename to sapl/templates/materia/subnav.yaml
diff --git a/templates/menus/subnav.html b/sapl/templates/menus/subnav.html
similarity index 100%
rename from templates/menus/subnav.html
rename to sapl/templates/menus/subnav.html
diff --git a/templates/mesa_diretora/mesa_diretora.html b/sapl/templates/mesa_diretora/mesa_diretora.html
similarity index 100%
rename from templates/mesa_diretora/mesa_diretora.html
rename to sapl/templates/mesa_diretora/mesa_diretora.html
diff --git a/templates/norma/list_pesquisa.html b/sapl/templates/norma/list_pesquisa.html
similarity index 80%
rename from templates/norma/list_pesquisa.html
rename to sapl/templates/norma/list_pesquisa.html
index 517fd3969..a648121e8 100644
--- a/templates/norma/list_pesquisa.html
+++ b/sapl/templates/norma/list_pesquisa.html
@@ -4,7 +4,7 @@
{% block actions %}{% endblock %}
{% block detail_content %}
{% if object_list %}
@@ -20,7 +20,7 @@
{% for obj in object_list %}
|
- {{obj.tipo}} |
+ {{obj.tipo}} |
{{obj.numero}} |
{{obj.ano}} |
{{obj.data}} |
diff --git a/templates/norma/pesquisa.html b/sapl/templates/norma/pesquisa.html
similarity index 71%
rename from templates/norma/pesquisa.html
rename to sapl/templates/norma/pesquisa.html
index 82edd4116..d14c04c3f 100644
--- a/templates/norma/pesquisa.html
+++ b/sapl/templates/norma/pesquisa.html
@@ -6,7 +6,7 @@
{% block base_content %}
{% block actions %}
{% endblock %}
diff --git a/templates/norma/subnav.yaml b/sapl/templates/norma/subnav.yaml
similarity index 100%
rename from templates/norma/subnav.yaml
rename to sapl/templates/norma/subnav.yaml
diff --git a/templates/paginacao.html b/sapl/templates/paginacao.html
similarity index 100%
rename from templates/paginacao.html
rename to sapl/templates/paginacao.html
diff --git a/templates/painel/controlador.html b/sapl/templates/painel/controlador.html
similarity index 100%
rename from templates/painel/controlador.html
rename to sapl/templates/painel/controlador.html
diff --git a/templates/painel/index.html b/sapl/templates/painel/index.html
similarity index 98%
rename from templates/painel/index.html
rename to sapl/templates/painel/index.html
index e4c7e5301..941bc480a 100644
--- a/templates/painel/index.html
+++ b/sapl/templates/painel/index.html
@@ -168,7 +168,7 @@
-
+
diff --git a/templates/painel/mensagem.html b/sapl/templates/painel/mensagem.html
similarity index 97%
rename from templates/painel/mensagem.html
rename to sapl/templates/painel/mensagem.html
index 65071a796..011ea967c 100644
--- a/templates/painel/mensagem.html
+++ b/sapl/templates/painel/mensagem.html
@@ -94,7 +94,7 @@
{{ context.title }}
-
+
Ajax refresh counter:
diff --git a/templates/painel/parlamentares.html b/sapl/templates/painel/parlamentares.html
similarity index 97%
rename from templates/painel/parlamentares.html
rename to sapl/templates/painel/parlamentares.html
index b31e9b1f4..ab48a4ef6 100644
--- a/templates/painel/parlamentares.html
+++ b/sapl/templates/painel/parlamentares.html
@@ -95,7 +95,7 @@
{{ context.title }}
-
+
diff --git a/templates/painel/votacao.html b/sapl/templates/painel/votacao.html
similarity index 97%
rename from templates/painel/votacao.html
rename to sapl/templates/painel/votacao.html
index ea77c1727..66cdaf2f2 100644
--- a/templates/painel/votacao.html
+++ b/sapl/templates/painel/votacao.html
@@ -94,7 +94,7 @@
{{ context.title }}
-
+
diff --git a/templates/parlamentares/coligacao_detail.html b/sapl/templates/parlamentares/coligacao_detail.html
similarity index 65%
rename from templates/parlamentares/coligacao_detail.html
rename to sapl/templates/parlamentares/coligacao_detail.html
index 9b9be3a54..02345a4e9 100644
--- a/templates/parlamentares/coligacao_detail.html
+++ b/sapl/templates/parlamentares/coligacao_detail.html
@@ -3,7 +3,7 @@
{% block actions %}
diff --git a/templates/parlamentares/parlamentares_list.html b/sapl/templates/parlamentares/parlamentares_list.html
similarity index 100%
rename from templates/parlamentares/parlamentares_list.html
rename to sapl/templates/parlamentares/parlamentares_list.html
diff --git a/templates/parlamentares/subnav.yaml b/sapl/templates/parlamentares/subnav.yaml
similarity index 100%
rename from templates/parlamentares/subnav.yaml
rename to sapl/templates/parlamentares/subnav.yaml
diff --git a/templates/protocoloadm/anular_protocoloadm.html b/sapl/templates/protocoloadm/anular_protocoloadm.html
similarity index 100%
rename from templates/protocoloadm/anular_protocoloadm.html
rename to sapl/templates/protocoloadm/anular_protocoloadm.html
diff --git a/templates/protocoloadm/comprovante.html b/sapl/templates/protocoloadm/comprovante.html
similarity index 100%
rename from templates/protocoloadm/comprovante.html
rename to sapl/templates/protocoloadm/comprovante.html
diff --git a/templates/protocoloadm/criar_documento.html b/sapl/templates/protocoloadm/criar_documento.html
similarity index 100%
rename from templates/protocoloadm/criar_documento.html
rename to sapl/templates/protocoloadm/criar_documento.html
diff --git a/templates/protocoloadm/detail_doc_adm.html b/sapl/templates/protocoloadm/detail_doc_adm.html
similarity index 100%
rename from templates/protocoloadm/detail_doc_adm.html
rename to sapl/templates/protocoloadm/detail_doc_adm.html
diff --git a/sapl/templates/protocoloadm/detail_doc_detail.html b/sapl/templates/protocoloadm/detail_doc_detail.html
new file mode 100644
index 000000000..afaf7a773
--- /dev/null
+++ b/sapl/templates/protocoloadm/detail_doc_detail.html
@@ -0,0 +1,10 @@
+{% extends "crud/detail.html" %}
+{% load i18n %}
+{% block actions %} {% endblock %}
+{% block sections_nav %}
+
+{% endblock sections_nav %}
diff --git a/templates/protocoloadm/documento_acessorio_administrativo.html b/sapl/templates/protocoloadm/documento_acessorio_administrativo.html
similarity index 90%
rename from templates/protocoloadm/documento_acessorio_administrativo.html
rename to sapl/templates/protocoloadm/documento_acessorio_administrativo.html
index 8e02768e1..044db33d2 100644
--- a/templates/protocoloadm/documento_acessorio_administrativo.html
+++ b/sapl/templates/protocoloadm/documento_acessorio_administrativo.html
@@ -26,7 +26,7 @@
{% for d in doc_ace %}
{{d.arquivo}} |
- {{d.nome}} |
+ {{d.nome}} |
{{d.tipo.descricao}} |
{{d.data|date:"d/m/Y"}} |
{{d.autor}} |
diff --git a/templates/protocoloadm/documento_acessorio_administrativo_edit.html b/sapl/templates/protocoloadm/documento_acessorio_administrativo_edit.html
similarity index 100%
rename from templates/protocoloadm/documento_acessorio_administrativo_edit.html
rename to sapl/templates/protocoloadm/documento_acessorio_administrativo_edit.html
diff --git a/templates/protocoloadm/documentoadministrativo_filter.html b/sapl/templates/protocoloadm/documentoadministrativo_filter.html
similarity index 87%
rename from templates/protocoloadm/documentoadministrativo_filter.html
rename to sapl/templates/protocoloadm/documentoadministrativo_filter.html
index 21435b7a8..cb83992ba 100644
--- a/templates/protocoloadm/documentoadministrativo_filter.html
+++ b/sapl/templates/protocoloadm/documentoadministrativo_filter.html
@@ -28,7 +28,7 @@
- {{d.tipo.sigla}} {{d.numero}}/{{d.ano}} - {{d.tipo}}
+ {{d.tipo.sigla}} {{d.numero}}/{{d.ano}} - {{d.tipo}}
Interessado: {{ d.interessado|default_if_none:"Não Informado"}}
Assunto: {{ d.assunto|safe }}
diff --git a/templates/protocoloadm/pesquisa_documento_detail.html b/sapl/templates/protocoloadm/pesquisa_documento_detail.html
similarity index 100%
rename from templates/protocoloadm/pesquisa_documento_detail.html
rename to sapl/templates/protocoloadm/pesquisa_documento_detail.html
diff --git a/templates/protocoloadm/proposicao_receber.html b/sapl/templates/protocoloadm/proposicao_receber.html
similarity index 100%
rename from templates/protocoloadm/proposicao_receber.html
rename to sapl/templates/protocoloadm/proposicao_receber.html
diff --git a/templates/protocoloadm/proposicao_view.html b/sapl/templates/protocoloadm/proposicao_view.html
similarity index 100%
rename from templates/protocoloadm/proposicao_view.html
rename to sapl/templates/protocoloadm/proposicao_view.html
diff --git a/templates/protocoloadm/proposicoes.html b/sapl/templates/protocoloadm/proposicoes.html
similarity index 100%
rename from templates/protocoloadm/proposicoes.html
rename to sapl/templates/protocoloadm/proposicoes.html
diff --git a/sapl/templates/protocoloadm/proposicoes_detail.html b/sapl/templates/protocoloadm/proposicoes_detail.html
new file mode 100644
index 000000000..068cd0417
--- /dev/null
+++ b/sapl/templates/protocoloadm/proposicoes_detail.html
@@ -0,0 +1,11 @@
+{% extends "crud/detail.html" %}
+{% load i18n %}
+
+{% block sections_nav %}
+
+{% endblock sections_nav %}
diff --git a/templates/protocoloadm/proposicoes_incorporadas.html b/sapl/templates/protocoloadm/proposicoes_incorporadas.html
similarity index 83%
rename from templates/protocoloadm/proposicoes_incorporadas.html
rename to sapl/templates/protocoloadm/proposicoes_incorporadas.html
index 4b60f1842..0a6abef4c 100644
--- a/templates/protocoloadm/proposicoes_incorporadas.html
+++ b/sapl/templates/protocoloadm/proposicoes_incorporadas.html
@@ -8,7 +8,7 @@
{% for p in object_list %}
|
-
+
{{ p.data_envio|date:"d/m/Y" }}
|
diff --git a/templates/protocoloadm/proposicoes_naoincorporadas.html b/sapl/templates/protocoloadm/proposicoes_naoincorporadas.html
similarity index 83%
rename from templates/protocoloadm/proposicoes_naoincorporadas.html
rename to sapl/templates/protocoloadm/proposicoes_naoincorporadas.html
index 44c561f2c..84213dc88 100644
--- a/templates/protocoloadm/proposicoes_naoincorporadas.html
+++ b/sapl/templates/protocoloadm/proposicoes_naoincorporadas.html
@@ -8,7 +8,7 @@
{% for p in object_list %}
-
+
{{ p.data_envio|date:"d/m/Y" }}
|
diff --git a/templates/protocoloadm/proposicoes_naorecebidas.html b/sapl/templates/protocoloadm/proposicoes_naorecebidas.html
similarity index 83%
rename from templates/protocoloadm/proposicoes_naorecebidas.html
rename to sapl/templates/protocoloadm/proposicoes_naorecebidas.html
index 1a2663b9c..4757c6bff 100644
--- a/templates/protocoloadm/proposicoes_naorecebidas.html
+++ b/sapl/templates/protocoloadm/proposicoes_naorecebidas.html
@@ -8,7 +8,7 @@
{% for p in object_list %}
-
+
{{ p.data_envio|date:"d/m/Y" }}
|
diff --git a/templates/protocoloadm/protocolar_documento.html b/sapl/templates/protocoloadm/protocolar_documento.html
similarity index 100%
rename from templates/protocoloadm/protocolar_documento.html
rename to sapl/templates/protocoloadm/protocolar_documento.html
diff --git a/templates/protocoloadm/protocolar_materia.html b/sapl/templates/protocoloadm/protocolar_materia.html
similarity index 100%
rename from templates/protocoloadm/protocolar_materia.html
rename to sapl/templates/protocoloadm/protocolar_materia.html
diff --git a/templates/protocoloadm/protocolo_filter.html b/sapl/templates/protocoloadm/protocolo_filter.html
similarity index 88%
rename from templates/protocoloadm/protocolo_filter.html
rename to sapl/templates/protocoloadm/protocolo_filter.html
index 8b690749d..51fff500f 100644
--- a/templates/protocoloadm/protocolo_filter.html
+++ b/sapl/templates/protocoloadm/protocolo_filter.html
@@ -10,7 +10,7 @@
{% if filter_url %}
{% endif %}
@@ -37,12 +37,12 @@
Protocolo:
-
+
{{ p.numero|stringformat:'06d' }}/{{ p.ano }}
-
-
+
diff --git a/templates/protocoloadm/protocolo_list.html b/sapl/templates/protocoloadm/protocolo_list.html
similarity index 87%
rename from templates/protocoloadm/protocolo_list.html
rename to sapl/templates/protocoloadm/protocolo_list.html
index fa1ae6a02..73faa9ed7 100644
--- a/templates/protocoloadm/protocolo_list.html
+++ b/sapl/templates/protocoloadm/protocolo_list.html
@@ -12,11 +12,11 @@
|
Protocolo:
-
+
{{ p.numero|stringformat:'06d' }}/{{ p.ano }}
-
-
+
Assunto: {{ p.assunto_ementa }}
diff --git a/templates/protocoloadm/protocolo_mostrar.html b/sapl/templates/protocoloadm/protocolo_mostrar.html
similarity index 68%
rename from templates/protocoloadm/protocolo_mostrar.html
rename to sapl/templates/protocoloadm/protocolo_mostrar.html
index 8df000d3b..58882a39e 100644
--- a/templates/protocoloadm/protocolo_mostrar.html
+++ b/sapl/templates/protocoloadm/protocolo_mostrar.html
@@ -16,8 +16,8 @@
Documento Vinculado:
- Criar Documento
+ Criar Documento
- Comprovante
+ Comprovante
{% endblock detail_content %}
\ No newline at end of file
diff --git a/templates/protocoloadm/protocolo_pesquisa.html b/sapl/templates/protocoloadm/protocolo_pesquisa.html
similarity index 100%
rename from templates/protocoloadm/protocolo_pesquisa.html
rename to sapl/templates/protocoloadm/protocolo_pesquisa.html
diff --git a/sapl/templates/protocoloadm/protocoloadm_detail.html b/sapl/templates/protocoloadm/protocoloadm_detail.html
new file mode 100644
index 000000000..a296bfa5d
--- /dev/null
+++ b/sapl/templates/protocoloadm/protocoloadm_detail.html
@@ -0,0 +1,9 @@
+{% extends "crud/detail.html" %}
+{% load i18n %}
+{% block actions %}
+
+{% endblock actions %}
diff --git a/templates/protocoloadm/tramitacao.html b/sapl/templates/protocoloadm/tramitacao.html
similarity index 67%
rename from templates/protocoloadm/tramitacao.html
rename to sapl/templates/protocoloadm/tramitacao.html
index 121ea5b54..84efeae42 100644
--- a/templates/protocoloadm/tramitacao.html
+++ b/sapl/templates/protocoloadm/tramitacao.html
@@ -22,11 +22,11 @@
|
{% for t in tramitacoes %}
- {{t.data_encaminhamento|date:"d/m/Y"}} |
+ {{t.data_encaminhamento|date:"d/m/Y"}} |
{{t.unidade_tramitacao_local}} |
{{t.unidade_tramitacao_destino}} |
{{t.status.sigla}} |
- Excluir |
+ Excluir |
{% endfor %}
@@ -35,6 +35,6 @@
Nenhuma tramitação cadastrada para este documento.
{% endif %}
- Incluir Tramitação
+ Incluir Tramitação
{% endblock detail_content %}
\ No newline at end of file
diff --git a/templates/protocoloadm/tramitacao_edit.html b/sapl/templates/protocoloadm/tramitacao_edit.html
similarity index 100%
rename from templates/protocoloadm/tramitacao_edit.html
rename to sapl/templates/protocoloadm/tramitacao_edit.html
diff --git a/templates/protocoloadm/tramitacao_incluir.html b/sapl/templates/protocoloadm/tramitacao_incluir.html
similarity index 100%
rename from templates/protocoloadm/tramitacao_incluir.html
rename to sapl/templates/protocoloadm/tramitacao_incluir.html
diff --git a/templates/sessao/OrdemDia.html b/sapl/templates/sessao/OrdemDia.html
similarity index 100%
rename from templates/sessao/OrdemDia.html
rename to sapl/templates/sessao/OrdemDia.html
diff --git a/templates/sessao/expediente.html b/sapl/templates/sessao/expediente.html
similarity index 100%
rename from templates/sessao/expediente.html
rename to sapl/templates/sessao/expediente.html
diff --git a/templates/sessao/expediente_ordemdia_list.html b/sapl/templates/sessao/expediente_ordemdia_list.html
similarity index 65%
rename from templates/sessao/expediente_ordemdia_list.html
rename to sapl/templates/sessao/expediente_ordemdia_list.html
index d5fc7e1d4..45529e447 100644
--- a/templates/sessao/expediente_ordemdia_list.html
+++ b/sapl/templates/sessao/expediente_ordemdia_list.html
@@ -30,7 +30,7 @@ Matérias do Expediente
{% for m in materias_ordem %}
- {{m.numero}} - {{m.titulo}}
+ {{m.numero}} - {{m.titulo}}
Autor{{m.autor|length|pluralize:"es"}}: {{m.autor|join:', '}}
@@ -41,24 +41,24 @@ Matérias do Expediente
|
{% if m.resultado %}
{% if m.tipo_votacao == 1 %}
- {{m.resultado}}
+ {{m.resultado}}
{% elif m.tipo_votacao == 2 %}
- {{m.resultado}}
+ {{m.resultado}}
{% elif m.tipo_votacao == 3%}
- {{m.resultado}}
+ {{m.resultado}}
{% endif %}
{% else %}
Matéria não votada
{% if m.votacao_aberta %}
{% if m.tipo_votacao == 1 %}
- Registrar Votação
+ Registrar Votação
{% elif m.tipo_votacao == 2 %}
- Registrar Votação
+ Registrar Votação
{% elif m.tipo_votacao == 3%}
- Registrar Votação
+ Registrar Votação
{% endif %}
{% else %}
- |
-
-