- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5RC1-19162-g85a990f
by Madhura Jayaratne 17 Sep '11

17 Sep '11

The branch, master has been updated via 85a990fabd4a3239f011f8d168be8558a802f96a (commit) via 1371398618fceb23db86e35252e1062c2c359bc7 (commit) via 472350cf97095c70c163d70539b5f963d4ce1cbb (commit) via edeba16cd76a6b48f22867dd6d6c2bbc9ed85d44 (commit) via 5643a33596f72a3a9b354a9ebd079ed36cd824ec (commit) via 5c03bd90e1466b2bad378e5400193a593535bb10 (commit) via b8815ca7669feddb50dfb670f97281e87c3d9b62 (commit) via 3936aab8804630a31afc98802afad3f7b27a28f7 (commit) via a61891560ff97a98a8339e1151330203dc0ccafd (commit) via fbcc3eb3a2d1f33f8a6d3e0f89f06ec82ab2d94c (commit) from dc35ecf227db206998ce20517b4e51ef05342f39 (commit) - Log ----------------------------------------------------------------- commit 85a990fabd4a3239f011f8d168be8558a802f96a Merge: 1371398 dc35ecf Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Sep 17 19:41:45 2011 +0530 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 1371398618fceb23db86e35252e1062c2c359bc7 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Sep 17 19:36:59 2011 +0530 Remove trailing white spaces commit 472350cf97095c70c163d70539b5f963d4ce1cbb Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Sep 17 19:28:35 2011 +0530 Spaces to make the code more readable commit edeba16cd76a6b48f22867dd6d6c2bbc9ed85d44 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Sep 17 19:06:18 2011 +0530 Proper indentation commit 5643a33596f72a3a9b354a9ebd079ed36cd824ec Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Sep 17 18:48:45 2011 +0530 Adding missing semicolons commit 5c03bd90e1466b2bad378e5400193a593535bb10 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Sep 17 18:46:09 2011 +0530 Fixing indentation commit b8815ca7669feddb50dfb670f97281e87c3d9b62 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Sep 17 18:30:46 2011 +0530 Always use curly braces with 'if' and 'else' commit 3936aab8804630a31afc98802afad3f7b27a28f7 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Sep 17 18:24:36 2011 +0530 More indentation problems fixed commit a61891560ff97a98a8339e1151330203dc0ccafd Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Sep 17 18:09:55 2011 +0530 Proper indentation commit fbcc3eb3a2d1f33f8a6d3e0f89f06ec82ab2d94c Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Sep 17 18:04:40 2011 +0530 Added missing semicolons ----------------------------------------------------------------------- Summary of changes: js/tbl_zoom_plot.js | 778 ++++++++++++++++++++++++++------------------------- 1 files changed, 391 insertions(+), 387 deletions(-) diff --git a/js/tbl_zoom_plot.js b/js/tbl_zoom_plot.js index b8c4259..788ca63 100644 --- a/js/tbl_zoom_plot.js +++ b/js/tbl_zoom_plot.js @@ -11,7 +11,7 @@ ** Display Help/Info **/ function displayHelp() { - var msgbox = PMA_ajaxShowMessage(PMA_messages['strDisplayHelp'],10000); + var msgbox = PMA_ajaxShowMessage(PMA_messages['strDisplayHelp'], 10000); msgbox.click(function() { PMA_ajaxRemoveMessage(msgbox); }); @@ -23,7 +23,7 @@ function displayHelp() { **/ Array.max = function (array) { return Math.max.apply( Math, array ); -} +}; /** ** Extend the array object for min function @@ -31,11 +31,11 @@ Array.max = function (array) { **/ Array.min = function (array) { return Math.min.apply( Math, array ); -} +}; /** ** Checks if a string contains only numeric value - ** @param n: String (to be checked) + ** @param n: String (to be checked) **/ function isNumeric(n) { return !isNaN(parseFloat(n)) && isFinite(n); @@ -43,7 +43,7 @@ function isNumeric(n) { /** ** Checks if an object is empty - ** @param n: Object (to be checked) + ** @param n: Object (to be checked) **/ function isEmpty(obj) { var name; @@ -58,16 +58,16 @@ function isEmpty(obj) { ** @param val Integer Timestamp ** @param type String Field type(datetime/timestamp/time/date) **/ -function getDate(val,type) { - if(type.toString().search(/datetime/i) != -1 || type.toString().search(/timestamp/i) != -1) { - return Highcharts.dateFormat('%Y-%m-%e %H:%M:%S', val) - } - else if(type.toString().search(/time/i) != -1) { - return Highcharts.dateFormat('%H:%M:%S', val) - } +function getDate(val, type) { + if (type.toString().search(/datetime/i) != -1 || type.toString().search(/timestamp/i) != -1) { + return Highcharts.dateFormat('%Y-%m-%e %H:%M:%S', val); + } + else if (type.toString().search(/time/i) != -1) { + return Highcharts.dateFormat('%H:%M:%S', val); + } else if (type.toString().search(/date/i) != -1) { - return Highcharts.dateFormat('%Y-%m-%e', val) - } + return Highcharts.dateFormat('%Y-%m-%e', val); + } } /** @@ -75,42 +75,42 @@ function getDate(val,type) { ** @param val String Date ** @param type Sring Field type(datetime/timestamp/time/date) **/ -function getTimeStamp(val,type) { - if(type.toString().search(/datetime/i) != -1 || type.toString().search(/timestamp/i) != -1) { - return getDateFromFormat(val,'yyyy-MM-dd HH:mm:ss', val) - } - else if(type.toString().search(/time/i) != -1) { - return getDateFromFormat('1970-01-01 ' + val,'yyyy-MM-dd HH:mm:ss') - } +function getTimeStamp(val, type) { + if (type.toString().search(/datetime/i) != -1 || type.toString().search(/timestamp/i) != -1) { + return getDateFromFormat(val, 'yyyy-MM-dd HH:mm:ss', val); + } + else if (type.toString().search(/time/i) != -1) { + return getDateFromFormat('1970-01-01 ' + val, 'yyyy-MM-dd HH:mm:ss'); + } else if (type.toString().search(/date/i) != -1) { - return getDateFromFormat(val,'yyyy-MM-dd') - } + return getDateFromFormat(val, 'yyyy-MM-dd'); + } } /** ** Classifies the field type into numeric,timeseries or text ** @param field: field type (as in database structure) - **/ + **/ function getType(field) { - if(field.toString().search(/int/i) != -1 || field.toString().search(/decimal/i) != -1 || field.toString().search(/year/i) != -1) + if (field.toString().search(/int/i) != -1 || field.toString().search(/decimal/i) != -1 || field.toString().search(/year/i) != -1) return 'numeric'; - else if(field.toString().search(/time/i) != -1 || field.toString().search(/date/i) != -1) + else if (field.toString().search(/time/i) != -1 || field.toString().search(/date/i) != -1) return 'time'; else return 'text'; } -/** +/** ** Converts a categorical array into numeric array ** @param array categorical values array **/ function getCord(arr) { var newCord = new Array(); - var original = $.extend(true,[],arr); + var original = $.extend(true, [], arr); var arr = jQuery.unique(arr).sort(); - $.each(original, function(index,value) { - newCord.push(jQuery.inArray(value,arr)); + $.each(original, function(index, value) { + newCord.push(jQuery.inArray(value, arr)); }); - return [newCord,arr,original]; + return [newCord, arr, original]; } /** @@ -140,23 +140,21 @@ function includePan(currentChart) { $('#querychart').mousemove(function(e) { if (mouseDown == 1) { if (e.pageX > lastX) { - var xExtremes = currentChart.xAxis[0].getExtremes(); + var xExtremes = currentChart.xAxis[0].getExtremes(); var diff = (e.pageX - lastX) * (xExtremes.max - xExtremes.min) / chartWidth; currentChart.xAxis[0].setExtremes(xExtremes.min - diff, xExtremes.max - diff); - } - else if (e.pageX < lastX) { - var xExtremes = currentChart.xAxis[0].getExtremes(); + } else if (e.pageX < lastX) { + var xExtremes = currentChart.xAxis[0].getExtremes(); var diff = (lastX - e.pageX) * (xExtremes.max - xExtremes.min) / chartWidth; currentChart.xAxis[0].setExtremes(xExtremes.min + diff, xExtremes.max + diff); } if (e.pageY > lastY) { - var yExtremes = currentChart.yAxis[0].getExtremes(); + var yExtremes = currentChart.yAxis[0].getExtremes(); var ydiff = 1.0 * (e.pageY - lastY) * (yExtremes.max - yExtremes.min) / chartHeight; currentChart.yAxis[0].setExtremes(yExtremes.min + ydiff, yExtremes.max + ydiff); - } - else if (e.pageY < lastY) { - var yExtremes = currentChart.yAxis[0].getExtremes(); + } else if (e.pageY < lastY) { + var yExtremes = currentChart.yAxis[0].getExtremes(); var ydiff = 1.0 * (lastY - e.pageY) * (yExtremes.max - yExtremes.min) / chartHeight; currentChart.yAxis[0].setExtremes(yExtremes.min - ydiff, yExtremes.max - ydiff); } @@ -176,7 +174,7 @@ $(document).ready(function() { cache: 'false' }); - var cursorMode = ($("input[name='mode']:checked").val() == 'edit') ? 'crosshair' : 'pointer'; + var cursorMode = ($("input[name='mode']:checked").val() == 'edit') ? 'crosshair' : 'pointer'; var currentChart = null; var currentData = null; var xLabel = $('#tableid_0').val(); @@ -189,7 +187,7 @@ $(document).ready(function() { var zoomRatio = 1; - // Get query result + // Get query result var data = jQuery.parseJSON($('#querydata').html()); /** @@ -197,38 +195,39 @@ $(document).ready(function() { **/ $('#tableid_0').change(function() { $('#zoom_search_form').submit(); - }) + }); $('#tableid_1').change(function() { $('#zoom_search_form').submit(); - }) + }); $('#tableid_2').change(function() { $('#zoom_search_form').submit(); - }) + }); $('#tableid_3').change(function() { $('#zoom_search_form').submit(); - }) + }); /** * Input form validation - **/ + **/ $('#inputFormSubmitId').click(function() { - if ($('#tableid_0').get(0).selectedIndex == 0 || $('#tableid_1').get(0).selectedIndex == 0) - PMA_ajaxShowMessage(PMA_messages['strInputNull']); - else if (xLabel == yLabel) + if ($('#tableid_0').get(0).selectedIndex == 0 || $('#tableid_1').get(0).selectedIndex == 0) { + PMA_ajaxShowMessage(PMA_messages['strInputNull']); + } else if (xLabel == yLabel) { PMA_ajaxShowMessage(PMA_messages['strSameInputs']); + } }); /** - ** Prepare a div containing a link, otherwise it's incorrectly displayed + ** Prepare a div containing a link, otherwise it's incorrectly displayed ** after a couple of clicks **/ $('<div id="togglesearchformdiv"><a id="togglesearchformlink"></a></div>') - .insertAfter('#zoom_search_form') - // don't show it until we have results on-screen - .hide(); + .insertAfter('#zoom_search_form') + // don't show it until we have results on-screen + .hide(); $('#togglesearchformlink') .html(PMA_messages['strShowSearchCriteria']) @@ -243,466 +242,471 @@ $(document).ready(function() { // avoid default click action return false; }); - - /** + + /** ** Set dialog properties for the data display form **/ $("#dataDisplay").dialog({ autoOpen: false, - title: 'Data point content', + title: 'Data point content', modal: false, //false otherwise other dialogues like timepicker may not function properly height: $('#dataDisplay').height() + 80, width: $('#dataDisplay').width() + 80 }); /* - * Handle submit of zoom_display_form + * Handle submit of zoom_display_form */ - + $("#submitForm").click(function(event) { - + //Prevent default submission of form event.preventDefault(); - - //Find changed values by comparing form values with selectedRow Object - var newValues = new Array();//Stores the values changed from original + + //Find changed values by comparing form values with selectedRow Object + var newValues = new Array();//Stores the values changed from original var it = 4; var xChange = false; var yChange = false; - for (key in selectedRow) { - if (key != 'where_clause'){ - var oldVal = selectedRow[key]; - var newVal = ($('#fields_null_id_' + it).attr('checked')) ? null : $('#fieldID_' + it).val(); - if (oldVal != newVal){ - selectedRow[key] = newVal; - newValues[key] = newVal; - if(key == xLabel) { - xChange = true; - data[currentData][xLabel] = newVal; - } - else if(key == yLabel) { - yChange = true; - data[currentData][yLabel] = newVal; + for (key in selectedRow) { + if (key != 'where_clause') { + var oldVal = selectedRow[key]; + var newVal = ($('#fields_null_id_' + it).attr('checked')) ? null : $('#fieldID_' + it).val(); + if (oldVal != newVal) { + selectedRow[key] = newVal; + newValues[key] = newVal; + if (key == xLabel) { + xChange = true; + data[currentData][xLabel] = newVal; + } else if (key == yLabel) { + yChange = true; + data[currentData][yLabel] = newVal; + } + } } - } - } - it++ - }//End data update - - //Update the chart series and replot + it++; + } //End data update + + //Update the chart series and replot if (xChange || yChange) { - var newSeries = new Array(); - newSeries[0] = new Object(); + var newSeries = new Array(); + newSeries[0] = new Object(); newSeries[0].marker = { symbol: 'circle' }; - //Logic similar to plot generation, replot only if xAxis changes or yAxis changes. Code includes a lot of checks so as to replot only when necessary - if(xChange) { - xCord[currentData] = selectedRow[xLabel]; - if(xType == 'numeric') { - currentChart.series[0].data[currentData].update({ x : selectedRow[xLabel] }); - currentChart.xAxis[0].setExtremes(Array.min(xCord) - 6,Array.max(xCord) + 6); - } - else if(xType == 'time') { - currentChart.series[0].data[currentData].update({ x : getTimeStamp(selectedRow[xLabel],$('#types_0').val())}); - } - else { - var tempX = getCord(xCord); - var tempY = getCord(yCord); - var i = 0; - newSeries[0].data = new Array(); - xCord = tempX[2]; - yCord = tempY[2]; - - $.each(data,function(key,value) { - if(yType != 'text') - newSeries[0].data.push({ name: value[dataLabel], x: tempX[0][i], y: value[yLabel], marker: {fillColor: colorCodes[i % 8]} , id: i } ); - else + //Logic similar to plot generation, replot only if xAxis changes or yAxis changes. Code includes a lot of checks so as to replot only when necessary + if (xChange) { + xCord[currentData] = selectedRow[xLabel]; + if (xType == 'numeric') { + currentChart.series[0].data[currentData].update({ x : selectedRow[xLabel] }); + currentChart.xAxis[0].setExtremes(Array.min(xCord) - 6, Array.max(xCord) + 6); + } else if (xType == 'time') { + currentChart.series[0].data[currentData].update({ x : getTimeStamp(selectedRow[xLabel], $('#types_0').val())}); + } else { + var tempX = getCord(xCord); + var tempY = getCord(yCord); + var i = 0; + newSeries[0].data = new Array(); + xCord = tempX[2]; + yCord = tempY[2]; + + $.each(data, function(key, value) { + if (yType != 'text') { + newSeries[0].data.push({ name: value[dataLabel], x: tempX[0][i], y: value[yLabel], marker: {fillColor: colorCodes[i % 8]} , id: i } ); + } else { newSeries[0].data.push({ name: value[dataLabel], x: tempX[0][i], y: tempY[0][i], marker: {fillColor: colorCodes[i % 8]} , id: i } ); - i++; + } + i++; }); - currentSettings.xAxis.labels = { formatter : function() { - if(tempX[1][this.value] && tempX[1][this.value].length > 10) - return tempX[1][this.value].substring(0,10) - else - return tempX[1][this.value]; + currentSettings.xAxis.labels = { + formatter : function() { + if (tempX[1][this.value] && tempX[1][this.value].length > 10) { + return tempX[1][this.value].substring(0, 10); + } else { + return tempX[1][this.value]; + } } - } - currentSettings.series = newSeries; - currentChart = PMA_createChart(currentSettings); - } - - } - if(yChange) { + }; + currentSettings.series = newSeries; + currentChart = PMA_createChart(currentSettings); + } - yCord[currentData] = selectedRow[yLabel]; - if(yType == 'numeric') { - currentChart.series[0].data[currentData].update({ y : selectedRow[yLabel] }); - currentChart.yAxis[0].setExtremes(Array.min(yCord) - 6,Array.max(yCord) + 6); - } - else if(yType =='time') { - currentChart.series[0].data[currentData].update({ y : getTimeStamp(selectedRow[yLabel],$('#types_1').val())}); - } - else { - var tempX = getCord(xCord); - var tempY = getCord(yCord); - var i = 0; - newSeries[0].data = new Array(); - xCord = tempX[2]; - yCord = tempY[2]; - - $.each(data,function(key,value) { - if(xType != 'text' ) + } + if (yChange) { + yCord[currentData] = selectedRow[yLabel]; + if (yType == 'numeric') { + currentChart.series[0].data[currentData].update({ y : selectedRow[yLabel] }); + currentChart.yAxis[0].setExtremes(Array.min(yCord) - 6, Array.max(yCord) + 6); + } else if (yType == 'time') { + currentChart.series[0].data[currentData].update({ y : getTimeStamp(selectedRow[yLabel], $('#types_1').val())}); + } else { + var tempX = getCord(xCord); + var tempY = getCord(yCord); + var i = 0; + newSeries[0].data = new Array(); + xCord = tempX[2]; + yCord = tempY[2]; + + $.each(data, function(key, value) { + if (xType != 'text' ) { newSeries[0].data.push({ name: value[dataLabel], x: value[xLabel], y: tempY[0][i], marker: {fillColor: colorCodes[i % 8]} , id: i } ); - else + } else { newSeries[0].data.push({ name: value[dataLabel], x: tempX[0][i], y: tempY[0][i], marker: {fillColor: colorCodes[i % 8]} , id: i } ); - i++; + } + i++; }); - currentSettings.yAxis.labels = { formatter : function() { - if(tempY[1][this.value] && tempY[1][this.value].length > 10) - return tempY[1][this.value].substring(0,10) - else - return tempY[1][this.value]; + currentSettings.yAxis.labels = { + formatter : function() { + if (tempY[1][this.value] && tempY[1][this.value].length > 10) { + return tempY[1][this.value].substring(0, 10); + } else { + return tempY[1][this.value]; + } } - } - currentSettings.series = newSeries; - currentChart = PMA_createChart(currentSettings); - } - } - currentChart.series[0].data[currentData].select(); - } - //End plot update + }; + currentSettings.series = newSeries; + currentChart = PMA_createChart(currentSettings); + } + } + currentChart.series[0].data[currentData].select(); + } //End plot update - //Generate SQL query for update - if (!isEmpty(newValues)) { + //Generate SQL query for update + if (!isEmpty(newValues)) { var sql_query = 'UPDATE `' + window.parent.table + '` SET '; - for (key in newValues) { - if(key != 'where_clause') { - sql_query += '`' + key + '`=' ; - var value = newValues[key]; - if(!isNumeric(value) && value != null) - sql_query += '\'' + value + '\' ,'; - else - sql_query += value + ' ,'; - } - } - sql_query = sql_query.substring(0, sql_query.length - 1); - sql_query += ' WHERE ' + PMA_urldecode(data[currentData]['where_clause']); - - //Post SQL query to sql.php - $.post('sql.php', { - 'token' : window.parent.token, - 'db' : window.parent.db, - 'ajax_request' : true, - 'sql_query' : sql_query, - 'inline_edit' : false - }, function(data) { - if(data.success == true) { - $('#sqlqueryresults').html(data.sql_query); - $("#sqlqueryresults").trigger('appendAnchor'); + for (key in newValues) { + if (key != 'where_clause') { + sql_query += '`' + key + '`=' ; + var value = newValues[key]; + if (!isNumeric(value) && value != null) { + sql_query += '\'' + value + '\' ,'; + } else { + sql_query += value + ' ,'; + } } - else - PMA_ajaxShowMessage(data.error); - })//End $.post - }//End database update - $("#dataDisplay").dialog("close"); - });//End submit handler + } + sql_query = sql_query.substring(0, sql_query.length - 1); + sql_query += ' WHERE ' + PMA_urldecode(data[currentData]['where_clause']); + + //Post SQL query to sql.php + $.post('sql.php', { + 'token' : window.parent.token, + 'db' : window.parent.db, + 'ajax_request' : true, + 'sql_query' : sql_query, + 'inline_edit' : false + }, function(data) { + if (data.success == true) { + $('#sqlqueryresults').html(data.sql_query); + $("#sqlqueryresults").trigger('appendAnchor'); + } else { + PMA_ajaxShowMessage(data.error); + } + }); //End $.post + }//End database update + $("#dataDisplay").dialog("close"); + });//End submit handler /* * Generate plot using Highcharts - */ + */ if (data != null) { $('#zoom_search_form') .slideToggle() .hide(); $('#togglesearchformlink') - .text(PMA_messages['strShowSearchCriteria']) - $('#togglesearchformdiv').show(); + .text(PMA_messages['strShowSearchCriteria']); + $('#togglesearchformdiv').show(); var selectedRow; - var colorCodes = ['#FF0000','#00FFFF','#0000FF','#0000A0','#FF0080','#800080','#FFFF00','#00FF00','#FF00FF']; + var colorCodes = ['#FF0000', '#00FFFF', '#0000FF', '#0000A0', '#FF0080', '#800080', '#FFFF00', '#00FF00', '#FF00FF']; var series = new Array(); var xCord = new Array(); var yCord = new Array(); - var tempX, tempY; + var tempX, tempY; var it = 0; - var xMax; // xAxis extreme max - var xMin; // xAxis extreme min - var yMax; // yAxis extreme max - var yMin; // yAxis extreme min + var xMax; // xAxis extreme max + var xMin; // xAxis extreme min + var yMax; // yAxis extreme max + var yMin; // yAxis extreme min // Set the basic plot settings var currentSettings = { chart: { renderTo: 'querychart', type: 'scatter', - //zoomType: 'xy', - width:$('#resizer').width() -3, - height:$('#resizer').height()-20 - }, - credits: { - enabled: false + //zoomType: 'xy', + width:$('#resizer').width() - 3, + height:$('#resizer').height() - 20 }, - exporting: { enabled: false }, + credits: { + enabled: false + }, + exporting: { enabled: false }, label: { text: $('#dataLabel').val() }, - plotOptions: { - series: { - allowPointSelect: true, + plotOptions: { + series: { + allowPointSelect: true, cursor: 'pointer', - showInLegend: false, + showInLegend: false, dataLabels: { - enabled: false, + enabled: false }, - point: { + point: { events: { click: function() { - var id = this.id; - var fid = 4; - currentData = id; - // Make AJAX request to tbl_zoom_select.php for getting the complete row info - var post_params = { + var id = this.id; + var fid = 4; + currentData = id; + // Make AJAX request to tbl_zoom_select.php for getting the complete row info + var post_params = { 'ajax_request' : true, 'get_data_row' : true, 'db' : window.parent.db, 'table' : window.parent.table, 'where_clause' : data[id]['where_clause'], - 'token' : window.parent.token, - } + 'token' : window.parent.token + }; $.post('tbl_zoom_select.php', post_params, function(data) { - // Row is contained in data.row_info, now fill the displayResultForm with row values - for ( key in data.row_info) { - if (data.row_info[key] == null) - $('#fields_null_id_' + fid).attr('checked', true); - else - $('#fieldID_' + fid).val(data.row_info[key]); - fid++; - } - selectedRow = new Object(); - selectedRow = data.row_info; + // Row is contained in data.row_info, now fill the displayResultForm with row values + for ( key in data.row_info) { + if (data.row_info[key] == null) { + $('#fields_null_id_' + fid).attr('checked', true); + } else { + $('#fieldID_' + fid).val(data.row_info[key]); + } + fid++; + } + selectedRow = new Object(); + selectedRow = data.row_info; }); - $("#dataDisplay").dialog("open"); - }, + $("#dataDisplay").dialog("open"); + } } + } } - } - }, - tooltip: { - formatter: function() { - return this.point.name; - } - }, + }, + tooltip: { + formatter: function() { + return this.point.name; + } + }, title: { text: 'Query Results' }, - xAxis: { - title: { text: $('#tableid_0').val() }, - events: { - setExtremes: function(e){ + xAxis: { + title: { text: $('#tableid_0').val() }, + events: { + setExtremes: function(e) { this.resetZoom.show(); } } }, yAxis: { - min: null, - title: { text: $('#tableid_1').val() }, - endOnTick: false, + min: null, + title: { text: $('#tableid_1').val() }, + endOnTick: false, startOnTick: false, - events: { - setExtremes: function(e){ + events: { + setExtremes: function(e) { this.resetZoom.show(); } } - }, - } + } + }; $('#resizer').resizable({ resize: function() { currentChart.setSize( - this.offsetWidth -3, - this.offsetHeight -20, + this.offsetWidth - 3, + this.offsetHeight - 20, false ); } }); - - // Classify types as either numeric,time,text - xType = getType(xType); - yType = getType(yType); - //Set the axis type based on the field - currentSettings.xAxis.type = (xType == 'time') ? 'datetime' : 'linear'; - currentSettings.yAxis.type = (yType == 'time') ? 'datetime' : 'linear'; + // Classify types as either numeric,time,text + xType = getType(xType); + yType = getType(yType); + + //Set the axis type based on the field + currentSettings.xAxis.type = (xType == 'time') ? 'datetime' : 'linear'; + currentSettings.yAxis.type = (yType == 'time') ? 'datetime' : 'linear'; // Formulate series data for plot series[0] = new Object(); series[0].data = new Array(); - series[0].marker = { + series[0].marker = { symbol: 'circle' }; - if (xType != 'text' && yType != 'text') { - $.each(data,function(key,value) { - var xVal = (xType == 'numeric') ? value[xLabel] : getTimeStamp(value[xLabel],$('#types_0').val()); - var yVal = (yType == 'numeric') ? value[yLabel] : getTimeStamp(value[yLabel],$('#types_1').val()); + if (xType != 'text' && yType != 'text') { + $.each(data, function(key, value) { + var xVal = (xType == 'numeric') ? value[xLabel] : getTimeStamp(value[xLabel], $('#types_0').val()); + var yVal = (yType == 'numeric') ? value[yLabel] : getTimeStamp(value[yLabel], $('#types_1').val()); series[0].data.push({ name: value[dataLabel], x: xVal, y: yVal, marker: {fillColor: colorCodes[it % 8]} , id: it } ); - xCord.push(value[xLabel]); - yCord.push(value[yLabel]); - it++; + xCord.push(value[xLabel]); + yCord.push(value[yLabel]); + it++; }); - if(xType == 'numeric') { - currentSettings.xAxis.max = Array.max(xCord) + 6 - currentSettings.xAxis.min = Array.min(xCord) - 6 - } - else { - currentSettings.xAxis.labels = { formatter : function() { - return getDate(this.value, $('#types_0').val()); - }} + if (xType == 'numeric') { + currentSettings.xAxis.max = Array.max(xCord) + 6; + currentSettings.xAxis.min = Array.min(xCord) - 6; + } else { + currentSettings.xAxis.labels = { formatter : function() { + return getDate(this.value, $('#types_0').val()); + }}; } - if(yType == 'numeric') { - currentSettings.yAxis.max = Array.max(yCord) + 6 - currentSettings.yAxis.min = Array.min(yCord) - 6 - } - else { - currentSettings.yAxis.labels = { formatter : function() { - return getDate(this.value, $('#types_1').val()); - }} + if (yType == 'numeric') { + currentSettings.yAxis.max = Array.max(yCord) + 6; + currentSettings.yAxis.min = Array.min(yCord) - 6; + } else { + currentSettings.yAxis.labels = { formatter : function() { + return getDate(this.value, $('#types_1').val()); + }}; } - } - - else if (xType =='text' && yType !='text') { - $.each(data,function(key,value) { - xCord.push(value[xLabel]); - yCord.push(value[yLabel]); - }); - - tempX = getCord(xCord); - $.each(data,function(key,value) { - var yVal = (yType == 'numeric') ? value[yLabel] : getTimeStamp(value[yLabel],$('#types_1').val()); + } else if (xType == 'text' && yType != 'text') { + $.each(data, function(key, value) { + xCord.push(value[xLabel]); + yCord.push(value[yLabel]); + }); + + tempX = getCord(xCord); + $.each(data, function(key, value) { + var yVal = (yType == 'numeric') ? value[yLabel] : getTimeStamp(value[yLabel], $('#types_1').val()); series[0].data.push({ name: value[dataLabel], x: tempX[0][it], y: yVal, marker: {fillColor: colorCodes[it % 8]} , id: it } ); - it++; + it++; }); - - currentSettings.xAxis.labels = { formatter : function() { - if(tempX[1][this.value] && tempX[1][this.value].length > 10) - return tempX[1][this.value].substring(0,10) - else - return tempX[1][this.value]; - } - } - if(yType == 'numeric') { - currentSettings.yAxis.max = Array.max(yCord) + 6 - currentSettings.yAxis.min = Array.min(yCord) - 6 - } - else { - currentSettings.yAxis.labels = { formatter : function() { - return getDate(this.value, $('#types_1').val()); - }} + + currentSettings.xAxis.labels = { + formatter : function() { + if (tempX[1][this.value] && tempX[1][this.value].length > 10) { + return tempX[1][this.value].substring(0, 10); + } else { + return tempX[1][this.value]; + } + } + }; + if (yType == 'numeric') { + currentSettings.yAxis.max = Array.max(yCord) + 6; + currentSettings.yAxis.min = Array.min(yCord) - 6; + } else { + currentSettings.yAxis.labels = { + formatter : function() { + return getDate(this.value, $('#types_1').val()); + } + }; } - xCord = tempX[2]; - } - - else if (xType !='text' && yType =='text') { - $.each(data,function(key,value) { - xCord.push(value[xLabel]); - yCord.push(value[yLabel]); - }); - tempY = getCord(yCord); - $.each(data,function(key,value) { - var xVal = (xType == 'numeric') ? value[xLabel] : getTimeStamp(value[xLabel],$('#types_0').val()); + xCord = tempX[2]; + + } else if (xType != 'text' && yType == 'text') { + $.each(data, function(key, value) { + xCord.push(value[xLabel]); + yCord.push(value[yLabel]); + }); + tempY = getCord(yCord); + $.each(data, function(key, value) { + var xVal = (xType == 'numeric') ? value[xLabel] : getTimeStamp(value[xLabel], $('#types_0').val()); series[0].data.push({ name: value[dataLabel], y: tempY[0][it], x: xVal, marker: {fillColor: colorCodes[it % 8]} , id: it } ); - it++; + it++; }); - if(xType == 'numeric') { - currentSettings.xAxis.max = Array.max(xCord) + 6 - currentSettings.xAxis.min = Array.min(xCord) - 6 - } - else { - currentSettings.xAxis.labels = { formatter : function() { - return getDate(this.value, $('#types_0').val()); - }} - } - currentSettings.yAxis.labels = { formatter : function() { - if(tempY[1][this.value] && tempY[1][this.value].length > 10) - return tempY[1][this.value].substring(0,10) - else - return tempY[1][this.value]; - } + if (xType == 'numeric') { + currentSettings.xAxis.max = Array.max(xCord) + 6; + currentSettings.xAxis.min = Array.min(xCord) - 6; + } else { + currentSettings.xAxis.labels = { + formatter : function() { + return getDate(this.value, $('#types_0').val()); + } + }; } - yCord = tempY[2]; - } - - else if (xType =='text' && yType =='text') { - $.each(data,function(key,value) { - xCord.push(value[xLabel]); - yCord.push(value[yLabel]); - }); - tempX = getCord(xCord); - tempY = getCord(yCord); - $.each(data,function(key,value) { + currentSettings.yAxis.labels = { + formatter : function() { + if (tempY[1][this.value] && tempY[1][this.value].length > 10) { + return tempY[1][this.value].substring(0, 10); + } else { + return tempY[1][this.value]; + } + } + }; + yCord = tempY[2]; + + } else if (xType == 'text' && yType == 'text') { + $.each(data, function(key, value) { + xCord.push(value[xLabel]); + yCord.push(value[yLabel]); + }); + tempX = getCord(xCord); + tempY = getCord(yCord); + $.each(data, function(key, value) { series[0].data.push({ name: value[dataLabel], x: tempX[0][it], y: tempY[0][it], marker: {fillColor: colorCodes[it % 8]} , id: it } ); - it++; + it++; }); - currentSettings.xAxis.labels = { formatter : function() { - if(tempX[1][this.value] && tempX[1][this.value].length > 10) - return tempX[1][this.value].substring(0,10) - else - return tempX[1][this.value]; - } - } - currentSettings.yAxis.labels = { formatter : function() { - if(tempY[1][this.value] && tempY[1][this.value].length > 10) - return tempY[1][this.value].substring(0,10) - else - return tempY[1][this.value]; - } + currentSettings.xAxis.labels = { + formatter : function() { + if (tempX[1][this.value] && tempX[1][this.value].length > 10) { + return tempX[1][this.value].substring(0, 10); + } else { + return tempX[1][this.value]; + } + } + }; + currentSettings.yAxis.labels = { + formatter : function() { + if (tempY[1][this.value] && tempY[1][this.value].length > 10) { + return tempY[1][this.value].substring(0, 10); + } else { + return tempY[1][this.value]; + } + } + }; + xCord = tempX[2]; + yCord = tempY[2]; } - xCord = tempX[2]; - yCord = tempY[2]; - } - - currentSettings.series = series; + currentSettings.series = series; currentChart = PMA_createChart(currentSettings); - xMin = currentChart.xAxis[0].getExtremes().min; + xMin = currentChart.xAxis[0].getExtremes().min; xMax = currentChart.xAxis[0].getExtremes().max; yMin = currentChart.yAxis[0].getExtremes().min; yMax = currentChart.yAxis[0].getExtremes().max; - includePan(currentChart); //Enable panning feature + includePan(currentChart); //Enable panning feature var setZoom = function() { - var newxm = xMin + (xMax - xMin) * (1 - zoomRatio) / 2; - var newxM = xMax - (xMax - xMin) * (1 - zoomRatio) / 2; - var newym = yMin + (yMax - yMin) * (1 - zoomRatio) / 2; - var newyM = yMax - (yMax - yMin) * (1 - zoomRatio) / 2; - currentChart.xAxis[0].setExtremes(newxm,newxM); - currentChart.yAxis[0].setExtremes(newym,newyM); - }; - //Enable zoom feature - $("#querychart").mousewheel(function(objEvent, intDelta) { + var newxm = xMin + (xMax - xMin) * (1 - zoomRatio) / 2; + var newxM = xMax - (xMax - xMin) * (1 - zoomRatio) / 2; + var newym = yMin + (yMax - yMin) * (1 - zoomRatio) / 2; + var newyM = yMax - (yMax - yMin) * (1 - zoomRatio) / 2; + currentChart.xAxis[0].setExtremes(newxm, newxM); + currentChart.yAxis[0].setExtremes(newym, newyM); + }; + + //Enable zoom feature + $("#querychart").mousewheel(function(objEvent, intDelta) { if (intDelta > 0) { if (zoomRatio > 0.1) { zoomRatio = zoomRatio - 0.1; setZoom(); } - } - else if (intDelta < 0) { + } else if (intDelta < 0) { zoomRatio = zoomRatio + 0.1; setZoom(); } }); + //Add reset zoom feature currentChart.yAxis[0].resetZoom = currentChart.xAxis[0].resetZoom = $('<a href="#">Reset zoom</a>') - .appendTo(currentChart.container) - .css({ - position: 'absolute', - top: 10, - right: 20, - display: 'none' - }) - .click(function(){ - currentChart.xAxis[0].setExtremes(null, null) - currentChart.yAxis[0].setExtremes(null, null) - this.style.display = 'none' - }); - scrollToChart(); + .appendTo(currentChart.container) + .css({ + position: 'absolute', + top: 10, + right: 20, + display: 'none' + }) + .click(function() { + currentChart.xAxis[0].setExtremes(null, null); + currentChart.yAxis[0].setExtremes(null, null); + this.style.display = 'none'; + }); + scrollToChart(); } }); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5RC1-19152-gdc35ecf
by Marc Delisle 17 Sep '11

17 Sep '11

The branch, master has been updated via dc35ecf227db206998ce20517b4e51ef05342f39 (commit) via 56a73a463ae9e02891eab15c6c28c1e757cb98b4 (commit) from 9d083bee677b5f2f0979f2633bc2c0f192824569 (commit) - Log ----------------------------------------------------------------- commit dc35ecf227db206998ce20517b4e51ef05342f39 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Sep 17 06:48:08 2011 -0400 XHTML problems commit 56a73a463ae9e02891eab15c6c28c1e757cb98b4 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Sep 17 06:38:49 2011 -0400 XHTML problems ----------------------------------------------------------------------- Summary of changes: tbl_zoom_select.php | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php index 11754b8..cf8a64f 100644 --- a/tbl_zoom_select.php +++ b/tbl_zoom_select.php @@ -133,7 +133,7 @@ for ($i = 0; $i < 4; $i++) { if ($i == 2) { echo "<tr><td>"; echo __("Additional search criteria"); - echo "</td><tr>"; + echo "</td></tr>"; } ?> <tr class="noclick <?php echo $odd_row ? 'odd' : 'even'; $odd_row = ! $odd_row; ?>"> @@ -229,17 +229,17 @@ for ($i = 0; $i < 4; $i++) { <?php } ?> - </td> </tr> - <input type="hidden" name="types[<?php echo $i; ?>]" id="types_<?php echo $i; ?>" + <tr><td><input type="hidden" name="types[<?php echo $i; ?>]" id="types_<?php echo $i; ?>" value="<?php if(isset($tbl_fields_type[$i]))echo $tbl_fields_type[$i]; ?>" /> <input type="hidden" name="collations[<?php echo $i; ?>]" - value="<?php if(isset($tbl_fields_collation[$i]))echo $tbl_fields_collation[$i]; ?>" /> + value="<?php if(isset($tbl_fields_collation[$i]))echo $tbl_fields_collation[$i]; ?>" /></td></tr> <?php }//end for ?> + </tbody> </table> <?php @@ -255,7 +255,7 @@ if (isset($zoom_submit) && $inputs[0] != 'pma_null' && $inputs[1] != 'pma_null') } ?> <table class="data"> - <tr><td><label for="dataLabel"><?php echo __("Data Label"); ?></label>&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp</td> + <tr><td><label for="dataLabel"><?php echo __("Data Label"); ?></label></td> <td><select name="dataLabel" id='dataLabel' > <option value = ''> <?php echo __('None'); ?> </option> <?php @@ -293,6 +293,7 @@ echo '" /></td></tr>'; <input type="submit" name="zoom_submit" id="inputFormSubmitId" value="<?php echo __('Go'); ?>" /> </fieldset> </form> +</fieldset> <?php hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5RC1-19150-g9d083be
by Madhura Jayaratne 17 Sep '11

17 Sep '11

The branch, master has been updated via 9d083bee677b5f2f0979f2633bc2c0f192824569 (commit) from 5d3735b3b4226e4b7c581d5015218a7dd35cf228 (commit) - Log ----------------------------------------------------------------- commit 9d083bee677b5f2f0979f2633bc2c0f192824569 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Sep 17 10:03:46 2011 +0530 Fix some broken paths to images ----------------------------------------------------------------------- Summary of changes: pmd_general.php | 52 ++++++++++++++++++++++++++-------------------------- 1 files changed, 26 insertions(+), 26 deletions(-) diff --git a/pmd_general.php b/pmd_general.php index 7423d54..73c6543 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -62,56 +62,56 @@ echo $script_tabs . $script_contr . $script_display_field; <a href="javascript:Show_left_menu(document.getElementById('key_Show_left_menu'));" onmousedown="return false;" class="M_butt first" target="_self"> <img id='key_Show_left_menu' title="<?php echo __('Show/Hide left menu'); ?>" - alt="v" src="pmd/images/downarrow2_m.png" /></a> + alt="v" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/downarrow2_m.png" /></a> <a href="javascript:Save2();" onmousedown="return false;" class="M_butt" target="_self" - ><img title="<?php echo __('Save position') ?>" src="pmd/images/save.png" alt="" + ><img title="<?php echo __('Save position') ?>" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/save.png" alt="" /></a><a href="javascript:Start_table_new();" onmousedown="return false;" class="M_butt" target="_self" - ><img title="<?php echo __('Create table')?>" src="pmd/images/table.png" alt="" + ><img title="<?php echo __('Create table')?>" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/table.png" alt="" /></a><a href="javascript:Start_relation();" onmousedown="return false;" class="M_butt" id="rel_button" target="_self" - ><img title="<?php echo __('Create relation') ?>" src="pmd/images/relation.png" alt="" + ><img title="<?php echo __('Create relation') ?>" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/relation.png" alt="" /></a><a href="javascript:Start_display_field();" onmousedown="return false;" class="M_butt" id="display_field_button" target="_self" - ><img title="<?php echo __('Choose column to display') ?>" src="pmd/images/display_field.png" alt="" + ><img title="<?php echo __('Choose column to display') ?>" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/display_field.png" alt="" /></a><a href="javascript:location.reload();" onmousedown="return false;" class="M_butt" target="_self" - ><img title="<?php echo __('Reload'); ?>" src="pmd/images/reload.png" alt="" + ><img title="<?php echo __('Reload'); ?>" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/reload.png" alt="" /></a><a href="Documentation.html#faq6_31" target="documentation" class="M_butt" target="_self" - ><img title="<?php echo __('Help'); ?>" src="pmd/images/help.png" alt="" - /></a><img class="M_bord" src="pmd/images/bord.png" alt="" + ><img title="<?php echo __('Help'); ?>" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/help.png" alt="" + /></a><img class="M_bord" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/bord.png" alt="" /><a href="javascript:Angular_direct();" onmousedown="return false;" class="M_butt" id="angular_direct_button" target="_self" ><img title="<?php echo __('Angular links') . ' / ' . __('Direct links'); ?>" - src="pmd/images/ang_direct.png" alt="" + src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/ang_direct.png" alt="" /></a><a href="javascript:Grid();" onmousedown="return false;" class="M_butt" id="grid_button" target="_self" - ><img title="<?php echo __('Snap to grid') ?>" src="pmd/images/grid.png" alt="" - /></a><img class="M_bord" src="pmd/images/bord.png" alt="" + ><img title="<?php echo __('Snap to grid') ?>" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/grid.png" alt="" + /></a><img class="M_bord" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/bord.png" alt="" /><a href="javascript:Small_tab_all(document.getElementById('key_SB_all'));" onmousedown="return false;" class="M_butt" target="_self" ><img id='key_SB_all' title="<?php echo __('Small/Big All'); ?>" alt="v" - src="pmd/images/downarrow1.png" + src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/downarrow1.png" /></a><a href="javascript:Small_tab_invert();" onmousedown="return false;" class="M_butt" target="_self" - ><img title="<?php echo __('Toggle small/big'); ?>" alt="key" src="pmd/images/bottom.png" - /></a><img class="M_bord" src="pmd/images/bord.png" alt="" + ><img title="<?php echo __('Toggle small/big'); ?>" alt="key" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/bottom.png" + /></a><img class="M_bord" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/bord.png" alt="" /><a href="javascript:PDF_save();" onmousedown="return false;" class="M_butt" target="_self" - ><img src="pmd/images/pdf.png" alt="key" width="20" height="20" + ><img src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/pdf.png" alt="key" width="20" height="20" title="<?php echo __('Import/Export coordinates for PDF schema'); ?>" /></a > <?php if (isset($_REQUEST['query'])) { echo '<a href="#" onClick="build_query(\'SQL Query on Database\', 0)" onmousedown="return false;" class="M_butt" target="_self">'; - echo '<img src="pmd/images/query_builder.png" alt="key" width="20" height="20" title="'; + echo '<img src="'. $GLOBALS['pmaThemeImage'] . 'pmd/query_builder.png" alt="key" width="20" height="20" title="'; echo __('Build Query'); echo '"/></a>'; }?> <a href="javascript:Top_menu_right(document.getElementById('key_Left_Right'));" onmousedown="return false;" class="M_butt last" target="_self"> - <img src="pmd/images/2rightarrow_m.png" id="key_Left_Right" alt=">" + <img src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/2rightarrow_m.png" id="key_Left_Right" alt=">" title="<?php echo __('Move Menu'); ?>" /></a> </div> @@ -124,11 +124,11 @@ echo $script_tabs . $script_contr . $script_display_field; <a href="javascript:Hide_tab_all(document.getElementById('key_HS_all'));" onmousedown="return false;" class="M_butt" target="_self"> <img title="<?php echo __('Hide/Show all'); ?>" alt="v" - src="pmd/images/downarrow1.png" id='key_HS_all' /></a> + src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/downarrow1.png" id='key_HS_all' /></a> <a href="javascript:No_have_constr(document.getElementById('key_HS'));" onmousedown="return false;" class="M_butt" target="_self"> <img title="<?php echo __('Hide/Show Tables with no relation'); ?>" alt="v" - src="pmd/images/downarrow2.png" id='key_HS' /></a> + src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/downarrow2.png" id='key_HS' /></a> </div> <div id="id_scroll_tab" class="scroll_tab"> @@ -141,7 +141,7 @@ for ($i = 0; $i < $name_cnt; $i++) { onmouseover="this.className='L_butt2_2'" onmouseout="this.className='L_butt2_1'"> <img onclick="Start_tab_upd('<?php echo $GLOBALS['PMD_URL']["TABLE_NAME_SMALL"][$i]; ?>');" - src="pmd/images/exec.png" alt="" /></td> + src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/exec.png" alt="" /></td> <td width="1px"> <input onclick="VisibleTab(this,'<?php echo $GLOBALS['PMD_URL']["TABLE_NAME"][$i]; ?>')" title="<?php echo __('Hide'); ?>" @@ -217,7 +217,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { <td class="small_tab_pref" onmouseover="this.className='small_tab_pref2';" onmouseout="this.className='small_tab_pref';" onclick="Start_tab_upd('<?php echo $GLOBALS['PMD_URL']["TABLE_NAME_SMALL"][$i]; ?>');"> - <img src="pmd/images/exec_small.png" alt="" /></td> + <img src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/exec_small.png" alt="" /></td> <td nowrap="nowrap" id="id_zag_<?php echo $t_n_url ?>" class="tab_zag" onmousedown="cur_click=document.getElementById('<?php echo $t_n_url ?>');"/ onmouseover="Table_onover('<?php echo $t_n_url ?>',0,<?php echo (isset($_REQUEST['query'])? 1 : 0 )?> )" @@ -314,7 +314,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { echo '<td class="small_tab_pref" onmouseover="this.className=\'small_tab_pref2\';"'; echo 'onmouseout="this.className=\'small_tab_pref\';"'; echo 'onclick="Click_option(\'pmd_optionse\',\''.urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]).'\',\''.$GLOBALS['PMD_OUT']["TABLE_NAME_SMALL"][$i].'\')" >'; - echo '<img src="pmd/images/exec_small.png" title="options" alt="" /></td> '; + echo '<img src="' . $GLOBALS['pmaThemeImage'] . 'pmd/exec_small.png" title="options" alt="" /></td> '; } ?> </tr> <?php @@ -817,9 +817,9 @@ if ($_REQUEST['query']) {  -<img src="pmd/images/2leftarrow_m.png" width="0" height="0" alt="" /> -<img src="pmd/images/rightarrow1.png" width="0" height="0" alt="" /> -<img src="pmd/images/rightarrow2.png" width="0" height="0" alt="" /> -<img src="pmd/images/uparrow2_m.png" width="0" height="0" alt="" /> +<img src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/2leftarrow_m.png" width="0" height="0" alt="" /> +<img src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/rightarrow1.png" width="0" height="0" alt="" /> +<img src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/rightarrow2.png" width="0" height="0" alt="" /> +<img src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/uparrow2_m.png" width="0" height="0" alt="" /> </body> </html> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5RC1-19149-g5d3735b
by Madhura Jayaratne 16 Sep '11

16 Sep '11

The branch, master has been updated via 5d3735b3b4226e4b7c581d5015218a7dd35cf228 (commit) via 5511ae8fbc577abb44206e35dd61a947dd60c814 (commit) from bee270dd400e34d1ee04d4696509f47b322aa319 (commit) - Log ----------------------------------------------------------------- commit 5d3735b3b4226e4b7c581d5015218a7dd35cf228 Merge: bee270d 5511ae8 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Fri Sep 16 23:50:47 2011 +0530 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/config/messages.inc.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1ce49af..b0d3206 100644 --- a/ChangeLog +++ b/ChangeLog @@ -55,6 +55,7 @@ phpMyAdmin - ChangeLog - bug #3403165 [interface] Collation not displayed for long enum fields - bug #3399951 [export] Config for export compression not used - bug #3400690 [privileges] DB-specific privileges won't submit +- bug #3410604 [config] Configuration storage incorrect suggested table name 3.4.5.0 (2011-09-14) - bug #3375325 [interface] Page list in navigation frame looks odd diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php index 77f5370..3c55558 100644 --- a/libraries/config/messages.inc.php +++ b/libraries/config/messages.inc.php @@ -440,7 +440,7 @@ $strConfigServers_tracking_desc = __('Leave blank for no SQL query tracking supp $strConfigServers_tracking_name = __('SQL query tracking table'); $strConfigServers_tracking_version_auto_create_desc = __('Whether the tracking mechanism creates versions for tables and views automatically.'); $strConfigServers_tracking_version_auto_create_name = __('Automatically create versions'); -$strConfigServers_userconfig_desc = __('Leave blank for no user preferences storage in database, suggested: [kbd]pma_config[/kbd]'); +$strConfigServers_userconfig_desc = __('Leave blank for no user preferences storage in database, suggested: [kbd]pma_userconfig[/kbd]'); $strConfigServers_userconfig_name = __('User preferences storage table'); $strConfigServers_user_desc = __('Leave empty if not using config auth'); $strConfigServers_user_name = __('User for config auth'); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_5RC1-12-g5511ae8
by Madhura Jayaratne 16 Sep '11

16 Sep '11

The branch, QA_3_4 has been updated via 5511ae8fbc577abb44206e35dd61a947dd60c814 (commit) from d3bd40b56d619f0672e323844095cc8b36e9e49e (commit) - Log ----------------------------------------------------------------- commit 5511ae8fbc577abb44206e35dd61a947dd60c814 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Fri Sep 16 23:45:36 2011 +0530 bug #3410604 [config] Configuration storage incorrect suggested table name ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/config/messages.inc.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 83aa38d..3287323 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ phpMyAdmin - ChangeLog - bug #3403165 [interface] Collation not displayed for long enum fields - bug #3399951 [export] Config for export compression not used - bug #3400690 [privileges] DB-specific privileges won't submit +- bug #3410604 [config] Configuration storage incorrect suggested table name 3.4.5.0 (2011-09-14) - bug #3375325 [interface] Page list in navigation frame looks odd diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php index 266bac7..97fc191 100644 --- a/libraries/config/messages.inc.php +++ b/libraries/config/messages.inc.php @@ -428,7 +428,7 @@ $strConfigServers_tracking_desc = __('Leave blank for no SQL query tracking supp $strConfigServers_tracking_name = __('SQL query tracking table'); $strConfigServers_tracking_version_auto_create_desc = __('Whether the tracking mechanism creates versions for tables and views automatically.'); $strConfigServers_tracking_version_auto_create_name = __('Automatically create versions'); -$strConfigServers_userconfig_desc = __('Leave blank for no user preferences storage in database, suggested: [kbd]pma_config[/kbd]'); +$strConfigServers_userconfig_desc = __('Leave blank for no user preferences storage in database, suggested: [kbd]pma_userconfig[/kbd]'); $strConfigServers_userconfig_name = __('User preferences storage table'); $strConfigServers_user_desc = __('Leave empty if not using config auth'); $strConfigServers_user_name = __('User for config auth'); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5RC1-19147-gbee270d
by Madhura Jayaratne 15 Sep '11

15 Sep '11

The branch, master has been updated via bee270dd400e34d1ee04d4696509f47b322aa319 (commit) from a8a63246efe931924c5cd91b93bae0c6bbcc18e3 (commit) - Log ----------------------------------------------------------------- commit bee270dd400e34d1ee04d4696509f47b322aa319 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Fri Sep 16 07:09:02 2011 +0530 It's better to force text next to these icons as well ----------------------------------------------------------------------- Summary of changes: tbl_structure.php | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tbl_structure.php b/tbl_structure.php index 1577111..a0bec5d 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -603,13 +603,13 @@ if ($tbl_is_view) { 'show_query' => '1', ) ), - PMA_getIcon('b_edit.png', __('Edit view')) + PMA_getIcon('b_edit.png', __('Edit view'), true) ); } ?> <a href="tbl_printview.php?<?php echo $url_query; ?>"><?php -echo PMA_getIcon('b_print.png', __('Print view')); +echo PMA_getIcon('b_print.png', __('Print view'), true); ?></a> <?php @@ -620,7 +620,7 @@ if (! $tbl_is_view && ! $db_is_information_schema) { if ($cfgRelation['relwork'] || PMA_foreignkey_supported($tbl_type)) { ?> <a href="tbl_relation.php?<?php echo $url_query; ?>"><?php - echo PMA_getIcon('b_relations.png', __('Relation view')); + echo PMA_getIcon('b_relations.png', __('Relation view'), true); ?></a> <?php } @@ -628,14 +628,14 @@ if (! $tbl_is_view && ! $db_is_information_schema) { if (!PMA_DRIZZLE) { ?> <a href="sql.php?<?php echo $url_query; ?>&session_max_rows=all&sql_query=<?php echo urlencode('SELECT * FROM ' . PMA_backquote($table) . ' PROCEDURE ANALYSE()'); ?>"><?php - echo PMA_getIcon('b_tblanalyse.png', __('Propose table structure')); + echo PMA_getIcon('b_tblanalyse.png', __('Propose table structure'), true); ?></a><?php echo PMA_showMySQLDocu('Extending_MySQL', 'procedure_analyse') . "\n"; } if (PMA_Tracker::isActive()) { echo '<a href="tbl_tracking.php?' . $url_query . '">'; - echo PMA_getIcon('eye.png', __('Track table')); + echo PMA_getIcon('eye.png', __('Track table'), true); echo '</a>'; } ?> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5RC1-19146-ga8a6324
by Madhura Jayaratne 15 Sep '11

15 Sep '11

The branch, master has been updated via a8a63246efe931924c5cd91b93bae0c6bbcc18e3 (commit) from 464a4159314e9de3fc8d43ba33b4869d9e657a92 (commit) - Log ----------------------------------------------------------------- commit a8a63246efe931924c5cd91b93bae0c6bbcc18e3 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Thu Sep 15 23:37:21 2011 +0530 Revert changes made by 464a4159314e9de3fc8d43ba33b4869d9e657a92 and a similar instance. ----------------------------------------------------------------------- Summary of changes: db_operations.php | 27 ++++++++++++++++++++++----- 1 files changed, 22 insertions(+), 5 deletions(-) diff --git a/db_operations.php b/db_operations.php index 6c7df59..512c894 100644 --- a/db_operations.php +++ b/db_operations.php @@ -357,7 +357,12 @@ if (!$is_information_schema) { <?php echo PMA_generate_common_hidden_inputs($db); ?> <fieldset> <legend> - <?php echo PMA_getIcon('b_comment.png', __('Database comment: '), true); ?> + <?php + if ($cfg['PropertiesIconic']) { + echo '<img class="icon ic_b_comment" src="themes/dot.gif" alt="" />'; + } + echo __('Database comment: '); + ?> </legend> <input type="text" name="comment" class="textfield" size="30" value="<?php @@ -395,7 +400,10 @@ if ($db != 'mysql') { <fieldset> <legend> <?php - echo PMA_getIcon('b_edit.png', __('Rename database to'), true) . ':'; + if ($cfg['PropertiesIconic']) { + echo '<img class="icon ic_b_edit" src="themes/dot.gif" alt="" />'; + } + echo __('Rename database to') . ':'; ?> </legend> <input id="new_db_name" type="text" name="newname" size="30" class="textfield" value="" /> @@ -418,7 +426,10 @@ if (($is_superuser || $GLOBALS['cfg']['AllowUserDropDatabase']) <div class="operations_half_width"> <fieldset class="caution"> <legend><?php -echo PMA_getIcon('b_deltbl.png', __('Remove database'), true); +if ($cfg['PropertiesIconic']) { + echo '<img class="icon ic_b_deltbl" src="themes/dot.gif" alt="" />'; +} +echo __('Remove database'); ?></legend> <ul> @@ -461,7 +472,10 @@ echo PMA_getIcon('b_deltbl.png', __('Remove database'), true); <fieldset> <legend> <?php - echo PMA_getIcon('b_edit.png', __('Copy database to'), true) . ':'; + if ($cfg['PropertiesIconic']) { + echo '<img class="icon ic_b_edit" src="themes/dot.gif" alt="" />'; + } + echo __('Copy database to') . ':'; $drop_clause = 'DROP TABLE / DROP VIEW'; ?> </legend> @@ -522,7 +536,10 @@ echo PMA_getIcon('b_deltbl.png', __('Remove database'), true); . PMA_generate_common_hidden_inputs($db, $table) . '<fieldset>' . "\n" . ' <legend>'; - echo PMA_getIcon('s_asci.png', __('Collation'), true) . ':' + if ($cfg['PropertiesIconic']) { + echo '<img class="icon ic_s_asci" src="themes/dot.gif" alt="" />'; + } + echo ' <label for="select_db_collation">' . __('Collation') . ':</label>' . "\n" . ' </legend>' . "\n" . PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_COLLATION, 'db_collation', 'select_db_collation', $db_collation, false, 3) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5RC1-19145-g464a415
by Madhura Jayaratne 15 Sep '11

15 Sep '11

The branch, master has been updated via 464a4159314e9de3fc8d43ba33b4869d9e657a92 (commit) from 65fff4483e5812f70b4ee7204ce3117287e83eb9 (commit) - Log ----------------------------------------------------------------- commit 464a4159314e9de3fc8d43ba33b4869d9e657a92 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Thu Sep 15 14:04:49 2011 +0530 Use PMA_getIcon() ----------------------------------------------------------------------- Summary of changes: db_operations.php | 20 ++++---------------- 1 files changed, 4 insertions(+), 16 deletions(-) diff --git a/db_operations.php b/db_operations.php index 77c2af7..6c7df59 100644 --- a/db_operations.php +++ b/db_operations.php @@ -395,10 +395,7 @@ if ($db != 'mysql') { <fieldset> <legend> <?php - if ($cfg['PropertiesIconic']) { - echo '<img class="icon ic_b_edit" src="themes/dot.gif" alt="" />'; - } - echo __('Rename database to') . ':'; + echo PMA_getIcon('b_edit.png', __('Rename database to'), true) . ':'; ?> </legend> <input id="new_db_name" type="text" name="newname" size="30" class="textfield" value="" /> @@ -421,10 +418,7 @@ if (($is_superuser || $GLOBALS['cfg']['AllowUserDropDatabase']) <div class="operations_half_width"> <fieldset class="caution"> <legend><?php -if ($cfg['PropertiesIconic']) { - echo '<img class="icon ic_b_deltbl" src="themes/dot.gif" alt="" />'; -} -echo __('Remove database'); +echo PMA_getIcon('b_deltbl.png', __('Remove database'), true); ?></legend> <ul> @@ -467,10 +461,7 @@ echo __('Remove database'); <fieldset> <legend> <?php - if ($cfg['PropertiesIconic']) { - echo '<img class="icon ic_b_edit" src="themes/dot.gif" alt="" />'; - } - echo __('Copy database to') . ':'; + echo PMA_getIcon('b_edit.png', __('Copy database to'), true) . ':'; $drop_clause = 'DROP TABLE / DROP VIEW'; ?> </legend> @@ -531,10 +522,7 @@ echo __('Remove database'); . PMA_generate_common_hidden_inputs($db, $table) . '<fieldset>' . "\n" . ' <legend>'; - if ($cfg['PropertiesIconic']) { - echo '<img class="icon ic_s_asci" src="themes/dot.gif" alt="" />'; - } - echo ' <label for="select_db_collation">' . __('Collation') . ':</label>' . "\n" + echo PMA_getIcon('s_asci.png', __('Collation'), true) . ':' . ' </legend>' . "\n" . PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_COLLATION, 'db_collation', 'select_db_collation', $db_collation, false, 3) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5RC1-19144-g65fff44
by Madhura Jayaratne 15 Sep '11

15 Sep '11

The branch, master has been updated via 65fff4483e5812f70b4ee7204ce3117287e83eb9 (commit) from 47b5a2b2f4b8ed659c3bed3a206534957b78b60d (commit) - Log ----------------------------------------------------------------- commit 65fff4483e5812f70b4ee7204ce3117287e83eb9 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Thu Sep 15 14:09:44 2011 +0530 No need to force text here ----------------------------------------------------------------------- Summary of changes: libraries/tbl_select.lib.php | 2 +- tbl_change.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/tbl_select.lib.php b/libraries/tbl_select.lib.php index b200e45..848eb28 100644 --- a/libraries/tbl_select.lib.php +++ b/libraries/tbl_select.lib.php @@ -202,7 +202,7 @@ EOT; if ($in_fbs) { $edit_url = 'gis_data_editor.php?' . PMA_generate_common_url(); - $edit_str = PMA_getIcon('b_edit.png', __('Edit/Insert'), true); + $edit_str = PMA_getIcon('b_edit.png', __('Edit/Insert')); $str .= '<span class="open_search_gis_editor">'; $str .= PMA_linkOrButton($edit_url, $edit_str, array(), false, false, '_blank'); $str .= '</span>'; diff --git a/tbl_change.php b/tbl_change.php index 2fd9394..7bc0767 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -990,7 +990,7 @@ foreach ($rows as $row_id => $vrow) { $_url_params = $_url_params + array('gis_data[gis_type]' => strtoupper($field['pma_type'])); } $edit_url = 'gis_data_editor.php' . PMA_generate_common_url($_url_params); - $edit_str = PMA_getIcon('b_edit.png', __('Edit/Insert'), true); + $edit_str = PMA_getIcon('b_edit.png', __('Edit/Insert')); echo('<span class="open_gis_editor">'); echo(PMA_linkOrButton($edit_url, $edit_str, array(), false, false, '_blank')); echo('</span>'); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5RC1-19143-g47b5a2b
by Madhura Jayaratne 15 Sep '11

15 Sep '11

The branch, master has been updated via 47b5a2b2f4b8ed659c3bed3a206534957b78b60d (commit) from 87c7d027ac101b57a2d3c445155e05de0144c29e (commit) - Log ----------------------------------------------------------------- commit 47b5a2b2f4b8ed659c3bed3a206534957b78b60d Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Thu Sep 15 23:00:02 2011 +0530 bug #3410077 - User overview erroneously loaded into Ajax dialog ----------------------------------------------------------------------- Summary of changes: js/server_privileges.js | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/js/server_privileges.js b/js/server_privileges.js index 738d64b..d1d051d 100644 --- a/js/server_privileges.js +++ b/js/server_privileges.js @@ -364,7 +364,8 @@ $(document).ready(function() { var button_options = {}; button_options[PMA_messages['strCancel']] = function() {$(this).dialog("close").remove();} - $.get($(this).attr('href'), {'ajax_request':true, 'edit_user_dialog': true}, function(data) { + var token = $(this).parents('form').find('input[name="token"]').val(); + $.get($(this).attr('href'), {'ajax_request':true, 'edit_user_dialog': true, 'token': token}, function(data) { $('<div id="edit_user_dialog"></div>') .append(data) .dialog({ hooks/post-receive -- phpMyAdmin

1 0