Commit a1bf5c61375f6842f066e2646ba182f516e1e992
1 parent
e5299526
Exists in
master
and in
7 other branches
Atualização admin1
Showing
8 changed files
with
117 additions
and
42 deletions
Show diff stats
admin1/dicionario/core.js
@@ -141,6 +141,11 @@ i3GEOadmin.core.dicionario = { | @@ -141,6 +141,11 @@ i3GEOadmin.core.dicionario = { | ||
141 | en : "", | 141 | en : "", |
142 | es : "" | 142 | es : "" |
143 | } ], | 143 | } ], |
144 | + 'adicionar' : [ { | ||
145 | + pt : "Adicionar", | ||
146 | + en : "", | ||
147 | + es : "" | ||
148 | + } ], | ||
144 | 'layers' : [ { | 149 | 'layers' : [ { |
145 | pt : "Layers", | 150 | pt : "Layers", |
146 | en : "", | 151 | en : "", |
admin1/dicionario/operacoes.js
@@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
2 | i3GEOadmin.operacoes = {}; | 2 | i3GEOadmin.operacoes = {}; |
3 | i3GEOadmin.operacoes.dicionario = { | 3 | i3GEOadmin.operacoes.dicionario = { |
4 | 'operacoes' : [ { | 4 | 'operacoes' : [ { |
5 | - pt : "Operações e executores (papéis)", | 5 | + pt : "Operações e quem pode executá-las (papéis)", |
6 | en : "", | 6 | en : "", |
7 | es : "" | 7 | es : "" |
8 | } ], | 8 | } ], |
admin1/head.php
@@ -163,6 +163,17 @@ body { | @@ -163,6 +163,17 @@ body { | ||
163 | .navbar .dropdown-menu li>a, .navbar.navbar-default .dropdown-menu li>a { | 163 | .navbar .dropdown-menu li>a, .navbar.navbar-default .dropdown-menu li>a { |
164 | font-size: 1em; | 164 | font-size: 1em; |
165 | } | 165 | } |
166 | + | ||
167 | +#indice .bs-docs-sidebar .nav>.active:focus>a, .bs-docs-sidebar .nav>.active:hover>a, | ||
168 | + .bs-docs-sidebar .nav>.active>a { | ||
169 | + background-color: transparent; | ||
170 | + border-left-color: green; | ||
171 | + border-left-style: solid; | ||
172 | + border-left-width: 2px; | ||
173 | + color: green; | ||
174 | + font-weight: 700; | ||
175 | + padding-left: 18px; | ||
176 | +} | ||
166 | </style> | 177 | </style> |
167 | </head> | 178 | </head> |
168 | <body style="padding-top: 55px;" id="topo"> | 179 | <body style="padding-top: 55px;" id="topo"> |
@@ -61,7 +61,7 @@ switch (strtoupper($funcao)) | @@ -61,7 +61,7 @@ switch (strtoupper($funcao)) | ||
61 | $operacao["papeis"] = $p; | 61 | $operacao["papeis"] = $p; |
62 | $o[] = $operacao; | 62 | $o[] = $operacao; |
63 | } | 63 | } |
64 | - $papeis = pegaDados("SELECT * from ".$esquemaadmin."i3geousr_papeis order by nome"); | 64 | + $papeis = pegaDados("SELECT * from ".$esquemaadmin."i3geousr_papeis WHERE nome <> 'admin' order by nome"); |
65 | retornaJSON(array("operacoes"=>$o,"papeis"=>$papeis)); | 65 | retornaJSON(array("operacoes"=>$o,"papeis"=>$papeis)); |
66 | break; | 66 | break; |
67 | case "PEGAOPERACOES": | 67 | case "PEGAOPERACOES": |
@@ -30,7 +30,7 @@ Inicializa o editor | @@ -30,7 +30,7 @@ Inicializa o editor | ||
30 | function init(){ | 30 | function init(){ |
31 | pegaOperacoes(); | 31 | pegaOperacoes(); |
32 | } | 32 | } |
33 | -function ativaBotaoAdicionaOperacao(sUrl,idBotao){ | 33 | +function adicionaOperacao(){ |
34 | var botao, adiciona = function() | 34 | var botao, adiciona = function() |
35 | { | 35 | { |
36 | core_carregando("ativa"); | 36 | core_carregando("ativa"); |
@@ -60,19 +60,20 @@ function ativaBotaoAdicionaOperacao(sUrl,idBotao){ | @@ -60,19 +60,20 @@ function ativaBotaoAdicionaOperacao(sUrl,idBotao){ | ||
60 | /* | 60 | /* |
61 | Function: pegaOperacoes | 61 | Function: pegaOperacoes |
62 | 62 | ||
63 | -Obtém a lista de atlas | ||
64 | - | ||
65 | -<PEGAATLAS> | 63 | +Obtém a lista de operacoes |
66 | */ | 64 | */ |
67 | function pegaOperacoes(){ | 65 | function pegaOperacoes(){ |
68 | - //core_pegaDados($trad("msgBuscaOperacoes",i3GEOadmin.operacoes.dicionario),"../php/operacoes.php?funcao=pegaOperacoes","montaArvore"); | ||
69 | $.post( | 66 | $.post( |
70 | "exec.php?funcao=pegaOperacoesEpapeis", | 67 | "exec.php?funcao=pegaOperacoesEpapeis", |
71 | {}, | 68 | {}, |
72 | function(data, status){ | 69 | function(data, status){ |
70 | + //objeto json com os dados viondos do banco | ||
73 | var json = jQuery.parseJSON(data); | 71 | var json = jQuery.parseJSON(data); |
72 | + //template dos checkbox | ||
74 | var templatePapeis = $("#templateInputPapeis").html(); | 73 | var templatePapeis = $("#templateInputPapeis").html(); |
74 | + //template do form de cada operacao | ||
75 | var templateOperacoes = $("#templateOperacoes").html(); | 75 | var templateOperacoes = $("#templateOperacoes").html(); |
76 | + //lista todas as operacoes | ||
76 | var html = Mustache.to_html( | 77 | var html = Mustache.to_html( |
77 | "{{#data}}" + templateOperacoes + "{{/data}}", | 78 | "{{#data}}" + templateOperacoes + "{{/data}}", |
78 | { | 79 | { |
@@ -104,6 +105,34 @@ function pegaOperacoes(){ | @@ -104,6 +105,34 @@ function pegaOperacoes(){ | ||
104 | } | 105 | } |
105 | ); | 106 | ); |
106 | $("#corpo").html(html); | 107 | $("#corpo").html(html); |
108 | + //indice | ||
109 | + html = Mustache.to_html( | ||
110 | + "{{#data}}" + $("#indiceTpl").html() + "{{/data}}", | ||
111 | + {"data":json["operacoes"]} | ||
112 | + ); | ||
113 | + $("#indice").html(html); | ||
114 | + //$("#indice").affix('checkPosition'); | ||
115 | + //monta um template para o modal de inclusao de nova operacao | ||
116 | + html = Mustache.to_html( | ||
117 | + $("#templateOperacoes").html(), | ||
118 | + { | ||
119 | + "labelCodigo": $trad("codigo",i3GEOadmin.operacoes.dicionario), | ||
120 | + "labelDescricao": $trad("descricao",i3GEOadmin.operacoes.dicionario), | ||
121 | + "operacao": $trad("operacao",i3GEOadmin.operacoes.dicionario), | ||
122 | + "papeisv": $trad("papeisv",i3GEOadmin.operacoes.dicionario), | ||
123 | + "codigo": "", | ||
124 | + "descricao": "", | ||
125 | + "inputPapeis": function(){ | ||
126 | + return Mustache.to_html( | ||
127 | + "{{#data}}" + $("#templateInputPapeis").html() + "{{/data}}", | ||
128 | + { | ||
129 | + "data":json["papeis"] | ||
130 | + } | ||
131 | + ); | ||
132 | + } | ||
133 | + } | ||
134 | + ); | ||
135 | + $("#adicionaOperacao .modal-body").html(html); | ||
107 | $.material.init(); | 136 | $.material.init(); |
108 | } | 137 | } |
109 | ); | 138 | ); |
admin1/usuarios/operacoes/index.php
@@ -16,7 +16,7 @@ include "../../head.php"; | @@ -16,7 +16,7 @@ include "../../head.php"; | ||
16 | </div> | 16 | </div> |
17 | <div class="container"> | 17 | <div class="container"> |
18 | <div class="row center-block"> | 18 | <div class="row center-block"> |
19 | - <div class="col-sm-12"> | 19 | + <div class="col-xs-12 col-sm-10"> |
20 | <div class="well hidden" id="titulo"> | 20 | <div class="well hidden" id="titulo"> |
21 | <button data-toggle="modal" data-target="#ajudaPrincipal" | 21 | <button data-toggle="modal" data-target="#ajudaPrincipal" |
22 | class="btn btn-primary btn-fab btn-fab-mini pull-right"> | 22 | class="btn btn-primary btn-fab btn-fab-mini pull-right"> |
@@ -24,7 +24,11 @@ include "../../head.php"; | @@ -24,7 +24,11 @@ include "../../head.php"; | ||
24 | </button> | 24 | </button> |
25 | <h3>{{{operacoes}}}</h3> | 25 | <h3>{{{operacoes}}}</h3> |
26 | <h4>{{{txtAjuda}}}</h4> | 26 | <h4>{{{txtAjuda}}}</h4> |
27 | - <!--Modal--> | 27 | + <div class="row pull-right"> |
28 | + <a data-toggle="modal" data-target="#adicionaOperacao" href="javascript:void(0)" class="btn btn-primary" role="button">{{{adicionar}}}</a> | ||
29 | + </div> | ||
30 | + <div class="clearfix"></div> | ||
31 | + <!--Modal ajuda--> | ||
28 | <div id="ajudaPrincipal" class="modal fade" tabindex="-1"> | 32 | <div id="ajudaPrincipal" class="modal fade" tabindex="-1"> |
29 | <div class="modal-dialog"> | 33 | <div class="modal-dialog"> |
30 | <div class="modal-content"> | 34 | <div class="modal-content"> |
@@ -34,17 +38,42 @@ include "../../head.php"; | @@ -34,17 +38,42 @@ include "../../head.php"; | ||
34 | </div> | 38 | </div> |
35 | </div> | 39 | </div> |
36 | </div> | 40 | </div> |
41 | + <!--Modal adicao de nova operacao e preenchido na inicializacao--> | ||
42 | + <div id="adicionaOperacao" class="modal fade" tabindex="-1"> | ||
43 | + <div class="modal-dialog modal-lg"> | ||
44 | + <div class="modal-content"> | ||
45 | + <div class="modal-body modal-lg"></div> | ||
46 | + </div> | ||
47 | + </div> | ||
48 | + </div> | ||
37 | </div> | 49 | </div> |
38 | - <div class="well hidden" id="corpo"> | ||
39 | - <i class="fa fa-spinner fa-pulse fa-3x fa-fw"></i> <span class="sr-only">Loading...</span> | 50 | + <div class="well hidden"> |
51 | + <div id="corpo"> | ||
52 | + <i class="fa fa-spinner fa-pulse fa-3x fa-fw"></i> <span class="sr-only">Loading...</span> | ||
53 | + </div> | ||
40 | </div> | 54 | </div> |
41 | </div> | 55 | </div> |
56 | + <!-- lateral--> | ||
57 | + <div class="col-sm-2 hidden-xs"> | ||
58 | + <nav class="bs-docs-sidebar affix-top" style="" id="indiceSpy"> | ||
59 | + <ul class="nav nav-pills nav-stacked" role="tablist"> | ||
60 | + | ||
61 | + <li><a onclick="$('.panel').show();" href="#">Links <i class="material-icons">visibility</i></a></li> | ||
62 | + </ul> | ||
63 | + <ul class="nav nav-pills nav-stacked" role="tablist" id="indice"> | ||
64 | + </ul> | ||
65 | + </nav> | ||
66 | + </div> | ||
67 | + | ||
42 | </div> | 68 | </div> |
43 | </div> | 69 | </div> |
70 | +<script id="indiceTpl" type="x-tmpl-mustache"> | ||
71 | +<li><a onclick="$('.panel').hide();$('#form-{{id_operacao}}').show();" href="#">{{{codigo}}}</a></li> | ||
72 | +</script> | ||
44 | <script id="templateOperacoes" type="x-tmpl-mustache"> | 73 | <script id="templateOperacoes" type="x-tmpl-mustache"> |
45 | -<div class="panel panel-default"> | 74 | +<div class="panel panel-default" id="form-{{id_operacao}}"> |
46 | <div class="panel-body"> | 75 | <div class="panel-body"> |
47 | - <form class="form" role="form" method="post" action=""> | 76 | + <form class="form" role="form" method="post" action="" > |
48 | <div class="row"> | 77 | <div class="row"> |
49 | <div class="col-md-8"> | 78 | <div class="col-md-8"> |
50 | <h4>{{{operacao}}}</h4> | 79 | <h4>{{{operacao}}}</h4> |
@@ -57,8 +86,7 @@ include "../../head.php"; | @@ -57,8 +86,7 @@ include "../../head.php"; | ||
57 | <div class="form-group form-group-lg"> | 86 | <div class="form-group form-group-lg"> |
58 | <label class="col-md-2 control-label" for="descricao">{{{labelDescricao}}}</label> | 87 | <label class="col-md-2 control-label" for="descricao">{{{labelDescricao}}}</label> |
59 | <div class="col-md-10"> | 88 | <div class="col-md-10"> |
60 | - <input type="text" value="{{{descricao}}}" class="form-control" name="descricao" | ||
61 | - placeholder="descricao" required> | 89 | + <input type="text" value="{{{descricao}}}" class="form-control" name="descricao" required> |
62 | </div> | 90 | </div> |
63 | </div> | 91 | </div> |
64 | </div> | 92 | </div> |
@@ -68,16 +96,20 @@ include "../../head.php"; | @@ -68,16 +96,20 @@ include "../../head.php"; | ||
68 | </div> | 96 | </div> |
69 | </div> | 97 | </div> |
70 | </form> | 98 | </form> |
99 | + <div class="pull-right"> | ||
100 | + <a href="javascript:void(0)" class="btn btn-danger" role="button">Excluir</a> | ||
101 | + <a href="javascript:void(0)" class="btn btn-primary" role="button">salvar</a> | ||
102 | + </div> | ||
71 | </div> | 103 | </div> |
104 | + | ||
72 | </div> | 105 | </div> |
73 | </script> | 106 | </script> |
74 | <script id="templateInputPapeis" type="x-tmpl-mustache"> | 107 | <script id="templateInputPapeis" type="x-tmpl-mustache"> |
75 | <div class="checkbox"> | 108 | <div class="checkbox"> |
76 | <label> | 109 | <label> |
77 | - <input type="checkbox" {{checked}} name="{{{id_papel}}}" /> <abbr title="{{{descricao}}}">{{{nome}}}</abbr> | 110 | + <input type="checkbox" {{checked}} name="id_papel-{{{id_papel}}}" /> <abbr title="{{{descricao}}}">{{{nome}}}</abbr> |
78 | </label> | 111 | </label> |
79 | </div> | 112 | </div> |
80 | - | ||
81 | </script> | 113 | </script> |
82 | <script type="text/javascript" src="../../dicionario/operacoes.js"></script> | 114 | <script type="text/javascript" src="../../dicionario/operacoes.js"></script> |
83 | <script type="text/javascript" src="index.js"></script> | 115 | <script type="text/javascript" src="index.js"></script> |
@@ -93,6 +125,8 @@ include "../../head.php"; | @@ -93,6 +125,8 @@ include "../../head.php"; | ||
93 | }); | 125 | }); |
94 | //traducao | 126 | //traducao |
95 | var t = $("#titulo"); | 127 | var t = $("#titulo"); |
128 | + //complementa dicionario | ||
129 | + i3GEOadmin.operacoes.dicionario.adicionar = i3GEOadmin.core.dicionario.adicionar; | ||
96 | t.html( | 130 | t.html( |
97 | Mustache.to_html( | 131 | Mustache.to_html( |
98 | t.html(), | 132 | t.html(), |
mapas/index.php
@@ -34,7 +34,7 @@ include "../init/head.php"; | @@ -34,7 +34,7 @@ include "../init/head.php"; | ||
34 | border-radius: 20%; | 34 | border-radius: 20%; |
35 | } | 35 | } |
36 | 36 | ||
37 | -.list-group .list-group-separator::before{ | 37 | +.list-group .list-group-separator::before { |
38 | width: 100%; | 38 | width: 100%; |
39 | } | 39 | } |
40 | 40 | ||
@@ -77,7 +77,8 @@ include "../init/head.php"; | @@ -77,7 +77,8 @@ include "../init/head.php"; | ||
77 | height: 78px; | 77 | height: 78px; |
78 | width: 170px | 78 | width: 170px |
79 | } | 79 | } |
80 | -.thumbnail.hidden-xs > a > img { | 80 | + |
81 | +.thumbnail.hidden-xs>a>img { | ||
81 | height: 67px; | 82 | height: 67px; |
82 | width: 160px; | 83 | width: 160px; |
83 | } | 84 | } |
@@ -87,7 +88,8 @@ include "../init/head.php"; | @@ -87,7 +88,8 @@ include "../init/head.php"; | ||
87 | height: 43px; | 88 | height: 43px; |
88 | width: 85px | 89 | width: 85px |
89 | } | 90 | } |
90 | -.thumbnail.visible-xs > a > img { | 91 | + |
92 | +.thumbnail.visible-xs>a>img { | ||
91 | height: 33px; | 93 | height: 33px; |
92 | width: 80px; | 94 | width: 80px; |
93 | } | 95 | } |
@@ -149,8 +151,8 @@ include "../init/head.php"; | @@ -149,8 +151,8 @@ include "../init/head.php"; | ||
149 | <script id="indiceTpl" type="x-tmpl-mustache"> | 151 | <script id="indiceTpl" type="x-tmpl-mustache"> |
150 | <li><a href="#affix-{{ID_MAPA}}">{{{NOME}}}</a></li> | 152 | <li><a href="#affix-{{ID_MAPA}}">{{{NOME}}}</a></li> |
151 | </script> | 153 | </script> |
152 | -<body style="padding-top: 55px; position: relative;" id="affix-topo" | ||
153 | - data-spy="scroll" data-target="#indiceSpy" data-offset="80"> | 154 | +<body style="padding-top: 55px; position: relative;" id="affix-topo" data-spy="scroll" |
155 | + data-target="#indiceSpy" data-offset="80"> | ||
154 | <nav class="navbar navbar-default navbar-fixed-top"> | 156 | <nav class="navbar navbar-default navbar-fixed-top"> |
155 | <div class="container-fluid"> | 157 | <div class="container-fluid"> |
156 | <div class="navbar-header"> | 158 | <div class="navbar-header"> |
@@ -171,8 +173,8 @@ include "../init/head.php"; | @@ -171,8 +173,8 @@ include "../init/head.php"; | ||
171 | <ol class="breadcrumb"> | 173 | <ol class="breadcrumb"> |
172 | <li><a href="../init/index.php">i3Geo</a></li> | 174 | <li><a href="../init/index.php">i3Geo</a></li> |
173 | <li class="active">Mapas de usuários</li> | 175 | <li class="active">Mapas de usuários</li> |
174 | - <li><a title="RSS" href="../admin/rssmapas.php"><i class="material-icons ">rss_feed</i></a> <a | ||
175 | - title="JSON" href="../admin/rssmapas.php?output=json"><i class="material-icons ">code</i></a> | 176 | + <li><a title="RSS" href="../admin/rssmapas.php"><i class="material-icons ">rss_feed</i></a> |
177 | + <a title="JSON" href="../admin/rssmapas.php?output=json"><i class="material-icons ">code</i></a> | ||
176 | </li> | 178 | </li> |
177 | </ol> | 179 | </ol> |
178 | </div> | 180 | </div> |
@@ -182,20 +184,18 @@ include "../init/head.php"; | @@ -182,20 +184,18 @@ include "../init/head.php"; | ||
182 | <div class="escondido hidden"> | 184 | <div class="escondido hidden"> |
183 | <div class="row"> | 185 | <div class="row"> |
184 | <div class="col-xs-12 col-sm-9 center-block escondido hidden" id="botoesTpl"> | 186 | <div class="col-xs-12 col-sm-9 center-block escondido hidden" id="botoesTpl"> |
185 | - <div class="row" id="affix-{{ID_MAPA}}"> | 187 | + <div class="row" id="affix-{{ID_MAPA}}" style="padding-top: 90px; margin-top: -90px;"> |
186 | <div class="col-md-12 center-block"> | 188 | <div class="col-md-12 center-block"> |
187 | <div id="titulo{{ID_MAPA}}" class="panel-group" role="tablist" aria-multiselectable="true"> | 189 | <div id="titulo{{ID_MAPA}}" class="panel-group" role="tablist" aria-multiselectable="true"> |
188 | <div class="panel panel-default"> | 190 | <div class="panel panel-default"> |
189 | - <div class="panel-heading" role="tab" style="background-color:#80cbc4;"> | 191 | + <div class="panel-heading" role="tab" style="background-color: #80cbc4;"> |
190 | <div class="thumbnail visible-xs"> | 192 | <div class="thumbnail visible-xs"> |
191 | - <a href="{{{LINK}}}"><img class="img-rounded" | ||
192 | - src="{{{IMAGEM}}}" /></a> | 193 | + <a href="{{{LINK}}}"><img class="img-rounded" src="{{{IMAGEM}}}" /></a> |
193 | </div> | 194 | </div> |
194 | <div class="thumbnail hidden-xs"> | 195 | <div class="thumbnail hidden-xs"> |
195 | - <a href="{{{LINK}}}"><img class="img-rounded" | ||
196 | - src="{{{IMAGEM}}}" /></a> | 196 | + <a href="{{{LINK}}}"><img class="img-rounded" src="{{{IMAGEM}}}" /></a> |
197 | </div> | 197 | </div> |
198 | - <h3 class="panel-title" > | 198 | + <h3 class="panel-title"> |
199 | <a data-parent="#titulo{{ID_MAPA}}" class="collapsed in pull-right" role="button" | 199 | <a data-parent="#titulo{{ID_MAPA}}" class="collapsed in pull-right" role="button" |
200 | data-toggle="collapse" href="#corpo{{ID_MAPA}}" aria-expanded="false" | 200 | data-toggle="collapse" href="#corpo{{ID_MAPA}}" aria-expanded="false" |
201 | aria-controls="#corpo{{ID_MAPA}}">{{{NOME}}} </a> | 201 | aria-controls="#corpo{{ID_MAPA}}">{{{NOME}}} </a> |
@@ -214,24 +214,20 @@ include "../init/head.php"; | @@ -214,24 +214,20 @@ include "../init/head.php"; | ||
214 | <div class="panel-body"> | 214 | <div class="panel-body"> |
215 | <div id="corpo{{ID_MAPA}}" class="panel-collapse collapse list-group" role="tabpanel" | 215 | <div id="corpo{{ID_MAPA}}" class="panel-collapse collapse list-group" role="tabpanel" |
216 | aria-multiselectable="true"> | 216 | aria-multiselectable="true"> |
217 | - <div class="list-group" > | ||
218 | - {{{subtitulo}}} | ||
219 | - </div> | ||
220 | - </div> | 217 | + <div class="list-group">{{{subtitulo}}}</div> |
218 | + </div> | ||
221 | </div> | 219 | </div> |
222 | </div> | 220 | </div> |
223 | </div> | 221 | </div> |
224 | </div> | 222 | </div> |
225 | </div> | 223 | </div> |
226 | </div> | 224 | </div> |
227 | - <div class="row"> | ||
228 | - <div class="col-sm-3 hidden-xs"> | ||
229 | - <nav class="bs-docs-sidebar affix" style="" id="indiceSpy"> | ||
230 | - <ul class="nav nav-pills nav-stacked" role="tablist" id="indice"> | 225 | + <div class="col-sm-3 hidden-xs"> |
226 | + <nav class="bs-docs-sidebar affix" style="" id="indiceSpy"> | ||
227 | + <ul class="nav nav-pills nav-stacked" role="tablist" id="indice"> | ||
231 | 228 | ||
232 | - </ul> | ||
233 | - </nav> | ||
234 | - </div> | 229 | + </ul> |
230 | + </nav> | ||
235 | </div> | 231 | </div> |
236 | </div> | 232 | </div> |
237 | </div> | 233 | </div> |