Commit 917983affe101bc4ec3dff41d52fe81108bb3ffb
1 parent
86a4b216
Exists in
master
and in
7 other branches
Reposicionamento da mensagem de inicialização
Showing
1 changed file
with
50 additions
and
47 deletions
Show diff stats
init/index.php
| @@ -35,7 +35,6 @@ if (file_exists ( $dir_tmp )) { | @@ -35,7 +35,6 @@ if (file_exists ( $dir_tmp )) { | ||
| 35 | error_reporting ( 0 ); | 35 | error_reporting ( 0 ); |
| 36 | include "head.php"; | 36 | include "head.php"; |
| 37 | ?> | 37 | ?> |
| 38 | - | ||
| 39 | <body style="background-color: #eeeeee; padding-top: 90px;" id="topo"> | 38 | <body style="background-color: #eeeeee; padding-top: 90px;" id="topo"> |
| 40 | <nav class="navbar navbar-fixed-top navbar-inverse" role="navigation"> | 39 | <nav class="navbar navbar-fixed-top navbar-inverse" role="navigation"> |
| 41 | <div class="container-fluid"> | 40 | <div class="container-fluid"> |
| @@ -50,11 +49,9 @@ include "head.php"; | @@ -50,11 +49,9 @@ include "head.php"; | ||
| 50 | <li class="fa"><a href="#"><div id="bandeiras"></div></a></li> | 49 | <li class="fa"><a href="#"><div id="bandeiras"></div></a></li> |
| 51 | </ul> | 50 | </ul> |
| 52 | <ul class="nav navbar-nav navbar-right"> | 51 | <ul class="nav navbar-nav navbar-right"> |
| 53 | - <li class="dropdown"> | ||
| 54 | - <a onclick="i3GEO.login.recarrega = true; i3GEO.login.dialogo.abreLogin('../','template_mst_bt.html');" href="#" class="dropdown-toggle" data-toggle="dropdown">Login <span class="caret"></span></a> | 52 | + <li class="dropdown"><a onclick="i3GEO.login.recarrega = true; i3GEO.login.dialogo.abreLogin('../','template_mst_bt.html');" href="#" class="dropdown-toggle" data-toggle="dropdown">Login <span class="caret"></span></a> |
| 55 | <ul id="i3GEOF_loginusuario" class="dropdown-menu" style="min-width: 280px; padding: 10px; background-color: white;"> | 53 | <ul id="i3GEOF_loginusuario" class="dropdown-menu" style="min-width: 280px; padding: 10px; background-color: white;"> |
| 56 | - </ul> | ||
| 57 | - </li> | 54 | + </ul></li> |
| 58 | </ul> | 55 | </ul> |
| 59 | <!-- template para permitir a traducao --> | 56 | <!-- template para permitir a traducao --> |
| 60 | <div id="menuTpl" class="hidden"> | 57 | <div id="menuTpl" class="hidden"> |
| @@ -68,21 +65,22 @@ include "head.php"; | @@ -68,21 +65,22 @@ include "head.php"; | ||
| 68 | </div> | 65 | </div> |
| 69 | </div> | 66 | </div> |
| 70 | </div> | 67 | </div> |
| 68 | + | ||
| 71 | </nav> | 69 | </nav> |
| 72 | - <nav class="navbar-fixed-bottom" id="mensagemLogin"></nav> | ||
| 73 | - <div class="container-fluid hidden"> | ||
| 74 | - <div class="row"> | ||
| 75 | - <div class="col-xs-12"> | ||
| 76 | - <div class="jumbotron" id="jumbotron"> | ||
| 77 | - <!-- Template pare mensagem do i3Geo --> | ||
| 78 | - <ul class="list-inline"> | ||
| 79 | - <li><img class="pull-left" src='../imagens/i3Geo_bigTransp.png' style='width: 80px; margin: 5px;' /> <img class="pull-right" src='../pacotes/qrcode/php/qr_img.php?host={{{host}}}&d={{{href}}}' style='width: 80px; margin: 5px;' /> | ||
| 80 | - <p>{{{jumbotron}}}</p></li> | ||
| 81 | - </ul> | ||
| 82 | - </div> | 70 | + <nav class="navbar-fixed-bottom"> |
| 71 | + <div class="container-fluid hidden"> | ||
| 72 | + <div class="jumbotron" id="jumbotron"> | ||
| 73 | + <!-- Template para mensagem do i3Geo --> | ||
| 74 | + <ul class="list-inline"> | ||
| 75 | + <li><img class="pull-left" src='../imagens/i3Geo_bigTransp.png' style='width: 80px; margin: 5px;' /> <img class="pull-right" src='../pacotes/qrcode/php/qr_img.php?host={{{host}}}&d={{{href}}}' style='width: 80px; margin: 5px;' /> | ||
| 76 | + <p>{{{jumbotron}}}</p></li> | ||
| 77 | + </ul> | ||
| 78 | + <div id="mensagemLogin"></div> | ||
| 83 | </div> | 79 | </div> |
| 80 | + | ||
| 84 | </div> | 81 | </div> |
| 85 | - </div> | 82 | + </nav> |
| 83 | + | ||
| 86 | <div class="container"> | 84 | <div class="container"> |
| 87 | <div class="row center-block"> | 85 | <div class="row center-block"> |
| 88 | <!-- Template para criacao dos quadros ver index.js --> | 86 | <!-- Template para criacao dos quadros ver index.js --> |
| @@ -145,7 +143,7 @@ include "head.php"; | @@ -145,7 +143,7 @@ include "head.php"; | ||
| 145 | <script> | 143 | <script> |
| 146 | //utilizado em ms_configura.php para customizar o local da pasta de inicializacao | 144 | //utilizado em ms_configura.php para customizar o local da pasta de inicializacao |
| 147 | var customDir = "../<?php echo $customDir; ?>"; | 145 | var customDir = "../<?php echo $customDir; ?>"; |
| 148 | - </script> | 146 | + </script> |
| 149 | <script src='../pacotes/cpaint/cpaint2_compacto.inc.js'></script> | 147 | <script src='../pacotes/cpaint/cpaint2_compacto.inc.js'></script> |
| 150 | <script src='../classesjs/compactados/dicionario_compacto.js'></script> | 148 | <script src='../classesjs/compactados/dicionario_compacto.js'></script> |
| 151 | <script src='../classesjs/compactados/classe_util_compacto.js'></script> | 149 | <script src='../classesjs/compactados/classe_util_compacto.js'></script> |
| @@ -156,36 +154,41 @@ include "head.php"; | @@ -156,36 +154,41 @@ include "head.php"; | ||
| 156 | <script src='dicionario.js'></script> | 154 | <script src='dicionario.js'></script> |
| 157 | <script src='index.js'></script> | 155 | <script src='index.js'></script> |
| 158 | <script> | 156 | <script> |
| 159 | - $(document).ready(function(){ | ||
| 160 | - <?php | ||
| 161 | - if ($i3geomaster [0] ["usuario"] == "admin" && $i3geomaster [0] ["senha"] == "admin") { | ||
| 162 | - echo "var men = '<div class=\'alert alert-danger\' style=\'margin-bottom:0px;\' >' + $" . "trad(19,g_traducao_init) + '</div>';"; | ||
| 163 | - } else { | ||
| 164 | - echo "var men = '';"; | ||
| 165 | - } | ||
| 166 | - ?> | ||
| 167 | - mostraBotoesBT(men); | ||
| 168 | - $('.hidden').removeClass('hidden'); | ||
| 169 | - $(window).scroll(function(){$("#mensagemLogin").fadeOut(300)}); | ||
| 170 | - //$("#mensagemLogin").delay(10000).fadeOut(300); | ||
| 171 | - //carrega o TT | ||
| 172 | - window.twttr = (function(d, s, id) { | ||
| 173 | - var js, fjs = d.getElementsByTagName(s)[0], | ||
| 174 | - t = window.twttr || {}; | ||
| 175 | - if (d.getElementById(id)) return t; | ||
| 176 | - js = d.createElement(s); | ||
| 177 | - js.id = id; | ||
| 178 | - js.src = "https://platform.twitter.com/widgets.js"; | ||
| 179 | - fjs.parentNode.insertBefore(js, fjs); | 157 | + $(document).ready(function(){ |
| 158 | + <?php | ||
| 159 | + if ($i3geomaster [0] ["usuario"] == "admin" && $i3geomaster [0] ["senha"] == "admin") { | ||
| 160 | + echo "var men = '<div class=\'alert alert-danger\' style=\'margin-bottom:0px;\' >' + $" . "trad(19,g_traducao_init) + '</div>';"; | ||
| 161 | + } else { | ||
| 162 | + echo "var men = '';"; | ||
| 163 | + } | ||
| 164 | + ?> | ||
| 165 | + mostraBotoesBT(men); | ||
| 166 | + $('.hidden').removeClass('hidden'); | ||
| 167 | + $(window).scroll( | ||
| 168 | + function(){ | ||
| 169 | + $("#mensagemLogin").fadeOut(300); | ||
| 170 | + $("#jumbotron").fadeOut(300) | ||
| 171 | + } | ||
| 172 | + ); | ||
| 173 | + //$("#mensagemLogin").delay(10000).fadeOut(300); | ||
| 174 | + //carrega o TT | ||
| 175 | + window.twttr = (function(d, s, id) { | ||
| 176 | + var js, fjs = d.getElementsByTagName(s)[0], | ||
| 177 | + t = window.twttr || {}; | ||
| 178 | + if (d.getElementById(id)) return t; | ||
| 179 | + js = d.createElement(s); | ||
| 180 | + js.id = id; | ||
| 181 | + js.src = "https://platform.twitter.com/widgets.js"; | ||
| 182 | + fjs.parentNode.insertBefore(js, fjs); | ||
| 180 | 183 | ||
| 181 | - t._e = []; | ||
| 182 | - t.ready = function(f) { | ||
| 183 | - t._e.push(f); | ||
| 184 | - }; | 184 | + t._e = []; |
| 185 | + t.ready = function(f) { | ||
| 186 | + t._e.push(f); | ||
| 187 | + }; | ||
| 185 | 188 | ||
| 186 | - return t; | ||
| 187 | - }(document, "script", "twitter-wjs")); | ||
| 188 | - }); | ||
| 189 | - </script> | 189 | + return t; |
| 190 | + }(document, "script", "twitter-wjs")); | ||
| 191 | + }); | ||
| 192 | + </script> | ||
| 190 | </body> | 193 | </body> |
| 191 | </html> | 194 | </html> |