Commit 86509020b7d126e73d91e3c5374669000e919bc0
1 parent
8d7de14a
Exists in
master
and in
7 other branches
Inclusão do qrcode na página principal
Showing
2 changed files
with
34 additions
and
16 deletions
Show diff stats
init/index.js
... | ... | @@ -212,7 +212,16 @@ function mostraBotoesBT(men){ |
212 | 212 | $("#menuTpl").html(html); |
213 | 213 | // |
214 | 214 | $i("mensagemLogin").innerHTML = men; |
215 | - $i("jumbotron").innerHTML = "<img src='../imagens/i3Geo_bigTransp.png' style='float:left;width:80px;margin:5px;' /><p>"+$trad(35,g_traducao_init)+"</p>"; | |
215 | + //$i("jumbotron").innerHTML = "<img src='../imagens/i3Geo_bigTransp.png' style='float:left;width:80px;margin:5px;' /><p>"+$trad(35,g_traducao_init)+"</p>"; | |
216 | + html = Mustache.to_html( | |
217 | + $("#jumbotron").html(), | |
218 | + { | |
219 | + "jumbotron" : $trad(35,g_traducao_init), | |
220 | + "host" : location.host, | |
221 | + "href" : location.href | |
222 | + } | |
223 | + ); | |
224 | + $("#jumbotron").html(html); | |
216 | 225 | i3GEO.configura = {"locaplic" : ".."}; |
217 | 226 | i3GEO.idioma.IDSELETOR = "bandeiras"; |
218 | 227 | i3GEO.idioma.mostraSeletor(); | ... | ... |
init/nindex.php
... | ... | @@ -123,18 +123,27 @@ define ( "ONDEI3GEO", ".." ); |
123 | 123 | </div> |
124 | 124 | </div> |
125 | 125 | </nav> |
126 | - <div class="container-fluid"> | |
126 | + <div class="container-fluid hidden"> | |
127 | 127 | <div class="row"> |
128 | 128 | <div class="col-sm-12" id="mensagemLogin"></div> |
129 | 129 | <div class="col-sm-12"> |
130 | - <div class="jumbotron" id="jumbotron"></div> | |
130 | + <div class="jumbotron" id="jumbotron"> | |
131 | + <!-- Template pare mensagem do i3Geo --> | |
132 | + <ul class="list-inline"> | |
133 | + <li> | |
134 | + <img class="pull-left" src='../imagens/i3Geo_bigTransp.png' style='width:80px;margin:5px;' /> | |
135 | + <img class="pull-right" src='../pacotes/qrcode/php/qr_img.php?host={{{host}}}&d={{{href}}}' style='width:80px;margin:5px;' /> | |
136 | + <p>{{{jumbotron}}}</p> | |
137 | + </li> | |
138 | + </ul> | |
139 | + </div> | |
131 | 140 | </div> |
132 | 141 | </div> |
133 | 142 | </div> |
134 | 143 | <div class="container"> |
135 | 144 | <div class="row"> |
136 | 145 | <!-- Template para criacao dos quadros ver index.js --> |
137 | - <div id="botoesTpl" class="hidden" > | |
146 | + <div id="botoesTpl" class="hidden"> | |
138 | 147 | <div id="{{{fa}}}" class="col-sm-12" style="width: 260px; min-width: 260px; max-width: 260px;"> |
139 | 148 | <div class="panel panel-default"> |
140 | 149 | <div class="panel-body" style="height: 250px;"> |
... | ... | @@ -176,7 +185,7 @@ define ( "ONDEI3GEO", ".." ); |
176 | 185 | </div> |
177 | 186 | </div> |
178 | 187 | |
179 | - <hr/> | |
188 | + <hr /> | |
180 | 189 | |
181 | 190 | <footer class="text-center"> |
182 | 191 | <div class="row hidden"> |
... | ... | @@ -194,22 +203,22 @@ define ( "ONDEI3GEO", ".." ); |
194 | 203 | </div> |
195 | 204 | |
196 | 205 | <?php |
197 | - echo "<script>"; | |
198 | - include "index.js"; | |
199 | - echo "</script>"; | |
200 | - include "body.php"; | |
201 | - ?> | |
206 | + echo "<script>"; | |
207 | + include "index.js"; | |
208 | + echo "</script>"; | |
209 | + include "body.php"; | |
210 | + ?> | |
202 | 211 | <script> |
203 | 212 | $(document).ready(function(){ |
204 | 213 | var template = '<div class="col-sm-12" style="width:260px;min-width:260px;max-width:260px;"><div class="panel panel-default"><div class="panel-body" style="height: 250px;"><div class="thumbnail" style="height:90px;"><img class="img-rounded" style="height: 100%; width: 100%" src="imagens/{{{img}}}" /></div><h4>{{{titulo}}}</h4><div style="overflow:auto;height:200px;"><p>{{{subtitulo}}}</p></div></div><div class="panel-footer text-right" style="border:0px;background-color:white;"><p><a class="btn btn-primary btn-raised" href="{{{href}}}" role="button" target="_blank" >Abrir <i class="fa fa-{{{fa}}}" aria-hidden="true" ></i></a></p></div></div></div>'; |
205 | 214 | |
206 | 215 | <?php |
207 | - if ($i3geomaster [0] ["usuario"] == "admin" && $i3geomaster [0] ["senha"] == "admin") { | |
208 | - echo "var men = '<div class=\'alert alert-danger\' >' + $" . "trad(19,g_traducao_init) + '</div>';"; | |
209 | - } else { | |
210 | - echo "var men = '';"; | |
211 | - } | |
212 | - ?> | |
216 | + if ($i3geomaster [0] ["usuario"] == "admin" && $i3geomaster [0] ["senha"] == "admin") { | |
217 | + echo "var men = '<div class=\'alert alert-danger\' >' + $" . "trad(19,g_traducao_init) + '</div>';"; | |
218 | + } else { | |
219 | + echo "var men = '';"; | |
220 | + } | |
221 | + ?> | |
213 | 222 | mostraBotoesBT(men); |
214 | 223 | $('.hidden').removeClass('hidden'); |
215 | 224 | //carrega o TT | ... | ... |