Commit 1c18bf426d282197aed128d48e2f0b12d1e82f46
1 parent
3e91d605
Exists in
master
Reformulação da página principal e atualização dos ícones
Showing
17 changed files
with
206 additions
and
189 deletions
Show diff stats
init/head.php
@@ -104,7 +104,7 @@ hr { | @@ -104,7 +104,7 @@ hr { | ||
104 | width: 40px; | 104 | width: 40px; |
105 | } | 105 | } |
106 | body{ | 106 | body{ |
107 | - background-color: rgb(240,240,240); | 107 | + background-color: rgb(245,245,245); |
108 | } | 108 | } |
109 | 109 | ||
110 | /* conforme regra de acessibilidade */ | 110 | /* conforme regra de acessibilidade */ |
@@ -254,6 +254,26 @@ h2 small { | @@ -254,6 +254,26 @@ h2 small { | ||
254 | max-height: 60px; | 254 | max-height: 60px; |
255 | height: 60px; | 255 | height: 60px; |
256 | } | 256 | } |
257 | + | ||
258 | +.panel { | ||
259 | + border-radius: 2px; | ||
260 | + border: 0; | ||
261 | + -webkit-box-shadow: 0 1px 6px 0 rgba(0,0,0,.12),0 1px 6px 0 rgba(0,0,0,.12); | ||
262 | + box-shadow: 0 1px 1px 0 rgba(0,0,0,.12),0 1px 1px 0 rgba(0,0,0,.2); | ||
263 | +} | ||
264 | + | ||
265 | +.thumbnail { | ||
266 | + display: block; | ||
267 | + padding: 0px; | ||
268 | + margin-bottom: 20px; | ||
269 | + line-height: 0; | ||
270 | + background-color: unset; | ||
271 | + border: 0px; | ||
272 | + border-radius: 0px; | ||
273 | + -webkit-transition: border .2s ease-in-out; | ||
274 | + -o-transition: border .2s ease-in-out; | ||
275 | + transition: border .2s ease-in-out; | ||
276 | +} | ||
257 | /* === For phones =================================== */ | 277 | /* === For phones =================================== */ |
258 | @media (max-width: 767px) { | 278 | @media (max-width: 767px) { |
259 | .btn-breadcrumb > *:nth-last-child(-n+2) { | 279 | .btn-breadcrumb > *:nth-last-child(-n+2) { |
init/imagens/applications-development-web.png
init/imagens/applications-development.png
init/imagens/googlemaps.png
init/imagens/insert-link.png
init/imagens/mailman.png
init/imagens/mashup.png
init/imagens/ogc_logo.png
init/imagens/openlayers.png
init/imagens/openlayersdebug.png
init/imagens/osm.png
init/imagens/sprite.php
init/imagens/window-duplicate.png
init/index.js
1 | botoesIni = [ | 1 | botoesIni = [ |
2 | { | 2 | { |
3 | - "img":"openlayers", | 3 | + "img":"imagens/openlayers.png", |
4 | "href": location.href.replace("init/index.php"+window.location.search,"") + customDir + "/ol.htm", | 4 | "href": location.href.replace("init/index.php"+window.location.search,"") + customDir + "/ol.htm", |
5 | "titulo":$trad(4,g_traducao_init), | 5 | "titulo":$trad(4,g_traducao_init), |
6 | "subtitulo": $trad("4a",g_traducao_init), | 6 | "subtitulo": $trad("4a",g_traducao_init), |
7 | "fa": "map-o", | 7 | "fa": "map-o", |
8 | "target": "_blank" | 8 | "target": "_blank" |
9 | },{ | 9 | },{ |
10 | - "img":"osm", | 10 | + "img":"imagens/osm.png", |
11 | "href": location.href.replace("init/index.php"+window.location.search,"") + customDir + "/osm.htm", | 11 | "href": location.href.replace("init/index.php"+window.location.search,"") + customDir + "/osm.htm", |
12 | "titulo":$trad(23,g_traducao_init), | 12 | "titulo":$trad(23,g_traducao_init), |
13 | "subtitulo": $trad("23a",g_traducao_init), | 13 | "subtitulo": $trad("23a",g_traducao_init), |
14 | "fa": "map-o", | 14 | "fa": "map-o", |
15 | "target": "_blank" | 15 | "target": "_blank" |
16 | },{ | 16 | },{ |
17 | - "img":"googlemaps", | 17 | + "img":"imagens/googlemaps.png", |
18 | "href": location.href.replace("init/index.php"+window.location.search,"") + customDir + "/gm.phtml", | 18 | "href": location.href.replace("init/index.php"+window.location.search,"") + customDir + "/gm.phtml", |
19 | "titulo":$trad(6,g_traducao_init), | 19 | "titulo":$trad(6,g_traducao_init), |
20 | "subtitulo": $trad("6a",g_traducao_init), | 20 | "subtitulo": $trad("6a",g_traducao_init), |
21 | "fa": "map-o", | 21 | "fa": "map-o", |
22 | "target": "_blank" | 22 | "target": "_blank" |
23 | },{ | 23 | },{ |
24 | - "img":"mashup", | 24 | + "img":"imagens/mashup.png", |
25 | "href": "../mashups/index.php", | 25 | "href": "../mashups/index.php", |
26 | "titulo":$trad(18,g_traducao_init) + "<br><a href='../mashups/osm.php?temas=&largura=800&altura=500' target=_blank >OSM</a>" + " - <a href='../mashups/openlayers.php?temas=&largura=800&altura=500' target=_blank >OpenLayers</a>", | 26 | "titulo":$trad(18,g_traducao_init) + "<br><a href='../mashups/osm.php?temas=&largura=800&altura=500' target=_blank >OSM</a>" + " - <a href='../mashups/openlayers.php?temas=&largura=800&altura=500' target=_blank >OpenLayers</a>", |
27 | "subtitulo": $trad("18a",g_traducao_init), | 27 | "subtitulo": $trad("18a",g_traducao_init), |
@@ -46,21 +46,21 @@ botoesIni = [ | @@ -46,21 +46,21 @@ botoesIni = [ | ||
46 | }, | 46 | }, |
47 | */ | 47 | */ |
48 | { | 48 | { |
49 | - "img":"window-duplicate", | 49 | + "img":"imagens/window-duplicate.png", |
50 | "href": "../mapas/index.php", | 50 | "href": "../mapas/index.php", |
51 | "titulo":$trad(34,g_traducao_init), | 51 | "titulo":$trad(34,g_traducao_init), |
52 | "subtitulo": $trad("34a",g_traducao_init), | 52 | "subtitulo": $trad("34a",g_traducao_init), |
53 | "fa": "map-o", | 53 | "fa": "map-o", |
54 | "target": "_self" | 54 | "target": "_self" |
55 | },{ | 55 | },{ |
56 | - "img":"ogc_logo", | 56 | + "img":"imagens/ogc_logo.png", |
57 | "href": "../ogc/index.php", | 57 | "href": "../ogc/index.php", |
58 | "titulo":$trad(11,g_traducao_init), | 58 | "titulo":$trad(11,g_traducao_init), |
59 | "subtitulo": $trad("11a",g_traducao_init), | 59 | "subtitulo": $trad("11a",g_traducao_init), |
60 | "fa": "download", | 60 | "fa": "download", |
61 | "target": "_self" | 61 | "target": "_self" |
62 | },{ | 62 | },{ |
63 | - "img":"application-vnd-google-earth-kml", | 63 | + "img":"imagens/application-vnd-google-earth-kml.png", |
64 | "href": "../kml.php", | 64 | "href": "../kml.php", |
65 | "titulo":$trad(12,g_traducao_init), | 65 | "titulo":$trad(12,g_traducao_init), |
66 | "subtitulo": $trad("12a",g_traducao_init), | 66 | "subtitulo": $trad("12a",g_traducao_init), |
@@ -78,35 +78,35 @@ botoesIni = [ | @@ -78,35 +78,35 @@ botoesIni = [ | ||
78 | }, | 78 | }, |
79 | */ | 79 | */ |
80 | { | 80 | { |
81 | - "img":"insert-link", | 81 | + "img":"imagens/insert-link.png", |
82 | "href": "../permlinks/index.php", | 82 | "href": "../permlinks/index.php", |
83 | "titulo":$trad(13,g_traducao_init), | 83 | "titulo":$trad(13,g_traducao_init), |
84 | "subtitulo": $trad("13a",g_traducao_init), | 84 | "subtitulo": $trad("13a",g_traducao_init), |
85 | "fa": "map-o", | 85 | "fa": "map-o", |
86 | "target": "_self" | 86 | "target": "_self" |
87 | },{ | 87 | },{ |
88 | - "img":"openlayersdebug", | 88 | + "img":"imagens/openlayersdebug.png", |
89 | "href": location.href.replace("init/index.php"+window.location.search,"") + customDir + "/openlayersdebug.htm", | 89 | "href": location.href.replace("init/index.php"+window.location.search,"") + customDir + "/openlayersdebug.htm", |
90 | "titulo":$trad(5,g_traducao_init), | 90 | "titulo":$trad(5,g_traducao_init), |
91 | "subtitulo": $trad("5a",g_traducao_init), | 91 | "subtitulo": $trad("5a",g_traducao_init), |
92 | "fa": "cogs", | 92 | "fa": "cogs", |
93 | "target": "_blank" | 93 | "target": "_blank" |
94 | },{ | 94 | },{ |
95 | - "img":"certificate-server", | 95 | + "img":"imagens/certificate-server.png", |
96 | "href": "../testainstal/index.php", | 96 | "href": "../testainstal/index.php", |
97 | "titulo":$trad(2,g_traducao_init), | 97 | "titulo":$trad(2,g_traducao_init), |
98 | "subtitulo": $trad("2a",g_traducao_init), | 98 | "subtitulo": $trad("2a",g_traducao_init), |
99 | "fa": "cogs", | 99 | "fa": "cogs", |
100 | "target": "_self" | 100 | "target": "_self" |
101 | },{ | 101 | },{ |
102 | - "img":"applications-development-web", | 102 | + "img":"imagens/applications-development-web.png", |
103 | "href": "../admin", | 103 | "href": "../admin", |
104 | "titulo":$trad(3,g_traducao_init), | 104 | "titulo":$trad(3,g_traducao_init), |
105 | "subtitulo": $trad("3a",g_traducao_init), | 105 | "subtitulo": $trad("3a",g_traducao_init), |
106 | "fa": "cogs", | 106 | "fa": "cogs", |
107 | "target": "_self" | 107 | "target": "_self" |
108 | },{ | 108 | },{ |
109 | - "img":"applications-development", | 109 | + "img":"imagens/applications-development.png", |
110 | "href": "../utilitarios/index.php", | 110 | "href": "../utilitarios/index.php", |
111 | "titulo":$trad(33,g_traducao_init), | 111 | "titulo":$trad(33,g_traducao_init), |
112 | "subtitulo": $trad("33a",g_traducao_init), | 112 | "subtitulo": $trad("33a",g_traducao_init), |
@@ -146,28 +146,28 @@ botoesIni = [ | @@ -146,28 +146,28 @@ botoesIni = [ | ||
146 | }, | 146 | }, |
147 | */ | 147 | */ |
148 | { | 148 | { |
149 | - "img":"tools-report-bug", | 149 | + "img":"imagens/tools-report-bug.png", |
150 | "href":"https://softwarepublico.gov.br/gitlab/i3geo/i3geo/issues", | 150 | "href":"https://softwarepublico.gov.br/gitlab/i3geo/i3geo/issues", |
151 | "titulo":$trad(16,g_traducao_init), | 151 | "titulo":$trad(16,g_traducao_init), |
152 | "subtitulo": $trad("16a",g_traducao_init), | 152 | "subtitulo": $trad("16a",g_traducao_init), |
153 | "fa": "group", | 153 | "fa": "group", |
154 | "target": "_self" | 154 | "target": "_self" |
155 | },{ | 155 | },{ |
156 | - "img":"apple-touch-icon", | 156 | + "img":"imagens/apple-touch-icon.png", |
157 | "href":"https://softwarepublico.gov.br/gitlab/groups/i3geo", | 157 | "href":"https://softwarepublico.gov.br/gitlab/groups/i3geo", |
158 | "titulo":$trad(30,g_traducao_init), | 158 | "titulo":$trad(30,g_traducao_init), |
159 | "subtitulo": $trad("30a",g_traducao_init), | 159 | "subtitulo": $trad("30a",g_traducao_init), |
160 | "fa": "book", | 160 | "fa": "book", |
161 | "target": "_self" | 161 | "target": "_self" |
162 | },{ | 162 | },{ |
163 | - "img":"logo_psp", | 163 | + "img":"imagens/logo_psp.png", |
164 | "href":"https://portal.softwarepublico.gov.br/social/i3geo/", | 164 | "href":"https://portal.softwarepublico.gov.br/social/i3geo/", |
165 | "titulo":$trad(31,g_traducao_init), | 165 | "titulo":$trad(31,g_traducao_init), |
166 | "subtitulo": $trad("31a",g_traducao_init), | 166 | "subtitulo": $trad("31a",g_traducao_init), |
167 | "fa": "group", | 167 | "fa": "group", |
168 | "target": "_self" | 168 | "target": "_self" |
169 | },{ | 169 | },{ |
170 | - "img":"mailman", | 170 | + "img":"imagens/mailman.png", |
171 | "href":"http://lists.osgeo.org/cgi-bin/mailman/listinfo/i3geo", | 171 | "href":"http://lists.osgeo.org/cgi-bin/mailman/listinfo/i3geo", |
172 | "titulo":$trad(32,g_traducao_init), | 172 | "titulo":$trad(32,g_traducao_init), |
173 | "subtitulo": $trad("32a",g_traducao_init), | 173 | "subtitulo": $trad("32a",g_traducao_init), |
init/index.php
@@ -13,190 +13,183 @@ | @@ -13,190 +13,183 @@ | ||
13 | /** | 13 | /** |
14 | * Cria as pastas temporarias que o i3Geo precisa, caso nao existam | 14 | * Cria as pastas temporarias que o i3Geo precisa, caso nao existam |
15 | */ | 15 | */ |
16 | -define ( "ONDEI3GEO", ".." ); | ||
17 | -include (dirname ( __FILE__ ) . "/../ms_configura.php"); | ||
18 | -if(empty($dir_tmp)){ | ||
19 | - exit; | 16 | +define("ONDEI3GEO", ".."); |
17 | +include (dirname(__FILE__) . "/../ms_configura.php"); | ||
18 | +if (empty($dir_tmp)) { | ||
19 | + exit(); | ||
20 | } | 20 | } |
21 | -if (! empty ( $_GET ["customDir"] )) { | ||
22 | - $customDir = strip_tags ( $_GET ["customDir"] ); | ||
23 | -} else if (empty ( $customDir )) { | ||
24 | - $customDir = "interface"; | 21 | +if (! empty($_GET["customDir"])) { |
22 | + $customDir = strip_tags($_GET["customDir"]); | ||
23 | +} else if (empty($customDir)) { | ||
24 | + $customDir = "interface"; | ||
25 | } | 25 | } |
26 | -include_once (dirname(__FILE__)."/../classesphp/sani_request.php"); | ||
27 | -if (! file_exists ( $dir_tmp )) { | ||
28 | - @mkdir ( $dir_tmp, 0744 ); | 26 | +include_once (dirname(__FILE__) . "/../classesphp/sani_request.php"); |
27 | +if (! file_exists($dir_tmp)) { | ||
28 | + @mkdir($dir_tmp, 0744); | ||
29 | } | 29 | } |
30 | -if (file_exists ( $dir_tmp )) { | ||
31 | - if(!file_exists($dir_tmp . "/comum")){ | ||
32 | - @mkdir ( $dir_tmp . "/comum", 0744 ); | ||
33 | - chmod ( $dir_tmp . "/comum", 0744 ); | ||
34 | - } | ||
35 | - if(!file_exists($dir_tmp . "/saiku-datasources")){ | ||
36 | - @mkdir ( $dir_tmp . "/saiku-datasources", 0744 ); | ||
37 | - chmod ( $dir_tmp . "/saiku-datasources", 0744 ); | ||
38 | - } | ||
39 | - if(!file_exists($dir_tmp . "/cache")){ | ||
40 | - @mkdir ( $dir_tmp . "/cache", 0744 ); | ||
41 | - chmod ( $dir_tmp . "/cache", 0744 ); | ||
42 | - } | ||
43 | - if(!file_exists($dir_tmp . "/cache/googlemaps")){ | ||
44 | - @mkdir ( $dir_tmp . "/cache/googlemaps", 0744 ); | ||
45 | - chmod ( $dir_tmp . "/cache/googlemaps", 0744 ); | ||
46 | - } | ||
47 | - foreach(glob($dir_tmp . '/{,.}*.php', GLOB_BRACE) as $f) { | ||
48 | - unlink ($f); | ||
49 | - } | 30 | +if (file_exists($dir_tmp)) { |
31 | + if (! file_exists($dir_tmp . "/comum")) { | ||
32 | + @mkdir($dir_tmp . "/comum", 0744); | ||
33 | + chmod($dir_tmp . "/comum", 0744); | ||
34 | + } | ||
35 | + if (! file_exists($dir_tmp . "/saiku-datasources")) { | ||
36 | + @mkdir($dir_tmp . "/saiku-datasources", 0744); | ||
37 | + chmod($dir_tmp . "/saiku-datasources", 0744); | ||
38 | + } | ||
39 | + if (! file_exists($dir_tmp . "/cache")) { | ||
40 | + @mkdir($dir_tmp . "/cache", 0744); | ||
41 | + chmod($dir_tmp . "/cache", 0744); | ||
42 | + } | ||
43 | + if (! file_exists($dir_tmp . "/cache/googlemaps")) { | ||
44 | + @mkdir($dir_tmp . "/cache/googlemaps", 0744); | ||
45 | + chmod($dir_tmp . "/cache/googlemaps", 0744); | ||
46 | + } | ||
47 | + foreach (glob($dir_tmp . '/{,.}*.php', GLOB_BRACE) as $f) { | ||
48 | + unlink($f); | ||
49 | + } | ||
50 | } | 50 | } |
51 | -//error_reporting ( 0 ); | 51 | +// error_reporting ( 0 ); |
52 | include "head.php"; | 52 | include "head.php"; |
53 | ?> | 53 | ?> |
54 | -<link href='imagens/sprites.css' rel='stylesheet'> | ||
55 | <style> | 54 | <style> |
56 | .amarelo { | 55 | .amarelo { |
57 | color: yellow; | 56 | color: yellow; |
58 | } | 57 | } |
59 | </style> | 58 | </style> |
60 | <body style="padding-top: 90px;" id="topo"> | 59 | <body style="padding-top: 90px;" id="topo"> |
61 | - <a href="#conteudoPrincipal" class="sr-only sr-only-focusable"><span class="well" style="background: white; color: #007e72;">Skip to main content</span></a> | ||
62 | - <nav class="navbar navbar-default navbar-fixed-top"> | ||
63 | - <div class="container-fluid"> | ||
64 | - <div class="navbar-header"> | ||
65 | - <button type="button" title="icon-bar" class="navbar-toggle collapsed" data-toggle="collapse" | ||
66 | - data-target="#navbar" aria-expanded="false" aria-controls="navbar"> | ||
67 | - <span class="sr-only"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> <span | ||
68 | - class="icon-bar"></span> | ||
69 | - </button> | ||
70 | - <a class="navbar-brand" onclick="$('.cartao').fadeIn(600);" href="#"> | ||
71 | - <?php echo $mensagemInicia;?> <i class="fa fa-home fa-1x"></i></a> | ||
72 | - </div> | ||
73 | - <div id="navbar" class="navbar-collapse collapse navbar-responsive-collapse"> | ||
74 | - <!-- template para permitir a traducao --> | ||
75 | - <div id="menuTpl" class="hidden"> | ||
76 | - <ul class="nav navbar-nav"> | ||
77 | - <li class="fa visible-lg"><a href="#" tabindex='-1' ><span id="bandeiras"></span></a></li> | ||
78 | - <li class="visible-lg"><a data-toggle="collapse" data-target=".in" role="button" href="#topo" onclick="$('.cartao').hide();$('.map-o').fadeIn(600);">{{{mapas}}}</a></li> | ||
79 | - <li><a data-toggle="collapse" data-target=".in" role="button" href="#topo" onclick="$('.cartao').hide();$('.download').fadeIn(600);">OGC/Download</a></li> | ||
80 | - <li><a data-toggle="collapse" data-target=".in" role="button" href="#topo" onclick="$('.cartao').hide();$('.cogs').fadeIn(600);">{{{admin}}}</a></li> | ||
81 | - <li class="visible-lg"><a data-toggle="collapse" data-target=".in" role="button" href="#topo" onclick="$('.cartao').hide();$('.book').fadeIn(600);">{{{docs}}}</a></li> | ||
82 | - <li class="visible-lg"><a data-toggle="collapse" data-target=".in" role="button" href="#topo" onclick="$('.cartao').hide();$('.group').fadeIn(600);">{{{comunidade}}}</a></li> | ||
83 | - <li><a role="button" href="../social/index.php" >Social</a></li> | ||
84 | - <li><a role="button" href="../rss/index.php" >RSS</a></li> | ||
85 | - <li <?php if(isset($i3geoPermiteLogin) && $i3geoPermiteLogin == false) { echo "style=display:none "; }?>> | ||
86 | - <a role="button" onclick="i3GEO.login.recarrega = true; i3GEO.login.dialogo.abreLogin('../','template_mst_bt.html');" | ||
87 | - href="#topo" data-toggle="modal" data-target="#modalLogin">Login <i class="material-icons md-18">input</i></a> | ||
88 | - </li> | ||
89 | - </ul> | ||
90 | - </div> | ||
91 | - </div> | ||
92 | - </div> | ||
93 | - </nav> | ||
94 | - <nav class="navbar-fixed-bottom"> | ||
95 | - <div class="container-fluid hidden"> | ||
96 | - <div class="jumbotron hidden-xs" id="jumbotron" | ||
97 | - style="background: rgb(255, 255, 255); background: rgba(255, 255, 255, 0.8);"> | ||
98 | - <!-- Template para mensagem do i3Geo --> | ||
99 | - <ul class="list-inline"> | ||
100 | - <li><img class="pull-left" alt="i3Geo Logo" src='../imagens/i3Geo_bigTransp.png' | ||
101 | - style='width: 80px; margin: 5px;' /> <img alt="qrcode site" class="pull-right hidden-xs" | ||
102 | - src='../pacotes/qrcode/php/qr_img.php?host={{{host}}}&d={{{href}}}' | ||
103 | - style='width: 80px; margin: 5px;' /> | ||
104 | - <p>{{{jumbotron}}}</p></li> | ||
105 | - </ul> | ||
106 | - <div id="mensagemLogin"></div> | ||
107 | - </div> | ||
108 | - </div> | ||
109 | - </nav> | 60 | + <a href="#conteudoPrincipal" class="sr-only sr-only-focusable"> |
61 | + <span class="well" style="background: white; color: #007e72;">Skip to main content</span> | ||
62 | + </a> | ||
63 | + <nav class="navbar navbar-default navbar-fixed-top"> | ||
64 | + <div class="container-fluid"> | ||
65 | + <div class="navbar-header"> | ||
66 | + <button type="button" title="icon-bar" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar"> | ||
67 | + <span class="sr-only"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> | ||
68 | + </button> | ||
69 | + <a class="navbar-brand" onclick="$('.cartao').fadeIn(600);" href="#"> | ||
70 | + <?php echo $mensagemInicia;?> <i class="fa fa-home fa-1x"></i> | ||
71 | + </a> | ||
72 | + </div> | ||
73 | + <div id="navbar" class="navbar-collapse collapse navbar-responsive-collapse"> | ||
74 | + <!-- template para permitir a traducao --> | ||
75 | + <div id="menuTpl" class="hidden"> | ||
76 | + <ul class="nav navbar-nav"> | ||
77 | + <li class="fa visible-lg"><a href="#" tabindex='-1'> | ||
78 | + <span id="bandeiras"></span> | ||
79 | + </a></li> | ||
80 | + <li class="visible-lg"><a data-toggle="collapse" data-target=".in" role="button" href="#topo" onclick="$('.cartao').hide();$('.map-o').fadeIn(600);">{{{mapas}}}</a></li> | ||
81 | + <li><a data-toggle="collapse" data-target=".in" role="button" href="#topo" onclick="$('.cartao').hide();$('.download').fadeIn(600);">OGC/Download</a></li> | ||
82 | + <li><a data-toggle="collapse" data-target=".in" role="button" href="#topo" onclick="$('.cartao').hide();$('.cogs').fadeIn(600);">{{{admin}}}</a></li> | ||
83 | + <li class="visible-lg"><a data-toggle="collapse" data-target=".in" role="button" href="#topo" onclick="$('.cartao').hide();$('.book').fadeIn(600);">{{{docs}}}</a></li> | ||
84 | + <li class="visible-lg"><a data-toggle="collapse" data-target=".in" role="button" href="#topo" onclick="$('.cartao').hide();$('.group').fadeIn(600);">{{{comunidade}}}</a></li> | ||
85 | + <li><a role="button" href="../social/index.php">Social</a></li> | ||
86 | + <li><a role="button" href="../rss/index.php">RSS</a></li> | ||
87 | + <li <?php if(isset($i3geoPermiteLogin) && $i3geoPermiteLogin == false) { echo "style=display:none "; }?>><a role="button" | ||
88 | + onclick="i3GEO.login.recarrega = true; i3GEO.login.dialogo.abreLogin('../','template_mst_bt.html');" href="#topo" data-toggle="modal" data-target="#modalLogin"> | ||
89 | + Login <i class="material-icons md-18">input</i> | ||
90 | + </a></li> | ||
91 | + </ul> | ||
92 | + </div> | ||
93 | + </div> | ||
94 | + </div> | ||
95 | + </nav> | ||
96 | + <nav class="navbar-fixed-bottom"> | ||
97 | + <div class="container-fluid hidden"> | ||
98 | + <div class="jumbotron hidden-xs" id="jumbotron" style="background: rgb(255, 255, 255); background: rgba(255, 255, 255, 0.8);"> | ||
99 | + <!-- Template para mensagem do i3Geo --> | ||
100 | + <ul class="list-inline"> | ||
101 | + <li><img class="pull-left" alt="i3Geo Logo" src='../imagens/i3Geo_bigTransp.png' style='width: 80px; margin: 5px;' /> <img alt="qrcode site" class="pull-right hidden-xs" | ||
102 | + src='../pacotes/qrcode/php/qr_img.php?host={{{host}}}&d={{{href}}}' style='width: 80px; margin: 5px;' /> | ||
103 | + <p>{{{jumbotron}}}</p></li> | ||
104 | + </ul> | ||
105 | + <div id="mensagemLogin"></div> | ||
106 | + </div> | ||
107 | + </div> | ||
108 | + </nav> | ||
110 | 109 | ||
111 | - <div class="container-fluid" id="conteudoPrincipal" tabindex="-1"> | ||
112 | - <div class="row center-block"> | 110 | + <div class="container-fluid" id="conteudoPrincipal" tabindex="-1"> |
111 | + <div class="row center-block"> | ||
113 | <?php | 112 | <?php |
114 | - include_once("../classesphp/carrega_ext.php"); | ||
115 | - if(!function_exists("ms_GetVersion")){ | ||
116 | - echo '<div class="alert alert-danger" role="alert">Verifique se PHP-Mapscript está instalado</div>'; | ||
117 | - } | 113 | +include_once ("../classesphp/carrega_ext.php"); |
114 | +if (! function_exists("ms_GetVersion")) { | ||
115 | + echo '<div class="alert alert-danger" role="alert">Verifique se PHP-Mapscript está instalado</div>'; | ||
116 | +} | ||
118 | ?> | 117 | ?> |
119 | <!-- Template para criacao dos quadros ver index.js --> | 118 | <!-- Template para criacao dos quadros ver index.js --> |
120 | - <div id="botoesTpl" class="hidden"> | ||
121 | - <div class="cartao {{{fa}}} col-xs-12 center-block" | ||
122 | - style="width: 30rem; min-width: 30rem; max-width: 30rem;"> | ||
123 | - <div class="panel panel-default"> | ||
124 | - <div class="panel-body" tabindex="-1" > | ||
125 | - <!-- | 119 | + <div id="botoesTpl" class="hidden"> |
120 | + <div class="cartao {{{fa}}} col-xs-12 center-block" style="width: 30rem; min-width: 30rem; max-width: 30rem;"> | ||
121 | + <div class="panel panel-default"> | ||
122 | + <div class="panel-heading" style="padding:0px;"> | ||
123 | + <h5 style="height: 35px;padding:10px 10px;">{{{titulo}}}</h5> | ||
124 | + | ||
125 | + <a tabindex="-1" target="{{{target}}}" href="{{{href}}}"> | ||
126 | + <img alt="{{{titulo}}}" tabindex="-1" style="height: 100px; width: 100%; border-radius: 0px;" src="{{{img}}}" /> | ||
127 | + </a> | ||
128 | + | ||
129 | + </div> | ||
130 | + <div class="panel-body" tabindex="-1" style="background-color: rgb(250, 250, 250)"> | ||
131 | + <!-- | ||
126 | <div class="thumbnail" role="button" style="height: 90px;"> | 132 | <div class="thumbnail" role="button" style="height: 90px;"> |
127 | <a target="{{{target}}}" href="{{{href}}}"> <img class="img-rounded" | 133 | <a target="{{{target}}}" href="{{{href}}}"> <img class="img-rounded" |
128 | style="height: 100%; width: 100%" src="imagens/{{{img}}}" /> | 134 | style="height: 100%; width: 100%" src="imagens/{{{img}}}" /> |
129 | </a> | 135 | </a> |
130 | </div> | 136 | </div> |
131 | --> | 137 | --> |
132 | - <div class="thumbnail" role="button" style="height: 90px; width: 200px;margin:auto;"> | ||
133 | - <a tabindex="-1" target="{{{target}}}" href="{{{href}}}"> <img alt="{{{titulo}}}" tabindex="-1" class="img-rounded {{{img}}}" | ||
134 | - style="height: 100%; width: 100%" src="../imagens/branco.gif" /> | ||
135 | - </a> | ||
136 | - </div> | ||
137 | - | ||
138 | - <h4 style="height: 40px;">{{{titulo}}}</h4> | ||
139 | - <h5 tabindex="-1" class="hidden-xs" style="height: 10rem;font-size: 1.7rem;">{{{subtitulo}}}</h5> | ||
140 | - | ||
141 | - </div> | ||
142 | - <div class="panel-footer text-right" | ||
143 | - style="padding: 0px; padding-right: 15px; border: 0px; background-color: white;"> | ||
144 | - <div class="row center-block"> | ||
145 | - <div class="col-xs-6" style="line-height: 3.5; text-align: left;"> | ||
146 | - <!-- o texto no span e para acessibilidade--> | ||
147 | - <button tabindex="-1" role="button" data-toggle="quadroQrcode" data-url="{{{href}}}" | ||
148 | - class="btn btn-primary btn-fab btn-fab-mini" style="padding-left: 8px;padding-top: 7px;margin: auto;"> <span | ||
149 | - class="glyphicon glyphicon-qrcode" aria-hidden="true"> qrcode</span> | ||
150 | - </button> | ||
151 | - | ||
152 | - <button tabindex="-1" role="button" onclick="favorita(this);return false;" class="btn btn-primary btn-fab btn-fab-mini"> | ||
153 | - <span data-cookie="{{{img}}}" ><i class="material-icons">grade</i></span> | ||
154 | - </button> | ||
155 | - </div> | ||
156 | - <div class="col-xs-6"> | ||
157 | - <a class="btn btn-primary" style="color:#008579;" href="{{{href}}}" role="button" target="{{{target}}}"> | ||
158 | - {{{abrir}}} </a> | ||
159 | - </div> | ||
160 | - </div> | ||
161 | - </div> | ||
162 | - </div> | ||
163 | - </div> | ||
164 | - </div> | ||
165 | - </div> | ||
166 | - </div> | ||
167 | - <div tabindex="-1" class="container-fluid" | ||
168 | - style="background-color: #fff; margin-top: 10px; padding-top: 10px;"> | ||
169 | - <div class="row text-center hidden"> | ||
170 | - <div class="col-lg-12 center-block"> | ||
171 | - <a tabindex="-1" rel="license" href="http://creativecommons.org/licenses/GPL/2.0/legalcode.pt" target="_blank"><img | ||
172 | - alt="Licença Creative Commons" style="border-width: 0" | ||
173 | - src="https://i.creativecommons.org/l/GPL/2.0/88x62.png" /></a><br />O i3Geo está | ||
174 | - licenciado com uma Licença <a tabindex="-1" rel="license" | ||
175 | - href="http://creativecommons.org/licenses/GPL/2.0/legalcode.pt" style="color:#008579;" target="_blank">Creative | ||
176 | - Commons - Licença Pública Geral GNU ("GNU General Public License")</a> | ||
177 | - </div> | ||
178 | - </div> | ||
179 | - </div> | ||
180 | - <div id="modalLogin" class="modal fade" tabindex="-1"> | ||
181 | - <div class="modal-dialog"> | ||
182 | - <div class="modal-content"> | ||
183 | - <div class="modal-header"> | ||
184 | - <button type="button" class="close" data-dismiss="modal" aria-label="Close"> | ||
185 | - <span aria-hidden="true">×</span> | ||
186 | - </button> | ||
187 | - </div> | ||
188 | - <div class="modal-body" id="i3GEOF_loginusuario"> | 138 | + <h5 tabindex="-1" class="hidden-xs" style="height: 10rem; font-size: 1.7rem; color: #0f0e0e66;">{{{subtitulo}}}</h5> |
139 | + </div> | ||
140 | + <div class="panel-footer text-right" style="padding: 0px; padding-right: 15px; border: 0px; background-color: rgb(250, 250, 250);"> | ||
141 | + <div class="row center-block"> | ||
142 | + <div class="col-xs-6" style="line-height: 3.5; text-align: left;"> | ||
143 | + <!-- o texto no span e para acessibilidade--> | ||
144 | + <button tabindex="-1" role="button" data-toggle="quadroQrcode" data-url="{{{href}}}" class="btn btn-primary btn-fab btn-fab-mini" | ||
145 | + style="opacity: 0.2; padding-left: 8px; padding-top: 7px; margin: auto;"> | ||
146 | + <span class="glyphicon glyphicon-qrcode" aria-hidden="true"> qrcode</span> | ||
147 | + </button> | ||
189 | 148 | ||
190 | - </div> | ||
191 | - </div> | ||
192 | - </div> | ||
193 | - </div> | ||
194 | - <script> | 149 | + <button tabindex="-1" role="button" style="opacity: 0.2;" onclick="favorita(this);return false;" class="btn btn-primary btn-fab btn-fab-mini"> |
150 | + <span data-cookie="{{{img}}}"><i class="material-icons">grade</i></span> | ||
151 | + </button> | ||
152 | + </div> | ||
153 | + <div class="col-xs-6"> | ||
154 | + <a class="btn btn-primary" style="color: #008579;" href="{{{href}}}" role="button" target="{{{target}}}"> {{{abrir}}} </a> | ||
155 | + </div> | ||
156 | + </div> | ||
157 | + </div> | ||
158 | + </div> | ||
159 | + </div> | ||
160 | + </div> | ||
161 | + </div> | ||
162 | + </div> | ||
163 | + <div tabindex="-1" class="container-fluid" style="background-color: #fff; margin-top: 10px; padding-top: 10px;"> | ||
164 | + <div class="row text-center hidden"> | ||
165 | + <div class="col-lg-12 center-block"> | ||
166 | + <a tabindex="-1" rel="license" href="http://creativecommons.org/licenses/GPL/2.0/legalcode.pt" target="_blank"> | ||
167 | + <img alt="Licença Creative Commons" style="border-width: 0" src="https://i.creativecommons.org/l/GPL/2.0/88x62.png" /> | ||
168 | + </a> | ||
169 | + <br />O i3Geo está licenciado com uma Licença | ||
170 | + <a tabindex="-1" rel="license" href="http://creativecommons.org/licenses/GPL/2.0/legalcode.pt" style="color: #008579;" target="_blank">Creative Commons - Licença Pública | ||
171 | + Geral GNU ("GNU General Public License")</a> | ||
172 | + </div> | ||
173 | + </div> | ||
174 | + </div> | ||
175 | + <div id="modalLogin" class="modal fade" tabindex="-1"> | ||
176 | + <div class="modal-dialog"> | ||
177 | + <div class="modal-content"> | ||
178 | + <div class="modal-header"> | ||
179 | + <button type="button" class="close" data-dismiss="modal" aria-label="Close"> | ||
180 | + <span aria-hidden="true">×</span> | ||
181 | + </button> | ||
182 | + </div> | ||
183 | + <div class="modal-body" id="i3GEOF_loginusuario"></div> | ||
184 | + </div> | ||
185 | + </div> | ||
186 | + </div> | ||
187 | + <script> | ||
195 | //utilizado em ms_configura.php para customizar o local da pasta de inicializacao | 188 | //utilizado em ms_configura.php para customizar o local da pasta de inicializacao |
196 | var customDir = "<?php echo $customDir; ?>"; | 189 | var customDir = "<?php echo $customDir; ?>"; |
197 | </script> | 190 | </script> |
198 | - <script src='indexjs.php'></script> | ||
199 | - <script> | 191 | + <script src='indexjs.php'></script> |
192 | + <script> | ||
200 | $(document).ready(function(){ | 193 | $(document).ready(function(){ |
201 | <?php | 194 | <?php |
202 | if (!empty ($i3geomaster) && ($i3geomaster [0] ["usuario"] == "admin" && $i3geomaster [0] ["senha"] == "admin")) { | 195 | if (!empty ($i3geomaster) && ($i3geomaster [0] ["usuario"] == "admin" && $i3geomaster [0] ["senha"] == "admin")) { |
social/index.php
@@ -19,7 +19,7 @@ include "../init/head.php"; | @@ -19,7 +19,7 @@ include "../init/head.php"; | ||
19 | margin: auto; | 19 | margin: auto; |
20 | } | 20 | } |
21 | </style> | 21 | </style> |
22 | -<body style="padding-top: 55px;"> | 22 | +<body style="padding-top: 60px;"> |
23 | <nav class="navbar navbar-default navbar-fixed-top"> | 23 | <nav class="navbar navbar-default navbar-fixed-top"> |
24 | <div class="container-fluid"> | 24 | <div class="container-fluid"> |
25 | <div class="navbar-header"> | 25 | <div class="navbar-header"> |
@@ -28,14 +28,15 @@ include "../init/head.php"; | @@ -28,14 +28,15 @@ include "../init/head.php"; | ||
28 | </div> | 28 | </div> |
29 | </div> | 29 | </div> |
30 | </nav> | 30 | </nav> |
31 | - <div class="container-fluid"> | ||
32 | - <div class="row"> | ||
33 | - <ol class="breadcrumb"> | ||
34 | - <li><a href="../init/index.php?home=">i3Geo</a></li> | ||
35 | - <li class="active">Social</li> | ||
36 | - </ol> | ||
37 | - </div> | ||
38 | - </div> | 31 | + <div class="container-fluid migalha"> |
32 | + <div class="row"> | ||
33 | + <div class="btn-group btn-breadcrumb"> | ||
34 | + <a class="btn btn-default" href="../init/index.php?home=">i3Geo</a> | ||
35 | + <a class="btn btn-default" style="pointer-events: none">Social</a> | ||
36 | + </div> | ||
37 | + </div> | ||
38 | + </div> | ||
39 | + | ||
39 | <div class="container"> | 40 | <div class="container"> |
40 | <div class="row center-block"> | 41 | <div class="row center-block"> |
41 | <div class="center-block col-xs-12 col-md-6"> | 42 | <div class="center-block col-xs-12 col-md-6"> |
@@ -49,8 +50,9 @@ include "../init/head.php"; | @@ -49,8 +50,9 @@ include "../init/head.php"; | ||
49 | <div class="center-block col-xs-12 col-md-6"> | 50 | <div class="center-block col-xs-12 col-md-6"> |
50 | <div class="panel panel-default"> | 51 | <div class="panel panel-default"> |
51 | <div class="panel-body"> | 52 | <div class="panel-body"> |
52 | - <a class="twitter-timeline htag" href="https://twitter.com/hashtag/i3geo" | ||
53 | - data-widget-id="643417277208133633" height="320">i3geo Tweets</a> | 53 | + <a height="320" class="twitter-timeline" href="https://twitter.com/search?q=i3geo" data-widget-id="990311163815710720">Tweets sobre i3geo</a> |
54 | + <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script> | ||
55 | + | ||
54 | </div> | 56 | </div> |
55 | </div> | 57 | </div> |
56 | </div> | 58 | </div> |
@@ -61,8 +63,7 @@ include "../init/head.php"; | @@ -61,8 +63,7 @@ include "../init/head.php"; | ||
61 | src='https://www.openhub.net/p/i3geo/widgets/project_users?format=js&style=blue'></script> | 63 | src='https://www.openhub.net/p/i3geo/widgets/project_users?format=js&style=blue'></script> |
62 | </div> | 64 | </div> |
63 | <div tabindex="-1" class="col-xs-12 text-center"> | 65 | <div tabindex="-1" class="col-xs-12 text-center"> |
64 | - <script type="text/javascript" | ||
65 | - src="http://www.openhub.net/p/150688/widgets/project_basic_stats.js"></script> | 66 | + <script type='text/javascript' src='https://www.openhub.net/p/i3_geo/widgets/project_basic_stats?format=js'></script> |
66 | </div> | 67 | </div> |
67 | </div> | 68 | </div> |
68 | </div> | 69 | </div> |
versao.php
@@ -8,6 +8,8 @@ Utilizado como um include em ms_configura.php | @@ -8,6 +8,8 @@ Utilizado como um include em ms_configura.php | ||
8 | 8 | ||
9 | Alteracoes em relacao a versao 7.0.0 | 9 | Alteracoes em relacao a versao 7.0.0 |
10 | 10 | ||
11 | +- Reformulação da página principal | ||
12 | + | ||
11 | - Implementacao de UTFGRID | 13 | - Implementacao de UTFGRID |
12 | 14 | ||
13 | - Correcoes no plugin parametrossql | 15 | - Correcoes no plugin parametrossql |
@@ -15,5 +17,5 @@ Alteracoes em relacao a versao 7.0.0 | @@ -15,5 +17,5 @@ Alteracoes em relacao a versao 7.0.0 | ||
15 | - Inclusao de funcoes JS nas etiquetas | 17 | - Inclusao de funcoes JS nas etiquetas |
16 | 18 | ||
17 | */ | 19 | */ |
18 | -$mensagemInicia = 'V. 7.0.4'; | 20 | +$mensagemInicia = 'V. 7.0.5'; |
19 | ?> | 21 | ?> |