From f696e1e3af540c71bde920fca93ae33895632625 Mon Sep 17 00:00:00 2001 From: ricardocanela Date: Tue, 7 Jan 2020 17:41:13 -0300 Subject: [PATCH 1/8] refatorando composicao_list --- sapl/templates/comissoes/composicao_list.html | 63 +++++++++++++++---- .../parlamentares/parlamentares_list.html | 1 + 2 files changed, 52 insertions(+), 12 deletions(-) diff --git a/sapl/templates/comissoes/composicao_list.html b/sapl/templates/comissoes/composicao_list.html index d3080d878..5d627efe8 100644 --- a/sapl/templates/comissoes/composicao_list.html +++ b/sapl/templates/comissoes/composicao_list.html @@ -1,5 +1,24 @@ -{% extends "crud/list.html" %} -{% load i18n common_tags crispy_forms_tags%} +{% extends "base.html" %} +{% load i18n %} +{% load crispy_forms_tags cropping%} +{% load common_tags %} +{% load render_bundle from webpack_loader %} +{% load webpack_static from webpack_loader %} + +{% block base_content %} + +
+ +
+ Selecione o Período +
+ +
+
{% block actions %} {% if user.is_authenticated and perms.comissoes.add_composicao %} @@ -54,20 +73,40 @@ - {% for p in participacao_set %} - + + - {{ p.parlamentar }} + [[ p.nome ]] - {{p.cargo}} - {{p.titular|yesno:"Sim,Não"}} - {{p.data_designacao}} - {{p.data_desligamento|default:""}} - {{p.motivo_desligamento}} - {{p.observacao}} + [[p.cargo]] + [[p.titular]] + [[p.data_designacao]] + [[p.data_desligamento]] + [[p.motivo_desligamento]] + [[p.observacao]] - {% endfor %}
{% endblock %} + + + + + + + + +{% endblock base_content %} + + +{% block webpack_loader_css %} + {{ block.super }} + {% render_bundle 'comissoes' 'css' %} +{% endblock %} + +{% block webpack_loader_js %} + {% render_chunk_vendors 'js' %} + {% render_bundle 'global' 'js' %} + {% render_bundle 'comissoes' 'js' %} +{% endblock %} diff --git a/sapl/templates/parlamentares/parlamentares_list.html b/sapl/templates/parlamentares/parlamentares_list.html index 0285fa173..6123fe899 100644 --- a/sapl/templates/parlamentares/parlamentares_list.html +++ b/sapl/templates/parlamentares/parlamentares_list.html @@ -82,6 +82,7 @@ + {% endblock base_content %} From 87028eab20694df8931463b6320ea16c30c75c2a Mon Sep 17 00:00:00 2001 From: ricardocanela Date: Thu, 9 Jan 2020 15:09:07 -0300 Subject: [PATCH 2/8] alterando div composicao_list --- sapl/templates/comissoes/composicao_list.html | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/sapl/templates/comissoes/composicao_list.html b/sapl/templates/comissoes/composicao_list.html index 5d627efe8..0a73d9bad 100644 --- a/sapl/templates/comissoes/composicao_list.html +++ b/sapl/templates/comissoes/composicao_list.html @@ -7,7 +7,7 @@ {% block base_content %} -
+
Selecione o Período @@ -33,21 +33,6 @@ {% endif %} {% endblock actions %} -{% block extra_content %} -
-
- Selecione o Período - -
-
-
-{% endblock %} {% block container_table_list %} {% if user.is_authenticated and perms.comissoes.add_participacao and composicao_list %} From b330900ba5d599cf2763a92cb26d749f949a4c84 Mon Sep 17 00:00:00 2001 From: ricardocanela Date: Tue, 14 Jan 2020 12:17:20 -0300 Subject: [PATCH 3/8] refatorando botoes --- sapl/templates/comissoes/composicao_list.html | 15 ++++----------- sapl/webpack-stats.json | 2 +- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/sapl/templates/comissoes/composicao_list.html b/sapl/templates/comissoes/composicao_list.html index 0a73d9bad..8cc0ee6ce 100644 --- a/sapl/templates/comissoes/composicao_list.html +++ b/sapl/templates/comissoes/composicao_list.html @@ -20,15 +20,13 @@
+ {% block actions %} {% if user.is_authenticated and perms.comissoes.add_composicao %}
- {% if view.create_url %} - - {% blocktrans with verbose_name=view.verbose_name %} Adicionar {{ verbose_name }} {% endblocktrans %} + + Adicionar Composição de Comissão - {% endif %} - {% block more_buttons %}{% endblock more_buttons %}
{% endif %} {% endblock actions %} @@ -38,7 +36,7 @@ {% if user.is_authenticated and perms.comissoes.add_participacao and composicao_list %}
- + Adicionar Participação em Comissão
@@ -75,13 +73,8 @@
{% endblock %} - - - -
- {% endblock base_content %} diff --git a/sapl/webpack-stats.json b/sapl/webpack-stats.json index 43a686b5d..f556478cd 100644 --- a/sapl/webpack-stats.json +++ b/sapl/webpack-stats.json @@ -1 +1 @@ -{"status":"done","publicPath":"/static/sapl/frontend/","chunks":{"chunk-vendors":[{"name":"css/chunk-vendors.04c72a76.css","publicPath":"/static/sapl/frontend/css/chunk-vendors.04c72a76.css","path":"../sapl/sapl/static/sapl/frontend/css/chunk-vendors.04c72a76.css"},{"name":"js/chunk-vendors.826c3ecf.js","publicPath":"/static/sapl/frontend/js/chunk-vendors.826c3ecf.js","path":"../sapl/sapl/static/sapl/frontend/js/chunk-vendors.826c3ecf.js"},{"name":"css/chunk-vendors.04c72a76.css.map","publicPath":"/static/sapl/frontend/css/chunk-vendors.04c72a76.css.map","path":"../sapl/sapl/static/sapl/frontend/css/chunk-vendors.04c72a76.css.map"}],"compilacao":[{"name":"css/compilacao.eff62463.css","publicPath":"/static/sapl/frontend/css/compilacao.eff62463.css","path":"../sapl/sapl/static/sapl/frontend/css/compilacao.eff62463.css"},{"name":"js/compilacao.77fbad73.js","publicPath":"/static/sapl/frontend/js/compilacao.77fbad73.js","path":"../sapl/sapl/static/sapl/frontend/js/compilacao.77fbad73.js"},{"name":"css/compilacao.eff62463.css.map","publicPath":"/static/sapl/frontend/css/compilacao.eff62463.css.map","path":"../sapl/sapl/static/sapl/frontend/css/compilacao.eff62463.css.map"}],"global":[{"name":"css/global.a77827ad.css","publicPath":"/static/sapl/frontend/css/global.a77827ad.css","path":"../sapl/sapl/static/sapl/frontend/css/global.a77827ad.css"},{"name":"js/global.e051cc2f.js","publicPath":"/static/sapl/frontend/js/global.e051cc2f.js","path":"../sapl/sapl/static/sapl/frontend/js/global.e051cc2f.js"},{"name":"css/global.a77827ad.css.map","publicPath":"/static/sapl/frontend/css/global.a77827ad.css.map","path":"../sapl/sapl/static/sapl/frontend/css/global.a77827ad.css.map"}],"painel":[{"name":"css/painel.5d957a9b.css","publicPath":"/static/sapl/frontend/css/painel.5d957a9b.css","path":"../sapl/sapl/static/sapl/frontend/css/painel.5d957a9b.css"},{"name":"js/painel.35e9809a.js","publicPath":"/static/sapl/frontend/js/painel.35e9809a.js","path":"../sapl/sapl/static/sapl/frontend/js/painel.35e9809a.js"},{"name":"css/painel.5d957a9b.css.map","publicPath":"/static/sapl/frontend/css/painel.5d957a9b.css.map","path":"../sapl/sapl/static/sapl/frontend/css/painel.5d957a9b.css.map"}],"parlamentar":[{"name":"css/parlamentar.0e433876.css","publicPath":"/static/sapl/frontend/css/parlamentar.0e433876.css","path":"../sapl/sapl/static/sapl/frontend/css/parlamentar.0e433876.css"},{"name":"js/parlamentar.d5d320f2.js","publicPath":"/static/sapl/frontend/js/parlamentar.d5d320f2.js","path":"../sapl/sapl/static/sapl/frontend/js/parlamentar.d5d320f2.js"},{"name":"css/parlamentar.0e433876.css.map","publicPath":"/static/sapl/frontend/css/parlamentar.0e433876.css.map","path":"../sapl/sapl/static/sapl/frontend/css/parlamentar.0e433876.css.map"}]}} \ No newline at end of file +{"status":"done","publicPath":"/static/sapl/frontend/","chunks":{"chunk-vendors":[{"name":"css/chunk-vendors.04c72a76.css","publicPath":"/static/sapl/frontend/css/chunk-vendors.04c72a76.css","path":"../sapl/sapl/static/sapl/frontend/css/chunk-vendors.04c72a76.css"},{"name":"js/chunk-vendors.826c3ecf.js","publicPath":"/static/sapl/frontend/js/chunk-vendors.826c3ecf.js","path":"../sapl/sapl/static/sapl/frontend/js/chunk-vendors.826c3ecf.js"},{"name":"css/chunk-vendors.04c72a76.css.map","publicPath":"/static/sapl/frontend/css/chunk-vendors.04c72a76.css.map","path":"../sapl/sapl/static/sapl/frontend/css/chunk-vendors.04c72a76.css.map"}],"compilacao":[{"name":"css/compilacao.eff62463.css","publicPath":"/static/sapl/frontend/css/compilacao.eff62463.css","path":"../sapl/sapl/static/sapl/frontend/css/compilacao.eff62463.css"},{"name":"js/compilacao.77fbad73.js","publicPath":"/static/sapl/frontend/js/compilacao.77fbad73.js","path":"../sapl/sapl/static/sapl/frontend/js/compilacao.77fbad73.js"},{"name":"css/compilacao.eff62463.css.map","publicPath":"/static/sapl/frontend/css/compilacao.eff62463.css.map","path":"../sapl/sapl/static/sapl/frontend/css/compilacao.eff62463.css.map"}],"global":[{"name":"css/global.a77827ad.css","publicPath":"/static/sapl/frontend/css/global.a77827ad.css","path":"../sapl/sapl/static/sapl/frontend/css/global.a77827ad.css"},{"name":"js/global.e051cc2f.js","publicPath":"/static/sapl/frontend/js/global.e051cc2f.js","path":"../sapl/sapl/static/sapl/frontend/js/global.e051cc2f.js"},{"name":"css/global.a77827ad.css.map","publicPath":"/static/sapl/frontend/css/global.a77827ad.css.map","path":"../sapl/sapl/static/sapl/frontend/css/global.a77827ad.css.map"}],"painel":[{"name":"css/painel.5d957a9b.css","publicPath":"/static/sapl/frontend/css/painel.5d957a9b.css","path":"../sapl/sapl/static/sapl/frontend/css/painel.5d957a9b.css"},{"name":"js/painel.35e9809a.js","publicPath":"/static/sapl/frontend/js/painel.35e9809a.js","path":"../sapl/sapl/static/sapl/frontend/js/painel.35e9809a.js"},{"name":"css/painel.5d957a9b.css.map","publicPath":"/static/sapl/frontend/css/painel.5d957a9b.css.map","path":"../sapl/sapl/static/sapl/frontend/css/painel.5d957a9b.css.map"}],"parlamentar":[{"name":"css/parlamentar.0e433876.css","publicPath":"/static/sapl/frontend/css/parlamentar.0e433876.css","path":"../sapl/sapl/static/sapl/frontend/css/parlamentar.0e433876.css"},{"name":"js/parlamentar.d5d320f2.js","publicPath":"/static/sapl/frontend/js/parlamentar.d5d320f2.js","path":"../sapl/sapl/static/sapl/frontend/js/parlamentar.d5d320f2.js"},{"name":"css/parlamentar.0e433876.css.map","publicPath":"/static/sapl/frontend/css/parlamentar.0e433876.css.map","path":"../sapl/sapl/static/sapl/frontend/css/parlamentar.0e433876.css.map"}]}} From 92dec1968cff932d6ebbd26dfc7cc513ba268fcf Mon Sep 17 00:00:00 2001 From: ricardocanela Date: Tue, 7 Jan 2020 17:41:13 -0300 Subject: [PATCH 4/8] refatorando composicao_list --- sapl/templates/comissoes/composicao_list.html | 1 - 1 file changed, 1 deletion(-) diff --git a/sapl/templates/comissoes/composicao_list.html b/sapl/templates/comissoes/composicao_list.html index 8cc0ee6ce..e8ba38e22 100644 --- a/sapl/templates/comissoes/composicao_list.html +++ b/sapl/templates/comissoes/composicao_list.html @@ -20,7 +20,6 @@ - {% block actions %} {% if user.is_authenticated and perms.comissoes.add_composicao %}
From 1a52af34c5d5aad7ebbd94df1bc51afe97ab9ccb Mon Sep 17 00:00:00 2001 From: ricardocanela Date: Tue, 14 Jan 2020 12:17:20 -0300 Subject: [PATCH 5/8] refatorando botoes --- sapl/templates/comissoes/composicao_list.html | 1 + 1 file changed, 1 insertion(+) diff --git a/sapl/templates/comissoes/composicao_list.html b/sapl/templates/comissoes/composicao_list.html index e8ba38e22..8cc0ee6ce 100644 --- a/sapl/templates/comissoes/composicao_list.html +++ b/sapl/templates/comissoes/composicao_list.html @@ -20,6 +20,7 @@ + {% block actions %} {% if user.is_authenticated and perms.comissoes.add_composicao %}
From 446175b4a5b0185be51a995e6d2cbceaae5b51cf Mon Sep 17 00:00:00 2001 From: ricardocanela Date: Wed, 5 Feb 2020 16:34:23 -0300 Subject: [PATCH 6/8] inserindo arquivos de front-end --- .../sapl/frontend/css/mesadiretora.0e433876.css | 0 .../sapl/frontend/js/mesadiretora.4cfe1aad.js | 1 + .../sapl/frontend/js/mesadiretora.4cfe1aad.js.gz | Bin 0 -> 1365 bytes 3 files changed, 1 insertion(+) create mode 100644 sapl/static/sapl/frontend/css/mesadiretora.0e433876.css create mode 100644 sapl/static/sapl/frontend/js/mesadiretora.4cfe1aad.js create mode 100644 sapl/static/sapl/frontend/js/mesadiretora.4cfe1aad.js.gz diff --git a/sapl/static/sapl/frontend/css/mesadiretora.0e433876.css b/sapl/static/sapl/frontend/css/mesadiretora.0e433876.css new file mode 100644 index 000000000..e69de29bb diff --git a/sapl/static/sapl/frontend/js/mesadiretora.4cfe1aad.js b/sapl/static/sapl/frontend/js/mesadiretora.4cfe1aad.js new file mode 100644 index 000000000..2a394b898 --- /dev/null +++ b/sapl/static/sapl/frontend/js/mesadiretora.4cfe1aad.js @@ -0,0 +1 @@ +!function(e){function a(a){for(var t,n,i=a[0],l=a[1],c=a[2],f=0,g=[];f@bM)PJlq_5R6?9vHA%S%ykH@?Bj!!z9l{)j%=mgSLYeymxI5IYQ5H|8u zQ_01+KcNaAg9**>@oGY6yiezRJQ>a2Nv1&0{bDpbKTkE6DmzH_ag41U2!aW|HeQU8o{GggQ}g6@N~@@QG+ z3MDg0#Ki?2q!hSLG;_EE!AYxi%23rD@l{0)UoF9jT;h_kV%V>!t?6lV*MU|!OFZV4 zuJ;F1$ zyK{2JL!+2kbo;cN8WqRQlX-LNt<>|+Vjjn*PCWFbNSi8QNIsanR6wefp4v?A?!c|x z+HGh3CSAW%eoe|C7NKi-C?KV8W6?4MBV4@av-zQjTcpi9?(m@pZ0ULDWu)k1jaZe`l842;p)zu(ttl68ZL1XoQ zc#}6)4jImk8ZpDM=)Zc6D<;^Nm-!{yHrUhbdx5s*j_JgvBh5t1xMN?Oo!uC7FX30Q z1Wqy>dvgz(&;!4pLF8Z?zdtT+Zh!mfbK~jJ6KhEf!`9I77~w>+%0bDc^kCg^OvYnE z$z(z%6x5J>mziZ@oXms?`b%goyg2N>m4dl+N}w(7lyrU=NbbxzP>|sck&7WA)PZxt zY&_S)J*Vx_cj4^dSO}}ID(!^@clRLX#)aujShP0ds-jEq3zMU;qmKTv&BF~3@10*r zS3`}i3F(PK_I8fxb?WF{7h(=~PW}b_3j2lm1?VK{1{G`{3y${|QDYb@FhqAfIz{g} z;=7Q^yh@Lsg4y2Iu(jpM2Z4=_-kI>(V%I%0+8KonZ!O*_@*_SXVIng{(xXl`j)Vvm zJr?{Fbm8YzMREKRunp~MdqnTL6Ni)YmqH&$rPEl4uphSBKSlgz(~=*sBNLR@F#D-n z)$gGR+m)NTG1pW7hMR_ks7nJmhYd-)`Mk)`Vev1MvwQJ-*DbQ!Oj?2tBOk|a?>_Hg z|8?km%#5{AM&&Ys9iWVha*>B$h;|Cu!RwHzZ;IJrL!X4`ob--}S?`3T9C2O4_upaL zi5)c>y3=FZ9{wM}>Pq}^l-iP&nI{c4;SzTDeKW|KpnF*1OUIP>NtAbAk99$N?;uoy X@TDBS3J$(BaAov2^MB-9xDEgS9|f!8 literal 0 HcmV?d00001 From 6e6ad962a58ac8901deb9e06b1f49cc69bb4a841 Mon Sep 17 00:00:00 2001 From: ricardocanela Date: Wed, 5 Feb 2020 16:53:13 -0300 Subject: [PATCH 7/8] corrigindo arquivos de front-end --- ...etora.0e433876.css => comissoes.0e433876.css} | 0 .../sapl/frontend/js/comissoes.24ef3c79.js | 1 + .../sapl/frontend/js/comissoes.24ef3c79.js.gz | Bin 0 -> 1426 bytes .../sapl/frontend/js/mesadiretora.4cfe1aad.js | 1 - .../sapl/frontend/js/mesadiretora.4cfe1aad.js.gz | Bin 1365 -> 0 bytes 5 files changed, 1 insertion(+), 1 deletion(-) rename sapl/static/sapl/frontend/css/{mesadiretora.0e433876.css => comissoes.0e433876.css} (100%) create mode 100644 sapl/static/sapl/frontend/js/comissoes.24ef3c79.js create mode 100644 sapl/static/sapl/frontend/js/comissoes.24ef3c79.js.gz delete mode 100644 sapl/static/sapl/frontend/js/mesadiretora.4cfe1aad.js delete mode 100644 sapl/static/sapl/frontend/js/mesadiretora.4cfe1aad.js.gz diff --git a/sapl/static/sapl/frontend/css/mesadiretora.0e433876.css b/sapl/static/sapl/frontend/css/comissoes.0e433876.css similarity index 100% rename from sapl/static/sapl/frontend/css/mesadiretora.0e433876.css rename to sapl/static/sapl/frontend/css/comissoes.0e433876.css diff --git a/sapl/static/sapl/frontend/js/comissoes.24ef3c79.js b/sapl/static/sapl/frontend/js/comissoes.24ef3c79.js new file mode 100644 index 000000000..d469936fa --- /dev/null +++ b/sapl/static/sapl/frontend/js/comissoes.24ef3c79.js @@ -0,0 +1 @@ +!function(e){function t(t){for(var o,i,s=t[0],c=t[1],u=t[2],d=0,p=[];d-c$6&b|_i$H9!XpFyuq>Tt1%5C!H;7l{=|b1o66;0~a}5X%l@B zCeTz;%Uw2}(j5OLQ(EKS<&+kDOe>yE)8dU~C8#^MOpEjLSaO>cQ+hN13v$OQqn&n- z6|kkSHxKHg(G?i?$Z}DZk)bjULzBsA7*?#R?K1KU3>H%_@Nw#K=s>Cv?*}`3#p(lY^$~gRj_)9O zI~#X!-QM-vqD(^PTNWz}aZF!_uCEZJczWeeiEcv?-rotr(Er#r($=V}!xI&DTMt_~T3t1i|c6=fmlPl57;ei*LMv z_fc^&vQ9XekF2Q5(ZXouKouj>mc#M~ysds<4=}Gpe*c@*syemjNe7wMc3jk^$i`{6 zDna&@Jx%!Qtn(&D%k!inR)U1O_BU35wb zwnimPiSd;a26^81N=y3aMivPnbjNSI(KK`gZmA1oaU{);d*;Ve=9bc?{=s(qhM~^{ zT1R9gDmfb7Gb2QU9WSwag&w`##^&U_cd|tjGq(g4MY~aPymk?BoMFrZL(wO_iH~eL zpui6d*-BLVp7$Z|DetaE8}mA=sZ+tb7|0hf>%0ekhXT#y&NH{hOl1WO!}t zShrN@xBW`={YGN{QT}ZI4RhE|Y3p`pM*A?Q`*D|o`nKE*D24qIKRCv3RVE8mI%J;c ge@HRH`u2}*(=3Ai5=k(m*#FXh0dbR8$KnhC0I&|ni2wiq literal 0 HcmV?d00001 diff --git a/sapl/static/sapl/frontend/js/mesadiretora.4cfe1aad.js b/sapl/static/sapl/frontend/js/mesadiretora.4cfe1aad.js deleted file mode 100644 index 2a394b898..000000000 --- a/sapl/static/sapl/frontend/js/mesadiretora.4cfe1aad.js +++ /dev/null @@ -1 +0,0 @@ -!function(e){function a(a){for(var t,n,i=a[0],l=a[1],c=a[2],f=0,g=[];f@bM)PJlq_5R6?9vHA%S%ykH@?Bj!!z9l{)j%=mgSLYeymxI5IYQ5H|8u zQ_01+KcNaAg9**>@oGY6yiezRJQ>a2Nv1&0{bDpbKTkE6DmzH_ag41U2!aW|HeQU8o{GggQ}g6@N~@@QG+ z3MDg0#Ki?2q!hSLG;_EE!AYxi%23rD@l{0)UoF9jT;h_kV%V>!t?6lV*MU|!OFZV4 zuJ;F1$ zyK{2JL!+2kbo;cN8WqRQlX-LNt<>|+Vjjn*PCWFbNSi8QNIsanR6wefp4v?A?!c|x z+HGh3CSAW%eoe|C7NKi-C?KV8W6?4MBV4@av-zQjTcpi9?(m@pZ0ULDWu)k1jaZe`l842;p)zu(ttl68ZL1XoQ zc#}6)4jImk8ZpDM=)Zc6D<;^Nm-!{yHrUhbdx5s*j_JgvBh5t1xMN?Oo!uC7FX30Q z1Wqy>dvgz(&;!4pLF8Z?zdtT+Zh!mfbK~jJ6KhEf!`9I77~w>+%0bDc^kCg^OvYnE z$z(z%6x5J>mziZ@oXms?`b%goyg2N>m4dl+N}w(7lyrU=NbbxzP>|sck&7WA)PZxt zY&_S)J*Vx_cj4^dSO}}ID(!^@clRLX#)aujShP0ds-jEq3zMU;qmKTv&BF~3@10*r zS3`}i3F(PK_I8fxb?WF{7h(=~PW}b_3j2lm1?VK{1{G`{3y${|QDYb@FhqAfIz{g} z;=7Q^yh@Lsg4y2Iu(jpM2Z4=_-kI>(V%I%0+8KonZ!O*_@*_SXVIng{(xXl`j)Vvm zJr?{Fbm8YzMREKRunp~MdqnTL6Ni)YmqH&$rPEl4uphSBKSlgz(~=*sBNLR@F#D-n z)$gGR+m)NTG1pW7hMR_ks7nJmhYd-)`Mk)`Vev1MvwQJ-*DbQ!Oj?2tBOk|a?>_Hg z|8?km%#5{AM&&Ys9iWVha*>B$h;|Cu!RwHzZ;IJrL!X4`ob--}S?`3T9C2O4_upaL zi5)c>y3=FZ9{wM}>Pq}^l-iP&nI{c4;SzTDeKW|KpnF*1OUIP>NtAbAk99$N?;uoy X@TDBS3J$(BaAov2^MB-9xDEgS9|f!8 From 365e83a4bfbf8da06b7c7f52082515e9e4ddab4a Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Mon, 6 Apr 2020 23:34:10 -0300 Subject: [PATCH 8/8] =?UTF-8?q?ajusta=20bot=C3=B5es=20de=20inser=C3=A7?= =?UTF-8?q?=C3=A3o=20de=20participantes=20e=20composi=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/templates/comissoes/composicao_list.html | 24 ++++++++----------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/sapl/templates/comissoes/composicao_list.html b/sapl/templates/comissoes/composicao_list.html index 8cc0ee6ce..3b38bdccf 100644 --- a/sapl/templates/comissoes/composicao_list.html +++ b/sapl/templates/comissoes/composicao_list.html @@ -22,26 +22,22 @@ {% block actions %} - {% if user.is_authenticated and perms.comissoes.add_composicao %} -
- +
+ {% if user.is_authenticated and perms.comissoes.add_participacao and composicao_list %} + + Adicionar Participação em Comissão + + {% endif %} + {% if user.is_authenticated and perms.comissoes.add_composicao %} + Adicionar Composição de Comissão -
- {% endif %} + {% endif %} +
{% endblock actions %} {% block container_table_list %} - {% if user.is_authenticated and perms.comissoes.add_participacao and composicao_list %} -
-
- - Adicionar Participação em Comissão - -
-
- {% endif %}