From 3522da6749d6fe6cd5736ea259370678e42e4f88 Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Wed, 5 Sep 2012 23:48:50 +0530 Subject: [PATCH 1/7] jqplot: fixed y axis autoscaling --- js/server_status_monitor.js | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js index bef3d0ddde..dcfb0d9878 100644 --- a/js/server_status_monitor.js +++ b/js/server_status_monitor.js @@ -1241,6 +1241,7 @@ $(function() { /* Update values in each graph */ $.each(runtime.charts, function(orderKey, elem) { var key = elem.chartID; + var maxVal = 1; // If newly added chart, we have no data for it yet if (! chartData[key]) { return; @@ -1291,21 +1292,30 @@ $(function() { // Set y value, if defined if (value != undefined) { elem.chart.series[j].data.push([chartData.x, value]); - if(elem.maxYLabel.length == 0) { - elem.maxYLabel.push([runtime.xmax, 100]); - }else if(value > elem.maxYLabel[elem.maxYLabel.length - 1][1]) { - elem.maxYLabel.push([chartData.x, value + 200]); - } else if(elem.maxYLabel[elem.maxYLabel.length - 1][0] < runtime.xmin) { - elem.maxYLabel.pop(); - } + maxVal = (maxVal > value) ? maxVal : value; } } + if(elem.maxYLabel.length == 0) { + elem.maxYLabel.push([runtime.xmax, 1]); + } + if(maxVal > elem.maxYLabel[elem.maxYLabel.length - 1][1]) { + elem.maxYLabel.push([chartData.x, (Math.ceil(maxVal*1.2))]); + } else if(maxVal > elem.maxYLabel[0][1]) { + elem.maxYLabel.splice(1,0,[chartData.x, (Math.ceil(maxVal*1.2))]); + } + + if(elem.maxYLabel.length > 1 + && elem.maxYLabel[elem.maxYLabel.length - 1][0] < runtime.xmin + ) { + elem.maxYLabel.pop(); + elem.maxYLabel.sort(function(a,b){return a[1]-b[1]}); + } // update chart options elem.chart['axes']['xaxis']['max'] = runtime.xmax; elem.chart['axes']['xaxis']['min'] = runtime.xmin; - elem.chart['axes']['yaxis']['max'] = (elem.maxYLabel.length == 0) ? 100 : elem.maxYLabel[elem.maxYLabel.length - 1][1]; - elem.chart['axes']['yaxis']['tickInterval'] = (elem.maxYLabel.length == 0) ? 20 : Math.floor(elem.maxYLabel[elem.maxYLabel.length - 1][1]/5); + elem.chart['axes']['yaxis']['max'] = elem.maxYLabel[elem.maxYLabel.length - 1][1]; + elem.chart['axes']['yaxis']['tickInterval'] = elem.maxYLabel[elem.maxYLabel.length - 1][1]/5; i++; runtime.charts[orderKey].numPoints++; if (runtime.redrawCharts) { From ec2353250cbb836b9dc58034616fe0b8c84337c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojislav=20Pavi=C4=87?= Date: Wed, 5 Sep 2012 17:46:30 +0200 Subject: [PATCH 2/7] Translated using Weblate. --- po/sr@latin.po | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/po/sr@latin.po b/po/sr@latin.po index 31c3ca7a3e..9d4347005a 100644 --- a/po/sr@latin.po +++ b/po/sr@latin.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.3-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-08-22 06:32-0400\n" -"PO-Revision-Date: 2012-09-05 13:50+0200\n" +"PO-Revision-Date: 2012-09-05 17:46+0200\n" "Last-Translator: Vojislav Pavić \n" "Language-Team: Serbian (latin) " "\n" @@ -4260,6 +4260,8 @@ msgid "" "Default format; be aware that this list depends on location (database, " "table) and only SQL is always available" msgstr "" +"Podrazumevani format; budite svesni da ova lista zavisi od lokacije (baza, " +"tabela) i samo SQL je uvek na raspolaganju" #: libraries/config/messages.inc.php:249 msgid "Format of imported file" @@ -4285,7 +4287,7 @@ msgstr "Uvezi valute ($5.00 do 5.00)" #: libraries/config/messages.inc.php:259 msgid "Import percentages as proper decimals (12.00% to .12)" -msgstr "" +msgstr "Uvezi procente kao prave decimalne brojeve (12.00% kao .12)" #: libraries/config/messages.inc.php:260 #| msgid "Number of records (queries) to skip from start" @@ -4429,7 +4431,7 @@ msgstr "" #: libraries/config/messages.inc.php:295 msgid "Limit column characters" -msgstr "" +msgstr "Ograničenje znakova kolone" #: libraries/config/messages.inc.php:296 msgid "" @@ -4450,7 +4452,7 @@ msgstr "" #: libraries/config/messages.inc.php:299 msgid "Recall user name" -msgstr "" +msgstr "Opozovi ime korisnika" #: libraries/config/messages.inc.php:300 msgid "" @@ -4605,6 +4607,9 @@ msgid "" "Structure page if any of the required tables for the phpMyAdmin " "configuration storage could not be found" msgstr "" +"Onemogući podrazumevano upozorenje koje se prikazuje na stranici sa " +"detaljima strukture baze podataka ako bilo koju od neophodnih tabela za " +"skladištenje phpMyAdmin konfiguracije nije bilo moguće pronaći" #: libraries/config/messages.inc.php:334 msgid "Missing phpMyAdmin configuration storage tables" @@ -4670,7 +4675,7 @@ msgstr "Dužina prozora za upite" #: libraries/config/messages.inc.php:350 msgid "Select which functions will be used for character set conversion" -msgstr "" +msgstr "Izaberite koje funcije će biti korišćene za konverziju seta znakova" #: libraries/config/messages.inc.php:351 msgid "Recoding engine" @@ -4678,7 +4683,7 @@ msgstr "" #: libraries/config/messages.inc.php:352 msgid "When browsing tables, the sorting of each table is remembered" -msgstr "" +msgstr "Kada pregledate tabele, sortiranje svake tabele je upamćeno" #: libraries/config/messages.inc.php:353 #| msgid "Rename table to" @@ -4688,6 +4693,7 @@ msgstr "Zapamti način sortiranja u tabeli" #: libraries/config/messages.inc.php:354 msgid "Repeat the headers every X cells, [kbd]0[/kbd] deactivates this feature" msgstr "" +"Ponovi zaglavlje nakon svakih X ćelija, [kbd]0[/kbd] isključuje ovu funkciju" #: libraries/config/messages.inc.php:355 #| msgid "Repair threads" @@ -4696,19 +4702,19 @@ msgstr "Ponovi zaglavlja" #: libraries/config/messages.inc.php:356 msgid "Show help button instead of Documentation text" -msgstr "" +msgstr "Prikaži dugme za pomoć umesto teksta dokumentacije" #: libraries/config/messages.inc.php:357 msgid "Show help button" -msgstr "" +msgstr "Prikaži dugme za pomoć" #: libraries/config/messages.inc.php:359 msgid "Save all edited cells at once" -msgstr "" +msgstr "Snimi sve izmenjene ćelije odjednom" #: libraries/config/messages.inc.php:360 msgid "Directory where exports can be saved on server" -msgstr "" +msgstr "Direktorijum na serveru u koji izvezeni podaci mogu biti snimljeni" #: libraries/config/messages.inc.php:361 msgid "Save directory" @@ -4716,27 +4722,27 @@ msgstr "Snimi direktorijum" #: libraries/config/messages.inc.php:362 msgid "Leave blank if not used" -msgstr "" +msgstr "Ostavi prazno ako se ne koristi" #: libraries/config/messages.inc.php:363 msgid "Host authorization order" -msgstr "" +msgstr "Redosled autorizacije hostova" #: libraries/config/messages.inc.php:364 msgid "Leave blank for defaults" -msgstr "" +msgstr "Ostavi prazno za podrazumevane vrednosti" #: libraries/config/messages.inc.php:365 msgid "Host authorization rules" -msgstr "" +msgstr "Pravila autorizacije hostova" #: libraries/config/messages.inc.php:366 msgid "Allow logins without a password" -msgstr "" +msgstr "Dozvoli prijavljivanje bez lozinke" #: libraries/config/messages.inc.php:367 msgid "Allow root login" -msgstr "" +msgstr "Dozvoli prijavljivanje root-a" #: libraries/config/messages.inc.php:368 msgid "HTTP Basic Auth Realm name to display when doing HTTP Auth" From 13ca31d85fc734ceba603971c2a9c64883993cc6 Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Thu, 6 Sep 2012 00:03:52 +0530 Subject: [PATCH 3/7] jqplot: remove X axis vertical grid lines --- js/server_status.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/js/server_status.js b/js/server_status.js index aa9a962721..0480416ea9 100644 --- a/js/server_status.js +++ b/js/server_status.js @@ -380,7 +380,8 @@ $(function() { xaxis: { renderer: $.jqplot.DateAxisRenderer, tickOptions: { - formatString: '%H:%M:%S' + formatString: '%H:%M:%S', + showGridline: false } }, yaxis: { From 2325723a4e78d17aa0d10d2262c25a039c4e7632 Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Thu, 6 Sep 2012 00:32:58 +0530 Subject: [PATCH 4/7] jqplot: make background transparent in live query/traffic/connections charts --- js/server_status.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/js/server_status.js b/js/server_status.js index 0480416ea9..8f6257bd23 100644 --- a/js/server_status.js +++ b/js/server_status.js @@ -376,6 +376,11 @@ $(function() { function getSettings(type) { var settings = { + grid: { + drawBorder: false, + shadow: false, + background: 'rgba(0,0,0,0)' + }, axes: { xaxis: { renderer: $.jqplot.DateAxisRenderer, From 536e71c20b2d69648e84e429d5e777802a52fbf5 Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Thu, 6 Sep 2012 00:36:00 +0530 Subject: [PATCH 5/7] jqplot: make background transparent in monitor charts --- js/server_status_monitor.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js index bb4eb8d67e..ce2c5ae8ad 100644 --- a/js/server_status_monitor.js +++ b/js/server_status_monitor.js @@ -1121,6 +1121,11 @@ $(function() { var settings = { title: chartObj.title, + grid: { + drawBorder: false, + shadow: false, + background: 'rgba(0,0,0,0)' + }, axes: { xaxis: { renderer: $.jqplot.DateAxisRenderer, From 68954a8c283a9248371e9de9d6a961f0c2a69dd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D9=85=D8=AA=D8=B1=D8=AC=D9=85=20=D8=AD=D8=B1=D9=91?= Date: Wed, 5 Sep 2012 21:37:15 +0200 Subject: [PATCH 6/7] Translated using Weblate. --- po/ar.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/po/ar.po b/po/ar.po index a0aeeb6d38..0dcb3295c2 100644 --- a/po/ar.po +++ b/po/ar.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.3-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-08-22 06:32-0400\n" -"PO-Revision-Date: 2012-09-04 16:55+0200\n" +"PO-Revision-Date: 2012-09-05 21:37+0200\n" "Last-Translator: مترجم حرّ \n" "Language-Team: Arabic \n" "Language: ar\n" @@ -1311,7 +1311,7 @@ msgstr "الذاكرة المؤقتة" #: js/messages.php:110 msgid "Buffered memory" -msgstr "" +msgstr "الذاكرة الوسيطة" #: js/messages.php:111 msgid "Free memory" @@ -1407,7 +1407,7 @@ msgstr "تحرير العناوين" #: js/messages.php:140 msgid "Add chart to grid" -msgstr "" +msgstr "أضف تخطيط إلى المشبكة" #: js/messages.php:142 msgid "Please add at least one variable to the series" @@ -1570,6 +1570,7 @@ msgstr "" #: js/messages.php:181 msgid "Log data loaded. Queries executed in this time span:" msgstr "" +"تم تحميل بيانات سجلّ الوقائع. الإستعلامات المنفذة في الفترة الزمنية هذه:" #: js/messages.php:183 msgid "Jump to Log table" @@ -7070,7 +7071,7 @@ msgstr "تحويل المتصفح" #: libraries/relation.lib.php:119 msgid "" "Please see the documentation on how to update your column_comments table" -msgstr "رجاء راجع التوثيق لكيفية تحديث جدول column_comments." +msgstr "رجاء راجع التوثيق لكيفية تحديث جدول column_comments" #: libraries/relation.lib.php:124 libraries/sql_query_form.lib.php:376 msgid "Bookmarked SQL query" @@ -7404,7 +7405,7 @@ msgstr "" #: libraries/rte/rte_routines.lib.php:271 #, php-format msgid "Routine %1$s has been modified." -msgstr "تم تعديل الإجراء %1$s" +msgstr "تم تعديل الإجراء %1$s." #: libraries/rte/rte_routines.lib.php:284 #, php-format From 5bfcbbdbc4d2ac83294067a062b3561a6dbc06f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojislav=20Pavi=C4=87?= Date: Wed, 5 Sep 2012 23:00:44 +0200 Subject: [PATCH 7/7] Translated using Weblate. --- po/sr@latin.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/sr@latin.po b/po/sr@latin.po index 9d4347005a..fe45bf838c 100644 --- a/po/sr@latin.po +++ b/po/sr@latin.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.3-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-08-22 06:32-0400\n" -"PO-Revision-Date: 2012-09-05 17:46+0200\n" +"PO-Revision-Date: 2012-09-05 23:00+0200\n" "Last-Translator: Vojislav Pavić \n" "Language-Team: Serbian (latin) " "\n" @@ -4210,6 +4210,8 @@ msgid "" "Enable [a@http://en.wikipedia.org/wiki/Gzip]gzip[/a] compression for import " "and export operations" msgstr "" +"Omogući [a@http://en.wikipedia.org/wiki/Gzip]gzip[/a] kompresiju za " +"operacije uvoza i izvoza" #: libraries/config/messages.inc.php:235 msgid "GZip"