Commit ed85ba7defe4e73013cbdae5afbe2ed14f1b7cf1
1 parent
c2f010c3
Exists in
master
and in
7 other branches
Atualização admin1
Showing
7 changed files
with
90 additions
and
50 deletions
Show diff stats
admin/html/admin.css
@@ -238,7 +238,7 @@ select{ | @@ -238,7 +238,7 @@ select{ | ||
238 | 238 | ||
239 | .mascaraPrincipal { | 239 | .mascaraPrincipal { |
240 | position: relative; | 240 | position: relative; |
241 | - top: -15px; | 241 | + top: 10px; |
242 | width: 100%; | 242 | width: 100%; |
243 | max-width:650pt; | 243 | max-width:650pt; |
244 | text-align: left; | 244 | text-align: left; |
@@ -252,7 +252,6 @@ select{ | @@ -252,7 +252,6 @@ select{ | ||
252 | padding-top: 0px; | 252 | padding-top: 0px; |
253 | COLOR: #2F4632; | 253 | COLOR: #2F4632; |
254 | font-family: Verdana, Arial, Helvetica, sans-serif; | 254 | font-family: Verdana, Arial, Helvetica, sans-serif; |
255 | - background-color: rgb(250, 250, 250); | ||
256 | margin: auto; | 255 | margin: auto; |
257 | font-size: 12px; | 256 | font-size: 12px; |
258 | } | 257 | } |
admin/html/usuarios.html
@@ -22,9 +22,7 @@ body { | @@ -22,9 +22,7 @@ body { | ||
22 | </head> | 22 | </head> |
23 | <body class=" yui-skin-sam fundoPonto"> | 23 | <body class=" yui-skin-sam fundoPonto"> |
24 | <center> | 24 | <center> |
25 | - <div class="bordaSuperior"> </div> | ||
26 | <div class="mascaraPrincipal" id="divGeral"> | 25 | <div class="mascaraPrincipal" id="divGeral"> |
27 | - <div id=cabecalhoPrincipal></div> | ||
28 | <h1> | 26 | <h1> |
29 | {{{usuarios}}}<img | 27 | {{{usuarios}}}<img |
30 | src="../imagens/04.png" style="cursor: pointer" id=botaoAjuda /> | 28 | src="../imagens/04.png" style="cursor: pointer" id=botaoAjuda /> |
admin/js/core.js
@@ -133,20 +133,22 @@ function cabecalhoUsuarios(id,excluir){ | @@ -133,20 +133,22 @@ function cabecalhoUsuarios(id,excluir){ | ||
133 | ins += "<div id='i3GEONomeLogin' style=width:100%; > Login: "+u+"</div>"; | 133 | ins += "<div id='i3GEONomeLogin' style=width:100%; > Login: "+u+"</div>"; |
134 | ins += "</fieldset>"; | 134 | ins += "</fieldset>"; |
135 | temp = $i(id); | 135 | temp = $i(id); |
136 | - temp.innerHTML = ins; | ||
137 | - for(i=0;i<n;i++){ | ||
138 | - if(excluir === "principal" && botoes[i].link) | ||
139 | - {botoes[i].link = "html/"+botoes[i].link;} | ||
140 | - if(botoes[i].id !== excluir){ | ||
141 | - botao = new YAHOO.widget.Button(botoes[i].id); | ||
142 | - botao.addClass("abrir150"); | ||
143 | - if(botoes[i].link){ | ||
144 | - eval('$i("'+botoes[i].id+'-button'+'").onclick = function(){window.location = \''+botoes[i].link+'\';}'); | ||
145 | - } | ||
146 | - else{ | ||
147 | - eval('$i("'+botoes[i].id+'-button'+'").onclick = function(){'+botoes[i].js+';}'); | ||
148 | - } | 136 | + if(temp){ |
137 | + temp.innerHTML = ins; | ||
138 | + for(i=0;i<n;i++){ | ||
139 | + if(excluir === "principal" && botoes[i].link) | ||
140 | + {botoes[i].link = "html/"+botoes[i].link;} | ||
141 | + if(botoes[i].id !== excluir){ | ||
142 | + botao = new YAHOO.widget.Button(botoes[i].id); | ||
143 | + botao.addClass("abrir150"); | ||
144 | + if(botoes[i].link){ | ||
145 | + eval('$i("'+botoes[i].id+'-button'+'").onclick = function(){window.location = \''+botoes[i].link+'\';}'); | ||
146 | + } | ||
147 | + else{ | ||
148 | + eval('$i("'+botoes[i].id+'-button'+'").onclick = function(){'+botoes[i].js+';}'); | ||
149 | + } | ||
149 | 150 | ||
151 | + } | ||
150 | } | 152 | } |
151 | } | 153 | } |
152 | try{ | 154 | try{ |
@@ -360,7 +362,7 @@ function core_handleFailure(o,texto) | @@ -360,7 +362,7 @@ function core_handleFailure(o,texto) | ||
360 | } | 362 | } |
361 | if (!YAHOO.carregando.container.wait) | 363 | if (!YAHOO.carregando.container.wait) |
362 | { | 364 | { |
363 | - YAHOO.carregando.container.wait = new YAHOO.widget.Panel("wait",{width: "240px",fixedcenter: true,close: true,draggable: false,zindex:4,modal: true,visible: false}); | 365 | + YAHOO.carregando.container.wait = new YAHOO.widget.Panel("wait",{width: "240px",fixedcenter: false,close: true,draggable: false,zindex:4,modal: true,visible: false}); |
364 | YAHOO.carregando.container.wait.setHeader("Aguarde..."); | 366 | YAHOO.carregando.container.wait.setHeader("Aguarde..."); |
365 | YAHOO.carregando.container.wait.render(document.body); | 367 | YAHOO.carregando.container.wait.render(document.body); |
366 | } | 368 | } |
@@ -423,7 +425,7 @@ function core_carregando(tipo) | @@ -423,7 +425,7 @@ function core_carregando(tipo) | ||
423 | YAHOO.namespace("carregando.container"); | 425 | YAHOO.namespace("carregando.container"); |
424 | if (!YAHOO.carregando.container.wait) | 426 | if (!YAHOO.carregando.container.wait) |
425 | { | 427 | { |
426 | - YAHOO.carregando.container.wait = new YAHOO.widget.Panel("wait",{width: "240px",fixedcenter: true,close: true,draggable: false,zindex:4,modal: true,visible: false}); | 428 | + YAHOO.carregando.container.wait = new YAHOO.widget.Panel("wait",{width: "240px",fixedcenter: false,close: true,draggable: false,zindex:4,modal: true,visible: false}); |
427 | YAHOO.carregando.container.wait.setHeader("Aguarde..."); | 429 | YAHOO.carregando.container.wait.setHeader("Aguarde..."); |
428 | 430 | ||
429 | YAHOO.carregando.container.wait.setBody("<img src=\""+img+"\"/>"); | 431 | YAHOO.carregando.container.wait.setBody("<img src=\""+img+"\"/>"); |
@@ -464,7 +466,7 @@ function core_dialogoContinua(handleYes,handleNo,mensagem,largura,cabecalho) | @@ -464,7 +466,7 @@ function core_dialogoContinua(handleYes,handleNo,mensagem,largura,cabecalho) | ||
464 | YAHOO.continua.container.simpledialog1 = | 466 | YAHOO.continua.container.simpledialog1 = |
465 | new YAHOO.widget.SimpleDialog("simpledialog1", | 467 | new YAHOO.widget.SimpleDialog("simpledialog1", |
466 | { width: largura+"px", | 468 | { width: largura+"px", |
467 | - fixedcenter: true, | 469 | + fixedcenter: false, |
468 | visible: false, | 470 | visible: false, |
469 | draggable: false, | 471 | draggable: false, |
470 | close: true, | 472 | close: true, |
@@ -501,7 +503,7 @@ function core_dialogoPergunta(handleYes,handleNo,mensagem,largura) | @@ -501,7 +503,7 @@ function core_dialogoPergunta(handleYes,handleNo,mensagem,largura) | ||
501 | YAHOO.continua.container.simpledialog1 = | 503 | YAHOO.continua.container.simpledialog1 = |
502 | new YAHOO.widget.SimpleDialog("simpledialog1", | 504 | new YAHOO.widget.SimpleDialog("simpledialog1", |
503 | { width: largura+"px", | 505 | { width: largura+"px", |
504 | - fixedcenter: true, | 506 | + fixedcenter: false, |
505 | visible: false, | 507 | visible: false, |
506 | draggable: false, | 508 | draggable: false, |
507 | close: true, | 509 | close: true, |
@@ -1579,7 +1581,7 @@ function core_montaEditor(funcaoOK,w,h,funcaoClose,titulo,modal,bsalva,bcancela) | @@ -1579,7 +1581,7 @@ function core_montaEditor(funcaoOK,w,h,funcaoClose,titulo,modal,bsalva,bcancela) | ||
1579 | ); | 1581 | ); |
1580 | } | 1582 | } |
1581 | } | 1583 | } |
1582 | - YAHOO.admin.container.panelEditor = new YAHOO.widget.Panel("janela_editor", { fixedcenter:"contained",close:true,width:w, overflow:"auto",modal: modal,visible:false,constraintoviewport:true } ); | 1584 | + YAHOO.admin.container.panelEditor = new YAHOO.widget.Panel("janela_editor", { fixedcenter:false,close:true,width:w, overflow:"auto",modal: modal,visible:false,constraintoviewport:true } ); |
1583 | YAHOO.admin.container.panelEditor.render(); | 1585 | YAHOO.admin.container.panelEditor.render(); |
1584 | } | 1586 | } |
1585 | else | 1587 | else |
admin1/head.js
@@ -70,7 +70,7 @@ menuPrincipal = [ | @@ -70,7 +70,7 @@ menuPrincipal = [ | ||
70 | { | 70 | { |
71 | html: "<a href='" + i3GEO.configura.locaplic + "/admin1/usuarios/operacoes/index.php' >"+$trad("controleOperac",i3GEOadmin.menup.dicionario)+"</a>" | 71 | html: "<a href='" + i3GEO.configura.locaplic + "/admin1/usuarios/operacoes/index.php' >"+$trad("controleOperac",i3GEOadmin.menup.dicionario)+"</a>" |
72 | },{ | 72 | },{ |
73 | - html: "<a href='html/usuarios.html' >"+$trad("cadastroUsuario",i3GEOadmin.menup.dicionario)+"</a>" | 73 | + html: "<a href='" + i3GEO.configura.locaplic + "/admin1/usuarios/cadastro/index.php' >"+$trad("cadastroUsuario",i3GEOadmin.menup.dicionario)+"</a>" |
74 | },{ | 74 | },{ |
75 | html: "<a href='html/gruposusuarios.html' >"+$trad("cadastroGrupos",i3GEOadmin.menup.dicionario)+"</a>" | 75 | html: "<a href='html/gruposusuarios.html' >"+$trad("cadastroGrupos",i3GEOadmin.menup.dicionario)+"</a>" |
76 | } | 76 | } |
admin1/js/core.js
@@ -143,20 +143,22 @@ function cabecalhoMetaestat(id,excluir){ | @@ -143,20 +143,22 @@ function cabecalhoMetaestat(id,excluir){ | ||
143 | ins += "<div id='i3GEONomeLogin' style=width:100%; > Login: "+u+"</div>"; | 143 | ins += "<div id='i3GEONomeLogin' style=width:100%; > Login: "+u+"</div>"; |
144 | ins += "</fieldset>"; | 144 | ins += "</fieldset>"; |
145 | temp = $i(id); | 145 | temp = $i(id); |
146 | - temp.innerHTML = ins; | ||
147 | - for(i=0;i<n;i++){ | ||
148 | - if(excluir === "principal" && botoes[i].link) | ||
149 | - {botoes[i].link = "html/"+botoes[i].link;} | ||
150 | - if(botoes[i].id !== excluir){ | ||
151 | - botao = new YAHOO.widget.Button(botoes[i].id); | ||
152 | - botao.addClass("abrir150"); | ||
153 | - if(botoes[i].link){ | ||
154 | - eval('$i("'+botoes[i].id+'-button'+'").onclick = function(){window.location = \''+botoes[i].link+'\';}'); | ||
155 | - } | ||
156 | - else{ | ||
157 | - eval('$i("'+botoes[i].id+'-button'+'").onclick = function(){'+botoes[i].js+';}'); | ||
158 | - } | 146 | + if(temp){ |
147 | + temp.innerHTML = ins; | ||
148 | + for(i=0;i<n;i++){ | ||
149 | + if(excluir === "principal" && botoes[i].link) | ||
150 | + {botoes[i].link = "html/"+botoes[i].link;} | ||
151 | + if(botoes[i].id !== excluir){ | ||
152 | + botao = new YAHOO.widget.Button(botoes[i].id); | ||
153 | + botao.addClass("abrir150"); | ||
154 | + if(botoes[i].link){ | ||
155 | + eval('$i("'+botoes[i].id+'-button'+'").onclick = function(){window.location = \''+botoes[i].link+'\';}'); | ||
156 | + } | ||
157 | + else{ | ||
158 | + eval('$i("'+botoes[i].id+'-button'+'").onclick = function(){'+botoes[i].js+';}'); | ||
159 | + } | ||
159 | 160 | ||
161 | + } | ||
160 | } | 162 | } |
161 | } | 163 | } |
162 | try{ | 164 | try{ |
@@ -188,20 +190,22 @@ function cabecalhoUsuarios(id,excluir){ | @@ -188,20 +190,22 @@ function cabecalhoUsuarios(id,excluir){ | ||
188 | ins += "<div id='i3GEONomeLogin' style=width:100%; > Login: "+u+"</div>"; | 190 | ins += "<div id='i3GEONomeLogin' style=width:100%; > Login: "+u+"</div>"; |
189 | ins += "</fieldset>"; | 191 | ins += "</fieldset>"; |
190 | temp = $i(id); | 192 | temp = $i(id); |
191 | - temp.innerHTML = ins; | ||
192 | - for(i=0;i<n;i++){ | ||
193 | - if(excluir === "principal" && botoes[i].link) | ||
194 | - {botoes[i].link = "html/"+botoes[i].link;} | ||
195 | - if(botoes[i].id !== excluir){ | ||
196 | - botao = new YAHOO.widget.Button(botoes[i].id); | ||
197 | - botao.addClass("abrir150"); | ||
198 | - if(botoes[i].link){ | ||
199 | - eval('$i("'+botoes[i].id+'-button'+'").onclick = function(){window.location = \''+botoes[i].link+'\';}'); | ||
200 | - } | ||
201 | - else{ | ||
202 | - eval('$i("'+botoes[i].id+'-button'+'").onclick = function(){'+botoes[i].js+';}'); | ||
203 | - } | 193 | + if(temp){ |
194 | + temp.innerHTML = ins; | ||
195 | + for(i=0;i<n;i++){ | ||
196 | + if(excluir === "principal" && botoes[i].link) | ||
197 | + {botoes[i].link = "html/"+botoes[i].link;} | ||
198 | + if(botoes[i].id !== excluir){ | ||
199 | + botao = new YAHOO.widget.Button(botoes[i].id); | ||
200 | + botao.addClass("abrir150"); | ||
201 | + if(botoes[i].link){ | ||
202 | + eval('$i("'+botoes[i].id+'-button'+'").onclick = function(){window.location = \''+botoes[i].link+'\';}'); | ||
203 | + } | ||
204 | + else{ | ||
205 | + eval('$i("'+botoes[i].id+'-button'+'").onclick = function(){'+botoes[i].js+';}'); | ||
206 | + } | ||
204 | 207 | ||
208 | + } | ||
205 | } | 209 | } |
206 | } | 210 | } |
207 | try{ | 211 | try{ |
@@ -0,0 +1,37 @@ | @@ -0,0 +1,37 @@ | ||
1 | +<?php | ||
2 | +define ( ONDEI3GEO, "../../.." ); | ||
3 | +include (dirname ( __FILE__ ) . "/../../../ms_configura.php"); | ||
4 | +error_reporting ( 0 ); | ||
5 | +include "../../head.php"; | ||
6 | +?> | ||
7 | +<div class="container-fluid"> | ||
8 | + <div class="row"> | ||
9 | + <ol class="breadcrumb"> | ||
10 | + <li><a href="../../init/index.php">i3Geo</a></li> | ||
11 | + <li><a href="../../index.php">Admin</a></li> | ||
12 | + <li>Usuários</li> | ||
13 | + <li class="active">Cadastro</li> | ||
14 | + </ol> | ||
15 | + </div> | ||
16 | + | ||
17 | +</div> | ||
18 | +<div class="container-fluid"> | ||
19 | + <div class="row"> | ||
20 | + <iframe style="width:100%; height:5000px;border:none; scrolling:no; frameborder:0; marginheight:0; marginwidth:0;" src="../../../admin/html/usuarios.html"></iframe> | ||
21 | +</div> | ||
22 | +</div> | ||
23 | +<script> | ||
24 | + $(document).ready(function(){ | ||
25 | + //vem de admin1/index.js | ||
26 | + iniciaMenuPrincipal(); | ||
27 | + $('ul.dropdown-menu [data-toggle=dropdown]').on('click', function(event) { | ||
28 | + event.preventDefault(); | ||
29 | + event.stopPropagation(); | ||
30 | + $(this).parent().siblings().removeClass('open'); | ||
31 | + $(this).parent().toggleClass('open'); | ||
32 | + }); | ||
33 | + $.material.init(); | ||
34 | + }); | ||
35 | +</script> | ||
36 | +</body> | ||
37 | +</html> |
admin1/usuarios/operacoes/index.php
@@ -131,6 +131,6 @@ include "../../head.php"; | @@ -131,6 +131,6 @@ include "../../head.php"; | ||
131 | }; | 131 | }; |
132 | i3GEO.login.verificaOperacao("admin/html/operacoes",i3GEO.configura.locaplic, inicia, "sessao"); | 132 | i3GEO.login.verificaOperacao("admin/html/operacoes",i3GEO.configura.locaplic, inicia, "sessao"); |
133 | }); | 133 | }); |
134 | - </script> | 134 | +</script> |
135 | </body> | 135 | </body> |
136 | </html> | 136 | </html> |