From 97ed3d2dc369c2fdf5a1995f399450a44629f321 Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Tue, 12 Dec 2017 17:47:56 -0200
Subject: [PATCH] Inclusão de ícones de atalho para as guias nas barras laterais dos mapas interativos

---
 ferramentas/storymap/default.php |  2 +-
 interface/ol.htm                 | 53 +++++++++++++++++++++++++++++++++++++++++++----------
 interface/openlayersdebug.htm    | 23 +++++++++++++++++------
 interface/osm.htm                | 51 ++++++++++++++++++++++++++++++++++++++++++---------
 ms_criamapa.php                  | 10 ++++++++--
 5 files changed, 111 insertions(+), 28 deletions(-)
diff --git a/ferramentas/storymap/default.php b/ferramentas/storymap/default.php
index d83113a..89f48a2 100755
--- a/ferramentas/storymap/default.php
+++ b/ferramentas/storymap/default.php
@@ -69,7 +69,7 @@ html, body {
 
 </head>
 <body>
-	<div id="storymap">Carregando...</div>
+	<div id="storymap"></div>
 	<!-- JavaScript-->
 	<script src="../../pacotes/knightlab/StoryMapJS/compiled/js/storymap.js"></script>
 	<script>
diff --git a/interface/ol.htm b/interface/ol.htm
index af85596..3c57797 100755
--- a/interface/ol.htm
+++ b/interface/ol.htm
@@ -220,10 +220,21 @@
         <div id="i3GEOguiaMovelMolde">
             <div id="i3GEOguiaMovelConteudo">
                 <!-- camadas existentes no mapa -->
-                <div id='guia1obj' data-traduzir="true" style='display: none; height:100%'>
-                    <div class="i3GEOfechaGuia" onclick="i3GEO.guias.abreFecha('fecha');">
-                        <button>
-                            <span class="pull-left">{{{iconeMapa}}}</span> <span class="pull-right material-icons">cancel</span>
+                <div id='guia1obj' data-traduzir="true" style='display: none; height: 100%'>
+                    <div class="i3GEOfechaGuia" style="display: flex;">
+                        <button class="pull-left text-left" onclick="i3GEO.guias.abreFecha('fecha');">
+                            <span style="vertical-align: middle">{{{iconeMapa}}}</span>
+                        </button>
+                        <button style="width: unset; height: 3rem;" class="text-right" onclick="i3GEO.guias.abreFecha('fecha');">
+                            <span style="vertical-align: middle" class="material-icons">cancel</span>
+                        </button>
+                        <button title="{{{iconeCatalogo}}}" style="width: unset; height: 3rem;" class="text-right" onclick="i3GEO.guias.ativa('adiciona',this)" data-idconteudo="guia2obj"
+                            data-idMigalha="catalogoMigalha" data-idNavegacao="catalogoNavegacao" data-idCatalogo="catalogoPrincipal" data-idMenus="catalogoMenus">
+                            <span style="vertical-align: middle" class="material-icons">layers</span>
+                        </button>
+                        <button title="{{{iconeLegenda}}}" style="width: unset; height: 3rem;" class="text-right" onclick="i3GEO.guias.ativa('legenda',this)" data-idconteudo="guia4obj"
+                            data-idLegenda="legendaHtml">
+                            <span style="vertical-align: middle" class="material-icons">view_list</span>
                         </button>
                     </div>
                     <div class="separadorCabecalhoGuias">&nbsp;</div>
@@ -281,9 +292,20 @@
                 </div>
                 <!-- Catalogo de temas -->
                 <div id='guia2obj' data-traduzir="true" style='display: none; text-align: left;height:100%;'>
-                    <div class="i3GEOfechaGuia" onclick="i3GEO.guias.abreFecha('fecha');i3GEO.catalogoMenus.mostraCatalogoPrincipal();">
-                        <button>
-                            <span class="pull-left">{{{iconeCatalogo}}}</span> <span class="pull-right material-icons">cancel</span>
+                    <div class="i3GEOfechaGuia" style="display: flex;">
+                        <button class="pull-left text-left" onclick="i3GEO.guias.abreFecha('fecha');i3GEO.catalogoMenus.mostraCatalogoPrincipal();">
+                            <span style="vertical-align: middle">{{{iconeCatalogo}}}</span>
+                        </button>
+                        <button style="width: unset; height: 3rem;" class="text-right" onclick="i3GEO.guias.abreFecha('fecha');i3GEO.catalogoMenus.mostraCatalogoPrincipal();">
+                            <span style="vertical-align: middle" class="material-icons">cancel</span>
+                        </button>
+                        <button title="{{{iconeMapa}}}" style="width: unset; height: 3rem;" class="text-right" onclick="i3GEO.guias.ativa('temas',this)" data-verificaAbrangencia=""
+                            data-idconteudo="guia1obj" data-idListaFundo="listaFundo" data-idListaDeCamadas="listaTemas">
+                            <span style="vertical-align: middle" class="material-icons">visibility</span>
+                        </button>
+                        <button title="{{{iconeLegenda}}}" style="width: unset; height: 3rem;" class="text-right" onclick="i3GEO.guias.ativa('legenda',this)" data-idconteudo="guia4obj"
+                            data-idLegenda="legendaHtml">
+                            <span style="vertical-align: middle" class="material-icons">view_list</span>
                         </button>
                     </div>
                     <div class="separadorCabecalhoGuias">&nbsp;</div>
@@ -507,9 +529,20 @@
                 </div>
                 <!-- Legenda -->
                 <div data-traduzir="true" id='guia4obj' style='display: none; text-align: left;height:100%;'>
-                    <div class="i3GEOfechaGuia" onclick="i3GEO.legenda.off('legendaHtml');i3GEO.guias.abreFecha('fecha');">
-                        <button>
-                            <span class="pull-left">{{{iconeLegenda}}}</span> <span class="pull-right material-icons">cancel</span>
+                    <div class="i3GEOfechaGuia" style="display: flex;" >
+                        <button class="pull-left text-left" onclick="i3GEO.legenda.off('legendaHtml');i3GEO.guias.abreFecha('fecha');">
+                            <span style="vertical-align: middle">{{{iconeLegenda}}}</span>
+                        </button>
+                        <button style="width: unset; height: 3rem;" class="text-right" onclick="i3GEO.legenda.off('legendaHtml');i3GEO.guias.abreFecha('fecha');">
+                            <span style="vertical-align: middle" class="material-icons">cancel</span>
+                        </button>
+                        <button title="{{{iconeMapa}}}" style="width: unset; height: 3rem;" class="text-right" onclick="i3GEO.guias.ativa('temas',this)" data-verificaAbrangencia=""
+                            data-idconteudo="guia1obj" data-idListaFundo="listaFundo" data-idListaDeCamadas="listaTemas">
+                            <span style="vertical-align: middle" class="material-icons">visibility</span>
+                        </button>
+                        <button title="{{{iconeCatalogo}}}" style="width: unset; height: 3rem;" class="text-right" onclick="i3GEO.guias.ativa('adiciona',this)" data-idconteudo="guia2obj"
+                            data-idMigalha="catalogoMigalha" data-idNavegacao="catalogoNavegacao" data-idCatalogo="catalogoPrincipal" data-idMenus="catalogoMenus">
+                            <span style="vertical-align: middle" class="material-icons">layers</span>
                         </button>
                     </div>
                     <div class="separadorCabecalhoGuias">&nbsp;</div>
diff --git a/interface/openlayersdebug.htm b/interface/openlayersdebug.htm
index a5ccc47..5c33725 100755
--- a/interface/openlayersdebug.htm
+++ b/interface/openlayersdebug.htm
@@ -294,10 +294,10 @@
                 <!-- Catalogo de temas -->
                 <div id='guia2obj' data-traduzir="true" style='display: none; text-align: left; height: 100%;'>
                     <div class="i3GEOfechaGuia" style="display: flex;">
-                        <button class="pull-left text-left" onclick="i3GEO.guias.abreFecha('fecha');">
+                        <button class="pull-left text-left" onclick="i3GEO.guias.abreFecha('fecha');i3GEO.catalogoMenus.mostraCatalogoPrincipal();">
                             <span style="vertical-align: middle">{{{iconeCatalogo}}}</span>
                         </button>
-                        <button style="width: unset; height: 3rem;" class="text-right" onclick="i3GEO.guias.abreFecha('fecha');">
+                        <button style="width: unset; height: 3rem;" class="text-right" onclick="i3GEO.guias.abreFecha('fecha');i3GEO.catalogoMenus.mostraCatalogoPrincipal();">
                             <span style="vertical-align: middle" class="material-icons">cancel</span>
                         </button>
                         <button title="{{{iconeMapa}}}" style="width: unset; height: 3rem;" class="text-right" onclick="i3GEO.guias.ativa('temas',this)" data-verificaAbrangencia=""
@@ -516,12 +516,23 @@
                 </div>
                 <!-- Legenda -->
                 <div data-traduzir="true" id='guia4obj' style='display: none; text-align: left; height: 100%;'>
-                    <div class="i3GEOfechaGuia" onclick="i3GEO.legenda.off('legendaHtml');i3GEO.guias.abreFecha('fecha');">
-                        <button>
-                            <span class="pull-left">{{{iconeLegenda}}}</span>
-                            <span class="pull-right material-icons">cancel</span>
+                    <div class="i3GEOfechaGuia" style="display: flex;" >
+                        <button class="pull-left text-left" onclick="i3GEO.legenda.off('legendaHtml');i3GEO.guias.abreFecha('fecha');">
+                            <span style="vertical-align: middle">{{{iconeLegenda}}}</span>
+                        </button>
+                        <button style="width: unset; height: 3rem;" class="text-right" onclick="i3GEO.legenda.off('legendaHtml');i3GEO.guias.abreFecha('fecha');">
+                            <span style="vertical-align: middle" class="material-icons">cancel</span>
+                        </button>
+                        <button title="{{{iconeMapa}}}" style="width: unset; height: 3rem;" class="text-right" onclick="i3GEO.guias.ativa('temas',this)" data-verificaAbrangencia=""
+                            data-idconteudo="guia1obj" data-idListaFundo="listaFundo" data-idListaDeCamadas="listaTemas">
+                            <span style="vertical-align: middle" class="material-icons">visibility</span>
+                        </button>
+                        <button title="{{{iconeCatalogo}}}" style="width: unset; height: 3rem;" class="text-right" onclick="i3GEO.guias.ativa('adiciona',this)" data-idconteudo="guia2obj"
+                            data-idMigalha="catalogoMigalha" data-idNavegacao="catalogoNavegacao" data-idCatalogo="catalogoPrincipal" data-idMenus="catalogoMenus">
+                            <span style="vertical-align: middle" class="material-icons">layers</span>
                         </button>
                     </div>
+
                     <div class="separadorCabecalhoGuias">&nbsp;</div>
                     <div class="guiaOverflow" style="height: calc(100% - 45px)">
                         <a href='javascript:void(0)' onclick="i3GEO.legenda.inicia({'janela':true})">{{{x11}}}</a>
diff --git a/interface/osm.htm b/interface/osm.htm
index 43c2dd2..d4e5571 100755
--- a/interface/osm.htm
+++ b/interface/osm.htm
@@ -221,9 +221,20 @@
             <div id="i3GEOguiaMovelConteudo">
                 <!-- camadas existentes no mapa -->
                 <div id='guia1obj' data-traduzir="true" style='display: none; height:100%'>
-                    <div class="i3GEOfechaGuia" onclick="i3GEO.guias.abreFecha('fecha');">
-                        <button>
-                            <span class="pull-left">{{{iconeMapa}}}</span> <span class="pull-right material-icons">cancel</span>
+                    <div class="i3GEOfechaGuia" style="display: flex;">
+                        <button class="pull-left text-left" onclick="i3GEO.guias.abreFecha('fecha');">
+                            <span style="vertical-align: middle">{{{iconeMapa}}}</span>
+                        </button>
+                        <button style="width: unset; height: 3rem;" class="text-right" onclick="i3GEO.guias.abreFecha('fecha');">
+                            <span style="vertical-align: middle" class="material-icons">cancel</span>
+                        </button>
+                        <button title="{{{iconeCatalogo}}}" style="width: unset; height: 3rem;" class="text-right" onclick="i3GEO.guias.ativa('adiciona',this)" data-idconteudo="guia2obj"
+                            data-idMigalha="catalogoMigalha" data-idNavegacao="catalogoNavegacao" data-idCatalogo="catalogoPrincipal" data-idMenus="catalogoMenus">
+                            <span style="vertical-align: middle" class="material-icons">layers</span>
+                        </button>
+                        <button title="{{{iconeLegenda}}}" style="width: unset; height: 3rem;" class="text-right" onclick="i3GEO.guias.ativa('legenda',this)" data-idconteudo="guia4obj"
+                            data-idLegenda="legendaHtml">
+                            <span style="vertical-align: middle" class="material-icons">view_list</span>
                         </button>
                     </div>
                     <div class="separadorCabecalhoGuias">&nbsp;</div>
@@ -281,9 +292,20 @@
                 </div>
                 <!-- Catalogo de temas -->
                 <div id='guia2obj' data-traduzir="true" style='display: none; text-align: left;height:100%;'>
-                    <div class="i3GEOfechaGuia" onclick="i3GEO.guias.abreFecha('fecha');i3GEO.catalogoMenus.mostraCatalogoPrincipal();">
-                        <button>
-                            <span class="pull-left">{{{iconeCatalogo}}}</span> <span class="pull-right material-icons">cancel</span>
+                    <div class="i3GEOfechaGuia" style="display: flex;">
+                        <button class="pull-left text-left" onclick="i3GEO.guias.abreFecha('fecha');i3GEO.catalogoMenus.mostraCatalogoPrincipal();">
+                            <span style="vertical-align: middle">{{{iconeCatalogo}}}</span>
+                        </button>
+                        <button style="width: unset; height: 3rem;" class="text-right" onclick="i3GEO.guias.abreFecha('fecha');i3GEO.catalogoMenus.mostraCatalogoPrincipal();">
+                            <span style="vertical-align: middle" class="material-icons">cancel</span>
+                        </button>
+                        <button title="{{{iconeMapa}}}" style="width: unset; height: 3rem;" class="text-right" onclick="i3GEO.guias.ativa('temas',this)" data-verificaAbrangencia=""
+                            data-idconteudo="guia1obj" data-idListaFundo="listaFundo" data-idListaDeCamadas="listaTemas">
+                            <span style="vertical-align: middle" class="material-icons">visibility</span>
+                        </button>
+                        <button title="{{{iconeLegenda}}}" style="width: unset; height: 3rem;" class="text-right" onclick="i3GEO.guias.ativa('legenda',this)" data-idconteudo="guia4obj"
+                            data-idLegenda="legendaHtml">
+                            <span style="vertical-align: middle" class="material-icons">view_list</span>
                         </button>
                     </div>
                     <div class="separadorCabecalhoGuias">&nbsp;</div>
@@ -507,9 +529,20 @@
                 </div>
                 <!-- Legenda -->
                 <div data-traduzir="true" id='guia4obj' style='display: none; text-align: left;height:100%;'>
-                    <div class="i3GEOfechaGuia" onclick="i3GEO.legenda.off('legendaHtml');i3GEO.guias.abreFecha('fecha');">
-                        <button>
-                            <span class="pull-left">{{{iconeLegenda}}}</span> <span class="pull-right material-icons">cancel</span>
+                    <div class="i3GEOfechaGuia" style="display: flex;" >
+                        <button class="pull-left text-left" onclick="i3GEO.legenda.off('legendaHtml');i3GEO.guias.abreFecha('fecha');">
+                            <span style="vertical-align: middle">{{{iconeLegenda}}}</span>
+                        </button>
+                        <button style="width: unset; height: 3rem;" class="text-right" onclick="i3GEO.legenda.off('legendaHtml');i3GEO.guias.abreFecha('fecha');">
+                            <span style="vertical-align: middle" class="material-icons">cancel</span>
+                        </button>
+                        <button title="{{{iconeMapa}}}" style="width: unset; height: 3rem;" class="text-right" onclick="i3GEO.guias.ativa('temas',this)" data-verificaAbrangencia=""
+                            data-idconteudo="guia1obj" data-idListaFundo="listaFundo" data-idListaDeCamadas="listaTemas">
+                            <span style="vertical-align: middle" class="material-icons">visibility</span>
+                        </button>
+                        <button title="{{{iconeCatalogo}}}" style="width: unset; height: 3rem;" class="text-right" onclick="i3GEO.guias.ativa('adiciona',this)" data-idconteudo="guia2obj"
+                            data-idMigalha="catalogoMigalha" data-idNavegacao="catalogoNavegacao" data-idCatalogo="catalogoPrincipal" data-idMenus="catalogoMenus">
+                            <span style="vertical-align: middle" class="material-icons">layers</span>
                         </button>
                     </div>
                     <div class="separadorCabecalhoGuias">&nbsp;</div>
diff --git a/ms_criamapa.php b/ms_criamapa.php
index 8c00678..1052244 100755
--- a/ms_criamapa.php
+++ b/ms_criamapa.php
@@ -937,9 +937,15 @@ function incluiTemasIniciais()
                         $layern->set("status", $statustemp);
                     }
                     cloneInlineSymbol($layern, $maptemp, $mapn);
-                    $layerAdicionado = ms_newLayerObj($mapn, $layern);
+                    //$layerAdicionado = ms_newLayerObj($mapn, $layern);
+                    if($layern->type == MS_LAYER_POLYGON){
+                        $mapn->insertLayer($layern,0);
+                    } else {
+                        $mapn->insertLayer($layern,-1);
+                    }
                     // echo $layern->name;
-                    corrigeLayerGrid($layern, $layerAdicionado);
+                    //corrigeLayerGrid($layern, $layerAdicionado);
+                    corrigeLayerGrid($layern, $mapn->getlayerbyname($layern->name));
                 }
             }
         }
--
libgit2 0.21.2

