From 1c18bf426d282197aed128d48e2f0b12d1e82f46 Mon Sep 17 00:00:00 2001 From: Edmar Moretti Date: Sat, 28 Apr 2018 16:53:23 -0300 Subject: [PATCH] Reformulação da página principal e atualização dos ícones --- init/head.php | 22 +++++++++++++++++++++- init/imagens/applications-development-web.png | Bin 17310 -> 0 bytes init/imagens/applications-development.png | Bin 5893 -> 0 bytes init/imagens/googlemaps.png | Bin 17608 -> 0 bytes init/imagens/insert-link.png | Bin 6607 -> 0 bytes init/imagens/mailman.png | Bin 24251 -> 0 bytes init/imagens/mashup.png | Bin 20491 -> 0 bytes init/imagens/ogc_logo.png | Bin 3860 -> 0 bytes init/imagens/openlayers.png | Bin 28209 -> 0 bytes init/imagens/openlayersdebug.png | Bin 20147 -> 0 bytes init/imagens/osm.png | Bin 24909 -> 0 bytes init/imagens/sprite.php | 1 + init/imagens/window-duplicate.png | Bin 7910 -> 0 bytes init/index.js | 32 ++++++++++++++++---------------- init/index.php | 309 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------------------- social/index.php | 27 ++++++++++++++------------- versao.php | 4 +++- 17 files changed, 206 insertions(+), 189 deletions(-) diff --git a/init/head.php b/init/head.php index 438ba49..17e3346 100755 --- a/init/head.php +++ b/init/head.php @@ -104,7 +104,7 @@ hr { width: 40px; } body{ - background-color: rgb(240,240,240); + background-color: rgb(245,245,245); } /* conforme regra de acessibilidade */ @@ -254,6 +254,26 @@ h2 small { max-height: 60px; height: 60px; } + +.panel { + border-radius: 2px; + border: 0; + -webkit-box-shadow: 0 1px 6px 0 rgba(0,0,0,.12),0 1px 6px 0 rgba(0,0,0,.12); + box-shadow: 0 1px 1px 0 rgba(0,0,0,.12),0 1px 1px 0 rgba(0,0,0,.2); +} + +.thumbnail { + display: block; + padding: 0px; + margin-bottom: 20px; + line-height: 0; + background-color: unset; + border: 0px; + border-radius: 0px; + -webkit-transition: border .2s ease-in-out; + -o-transition: border .2s ease-in-out; + transition: border .2s ease-in-out; +} /* === For phones =================================== */ @media (max-width: 767px) { .btn-breadcrumb > *:nth-last-child(-n+2) { diff --git a/init/imagens/applications-development-web.png b/init/imagens/applications-development-web.png index 4099a54..43dd29f 100755 Binary files a/init/imagens/applications-development-web.png and b/init/imagens/applications-development-web.png differ diff --git a/init/imagens/applications-development.png b/init/imagens/applications-development.png index 854c759..fe4552d 100755 Binary files a/init/imagens/applications-development.png and b/init/imagens/applications-development.png differ diff --git a/init/imagens/googlemaps.png b/init/imagens/googlemaps.png index 8bcc3b4..c1b63c1 100755 Binary files a/init/imagens/googlemaps.png and b/init/imagens/googlemaps.png differ diff --git a/init/imagens/insert-link.png b/init/imagens/insert-link.png index 991db7e..dadae8a 100755 Binary files a/init/imagens/insert-link.png and b/init/imagens/insert-link.png differ diff --git a/init/imagens/mailman.png b/init/imagens/mailman.png index df2e6c2..df4c34e 100755 Binary files a/init/imagens/mailman.png and b/init/imagens/mailman.png differ diff --git a/init/imagens/mashup.png b/init/imagens/mashup.png index 7ee8ac7..af02b7d 100755 Binary files a/init/imagens/mashup.png and b/init/imagens/mashup.png differ diff --git a/init/imagens/ogc_logo.png b/init/imagens/ogc_logo.png index b1a1308..ae4340e 100755 Binary files a/init/imagens/ogc_logo.png and b/init/imagens/ogc_logo.png differ diff --git a/init/imagens/openlayers.png b/init/imagens/openlayers.png index c09d8a3..5509551 100755 Binary files a/init/imagens/openlayers.png and b/init/imagens/openlayers.png differ diff --git a/init/imagens/openlayersdebug.png b/init/imagens/openlayersdebug.png index 9d1cee1..2191e3f 100755 Binary files a/init/imagens/openlayersdebug.png and b/init/imagens/openlayersdebug.png differ diff --git a/init/imagens/osm.png b/init/imagens/osm.png index be58118..0aba5c7 100755 Binary files a/init/imagens/osm.png and b/init/imagens/osm.png differ diff --git a/init/imagens/sprite.php b/init/imagens/sprite.php index 5bd828b..510a489 100755 --- a/init/imagens/sprite.php +++ b/init/imagens/sprite.php @@ -1,4 +1,5 @@ OSM" + " - OpenLayers", "subtitulo": $trad("18a",g_traducao_init), @@ -46,21 +46,21 @@ botoesIni = [ }, */ { - "img":"window-duplicate", + "img":"imagens/window-duplicate.png", "href": "../mapas/index.php", "titulo":$trad(34,g_traducao_init), "subtitulo": $trad("34a",g_traducao_init), "fa": "map-o", "target": "_self" },{ - "img":"ogc_logo", + "img":"imagens/ogc_logo.png", "href": "../ogc/index.php", "titulo":$trad(11,g_traducao_init), "subtitulo": $trad("11a",g_traducao_init), "fa": "download", "target": "_self" },{ - "img":"application-vnd-google-earth-kml", + "img":"imagens/application-vnd-google-earth-kml.png", "href": "../kml.php", "titulo":$trad(12,g_traducao_init), "subtitulo": $trad("12a",g_traducao_init), @@ -78,35 +78,35 @@ botoesIni = [ }, */ { - "img":"insert-link", + "img":"imagens/insert-link.png", "href": "../permlinks/index.php", "titulo":$trad(13,g_traducao_init), "subtitulo": $trad("13a",g_traducao_init), "fa": "map-o", "target": "_self" },{ - "img":"openlayersdebug", + "img":"imagens/openlayersdebug.png", "href": location.href.replace("init/index.php"+window.location.search,"") + customDir + "/openlayersdebug.htm", "titulo":$trad(5,g_traducao_init), "subtitulo": $trad("5a",g_traducao_init), "fa": "cogs", "target": "_blank" },{ - "img":"certificate-server", + "img":"imagens/certificate-server.png", "href": "../testainstal/index.php", "titulo":$trad(2,g_traducao_init), "subtitulo": $trad("2a",g_traducao_init), "fa": "cogs", "target": "_self" },{ - "img":"applications-development-web", + "img":"imagens/applications-development-web.png", "href": "../admin", "titulo":$trad(3,g_traducao_init), "subtitulo": $trad("3a",g_traducao_init), "fa": "cogs", "target": "_self" },{ - "img":"applications-development", + "img":"imagens/applications-development.png", "href": "../utilitarios/index.php", "titulo":$trad(33,g_traducao_init), "subtitulo": $trad("33a",g_traducao_init), @@ -146,28 +146,28 @@ botoesIni = [ }, */ { - "img":"tools-report-bug", + "img":"imagens/tools-report-bug.png", "href":"https://softwarepublico.gov.br/gitlab/i3geo/i3geo/issues", "titulo":$trad(16,g_traducao_init), "subtitulo": $trad("16a",g_traducao_init), "fa": "group", "target": "_self" },{ - "img":"apple-touch-icon", + "img":"imagens/apple-touch-icon.png", "href":"https://softwarepublico.gov.br/gitlab/groups/i3geo", "titulo":$trad(30,g_traducao_init), "subtitulo": $trad("30a",g_traducao_init), "fa": "book", "target": "_self" },{ - "img":"logo_psp", + "img":"imagens/logo_psp.png", "href":"https://portal.softwarepublico.gov.br/social/i3geo/", "titulo":$trad(31,g_traducao_init), "subtitulo": $trad("31a",g_traducao_init), "fa": "group", "target": "_self" },{ - "img":"mailman", + "img":"imagens/mailman.png", "href":"http://lists.osgeo.org/cgi-bin/mailman/listinfo/i3geo", "titulo":$trad(32,g_traducao_init), "subtitulo": $trad("32a",g_traducao_init), diff --git a/init/index.php b/init/index.php index 2d31593..5a6cab8 100755 --- a/init/index.php +++ b/init/index.php @@ -13,190 +13,183 @@ /** * Cria as pastas temporarias que o i3Geo precisa, caso nao existam */ -define ( "ONDEI3GEO", ".." ); -include (dirname ( __FILE__ ) . "/../ms_configura.php"); -if(empty($dir_tmp)){ - exit; +define("ONDEI3GEO", ".."); +include (dirname(__FILE__) . "/../ms_configura.php"); +if (empty($dir_tmp)) { + exit(); } -if (! empty ( $_GET ["customDir"] )) { - $customDir = strip_tags ( $_GET ["customDir"] ); -} else if (empty ( $customDir )) { - $customDir = "interface"; +if (! empty($_GET["customDir"])) { + $customDir = strip_tags($_GET["customDir"]); +} else if (empty($customDir)) { + $customDir = "interface"; } -include_once (dirname(__FILE__)."/../classesphp/sani_request.php"); -if (! file_exists ( $dir_tmp )) { - @mkdir ( $dir_tmp, 0744 ); +include_once (dirname(__FILE__) . "/../classesphp/sani_request.php"); +if (! file_exists($dir_tmp)) { + @mkdir($dir_tmp, 0744); } -if (file_exists ( $dir_tmp )) { - if(!file_exists($dir_tmp . "/comum")){ - @mkdir ( $dir_tmp . "/comum", 0744 ); - chmod ( $dir_tmp . "/comum", 0744 ); - } - if(!file_exists($dir_tmp . "/saiku-datasources")){ - @mkdir ( $dir_tmp . "/saiku-datasources", 0744 ); - chmod ( $dir_tmp . "/saiku-datasources", 0744 ); - } - if(!file_exists($dir_tmp . "/cache")){ - @mkdir ( $dir_tmp . "/cache", 0744 ); - chmod ( $dir_tmp . "/cache", 0744 ); - } - if(!file_exists($dir_tmp . "/cache/googlemaps")){ - @mkdir ( $dir_tmp . "/cache/googlemaps", 0744 ); - chmod ( $dir_tmp . "/cache/googlemaps", 0744 ); - } - foreach(glob($dir_tmp . '/{,.}*.php', GLOB_BRACE) as $f) { - unlink ($f); - } +if (file_exists($dir_tmp)) { + if (! file_exists($dir_tmp . "/comum")) { + @mkdir($dir_tmp . "/comum", 0744); + chmod($dir_tmp . "/comum", 0744); + } + if (! file_exists($dir_tmp . "/saiku-datasources")) { + @mkdir($dir_tmp . "/saiku-datasources", 0744); + chmod($dir_tmp . "/saiku-datasources", 0744); + } + if (! file_exists($dir_tmp . "/cache")) { + @mkdir($dir_tmp . "/cache", 0744); + chmod($dir_tmp . "/cache", 0744); + } + if (! file_exists($dir_tmp . "/cache/googlemaps")) { + @mkdir($dir_tmp . "/cache/googlemaps", 0744); + chmod($dir_tmp . "/cache/googlemaps", 0744); + } + foreach (glob($dir_tmp . '/{,.}*.php', GLOB_BRACE) as $f) { + unlink($f); + } } -//error_reporting ( 0 ); +// error_reporting ( 0 ); include "head.php"; ?> - - Skip to main content - - + + Skip to main content + + + -
-
+
+
Verifique se PHP-Mapscript está instalado
'; - } +include_once ("../classesphp/carrega_ext.php"); +if (! function_exists("ms_GetVersion")) { + echo ''; +} ?> - -
-
-
- -
-
@@ -61,8 +63,7 @@ include "../init/head.php"; src='https://www.openhub.net/p/i3geo/widgets/project_users?format=js&style=blue'>
- +
diff --git a/versao.php b/versao.php index 6f96430..e3c3ac9 100755 --- a/versao.php +++ b/versao.php @@ -8,6 +8,8 @@ Utilizado como um include em ms_configura.php Alteracoes em relacao a versao 7.0.0 +- Reformulação da página principal + - Implementacao de UTFGRID - Correcoes no plugin parametrossql @@ -15,5 +17,5 @@ Alteracoes em relacao a versao 7.0.0 - Inclusao de funcoes JS nas etiquetas */ -$mensagemInicia = 'V. 7.0.4'; +$mensagemInicia = 'V. 7.0.5'; ?> -- libgit2 0.21.2