Download as
Browse Code »

Commit cc8686bf8f7eac9c53aa0e69417fb8bfa96de762

Authored by Edmar Moretti
1 parent a5a66763
Exists in master and in 7 other branches composer, doc-root, docker, guia, licenca, readme, unmaintened

Correção em ícones e estilos das páginas principais de aplicativos do i3Geo

Showing 11 changed files with 51 additions and 35 deletions   Show diff stats
admin1/head.php
  Diff comments   View file @cc8686b
@@ -411,7 +411,7 @@ a.collapsed .readLess { @@ -411,7 +411,7 @@ a.collapsed .readLess {
411 <button title="icon bar" type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar"> 411 <button title="icon bar" type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
412 <span class="sr-only"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> 412 <span class="sr-only"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span>
413 </button> 413 </button>
414 - <a class="navbar-brand" href="<?php echo ONDEI3GEO; ?>/init/index.php"><?php echo $_SESSION["mensagemInicia"];?> <i class="material-icons">home</i> 414 + <a class="navbar-brand" href="<?php echo ONDEI3GEO; ?>/init/index.php"><?php echo $_SESSION["mensagemInicia"];?> <i class="fa fa-home fa-1x"></i>
415 </a> 415 </a>
416 </div> 416 </div>
417 <div id="navbar" class="navbar-collapse collapse navbar-responsive-collapse"> 417 <div id="navbar" class="navbar-collapse collapse navbar-responsive-collapse">
classesphp/funcoes_gerais.php
  Diff comments   View file @cc8686b
@@ -3043,7 +3043,10 @@ function restauraMapaAdmin($id_mapa,$dir_tmp){ @@ -3043,7 +3043,10 @@ function restauraMapaAdmin($id_mapa,$dir_tmp){
3043 $dbh = null; 3043 $dbh = null;
3044 $dbhw = null; 3044 $dbhw = null;
3045 $mapasalvo = $mapasalvo[0]; 3045 $mapasalvo = $mapasalvo[0];
3046 - $base = ""; 3046 + $base = "";
  3047 + if(!isset($mapasalvo["publicado"])){
  3048 + $mapasalvo["publicado"] = "";
  3049 + }
3047 if(strtoupper($mapasalvo["publicado"]) != "NAO"){ 3050 if(strtoupper($mapasalvo["publicado"]) != "NAO"){
3048 $base = $dir_tmp."/".nomeRandomico()."_restaurado.map"; 3051 $base = $dir_tmp."/".nomeRandomico()."_restaurado.map";
3049 $baseh = fopen($base,'w'); 3052 $baseh = fopen($base,'w');
classesphp/mapa_controle.php
  Diff comments   View file @cc8686b
@@ -1595,12 +1595,16 @@ switch (strtoupper($funcao)) { @@ -1595,12 +1595,16 @@ switch (strtoupper($funcao)) {
1595 */ 1595 */
1596 case "PEGALISTADEMENUS": 1596 case "PEGALISTADEMENUS":
1597 include_once ("classe_menutemas.php"); 1597 include_once ("classe_menutemas.php");
1598 - if(isset($_pg["editores"])){ 1598 + if (isset($_pg["editores"])) {
1599 $editores = $_pg["editores"]; 1599 $editores = $_pg["editores"];
1600 } else { 1600 } else {
1601 $editores = ""; 1601 $editores = "";
1602 } 1602 }
1603 - $perfil = $_pg["perfil"]; 1603 + if (isset($_pg["perfil"])) {
  1604 + $perfil = $_pg["perfil"];
  1605 + } else {
  1606 + $perfil = "";
  1607 + }
1604 $idioma = $_pg["idioma"]; 1608 $idioma = $_pg["idioma"];
1605 $filtraOgc = $_pg["filtraOgc"]; 1609 $filtraOgc = $_pg["filtraOgc"];
1606 $filtraDown = $_pg["filtraDown"]; 1610 $filtraDown = $_pg["filtraDown"];
@@ -1619,14 +1623,14 @@ switch (strtoupper($funcao)) { @@ -1619,14 +1623,14 @@ switch (strtoupper($funcao)) {
1619 */ 1623 */
1620 case "PEGALISTADEGRUPOS": 1624 case "PEGALISTADEGRUPOS":
1621 include_once ("classe_menutemas.php"); 1625 include_once ("classe_menutemas.php");
1622 - if(isset($_pg["editores"])){ 1626 + if (isset($_pg["editores"])) {
1623 $editores = $_pg["editores"]; 1627 $editores = $_pg["editores"];
1624 } else { 1628 } else {
1625 $editores = ""; 1629 $editores = "";
1626 } 1630 }
1627 $perfil = $_pg["perfil"]; 1631 $perfil = $_pg["perfil"];
1628 $idioma = $_pg["idioma"]; 1632 $idioma = $_pg["idioma"];
1629 - if(isset($_pg["filtro"])){ 1633 + if (isset($_pg["filtro"])) {
1630 $filtro = $_pg["filtro"]; 1634 $filtro = $_pg["filtro"];
1631 } else { 1635 } else {
1632 $filtro = ""; 1636 $filtro = "";
@@ -1811,9 +1815,16 @@ switch (strtoupper($funcao)) { @@ -1811,9 +1815,16 @@ switch (strtoupper($funcao)) {
1811 */ 1815 */
1812 case "PEGAMAPAS": 1816 case "PEGAMAPAS":
1813 include_once ("classe_menutemas.php"); 1817 include_once ("classe_menutemas.php");
1814 - $perfil = $_pg["perfil"];  
1815 - $idioma = $_pg["idioma"];  
1816 - 1818 + if (isset($_pg["perfil"])) {
  1819 + $perfil = $_pg["perfil"];
  1820 + } else {
  1821 + $perfil = "";
  1822 + }
  1823 + if (isset($_pg["idioma"])) {
  1824 + $idioma = $_pg["idioma"];
  1825 + } else {
  1826 + $idioma = "pt";
  1827 + }
1817 $m = new Menutemas($map_file, $perfil, $locaplic, $urli3geo, $idioma); 1828 $m = new Menutemas($map_file, $perfil, $locaplic, $urli3geo, $idioma);
1818 $retorno = $m->pegaListaDeMapas($locmapas); 1829 $retorno = $m->pegaListaDeMapas($locmapas);
1819 break; 1830 break;
@@ -2114,10 +2125,10 @@ switch (strtoupper($funcao)) { @@ -2114,10 +2125,10 @@ switch (strtoupper($funcao)) {
2114 $inicio = $_pg["inicio"]; 2125 $inicio = $_pg["inicio"];
2115 $fim = $_pg["fim"]; 2126 $fim = $_pg["fim"];
2116 $tipolista = $_pg["tipolista"]; 2127 $tipolista = $_pg["tipolista"];
2117 - if(isset($_pg["itemtema"])){ 2128 + if (isset($_pg["itemtema"])) {
2118 $itemtema = $_pg["itemtema"]; 2129 $itemtema = $_pg["itemtema"];
2119 } 2130 }
2120 - if(isset($_pg["unico"])){ 2131 + if (isset($_pg["unico"])) {
2121 $unico = $_pg["unico"]; 2132 $unico = $_pg["unico"];
2122 } 2133 }
2123 $dadosDaClasse = $_pg["dadosDaClasse"]; 2134 $dadosDaClasse = $_pg["dadosDaClasse"];
@@ -2638,11 +2649,13 @@ switch (strtoupper($funcao)) { @@ -2638,11 +2649,13 @@ switch (strtoupper($funcao)) {
2638 ))) { 2649 ))) {
2639 // verifica se tem a carga do js i3geo.js 2650 // verifica se tem a carga do js i3geo.js
2640 $a = $p . "/" . $nomes[$i]; 2651 $a = $p . "/" . $nomes[$i];
2641 - $handle = fopen($a, "r");  
2642 - $conteudo = fread($handle, filesize($a));  
2643 - fclose($handle);  
2644 - if (strstr($conteudo, "i3geo.js")) {  
2645 - $retorno[] = "../" . basename($p) . "/" . $nomes[$i]; 2652 + if(file_exists($a)){
  2653 + $handle = fopen($a, "r");
  2654 + $conteudo = fread($handle, filesize($a));
  2655 + fclose($handle);
  2656 + if (strstr($conteudo, "i3geo.js")) {
  2657 + $retorno[] = "../" . basename($p) . "/" . $nomes[$i];
  2658 + }
2646 } 2659 }
2647 } 2660 }
2648 } 2661 }
classesphp/xml.php
  Diff comments   View file @cc8686b
@@ -623,7 +623,7 @@ function geraXmlIdentifica($perfil,$locaplic,$editores=&quot;&quot;) @@ -623,7 +623,7 @@ function geraXmlIdentifica($perfil,$locaplic,$editores=&quot;&quot;)
623 $dbhw = null; 623 $dbhw = null;
624 return $xml; 624 return $xml;
625 } 625 }
626 -function geraXmlMapas($perfil,$locaplic,$editores) 626 +function geraXmlMapas($perfil,$locaplic,$editores="")
627 { 627 {
628 global $esquemaadmin; 628 global $esquemaadmin;
629 if (!isset($perfil)){$perfil = "";} 629 if (!isset($perfil)){$perfil = "";}
init/index.php
  Diff comments   View file @cc8686b
@@ -68,7 +68,7 @@ include &quot;head.php&quot;; @@ -68,7 +68,7 @@ include &quot;head.php&quot;;
68 class="icon-bar"></span> 68 class="icon-bar"></span>
69 </button> 69 </button>
70 <a class="navbar-brand" onclick="$('.cartao').fadeIn(600);" href="#"> 70 <a class="navbar-brand" onclick="$('.cartao').fadeIn(600);" href="#">
71 - <?php echo $mensagemInicia;?> <i class="material-icons">home</i></a> 71 + <?php echo $mensagemInicia;?> <i class="fa fa-home fa-1x"></i></a>
72 </div> 72 </div>
73 <div id="navbar" class="navbar-collapse collapse navbar-responsive-collapse"> 73 <div id="navbar" class="navbar-collapse collapse navbar-responsive-collapse">
74 <!-- template para permitir a traducao --> 74 <!-- template para permitir a traducao -->
init/login.php
  Diff comments   View file @cc8686b
@@ -21,7 +21,7 @@ include &quot;head.php&quot;; @@ -21,7 +21,7 @@ include &quot;head.php&quot;;
21 class="icon-bar"></span> 21 class="icon-bar"></span>
22 </button> 22 </button>
23 <a class="navbar-brand" onclick="$('.cartao').fadeIn(600);" href="#"> 23 <a class="navbar-brand" onclick="$('.cartao').fadeIn(600);" href="#">
24 - <i class="material-icons">home</i></a> 24 + <i class="fa fa-home fa-1x"></i></a>
25 </div> 25 </div>
26 <div id="navbar" class="navbar-collapse collapse navbar-responsive-collapse"> 26 <div id="navbar" class="navbar-collapse collapse navbar-responsive-collapse">
27 <!-- template para permitir a traducao --> 27 <!-- template para permitir a traducao -->
mapas/index.php
  Diff comments   View file @cc8686b
@@ -73,7 +73,7 @@ include &quot;../init/head.php&quot;; @@ -73,7 +73,7 @@ include &quot;../init/head.php&quot;;
73 </style> 73 </style>
74 74
75 <body style="padding-top: 60px; position: relative;"> 75 <body style="padding-top: 60px; position: relative;">
76 - <nav class="navbar navbar-default navbar-fixed-top"> 76 + <nav id="navbar" class="navbar navbar-default navbar-fixed-top">
77 <div class="container-fluid"> 77 <div class="container-fluid">
78 <div class="navbar-header"> 78 <div class="navbar-header">
79 <a class="navbar-brand" href="../init/index.php?home="><?php echo $mensagemInicia;?> <i class="fa fa-home fa-1x"></i> 79 <a class="navbar-brand" href="../init/index.php?home="><?php echo $mensagemInicia;?> <i class="fa fa-home fa-1x"></i>
mashups/index.php
  Diff comments   View file @cc8686b
@@ -4,8 +4,8 @@ include (dirname ( __FILE__ ) . &quot;/../ms_configura.php&quot;); @@ -4,8 +4,8 @@ include (dirname ( __FILE__ ) . &quot;/../ms_configura.php&quot;);
4 //error_reporting ( 0 ); 4 //error_reporting ( 0 );
5 include "../init/head.php"; 5 include "../init/head.php";
6 ?> 6 ?>
7 -<body style="padding-top: 55px;">  
8 - <nav class="navbar navbar-default navbar-fixed-top"> 7 +<body style="padding-top: 60px;">
  8 + <nav id="navbar" class="navbar navbar-default navbar-fixed-top">
9 <div class="container-fluid"> 9 <div class="container-fluid">
10 <div class="navbar-header"> 10 <div class="navbar-header">
11 <a class="navbar-brand" href="../init/index.php"><?php echo $mensagemInicia;?> <i 11 <a class="navbar-brand" href="../init/index.php"><?php echo $mensagemInicia;?> <i
@@ -13,14 +13,14 @@ include &quot;../init/head.php&quot;; @@ -13,14 +13,14 @@ include &quot;../init/head.php&quot;;
13 </div> 13 </div>
14 </div> 14 </div>
15 </nav> 15 </nav>
16 - <div class="container-fluid">  
17 - <div class="row">  
18 - <ol class="breadcrumb">  
19 - <li><a href="../init/index.php?home=">i3Geo</a></li>  
20 - <li class="active">Mashups</li>  
21 - </ol>  
22 - </div>  
23 - </div> 16 + <div class="container-fluid migalha">
  17 + <div class="row">
  18 + <div class="btn-group btn-breadcrumb">
  19 + <a class="btn btn-default" href="../init/index.php?home=">i3Geo</a>
  20 + <a class="btn btn-default" style="pointer-events: none">Mashups</a>
  21 + </div>
  22 + </div>
  23 + </div>
24 <div class="container"> 24 <div class="container">
25 <div class="row center-block"> 25 <div class="row center-block">
26 <div class="col-sm-12"> 26 <div class="col-sm-12">
permlinks/index.php
  Diff comments   View file @cc8686b
@@ -61,8 +61,8 @@ include &quot;../init/head.php&quot;; @@ -61,8 +61,8 @@ include &quot;../init/head.php&quot;;
61 </ul> 61 </ul>
62 </script> 62 </script>
63 63
64 -<body style="padding-top: 65px; position: relative;">  
65 - <nav class="navbar navbar-default navbar-fixed-top"> 64 +<body style="padding-top: 60px; position: relative;">
  65 + <nav id="navbar" class="navbar navbar-default navbar-fixed-top">
66 <div class="container-fluid"> 66 <div class="container-fluid">
67 <div class="navbar-header"> 67 <div class="navbar-header">
68 <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" 68 <button type="button" class="navbar-toggle collapsed" data-toggle="collapse"
testainstal/index.php
  Diff comments   View file @cc8686b
@@ -22,11 +22,11 @@ include (&quot;../init/head.php&quot;); @@ -22,11 +22,11 @@ include (&quot;../init/head.php&quot;);
22 22
23 ?> 23 ?>
24 <body style="padding-top: 60px;" id="topo"> 24 <body style="padding-top: 60px;" id="topo">
25 - <nav class="navbar navbar-default navbar-fixed-top"> 25 + <nav id="navbar" class="navbar navbar-default navbar-fixed-top">
26 <div class="container-fluid"> 26 <div class="container-fluid">
27 <div class="navbar-header"> 27 <div class="navbar-header">
28 <a class="navbar-brand" href="../init/index.php?home="> 28 <a class="navbar-brand" href="../init/index.php?home=">
29 - <?php echo $mensagemInicia;?> <i class="material-icons">home</i> 29 + <?php echo $mensagemInicia;?> <i class="fa fa-home fa-1x"></i>
30 </a> 30 </a>
31 </div> 31 </div>
32 </div> 32 </div>
utilitarios/index.php
  Diff comments   View file @cc8686b
@@ -18,7 +18,7 @@ include &quot;../init/head.php&quot;; @@ -18,7 +18,7 @@ include &quot;../init/head.php&quot;;
18 } 18 }
19 </style> 19 </style>
20 <body style="padding-top: 60px;"> 20 <body style="padding-top: 60px;">
21 - <nav class="navbar navbar-default navbar-fixed-top"> 21 + <nav id="navbar" class="navbar navbar-default navbar-fixed-top">
22 <div class="container-fluid"> 22 <div class="container-fluid">
23 <div class="navbar-header"> 23 <div class="navbar-header">
24 <a class="navbar-brand" href="../init/index.php?home="><?php echo $mensagemInicia;?> <i 24 <a class="navbar-brand" href="../init/index.php?home="><?php echo $mensagemInicia;?> <i