Commit 97ed3d2dc369c2fdf5a1995f399450a44629f321
1 parent
260afaba
Exists in
master
and in
6 other branches
Inclusão de ícones de atalho para as guias nas barras laterais dos mapas interativos
Showing
5 changed files
with
111 additions
and
28 deletions
Show diff stats
ferramentas/storymap/default.php
| @@ -69,7 +69,7 @@ html, body { | @@ -69,7 +69,7 @@ html, body { | ||
| 69 | 69 | ||
| 70 | </head> | 70 | </head> |
| 71 | <body> | 71 | <body> |
| 72 | - <div id="storymap">Carregando...</div> | 72 | + <div id="storymap"></div> |
| 73 | <!-- JavaScript--> | 73 | <!-- JavaScript--> |
| 74 | <script src="../../pacotes/knightlab/StoryMapJS/compiled/js/storymap.js"></script> | 74 | <script src="../../pacotes/knightlab/StoryMapJS/compiled/js/storymap.js"></script> |
| 75 | <script> | 75 | <script> |
interface/ol.htm
| @@ -220,10 +220,21 @@ | @@ -220,10 +220,21 @@ | ||
| 220 | <div id="i3GEOguiaMovelMolde"> | 220 | <div id="i3GEOguiaMovelMolde"> |
| 221 | <div id="i3GEOguiaMovelConteudo"> | 221 | <div id="i3GEOguiaMovelConteudo"> |
| 222 | <!-- camadas existentes no mapa --> | 222 | <!-- camadas existentes no mapa --> |
| 223 | - <div id='guia1obj' data-traduzir="true" style='display: none; height:100%'> | ||
| 224 | - <div class="i3GEOfechaGuia" onclick="i3GEO.guias.abreFecha('fecha');"> | ||
| 225 | - <button> | ||
| 226 | - <span class="pull-left">{{{iconeMapa}}}</span> <span class="pull-right material-icons">cancel</span> | 223 | + <div id='guia1obj' data-traduzir="true" style='display: none; height: 100%'> |
| 224 | + <div class="i3GEOfechaGuia" style="display: flex;"> | ||
| 225 | + <button class="pull-left text-left" onclick="i3GEO.guias.abreFecha('fecha');"> | ||
| 226 | + <span style="vertical-align: middle">{{{iconeMapa}}}</span> | ||
| 227 | + </button> | ||
| 228 | + <button style="width: unset; height: 3rem;" class="text-right" onclick="i3GEO.guias.abreFecha('fecha');"> | ||
| 229 | + <span style="vertical-align: middle" class="material-icons">cancel</span> | ||
| 230 | + </button> | ||
| 231 | + <button title="{{{iconeCatalogo}}}" style="width: unset; height: 3rem;" class="text-right" onclick="i3GEO.guias.ativa('adiciona',this)" data-idconteudo="guia2obj" | ||
| 232 | + data-idMigalha="catalogoMigalha" data-idNavegacao="catalogoNavegacao" data-idCatalogo="catalogoPrincipal" data-idMenus="catalogoMenus"> | ||
| 233 | + <span style="vertical-align: middle" class="material-icons">layers</span> | ||
| 234 | + </button> | ||
| 235 | + <button title="{{{iconeLegenda}}}" style="width: unset; height: 3rem;" class="text-right" onclick="i3GEO.guias.ativa('legenda',this)" data-idconteudo="guia4obj" | ||
| 236 | + data-idLegenda="legendaHtml"> | ||
| 237 | + <span style="vertical-align: middle" class="material-icons">view_list</span> | ||
| 227 | </button> | 238 | </button> |
| 228 | </div> | 239 | </div> |
| 229 | <div class="separadorCabecalhoGuias"> </div> | 240 | <div class="separadorCabecalhoGuias"> </div> |
| @@ -281,9 +292,20 @@ | @@ -281,9 +292,20 @@ | ||
| 281 | </div> | 292 | </div> |
| 282 | <!-- Catalogo de temas --> | 293 | <!-- Catalogo de temas --> |
| 283 | <div id='guia2obj' data-traduzir="true" style='display: none; text-align: left;height:100%;'> | 294 | <div id='guia2obj' data-traduzir="true" style='display: none; text-align: left;height:100%;'> |
| 284 | - <div class="i3GEOfechaGuia" onclick="i3GEO.guias.abreFecha('fecha');i3GEO.catalogoMenus.mostraCatalogoPrincipal();"> | ||
| 285 | - <button> | ||
| 286 | - <span class="pull-left">{{{iconeCatalogo}}}</span> <span class="pull-right material-icons">cancel</span> | 295 | + <div class="i3GEOfechaGuia" style="display: flex;"> |
| 296 | + <button class="pull-left text-left" onclick="i3GEO.guias.abreFecha('fecha');i3GEO.catalogoMenus.mostraCatalogoPrincipal();"> | ||
| 297 | + <span style="vertical-align: middle">{{{iconeCatalogo}}}</span> | ||
| 298 | + </button> | ||
| 299 | + <button style="width: unset; height: 3rem;" class="text-right" onclick="i3GEO.guias.abreFecha('fecha');i3GEO.catalogoMenus.mostraCatalogoPrincipal();"> | ||
| 300 | + <span style="vertical-align: middle" class="material-icons">cancel</span> | ||
| 301 | + </button> | ||
| 302 | + <button title="{{{iconeMapa}}}" style="width: unset; height: 3rem;" class="text-right" onclick="i3GEO.guias.ativa('temas',this)" data-verificaAbrangencia="" | ||
| 303 | + data-idconteudo="guia1obj" data-idListaFundo="listaFundo" data-idListaDeCamadas="listaTemas"> | ||
| 304 | + <span style="vertical-align: middle" class="material-icons">visibility</span> | ||
| 305 | + </button> | ||
| 306 | + <button title="{{{iconeLegenda}}}" style="width: unset; height: 3rem;" class="text-right" onclick="i3GEO.guias.ativa('legenda',this)" data-idconteudo="guia4obj" | ||
| 307 | + data-idLegenda="legendaHtml"> | ||
| 308 | + <span style="vertical-align: middle" class="material-icons">view_list</span> | ||
| 287 | </button> | 309 | </button> |
| 288 | </div> | 310 | </div> |
| 289 | <div class="separadorCabecalhoGuias"> </div> | 311 | <div class="separadorCabecalhoGuias"> </div> |
| @@ -507,9 +529,20 @@ | @@ -507,9 +529,20 @@ | ||
| 507 | </div> | 529 | </div> |
| 508 | <!-- Legenda --> | 530 | <!-- Legenda --> |
| 509 | <div data-traduzir="true" id='guia4obj' style='display: none; text-align: left;height:100%;'> | 531 | <div data-traduzir="true" id='guia4obj' style='display: none; text-align: left;height:100%;'> |
| 510 | - <div class="i3GEOfechaGuia" onclick="i3GEO.legenda.off('legendaHtml');i3GEO.guias.abreFecha('fecha');"> | ||
| 511 | - <button> | ||
| 512 | - <span class="pull-left">{{{iconeLegenda}}}</span> <span class="pull-right material-icons">cancel</span> | 532 | + <div class="i3GEOfechaGuia" style="display: flex;" > |
| 533 | + <button class="pull-left text-left" onclick="i3GEO.legenda.off('legendaHtml');i3GEO.guias.abreFecha('fecha');"> | ||
| 534 | + <span style="vertical-align: middle">{{{iconeLegenda}}}</span> | ||
| 535 | + </button> | ||
| 536 | + <button style="width: unset; height: 3rem;" class="text-right" onclick="i3GEO.legenda.off('legendaHtml');i3GEO.guias.abreFecha('fecha');"> | ||
| 537 | + <span style="vertical-align: middle" class="material-icons">cancel</span> | ||
| 538 | + </button> | ||
| 539 | + <button title="{{{iconeMapa}}}" style="width: unset; height: 3rem;" class="text-right" onclick="i3GEO.guias.ativa('temas',this)" data-verificaAbrangencia="" | ||
| 540 | + data-idconteudo="guia1obj" data-idListaFundo="listaFundo" data-idListaDeCamadas="listaTemas"> | ||
| 541 | + <span style="vertical-align: middle" class="material-icons">visibility</span> | ||
| 542 | + </button> | ||
| 543 | + <button title="{{{iconeCatalogo}}}" style="width: unset; height: 3rem;" class="text-right" onclick="i3GEO.guias.ativa('adiciona',this)" data-idconteudo="guia2obj" | ||
| 544 | + data-idMigalha="catalogoMigalha" data-idNavegacao="catalogoNavegacao" data-idCatalogo="catalogoPrincipal" data-idMenus="catalogoMenus"> | ||
| 545 | + <span style="vertical-align: middle" class="material-icons">layers</span> | ||
| 513 | </button> | 546 | </button> |
| 514 | </div> | 547 | </div> |
| 515 | <div class="separadorCabecalhoGuias"> </div> | 548 | <div class="separadorCabecalhoGuias"> </div> |
interface/openlayersdebug.htm
| @@ -294,10 +294,10 @@ | @@ -294,10 +294,10 @@ | ||
| 294 | <!-- Catalogo de temas --> | 294 | <!-- Catalogo de temas --> |
| 295 | <div id='guia2obj' data-traduzir="true" style='display: none; text-align: left; height: 100%;'> | 295 | <div id='guia2obj' data-traduzir="true" style='display: none; text-align: left; height: 100%;'> |
| 296 | <div class="i3GEOfechaGuia" style="display: flex;"> | 296 | <div class="i3GEOfechaGuia" style="display: flex;"> |
| 297 | - <button class="pull-left text-left" onclick="i3GEO.guias.abreFecha('fecha');"> | 297 | + <button class="pull-left text-left" onclick="i3GEO.guias.abreFecha('fecha');i3GEO.catalogoMenus.mostraCatalogoPrincipal();"> |
| 298 | <span style="vertical-align: middle">{{{iconeCatalogo}}}</span> | 298 | <span style="vertical-align: middle">{{{iconeCatalogo}}}</span> |
| 299 | </button> | 299 | </button> |
| 300 | - <button style="width: unset; height: 3rem;" class="text-right" onclick="i3GEO.guias.abreFecha('fecha');"> | 300 | + <button style="width: unset; height: 3rem;" class="text-right" onclick="i3GEO.guias.abreFecha('fecha');i3GEO.catalogoMenus.mostraCatalogoPrincipal();"> |
| 301 | <span style="vertical-align: middle" class="material-icons">cancel</span> | 301 | <span style="vertical-align: middle" class="material-icons">cancel</span> |
| 302 | </button> | 302 | </button> |
| 303 | <button title="{{{iconeMapa}}}" style="width: unset; height: 3rem;" class="text-right" onclick="i3GEO.guias.ativa('temas',this)" data-verificaAbrangencia="" | 303 | <button title="{{{iconeMapa}}}" style="width: unset; height: 3rem;" class="text-right" onclick="i3GEO.guias.ativa('temas',this)" data-verificaAbrangencia="" |
| @@ -516,12 +516,23 @@ | @@ -516,12 +516,23 @@ | ||
| 516 | </div> | 516 | </div> |
| 517 | <!-- Legenda --> | 517 | <!-- Legenda --> |
| 518 | <div data-traduzir="true" id='guia4obj' style='display: none; text-align: left; height: 100%;'> | 518 | <div data-traduzir="true" id='guia4obj' style='display: none; text-align: left; height: 100%;'> |
| 519 | - <div class="i3GEOfechaGuia" onclick="i3GEO.legenda.off('legendaHtml');i3GEO.guias.abreFecha('fecha');"> | ||
| 520 | - <button> | ||
| 521 | - <span class="pull-left">{{{iconeLegenda}}}</span> | ||
| 522 | - <span class="pull-right material-icons">cancel</span> | 519 | + <div class="i3GEOfechaGuia" style="display: flex;" > |
| 520 | + <button class="pull-left text-left" onclick="i3GEO.legenda.off('legendaHtml');i3GEO.guias.abreFecha('fecha');"> | ||
| 521 | + <span style="vertical-align: middle">{{{iconeLegenda}}}</span> | ||
| 522 | + </button> | ||
| 523 | + <button style="width: unset; height: 3rem;" class="text-right" onclick="i3GEO.legenda.off('legendaHtml');i3GEO.guias.abreFecha('fecha');"> | ||
| 524 | + <span style="vertical-align: middle" class="material-icons">cancel</span> | ||
| 525 | + </button> | ||
| 526 | + <button title="{{{iconeMapa}}}" style="width: unset; height: 3rem;" class="text-right" onclick="i3GEO.guias.ativa('temas',this)" data-verificaAbrangencia="" | ||
| 527 | + data-idconteudo="guia1obj" data-idListaFundo="listaFundo" data-idListaDeCamadas="listaTemas"> | ||
| 528 | + <span style="vertical-align: middle" class="material-icons">visibility</span> | ||
| 529 | + </button> | ||
| 530 | + <button title="{{{iconeCatalogo}}}" style="width: unset; height: 3rem;" class="text-right" onclick="i3GEO.guias.ativa('adiciona',this)" data-idconteudo="guia2obj" | ||
| 531 | + data-idMigalha="catalogoMigalha" data-idNavegacao="catalogoNavegacao" data-idCatalogo="catalogoPrincipal" data-idMenus="catalogoMenus"> | ||
| 532 | + <span style="vertical-align: middle" class="material-icons">layers</span> | ||
| 523 | </button> | 533 | </button> |
| 524 | </div> | 534 | </div> |
| 535 | + | ||
| 525 | <div class="separadorCabecalhoGuias"> </div> | 536 | <div class="separadorCabecalhoGuias"> </div> |
| 526 | <div class="guiaOverflow" style="height: calc(100% - 45px)"> | 537 | <div class="guiaOverflow" style="height: calc(100% - 45px)"> |
| 527 | <a href='javascript:void(0)' onclick="i3GEO.legenda.inicia({'janela':true})">{{{x11}}}</a> | 538 | <a href='javascript:void(0)' onclick="i3GEO.legenda.inicia({'janela':true})">{{{x11}}}</a> |
interface/osm.htm
| @@ -221,9 +221,20 @@ | @@ -221,9 +221,20 @@ | ||
| 221 | <div id="i3GEOguiaMovelConteudo"> | 221 | <div id="i3GEOguiaMovelConteudo"> |
| 222 | <!-- camadas existentes no mapa --> | 222 | <!-- camadas existentes no mapa --> |
| 223 | <div id='guia1obj' data-traduzir="true" style='display: none; height:100%'> | 223 | <div id='guia1obj' data-traduzir="true" style='display: none; height:100%'> |
| 224 | - <div class="i3GEOfechaGuia" onclick="i3GEO.guias.abreFecha('fecha');"> | ||
| 225 | - <button> | ||
| 226 | - <span class="pull-left">{{{iconeMapa}}}</span> <span class="pull-right material-icons">cancel</span> | 224 | + <div class="i3GEOfechaGuia" style="display: flex;"> |
| 225 | + <button class="pull-left text-left" onclick="i3GEO.guias.abreFecha('fecha');"> | ||
| 226 | + <span style="vertical-align: middle">{{{iconeMapa}}}</span> | ||
| 227 | + </button> | ||
| 228 | + <button style="width: unset; height: 3rem;" class="text-right" onclick="i3GEO.guias.abreFecha('fecha');"> | ||
| 229 | + <span style="vertical-align: middle" class="material-icons">cancel</span> | ||
| 230 | + </button> | ||
| 231 | + <button title="{{{iconeCatalogo}}}" style="width: unset; height: 3rem;" class="text-right" onclick="i3GEO.guias.ativa('adiciona',this)" data-idconteudo="guia2obj" | ||
| 232 | + data-idMigalha="catalogoMigalha" data-idNavegacao="catalogoNavegacao" data-idCatalogo="catalogoPrincipal" data-idMenus="catalogoMenus"> | ||
| 233 | + <span style="vertical-align: middle" class="material-icons">layers</span> | ||
| 234 | + </button> | ||
| 235 | + <button title="{{{iconeLegenda}}}" style="width: unset; height: 3rem;" class="text-right" onclick="i3GEO.guias.ativa('legenda',this)" data-idconteudo="guia4obj" | ||
| 236 | + data-idLegenda="legendaHtml"> | ||
| 237 | + <span style="vertical-align: middle" class="material-icons">view_list</span> | ||
| 227 | </button> | 238 | </button> |
| 228 | </div> | 239 | </div> |
| 229 | <div class="separadorCabecalhoGuias"> </div> | 240 | <div class="separadorCabecalhoGuias"> </div> |
| @@ -281,9 +292,20 @@ | @@ -281,9 +292,20 @@ | ||
| 281 | </div> | 292 | </div> |
| 282 | <!-- Catalogo de temas --> | 293 | <!-- Catalogo de temas --> |
| 283 | <div id='guia2obj' data-traduzir="true" style='display: none; text-align: left;height:100%;'> | 294 | <div id='guia2obj' data-traduzir="true" style='display: none; text-align: left;height:100%;'> |
| 284 | - <div class="i3GEOfechaGuia" onclick="i3GEO.guias.abreFecha('fecha');i3GEO.catalogoMenus.mostraCatalogoPrincipal();"> | ||
| 285 | - <button> | ||
| 286 | - <span class="pull-left">{{{iconeCatalogo}}}</span> <span class="pull-right material-icons">cancel</span> | 295 | + <div class="i3GEOfechaGuia" style="display: flex;"> |
| 296 | + <button class="pull-left text-left" onclick="i3GEO.guias.abreFecha('fecha');i3GEO.catalogoMenus.mostraCatalogoPrincipal();"> | ||
| 297 | + <span style="vertical-align: middle">{{{iconeCatalogo}}}</span> | ||
| 298 | + </button> | ||
| 299 | + <button style="width: unset; height: 3rem;" class="text-right" onclick="i3GEO.guias.abreFecha('fecha');i3GEO.catalogoMenus.mostraCatalogoPrincipal();"> | ||
| 300 | + <span style="vertical-align: middle" class="material-icons">cancel</span> | ||
| 301 | + </button> | ||
| 302 | + <button title="{{{iconeMapa}}}" style="width: unset; height: 3rem;" class="text-right" onclick="i3GEO.guias.ativa('temas',this)" data-verificaAbrangencia="" | ||
| 303 | + data-idconteudo="guia1obj" data-idListaFundo="listaFundo" data-idListaDeCamadas="listaTemas"> | ||
| 304 | + <span style="vertical-align: middle" class="material-icons">visibility</span> | ||
| 305 | + </button> | ||
| 306 | + <button title="{{{iconeLegenda}}}" style="width: unset; height: 3rem;" class="text-right" onclick="i3GEO.guias.ativa('legenda',this)" data-idconteudo="guia4obj" | ||
| 307 | + data-idLegenda="legendaHtml"> | ||
| 308 | + <span style="vertical-align: middle" class="material-icons">view_list</span> | ||
| 287 | </button> | 309 | </button> |
| 288 | </div> | 310 | </div> |
| 289 | <div class="separadorCabecalhoGuias"> </div> | 311 | <div class="separadorCabecalhoGuias"> </div> |
| @@ -507,9 +529,20 @@ | @@ -507,9 +529,20 @@ | ||
| 507 | </div> | 529 | </div> |
| 508 | <!-- Legenda --> | 530 | <!-- Legenda --> |
| 509 | <div data-traduzir="true" id='guia4obj' style='display: none; text-align: left;height:100%;'> | 531 | <div data-traduzir="true" id='guia4obj' style='display: none; text-align: left;height:100%;'> |
| 510 | - <div class="i3GEOfechaGuia" onclick="i3GEO.legenda.off('legendaHtml');i3GEO.guias.abreFecha('fecha');"> | ||
| 511 | - <button> | ||
| 512 | - <span class="pull-left">{{{iconeLegenda}}}</span> <span class="pull-right material-icons">cancel</span> | 532 | + <div class="i3GEOfechaGuia" style="display: flex;" > |
| 533 | + <button class="pull-left text-left" onclick="i3GEO.legenda.off('legendaHtml');i3GEO.guias.abreFecha('fecha');"> | ||
| 534 | + <span style="vertical-align: middle">{{{iconeLegenda}}}</span> | ||
| 535 | + </button> | ||
| 536 | + <button style="width: unset; height: 3rem;" class="text-right" onclick="i3GEO.legenda.off('legendaHtml');i3GEO.guias.abreFecha('fecha');"> | ||
| 537 | + <span style="vertical-align: middle" class="material-icons">cancel</span> | ||
| 538 | + </button> | ||
| 539 | + <button title="{{{iconeMapa}}}" style="width: unset; height: 3rem;" class="text-right" onclick="i3GEO.guias.ativa('temas',this)" data-verificaAbrangencia="" | ||
| 540 | + data-idconteudo="guia1obj" data-idListaFundo="listaFundo" data-idListaDeCamadas="listaTemas"> | ||
| 541 | + <span style="vertical-align: middle" class="material-icons">visibility</span> | ||
| 542 | + </button> | ||
| 543 | + <button title="{{{iconeCatalogo}}}" style="width: unset; height: 3rem;" class="text-right" onclick="i3GEO.guias.ativa('adiciona',this)" data-idconteudo="guia2obj" | ||
| 544 | + data-idMigalha="catalogoMigalha" data-idNavegacao="catalogoNavegacao" data-idCatalogo="catalogoPrincipal" data-idMenus="catalogoMenus"> | ||
| 545 | + <span style="vertical-align: middle" class="material-icons">layers</span> | ||
| 513 | </button> | 546 | </button> |
| 514 | </div> | 547 | </div> |
| 515 | <div class="separadorCabecalhoGuias"> </div> | 548 | <div class="separadorCabecalhoGuias"> </div> |
ms_criamapa.php
| @@ -937,9 +937,15 @@ function incluiTemasIniciais() | @@ -937,9 +937,15 @@ function incluiTemasIniciais() | ||
| 937 | $layern->set("status", $statustemp); | 937 | $layern->set("status", $statustemp); |
| 938 | } | 938 | } |
| 939 | cloneInlineSymbol($layern, $maptemp, $mapn); | 939 | cloneInlineSymbol($layern, $maptemp, $mapn); |
| 940 | - $layerAdicionado = ms_newLayerObj($mapn, $layern); | 940 | + //$layerAdicionado = ms_newLayerObj($mapn, $layern); |
| 941 | + if($layern->type == MS_LAYER_POLYGON){ | ||
| 942 | + $mapn->insertLayer($layern,0); | ||
| 943 | + } else { | ||
| 944 | + $mapn->insertLayer($layern,-1); | ||
| 945 | + } | ||
| 941 | // echo $layern->name; | 946 | // echo $layern->name; |
| 942 | - corrigeLayerGrid($layern, $layerAdicionado); | 947 | + //corrigeLayerGrid($layern, $layerAdicionado); |
| 948 | + corrigeLayerGrid($layern, $mapn->getlayerbyname($layern->name)); | ||
| 943 | } | 949 | } |
| 944 | } | 950 | } |
| 945 | } | 951 | } |