From 18757aa07e28a9c0addcc5921923678eff3409c0 Mon Sep 17 00:00:00 2001 From: Edmar Moretti Date: Sat, 8 Dec 2007 02:32:32 +0000 Subject: [PATCH] ajustes dos programas devido à movimentação de diretórios --- aplicmap/geral.htm | 10 ++++------ aplicmap/simples.php | 10 +++++----- classesjs/compactajs.php | 18 +++++++++--------- classesjs/i3geonaocompacto.js | 8 ++++---- classesphp/admin.php | 2 +- classesphp/atlas_controle.php | 2 +- classesphp/mapa_controle.php | 2 +- classesphp/wscliente.php | 2 +- css/botoes.css | 4 ++-- css/geral.css | 5 ++++- css/i3geo.css | 9 ++++++--- css/i3geo.css.php | 9 ++++++--- datadownload.htm | 10 +++++----- ferramentas/downloadbase/index.htm | 4 ++-- ferramentas/navegacaodir/index.htm | 6 +++--- geradordelinks.htm | 4 ++-- kml.php | 3 --- ogc.htm | 10 +++++----- pacotes/jsobjects/jsUI-Treeview/component.js | 2 +- pacotes/jsobjects/jsUI-Treeview/component_i3geo.js | 2 +- wscliente.htm | 10 +++++----- 21 files changed, 68 insertions(+), 64 deletions(-) diff --git a/aplicmap/geral.htm b/aplicmap/geral.htm index 226f8ba..2ed53e0 100644 --- a/aplicmap/geral.htm +++ b/aplicmap/geral.htm @@ -17,9 +17,9 @@ arquivos não compactados, bastando substituir por i3geonaocompacto --> --> - +
- + @@ -190,9 +190,8 @@ http:///i3geo/ms_criamapa.php É utilizada para identificar o local correto onde estão os programas em php que são utilizados. - É definida automaticamente por i3geo.js, mas essa identificação automática pode não funcionar corretamente */ -//g_locaplic = "http://"+window.location.host+"/i3geo"; +g_locaplic = "http://"+window.location.host+"/i3geo"; /* Variable: g_localimg @@ -200,9 +199,8 @@ http:///i3geo/ms_criamapa.php É utilizada para identificar o local correto onde estão as imagens que são utilizados. - É definida automaticamente por i3geo.js, mas essa identificação automática pode não funcionar corretamente */ -//g_localimg = "http://"+window.location.host+"/i3geo/imagens"; +g_localimg = "http://"+window.location.host+"/i3geo/imagens"; /* Variable: g_funcaoTip diff --git a/aplicmap/simples.php b/aplicmap/simples.php index 4e86656..8795e2a 100644 --- a/aplicmap/simples.php +++ b/aplicmap/simples.php @@ -2,11 +2,11 @@ echo ' - - - - - + + + + + diff --git a/classesjs/compactajs.php b/classesjs/compactajs.php index 69cb30b..5dbf333 100644 --- a/classesjs/compactajs.php +++ b/classesjs/compactajs.php @@ -58,9 +58,9 @@ packer("iniciamma.js","compactados/iniciamma_compacto.js","Normal"); packer("ferramentas.js","compactados/ferramentas_compacto.js","Normal"); packer("funcoes.js","compactados/funcoes_compacto.js","Normal"); packer("menususpenso.js","compactados/menususpenso_compacto.js","Normal"); -packer("jsobjects/jsUI-Treeview/component_i3geo.js","jsobjects/jsUI-Treeview/component_compacto.js","Normal"); -packer("jsobjects/jsUI-Global/uiCommon.js","jsobjects/jsUI-Global/uiCommon_compacto.js","Normal"); -packer("jsobjects/jsUI-Global/common.js","jsobjects/jsUI-Global/common_compacto.js","Normal"); +packer("../pacotes/jsobjects/jsUI-Treeview/component_i3geo.js","../pacotes/jsobjects/jsUI-Treeview/component_compacto.js","Normal"); +packer("../pacotes/jsobjects/jsUI-Global/uiCommon.js","../pacotes/jsobjects/jsUI-Global/uiCommon_compacto.js","Normal"); +packer("../pacotes/jsobjects/jsUI-Global/common.js","../pacotes/jsobjects/jsUI-Global/common_compacto.js","Normal"); packer("../pacotes/yui231/build/yahoo/yahoo-min.js","../pacotes/yui231/build/yahoo/yahoo-min_packer.js","Normal"); packer("../pacotes/yui231/build/yahoo-dom-event/yahoo-dom-event.js","../pacotes/yui231/build/yahoo-dom-event/yahoo-dom-event_packer.js","None"); packer("../pacotes/yui231/build/utilities/utilities.js","../pacotes/yui231/build/utilities/utilities_packer.js"); @@ -81,10 +81,10 @@ $jsfiles = array( "../pacotes/yui231/build/element/element-beta-min.js", "../pacotes/yui231/build/tabview/tabview-min.js", "../pacotes/yui231/build/utilities/utilities_packer.js", -"cpaint/cpaint2.inc.compressed.js", -"jsobjects/jsUI-Global/common_compacto.js", -"jsobjects/jsUI-Global/uiCommon_compacto.js", -"jsobjects/jsUI-Treeview/component_compacto.js", +"../pacotes/cpaint/cpaint2.inc.compressed.js", +"../pacotes/jsobjects/jsUI-Global/common_compacto.js", +"../pacotes/jsobjects/jsUI-Global/uiCommon_compacto.js", +"../pacotes/jsobjects/jsUI-Treeview/component_compacto.js", "../pacotes/richdraw/richdraw_tudo_compacto.js", "compactados/funcoes_compacto.js", "compactados/configura_compacto.js", @@ -126,7 +126,7 @@ $jsfiles = array( "../pacotes/yui231/build/element/element-beta.js", "../pacotes/yui231/build/button/button-beta.js", "../pacotes/yui231/build/tabview/tabview.js", -"../classesjs/cpaint/cpaint2.inc.compressed.js" +"../pacotes/cpaint/cpaint2.inc.compressed.js" ); $buffer = "\$i = function(id){return document.getElementById(id);}\n"; salvatudojs($jsfiles,$buffer,"../ferramentas/i3geo_tudo_compacto.js","js"); @@ -174,7 +174,7 @@ function packer($src,$out,$tipo="None") //packer //$src = 'temp.js'; //$out = 'i3geo_tudo_compacto.js'; - require_once 'packer/class.JavaScriptPacker.php'; + require_once '../pacotes/packer/class.JavaScriptPacker.php'; $script = file_get_contents($src); $t1 = microtime(true); $packer = new JavaScriptPacker($script, $tipo, true, false); diff --git a/classesjs/i3geonaocompacto.js b/classesjs/i3geonaocompacto.js index 6ae69c4..745e9cc 100644 --- a/classesjs/i3geonaocompacto.js +++ b/classesjs/i3geonaocompacto.js @@ -58,10 +58,10 @@ var jsfiles = new Array( "../pacotes/yui231/build/element/element-beta.js", "../pacotes/yui231/build/tabview/tabview.js", "../pacotes/yui231/build/utilities/utilities.js", -"cpaint/cpaint2.inc.compressed.js", -"jsobjects/jsUI-Global/common.js", -"jsobjects/jsUI-Global/uiCommon.js", -"jsobjects/jsUI-Treeview/component_i3geo.js", +"../pacotes/cpaint/cpaint2.inc.compressed.js", +"../pacotes/jsobjects/jsUI-Global/common.js", +"../pacotes/jsobjects/jsUI-Global/uiCommon.js", +"../pacotes/jsobjects/jsUI-Treeview/component_i3geo.js", "funcoes.js", "configura.js", "ferramentas.js", diff --git a/classesphp/admin.php b/classesphp/admin.php index 043d143..b10fcac 100644 --- a/classesphp/admin.php +++ b/classesphp/admin.php @@ -48,7 +48,7 @@ foreach(array_keys($_SESSION) as $k) include_once ("carrega_ext.php"); //verifica se o cliente pode editar require_once("../ms_configura.php"); -require_once("../classesjs/cpaint/cpaint2.inc.php"); +require_once("../pacotes/cpaint/cpaint2.inc.php"); $editor = "nao"; foreach ($editores as $e) { diff --git a/classesphp/atlas_controle.php b/classesphp/atlas_controle.php index 048caa5..a732be4 100644 --- a/classesphp/atlas_controle.php +++ b/classesphp/atlas_controle.php @@ -82,7 +82,7 @@ if (!isset($atlasxml)) //se as extensões já estiverem carregadas no PHP, vc pode comentar essa linha para que o processamento fique mais rápido // include_once ("carrega_ext.php"); -require_once("../classesjs/cpaint/cpaint2.inc.php"); +require_once("../pacotes/cpaint/cpaint2.inc.php"); // //cria objeto cpaint para uso com ajax // diff --git a/classesphp/mapa_controle.php b/classesphp/mapa_controle.php index d6b9b77..c77eee9 100644 --- a/classesphp/mapa_controle.php +++ b/classesphp/mapa_controle.php @@ -112,7 +112,7 @@ if (isset($debug) && $debug == "sim") //se as extensões já estiverem carregadas no PHP, vc pode comentar essa linha para que o processamento fique mais rápido // include_once ("carrega_ext.php"); -require_once("../classesjs/cpaint/cpaint2.inc.php"); +require_once("../pacotes/cpaint/cpaint2.inc.php"); // //cria objeto cpaint para uso com ajax // diff --git a/classesphp/wscliente.php b/classesphp/wscliente.php index f240c81..6698b90 100644 --- a/classesphp/wscliente.php +++ b/classesphp/wscliente.php @@ -36,7 +36,7 @@ Include: */ require_once("pega_variaveis.php"); include("lews/wms_functions.php"); -require_once("../classesjs/cpaint/cpaint2.inc.php"); +require_once("../pacotes/cpaint/cpaint2.inc.php"); $cp = new cpaint(); // //busca o getcapabilities de um wms diff --git a/css/botoes.css b/css/botoes.css index a3a0fbe..9c4be11 100644 --- a/css/botoes.css +++ b/css/botoes.css @@ -14,8 +14,8 @@ {top:0px;position:absolute;visibility: hidden;} #mensagem {background-color:white;position:absolute;visibility:hidden} -#aplicari#funcoesrapidasi -{display:none;position:absolute;cursor:pointer;z-index:1000;} +#aplicari +{display:none;position:absolute;cursor:pointer;z-index:1000;background-color:#F6F6F6;color:#426252;} #img,#imgL,#imgO,#imgN,#imgS {border: 0px solid black;cursor:crosshair;top:0px;left:0px;} #img_d diff --git a/css/geral.css b/css/geral.css index e7a3732..3b4ed58 100644 --- a/css/geral.css +++ b/css/geral.css @@ -67,7 +67,10 @@ select .aplicar {visibility:visible;color: #2F4632;background:rgb(240,240,240);text-align: center;font-family: Verdana, Arial, Helvetica, sans-serif;font-size: 12px;border-style:outset;border-width:2px;border-color:#cc0000;cursor:pointer;z-index:1000;} .digitar -{border: 0px solid gray;border-bottom:1px solid gray;font-size: 10px;font-family: Verdana, Arial, Helvetica, sans-serif;} +{color:#426252;background-color:#F6F6F6;border: 1px solid #CBCBCB;font-size: 10px;font-family: Verdana, Arial, Helvetica, sans-serif;} +.digitarMouseover +{color:#426252;background-color:rgb(246,227,174);border: 0px solid #CBCBCB;font-size: 10px;font-family: Verdana, Arial, Helvetica, sans-serif;} + .legendaTema {font-size:10px;text-align:left;} #corpoMapa,#corpoMapaL,#corpoMapaO,#corpoMapaN,#corpoMapaS diff --git a/css/i3geo.css b/css/i3geo.css index 7546d9e..d3d24a3 100644 --- a/css/i3geo.css +++ b/css/i3geo.css @@ -67,7 +67,10 @@ select .aplicar {visibility:visible;color: #2F4632;background:rgb(240,240,240);text-align: center;font-family: Verdana, Arial, Helvetica, sans-serif;font-size: 12px;border-style:outset;border-width:2px;border-color:#cc0000;cursor:pointer;z-index:1000;} .digitar -{border: 0px solid gray;border-bottom:1px solid gray;font-size: 10px;font-family: Verdana, Arial, Helvetica, sans-serif;} +{color:#426252;background-color:#F6F6F6;border: 1px solid #CBCBCB;font-size: 10px;font-family: Verdana, Arial, Helvetica, sans-serif;} +.digitarMouseover +{color:#426252;background-color:rgb(246,227,174);border: 0px solid #CBCBCB;font-size: 10px;font-family: Verdana, Arial, Helvetica, sans-serif;} + .legendaTema {font-size:10px;text-align:left;} #corpoMapa,#corpoMapaL,#corpoMapaO,#corpoMapaN,#corpoMapaS @@ -161,8 +164,8 @@ h1 {padding:.25em .5em;background-color:#ccc;} {top:0px;position:absolute;visibility: hidden;} #mensagem {background-color:white;position:absolute;visibility:hidden} -#aplicari#funcoesrapidasi -{display:none;position:absolute;cursor:pointer;z-index:1000;} +#aplicari +{display:none;position:absolute;cursor:pointer;z-index:1000;background-color:#F6F6F6;color:#426252;} #img,#imgL,#imgO,#imgN,#imgS {border: 0px solid black;cursor:crosshair;top:0px;left:0px;} #img_d diff --git a/css/i3geo.css.php b/css/i3geo.css.php index 06f8bef..9ff46e9 100644 --- a/css/i3geo.css.php +++ b/css/i3geo.css.php @@ -67,7 +67,10 @@ select .aplicar {visibility:visible;color: #2F4632;background:rgb(240,240,240);text-align: center;font-family: Verdana, Arial, Helvetica, sans-serif;font-size: 12px;border-style:outset;border-width:2px;border-color:#cc0000;cursor:pointer;z-index:1000;} .digitar -{border: 0px solid gray;border-bottom:1px solid gray;font-size: 10px;font-family: Verdana, Arial, Helvetica, sans-serif;} +{color:#426252;background-color:#F6F6F6;border: 1px solid #CBCBCB;font-size: 10px;font-family: Verdana, Arial, Helvetica, sans-serif;} +.digitarMouseover +{color:#426252;background-color:rgb(246,227,174);border: 0px solid #CBCBCB;font-size: 10px;font-family: Verdana, Arial, Helvetica, sans-serif;} + .legendaTema {font-size:10px;text-align:left;} #corpoMapa,#corpoMapaL,#corpoMapaO,#corpoMapaN,#corpoMapaS @@ -161,8 +164,8 @@ h1 {padding:.25em .5em;background-color:#ccc;} {top:0px;position:absolute;visibility: hidden;} #mensagem {background-color:white;position:absolute;visibility:hidden} -#aplicari#funcoesrapidasi -{display:none;position:absolute;cursor:pointer;z-index:1000;} +#aplicari +{display:none;position:absolute;cursor:pointer;z-index:1000;background-color:#F6F6F6;color:#426252;} #img,#imgL,#imgO,#imgN,#imgS {border: 0px solid black;cursor:crosshair;top:0px;left:0px;} #img_d diff --git a/datadownload.htm b/datadownload.htm index 9d71ba7..c00c323 100644 --- a/datadownload.htm +++ b/datadownload.htm @@ -7,7 +7,7 @@ - + - - - - + + + + diff --git a/ferramentas/downloadbase/index.htm b/ferramentas/downloadbase/index.htm index aa80f9f..a197cc4 100644 --- a/ferramentas/downloadbase/index.htm +++ b/ferramentas/downloadbase/index.htm @@ -1,7 +1,7 @@ - + - + diff --git a/kml.php b/kml.php index bfbc031..d360d1b 100644 --- a/kml.php +++ b/kml.php @@ -35,10 +35,7 @@ echo ""; $protocolo = explode("/",$_SERVER['SERVER_PROTOCOL']); $protocolo = $protocolo[0]; $protocolo1 = strtolower($protocolo . '://'.$_SERVER['SERVER_NAME']); - $protocolo = $protocolo . '://'.$_SERVER['SERVER_NAME'] .":". $_SERVER['SERVER_PORT']; - - if ($menutemas == "") {$menus[] = "menutemas/menutemas.xml";} else diff --git a/ogc.htm b/ogc.htm index 23ffcea..8786620 100644 --- a/ogc.htm +++ b/ogc.htm @@ -7,7 +7,7 @@ - + - - - - + + + + diff --git a/pacotes/jsobjects/jsUI-Treeview/component.js b/pacotes/jsobjects/jsUI-Treeview/component.js index a48dd58..467aed4 100644 --- a/pacotes/jsobjects/jsUI-Treeview/component.js +++ b/pacotes/jsobjects/jsUI-Treeview/component.js @@ -3,7 +3,7 @@ function treeviewNew(treeviewName, skinName, treeviewParent, rootDir) if (treeviewName == null || treeviewName == "") return false; if (rootDir == null) - rootDir = g_locaplic+"/classesjs/jsobjects"; + rootDir = g_locaplic+"/pacotes/jsobjects"; jsUIGblAddSkin("jsUI-Treeview", skinName, rootDir); if (treeviewParent == null || treeviewParent == "" || treeviewParent == undefined) treeviewParent = document.body; diff --git a/pacotes/jsobjects/jsUI-Treeview/component_i3geo.js b/pacotes/jsobjects/jsUI-Treeview/component_i3geo.js index 5d23bea..30bc85d 100644 --- a/pacotes/jsobjects/jsUI-Treeview/component_i3geo.js +++ b/pacotes/jsobjects/jsUI-Treeview/component_i3geo.js @@ -3,7 +3,7 @@ function treeviewNew(treeviewName, skinName, treeviewParent, rootDir) if (treeviewName == null || treeviewName == "") return false; if (rootDir == null) - rootDir = g_locaplic+"/classesjs/jsobjects"; + rootDir = g_locaplic+"/pacotes/jsobjects"; jsUIGblAddSkin("jsUI-Treeview", skinName, rootDir); if (treeviewParent == null || treeviewParent == "" || treeviewParent == undefined) treeviewParent = document.body; diff --git a/wscliente.htm b/wscliente.htm index b7b1ffa..787d2f0 100644 --- a/wscliente.htm +++ b/wscliente.htm @@ -7,7 +7,7 @@ - + - - - - + + + + -- libgit2 0.21.2