From caac859a382106fae2203eb2dd92e5d308ebd2de Mon Sep 17 00:00:00 2001 From: Edmar Moretti Date: Wed, 30 Jul 2014 15:42:13 +0000 Subject: [PATCH] Várias correções de sintaxe e erro no grafico de pizza da legenda --- ferramentas/conectargeorss/index.htm | 6 +++--- ferramentas/graficointerativo1/index.js | 146 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------- ferramentas/imprimir/propriedades.htm | 102 +++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------- ferramentas/legenda/index.js | 12 ++++++------ ferramentas/metaestat/templates/semguias_lateral.php | 13 +++++++------ ferramentas/metaestat/templates/semguias_lateral_google.php | 13 +++++++------ ferramentas/metaestat/templates/semguias_lateral_google_noite.php | 13 +++++++------ ferramentas/metaestat/templates/simples_fixa.php | 13 +++++++------ ferramentas/metaestat/templates/simples_fixa_google.php | 17 +++++++++-------- ferramentas/metaestat/templates/simples_fixa_google_noite.php | 17 +++++++++-------- ferramentas/metaestat/templates/simples_lateral.php | 13 +++++++------ ferramentas/metaestat/templates/simples_movel.php | 13 +++++++------ ferramentas/navegarquivos/index.js | 4 ++-- ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/index.html | 4 ++-- ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/jquery/jquery.colourPicker.js | 28 ++++++++++++++-------------- ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/CCC_Chart/plugin.js | 4 ++-- ferramentas/tabela/template_mst.html | 12 ++++++------ 17 files changed, 222 insertions(+), 208 deletions(-) diff --git a/ferramentas/conectargeorss/index.htm b/ferramentas/conectargeorss/index.htm index 94d6de1..6d7c01c 100644 --- a/ferramentas/conectargeorss/index.htm +++ b/ferramentas/conectargeorss/index.htm @@ -15,8 +15,8 @@ body {
@@ -34,7 +34,7 @@ body {
- + - + \ No newline at end of file diff --git a/ferramentas/legenda/index.js b/ferramentas/legenda/index.js index 31c9aee..e59d22e 100644 --- a/ferramentas/legenda/index.js +++ b/ferramentas/legenda/index.js @@ -1019,7 +1019,7 @@ i3GEOF.legenda = { var p = i3GEO.configura.locaplic+"/classesphp/mapa_controle.php?g_sid="+i3GEO.configura.sid+"&funcao=editasimbolo&opcao=pegaparametros&tema="+i3GEOF.legenda.tema+"&classe="+i3GEOF.legenda.classe, cp = new cpaint(); cp.set_response_type("JSON"); - cp.call(p,"pegaParametrosMapa",i3GEOF.legenda.montaEditor); + cp.call(p,"pegaParametrosMapa",i3GEOF.legenda.montaEditor); }, /* Function: simbU @@ -1073,7 +1073,7 @@ i3GEOF.legenda = { else{ p += "&ext="+i3GEO.util.extOSM2Geo(i3GEO.parametros.extentTotal); } - + if (item == "") {i3GEO.janela.tempoMsg($trad(81,i3GEOF.legenda.dicionario));return;} i3GEOF.legenda.aguarde.visibility = "visible"; @@ -1509,8 +1509,8 @@ i3GEOF.legenda = { new YAHOO.widget.Button( "i3GEOlegendaGraficoPizza", {onclick:{fn: function(){ - var js = i3GEO.configura.locaplic+"/ferramentas/graficointerativo/index.js.php"; - i3GEO.util.scriptTag(js,"i3GEOF.legenda.iniciaGraficoPizza()","i3GEOF.graficointerativo_script"); + var js = i3GEO.configura.locaplic+"/ferramentas/graficointerativo1/dependencias.php"; + i3GEO.util.scriptTag(js,"i3GEOF.legenda.iniciaGraficoPizza()","i3GEOF.graficointerativo1_script"); } }} ); @@ -1531,8 +1531,8 @@ i3GEOF.legenda = { "dados":i3GEOF.legenda.dadosGrafico } }; - i3GEOF.graficointerativo.tipo = "pizza2d"; - i3GEOF.graficointerativo.criaJanelaFlutuante(dados); + i3GEOF.graficointerativo1.tipo = "pizza_1"; + i3GEOF.graficointerativo1.iniciaJanelaFlutuante(dados); }, /* Function: aplicaProcessos diff --git a/ferramentas/metaestat/templates/semguias_lateral.php b/ferramentas/metaestat/templates/semguias_lateral.php index 41d05ce..183f724 100755 --- a/ferramentas/metaestat/templates/semguias_lateral.php +++ b/ferramentas/metaestat/templates/semguias_lateral.php @@ -59,6 +59,12 @@ $dadosmapa = dadosmapa("../../../"); vertical-align: middle; } + + + + + + @@ -131,12 +137,7 @@ $dadosmapa = dadosmapa("../../../"); - - - - - - + + + + + + @@ -132,12 +138,7 @@ $dadosmapa = dadosmapa("../../../"); - - - - - - + + + + + + @@ -132,12 +138,7 @@ $dadosmapa = dadosmapa("../../../"); - - - - - - + + + + + + - - - - - - + + + + + +
- - + + @@ -155,12 +161,7 @@ $dadosmapa = dadosmapa("../../../"); - - - - - - + + + + + +
- - + + @@ -155,12 +161,7 @@ $dadosmapa = dadosmapa("../../../"); - - - - - - + + + + + +
@@ -146,12 +152,7 @@ $dadosmapa = dadosmapa("../../../"); - - - - - - + + + + + + - - - - - - + - + diff --git a/ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/jquery/jquery.colourPicker.js b/ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/jquery/jquery.colourPicker.js index 565b051..5a0817b 100755 --- a/ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/jquery/jquery.colourPicker.js +++ b/ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/jquery/jquery.colourPicker.js @@ -124,7 +124,7 @@ Use it like this: . @exampleJS: jQuery('#jquery-colour-picker-example select').colourPicker({ - ico: WEBROOT + 'aFramework/Modules/Base/gfx/jquery.colourPicker.gif', + ico: WEBROOT + 'aFramework/Modules/Base/gfx/jquery.colourPicker.gif', title: false }); ***/ @@ -145,7 +145,7 @@ jQuery.fn.colourPicker = function (conf) { var g = hex.substr(2, 2); var b = hex.substr(4, 2); - return 0.212671 * r + 0.715160 * g + 0.072169 * b < 0.5 ? 'ffffff' : '000000' + return 0.212671 * r + 0.715160 * g + 0.072169 * b < 0.5 ? 'ffffff' : '000000'; }; // Add the colour-picker dialogue if not added @@ -176,16 +176,16 @@ jQuery.fn.colourPicker = function (conf) { var hex = option.val(); var title = option.text(); - loc += '
  • ' - + title + loc += '
  • ' + + title + '
    • '; }); @@ -208,8 +208,8 @@ jQuery.fn.colourPicker = function (conf) { var heading = config.title ? '

    ' + config.title + '

    ' : ''; colourPicker.html(heading + '').css({ - position: 'absolute', - left: iconPos.left + 'px', + position: 'absolute', + left: iconPos.left + 'px', top: iconPos.top + 'px' }).show(config.speed); diff --git a/ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/CCC_Chart/plugin.js b/ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/CCC_Chart/plugin.js index 7185e9c..8a81ba2 100755 --- a/ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/CCC_Chart/plugin.js +++ b/ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/CCC_Chart/plugin.js @@ -32,7 +32,7 @@ var Chart = Backbone.View.extend({ hasProcessed: null, getChartProperties: function(chartName) { - var self = this; + //var self = this; var ret = []; _.each(ChartProperties, function(property) { if (property.ChartObject == chartName) { @@ -217,7 +217,7 @@ var Chart = Backbone.View.extend({ }, export_button: function(event) { - var self = this; + //var self = this; $target = $(event.target).hasClass('button') ? $(event.target) : $(event.target).parent(); var self = this; diff --git a/ferramentas/tabela/template_mst.html b/ferramentas/tabela/template_mst.html index de8aa9f..53495ff 100644 --- a/ferramentas/tabela/template_mst.html +++ b/ferramentas/tabela/template_mst.html @@ -1,11 +1,11 @@

    -- libgit2 0.21.2