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 411 <button title="icon bar" type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
412 412 <span class="sr-only"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span>
413 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 415 </a>
416 416 </div>
417 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 3043 $dbh = null;
3044 3044 $dbhw = null;
3045 3045 $mapasalvo = $mapasalvo[0];
3046   - $base = "";
  3046 + $base = "";
  3047 + if(!isset($mapasalvo["publicado"])){
  3048 + $mapasalvo["publicado"] = "";
  3049 + }
3047 3050 if(strtoupper($mapasalvo["publicado"]) != "NAO"){
3048 3051 $base = $dir_tmp."/".nomeRandomico()."_restaurado.map";
3049 3052 $baseh = fopen($base,'w');
... ...
classesphp/mapa_controle.php
  Diff comments   View file @cc8686b
... ... @@ -1595,12 +1595,16 @@ switch (strtoupper($funcao)) {
1595 1595 */
1596 1596 case "PEGALISTADEMENUS":
1597 1597 include_once ("classe_menutemas.php");
1598   - if(isset($_pg["editores"])){
  1598 + if (isset($_pg["editores"])) {
1599 1599 $editores = $_pg["editores"];
1600 1600 } else {
1601 1601 $editores = "";
1602 1602 }
1603   - $perfil = $_pg["perfil"];
  1603 + if (isset($_pg["perfil"])) {
  1604 + $perfil = $_pg["perfil"];
  1605 + } else {
  1606 + $perfil = "";
  1607 + }
1604 1608 $idioma = $_pg["idioma"];
1605 1609 $filtraOgc = $_pg["filtraOgc"];
1606 1610 $filtraDown = $_pg["filtraDown"];
... ... @@ -1619,14 +1623,14 @@ switch (strtoupper($funcao)) {
1619 1623 */
1620 1624 case "PEGALISTADEGRUPOS":
1621 1625 include_once ("classe_menutemas.php");
1622   - if(isset($_pg["editores"])){
  1626 + if (isset($_pg["editores"])) {
1623 1627 $editores = $_pg["editores"];
1624 1628 } else {
1625 1629 $editores = "";
1626 1630 }
1627 1631 $perfil = $_pg["perfil"];
1628 1632 $idioma = $_pg["idioma"];
1629   - if(isset($_pg["filtro"])){
  1633 + if (isset($_pg["filtro"])) {
1630 1634 $filtro = $_pg["filtro"];
1631 1635 } else {
1632 1636 $filtro = "";
... ... @@ -1811,9 +1815,16 @@ switch (strtoupper($funcao)) {
1811 1815 */
1812 1816 case "PEGAMAPAS":
1813 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 1828 $m = new Menutemas($map_file, $perfil, $locaplic, $urli3geo, $idioma);
1818 1829 $retorno = $m->pegaListaDeMapas($locmapas);
1819 1830 break;
... ... @@ -2114,10 +2125,10 @@ switch (strtoupper($funcao)) {
2114 2125 $inicio = $_pg["inicio"];
2115 2126 $fim = $_pg["fim"];
2116 2127 $tipolista = $_pg["tipolista"];
2117   - if(isset($_pg["itemtema"])){
  2128 + if (isset($_pg["itemtema"])) {
2118 2129 $itemtema = $_pg["itemtema"];
2119 2130 }
2120   - if(isset($_pg["unico"])){
  2131 + if (isset($_pg["unico"])) {
2121 2132 $unico = $_pg["unico"];
2122 2133 }
2123 2134 $dadosDaClasse = $_pg["dadosDaClasse"];
... ... @@ -2638,11 +2649,13 @@ switch (strtoupper($funcao)) {
2638 2649 ))) {
2639 2650 // verifica se tem a carga do js i3geo.js
2640 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 623 $dbhw = null;
624 624 return $xml;
625 625 }
626   -function geraXmlMapas($perfil,$locaplic,$editores)
  626 +function geraXmlMapas($perfil,$locaplic,$editores="")
627 627 {
628 628 global $esquemaadmin;
629 629 if (!isset($perfil)){$perfil = "";}
... ...
init/index.php
  Diff comments   View file @cc8686b
... ... @@ -68,7 +68,7 @@ include &quot;head.php&quot;;
68 68 class="icon-bar"></span>
69 69 </button>
70 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 72 </div>
73 73 <div id="navbar" class="navbar-collapse collapse navbar-responsive-collapse">
74 74 <!-- template para permitir a traducao -->
... ...
init/login.php
  Diff comments   View file @cc8686b
... ... @@ -21,7 +21,7 @@ include &quot;head.php&quot;;
21 21 class="icon-bar"></span>
22 22 </button>
23 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 25 </div>
26 26 <div id="navbar" class="navbar-collapse collapse navbar-responsive-collapse">
27 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 73 </style>
74 74  
75 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 77 <div class="container-fluid">
78 78 <div class="navbar-header">
79 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 4 //error_reporting ( 0 );
5 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 9 <div class="container-fluid">
10 10 <div class="navbar-header">
11 11 <a class="navbar-brand" href="../init/index.php"><?php echo $mensagemInicia;?> <i
... ... @@ -13,14 +13,14 @@ include &quot;../init/head.php&quot;;
13 13 </div>
14 14 </div>
15 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 24 <div class="container">
25 25 <div class="row center-block">
26 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 61 </ul>
62 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 66 <div class="container-fluid">
67 67 <div class="navbar-header">
68 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 22  
23 23 ?>
24 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 26 <div class="container-fluid">
27 27 <div class="navbar-header">
28 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 30 </a>
31 31 </div>
32 32 </div>
... ...
utilitarios/index.php
  Diff comments   View file @cc8686b
... ... @@ -18,7 +18,7 @@ include &quot;../init/head.php&quot;;
18 18 }
19 19 </style>
20 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 22 <div class="container-fluid">
23 23 <div class="navbar-header">
24 24 <a class="navbar-brand" href="../init/index.php?home="><?php echo $mensagemInicia;?> <i
... ...