Commit 036cee94f2c40b8bf597b5062f416f5f30bf6e3b
1 parent
e0fb451a
Exists in
master
and in
6 other branches
Correção no espaçamento da apresentação do links definido pelo usuário no gerado…
…r de links permanentes. Inclusão da variável customdir na definição da interface a ser aberta no ms_criamapa.php
Showing
2 changed files
with
20 additions
and
9 deletions
Show diff stats
ms_criamapa.php
| @@ -726,15 +726,19 @@ function adaptaLayers($tmpfname, $versao) | @@ -726,15 +726,19 @@ function adaptaLayers($tmpfname, $versao) | ||
| 726 | */ | 726 | */ |
| 727 | function abreInterface($interface, $caminho) | 727 | function abreInterface($interface, $caminho) |
| 728 | { | 728 | { |
| 729 | + global $customDir; | ||
| 730 | + if(empty($customDir)){ | ||
| 731 | + $customDir = "interface"; | ||
| 732 | + } | ||
| 729 | $nomeInterface = explode(".", basename($interface)); | 733 | $nomeInterface = explode(".", basename($interface)); |
| 730 | if (count(explode(".php", $interface)) > 1) { | 734 | if (count(explode(".php", $interface)) > 1) { |
| 731 | - if (file_exists($caminho . "interface/" . $interface)) { | ||
| 732 | - include_once ($caminho . "interface/" . $interface); | 735 | + if (file_exists($caminho . $customDir . "/" . $interface)) { |
| 736 | + include_once ($caminho . $customDir . "/" . $interface); | ||
| 733 | } | 737 | } |
| 734 | exit(); | 738 | exit(); |
| 735 | } else { | 739 | } else { |
| 736 | - if (file_exists($caminho . "interface/" . $interface)) { | ||
| 737 | - $urln = $caminho . "interface/" . $interface . "?&" . session_id(); | 740 | + if (file_exists($caminho . $customDir . "/" . $interface)) { |
| 741 | + $urln = $caminho . $customDir . "/" . $interface . "?&" . session_id(); | ||
| 738 | } else { | 742 | } else { |
| 739 | $urln = $interface . "?&" . session_id(); | 743 | $urln = $interface . "?&" . session_id(); |
| 740 | } | 744 | } |
permlinks/index.php
| @@ -72,18 +72,24 @@ include "../init/head.php"; | @@ -72,18 +72,24 @@ include "../init/head.php"; | ||
| 72 | </button> | 72 | </button> |
| 73 | <a class="navbar-brand" href="../init/index.php"><?php echo $mensagemInicia;?> <i | 73 | <a class="navbar-brand" href="../init/index.php"><?php echo $mensagemInicia;?> <i |
| 74 | class="fa fa-home fa-1x"></i></a> | 74 | class="fa fa-home fa-1x"></i></a> |
| 75 | - | ||
| 76 | </div> | 75 | </div> |
| 76 | + </div> | ||
| 77 | + </nav> | ||
| 78 | + <nav class="navbar-fixed-bottom"> | ||
| 79 | + <div class="container-fluid"> | ||
| 80 | + <div class="jumbotron" id="jumbotron" | ||
| 81 | + style="background: rgb(255, 255, 255); background: rgb(255, 255, 255);"> | ||
| 77 | 82 | ||
| 78 | - <p class="navbar-text"> | ||
| 79 | <button onclick="i3GEO.util.copyToClipboard($('#link').html());alerta('Copiado');" | 83 | <button onclick="i3GEO.util.copyToClipboard($('#link').html());alerta('Copiado');" |
| 80 | class="btn btn-primary btn-fab btn-fab-mini"> | 84 | class="btn btn-primary btn-fab btn-fab-mini"> |
| 81 | <i class="fa fa-files-o" aria-hidden="true"></i> | 85 | <i class="fa fa-files-o" aria-hidden="true"></i> |
| 82 | </button> | 86 | </button> |
| 83 | <a class="navbar-link" href="" id="link" target="_blank">http://</a> | 87 | <a class="navbar-link" href="" id="link" target="_blank">http://</a> |
| 84 | - </p> | ||
| 85 | - </div> | ||
| 86 | - </nav> | 88 | + |
| 89 | + </div> | ||
| 90 | + </div> | ||
| 91 | + </nav> | ||
| 92 | + | ||
| 87 | <!--para as mensagens de alerta--> | 93 | <!--para as mensagens de alerta--> |
| 88 | <div class="navbar-fixed-top alert alert-success text-center" style="padding: 0px;"></div> | 94 | <div class="navbar-fixed-top alert alert-success text-center" style="padding: 0px;"></div> |
| 89 | <div class="container-fluid migalha"> | 95 | <div class="container-fluid migalha"> |
| @@ -234,6 +240,7 @@ include "../init/head.php"; | @@ -234,6 +240,7 @@ include "../init/head.php"; | ||
| 234 | </div> | 240 | </div> |
| 235 | 241 | ||
| 236 | </div> | 242 | </div> |
| 243 | + <div style="height:400px;"> </div> | ||
| 237 | <script type="text/javascript" src="../classesjs/i3geo_tudo_compacto6.js"></script> | 244 | <script type="text/javascript" src="../classesjs/i3geo_tudo_compacto6.js"></script> |
| 238 | <script src='dicionario.js'></script> | 245 | <script src='dicionario.js'></script> |
| 239 | <script src='index.js'></script> | 246 | <script src='index.js'></script> |