From e4864c02e4f9df09cd51e2bec4eb79c04962cb62 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Mon, 15 Jun 2015 12:34:31 +0530 Subject: [PATCH 01/15] Use a jQuery dialog to display the generated query Signed-off-by: Madhura Jayaratne --- js/pmd/history.js | 76 ++++++++++++++------------ templates/designer/query_details.phtml | 14 +---- themes/pmahomme/css/pmd.css.php | 50 ----------------- 3 files changed, 44 insertions(+), 96 deletions(-) diff --git a/js/pmd/history.js b/js/pmd/history.js index 1577f4e338..2fd21ff515 100644 --- a/js/pmd/history.js +++ b/js/pmd/history.js @@ -10,6 +10,7 @@ var history_array = []; // Global array to store history objects var select_field = []; // Global array to store informaation for columns which are used in select clause var g_index; +var vqb_editor; /** * function for panel, hides and shows toggle_container
,which is for history elements uses {@link JQuery}. @@ -621,26 +622,6 @@ function check_rename(id_this) return ""; } -function gradient(id, level) -{ - var box = document.getElementById(id); - box.style.opacity = level; - box.style.MozOpacity = level; - box.style.KhtmlOpacity = level; - box.style.filter = "alpha(opacity=" + level * 100 + ")"; - box.style.display = "block"; -} - - -function fadein(id) -{ - var level = 0; - while (level <= 1) { - setTimeout("gradient('" + id + "'," + level + ")", (level * 1000) + 10); - level += 0.01; - } -} - /** * This function builds from clause of query * makes automatic joins. @@ -771,25 +752,50 @@ function build_query(formtitle, fadin) if (query_having() !== "") { q_select += "\nHAVING " + query_having(); } if (query_orderby() !== "") { q_select += "\nORDER BY " + query_orderby(); } var box = document.getElementById('box'); - document.getElementById('filter').style.display = 'block'; - var btitle = document.getElementById('boxtitle'); - btitle.innerHTML = 'SELECT';//formtitle; - if (fadin) { - gradient("box", 0); - fadein("box"); - } else { - box.style.display = 'block'; - } - document.getElementById('textSqlquery').innerHTML = q_select; -} -function closebox() -{ - document.getElementById('box').style.display = 'none'; - document.getElementById('filter').style.display = 'none'; + /** + * @var button_options Object containing options + * for jQueryUI dialog buttons + */ + var button_options = {}; + button_options[PMA_messages.strClose] = function () { + $(this).dialog("close"); + }; + button_options[PMA_messages.strGo] = function () { + if (vqb_editor) { + var $elm = $ajaxDialog.find('textarea'); + vqb_editor.save(); + $elm.val(vqb_editor.getValue()); + } + $('#vqb_form').submit(); + }; + + var $ajaxDialog = $(box).dialog({ + width: 500, + buttons: button_options, + modal: true, + title: 'SELECT' + }); + // Attach syntax highlighted editor to query dialog + /** + * @var $elm jQuery object containing the reference + * to the query textarea. + */ + var $elm = $ajaxDialog.find('textarea'); + if (! vqb_editor) { + vqb_editor = PMA_getSQLEditor($elm); + } + if (vqb_editor) { + vqb_editor.setValue(q_select); + vqb_editor.focus(); + } else { + $elm.val(q_select); + $elm.focus(); + } } AJAX.registerTeardown('pmd/history.js', function () { + vqb_editor = null; $("#ok_edit_rename").unbind('click'); $("#ok_edit_having").unbind('click'); $("#ok_edit_Aggr").unbind('click'); diff --git a/templates/designer/query_details.phtml b/templates/designer/query_details.phtml index b8315d91a2..ffae53a2b4 100755 --- a/templates/designer/query_details.phtml +++ b/templates/designer/query_details.phtml @@ -9,19 +9,11 @@ -
-
- - -
+ -
- - - -
-

+ +
\ No newline at end of file diff --git a/themes/pmahomme/css/pmd.css.php b/themes/pmahomme/css/pmd.css.php index 749b4ce6c2..a931facbc8 100644 --- a/themes/pmahomme/css/pmd.css.php +++ b/themes/pmahomme/css/pmd.css.php @@ -497,58 +497,8 @@ h2.active { background-color: #DBE4E8; } -#filter { - display: none; - position: absolute; - top: 0%; - left: 0%; - width: 100%; - height: 100%; - background-color: #CCA; - z-index: 10; - opacity: .5; - filter: alpha(opacity=50); -} - #box { display: none; - position: absolute; - top: 20%; - : 30%; - width: 500px; - height: 220px; - padding: 48px; - margin: 0; - border: 1px solid #000; - background-color: #fff; - z-index: 101; - overflow: visible; -} - -#boxtitle { - position: absolute; - float: center; - top: 0; - : 0; - width: 593px; - height: 20px; - padding: 0; - padding-top: 4px; - margin: 0; - border-bottom: 4px solid #3CF; - background-color: #D0DCE0; - color: black; - font-weight: bold; - padding-: 2px; - text-align: ; -} - -#tblfooter { - background-color: #D3DCE3; - float: ; - padding-top: 10px; - color: black; - font-weight: normal; } #foreignkeychk { From 61cf42ac101042fb2259781f0dd51753c4beb520 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Mon, 15 Jun 2015 12:35:16 +0530 Subject: [PATCH 02/15] Break line at FROM and WHERE Signed-off-by: Madhura Jayaratne --- js/pmd/history.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/pmd/history.js b/js/pmd/history.js index 2fd21ff515..77364617fc 100644 --- a/js/pmd/history.js +++ b/js/pmd/history.js @@ -743,9 +743,9 @@ function build_query(formtitle, fadin) } } q_select = q_select.substring(0, q_select.length - 1); - q_select += " FROM " + query_from(); + q_select += "\nFROM " + query_from(); if (query_where() !== "") { - q_select += "\n WHERE"; + q_select += "\nWHERE"; q_select += query_where(); } if (query_groupby() !== "") { q_select += "\nGROUP BY " + query_groupby(); } From 04435798b1cd2db6d2abcd50d61d1d529ed4a486 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Mon, 15 Jun 2015 12:42:01 +0530 Subject: [PATCH 03/15] Use backquotes. Consistently skip using db name Signed-off-by: Madhura Jayaratne --- js/pmd/history.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/js/pmd/history.js b/js/pmd/history.js index 77364617fc..ce2db1737f 100644 --- a/js/pmd/history.js +++ b/js/pmd/history.js @@ -653,7 +653,7 @@ function query_from() from_array = unique(from_array); tab_left = from_array; temp = tab_left.shift(); - quer = temp; + quer = '`' + temp + '`'; tab_used.push(temp); // if master table (key2) matches with tab used get all keys and check if tab_left matches // after this check if master table (key2) matches with tab left then check if any foreign matches with master . @@ -667,7 +667,7 @@ function query_from() parts1 = contr[K][key][key2][key3][0].split("."); if (found(tab_left, parts1[1]) > 0) { query += "\n" + 'LEFT JOIN '; - query += '`' + parts1[0] + '`.`' + parts1[1] + '` ON '; + query += '`' + parts1[1] + '` ON '; query += '`' + parts[1] + '`.`' + key3 + '` = '; query += '`' + parts1[1] + '`.`' + contr[K][key][key2][key3][1] + '` '; t_tab_left.push(parts1[1]); @@ -691,7 +691,7 @@ function query_from() parts1 = contr[K][key][key2][key3][0].split("."); if (found(tab_used, parts1[1]) > 0) { query += "\n" + 'LEFT JOIN '; - query += '`' + parts[0] + '`.`' + parts[1] + '` ON '; + query += '`' + parts[1] + '` ON '; query += '`' + parts1[1] + '`.`' + contr[K][key][key2][key3][1] + '` = '; query += '`' + parts[1] + '`.`' + key3 + '` '; t_tab_left.push(parts[1]); From 9912fec3e23961af73705600f5c5a0b84e7537b8 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Mon, 15 Jun 2015 12:44:35 +0530 Subject: [PATCH 04/15] Add space between column names Signed-off-by: Madhura Jayaratne --- js/pmd/history.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/js/pmd/history.js b/js/pmd/history.js index ce2db1737f..538404bfdc 100644 --- a/js/pmd/history.js +++ b/js/pmd/history.js @@ -736,13 +736,13 @@ function build_query(formtitle, fadin) if (temp !== "") { q_select += temp; temp = check_rename(select_field[i]); - q_select += temp + ","; + q_select += temp + ", "; } else { temp = check_rename(select_field[i]); - q_select += select_field[i] + temp + ","; + q_select += select_field[i] + temp + ", "; } } - q_select = q_select.substring(0, q_select.length - 1); + q_select = q_select.substring(0, q_select.length - 2); q_select += "\nFROM " + query_from(); if (query_where() !== "") { q_select += "\nWHERE"; From d15ae83b17142d58a95d7273773b03438146ab6c Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Mon, 15 Jun 2015 12:52:06 +0530 Subject: [PATCH 05/15] Reset variables on tear down Signed-off-by: Madhura Jayaratne --- js/pmd/history.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/js/pmd/history.js b/js/pmd/history.js index 538404bfdc..406c8be7b6 100644 --- a/js/pmd/history.js +++ b/js/pmd/history.js @@ -10,7 +10,7 @@ var history_array = []; // Global array to store history objects var select_field = []; // Global array to store informaation for columns which are used in select clause var g_index; -var vqb_editor; +var vqb_editor = null; /** * function for panel, hides and shows toggle_container
,which is for history elements uses {@link JQuery}. @@ -796,6 +796,8 @@ function build_query(formtitle, fadin) AJAX.registerTeardown('pmd/history.js', function () { vqb_editor = null; + history_array = []; + select_field = []; $("#ok_edit_rename").unbind('click'); $("#ok_edit_having").unbind('click'); $("#ok_edit_Aggr").unbind('click'); From ab7ef46b11420ee347d32d2ce060c0872b7d61f5 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Mon, 15 Jun 2015 12:54:44 +0530 Subject: [PATCH 06/15] Backquote column names in where clause Signed-off-by: Madhura Jayaratne --- js/pmd/history.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/pmd/history.js b/js/pmd/history.js index 406c8be7b6..2d93ef8fd1 100644 --- a/js/pmd/history.js +++ b/js/pmd/history.js @@ -574,10 +574,10 @@ function query_where() for (i = 0; i < history_array.length;i++) { if (history_array[i].get_type() == "Where") { if (history_array[i].get_and_or() === 0) { - and += "( " + history_array[i].get_column_name() + " " + history_array[i].get_obj().getrelation_operator() + " " + history_array[i].get_obj().getquery() + ")"; + and += "( `" + history_array[i].get_column_name() + "` " + history_array[i].get_obj().getrelation_operator() + " " + history_array[i].get_obj().getquery() + ")"; and += " AND "; } else { - or += "( " + history_array[i].get_column_name() + " " + history_array[i].get_obj().getrelation_operator() + " " + history_array[i].get_obj().getquery() + ")"; + or += "( `" + history_array[i].get_column_name() + "` " + history_array[i].get_obj().getrelation_operator() + " " + history_array[i].get_obj().getquery() + ")"; or += " OR "; } } From 78cbe1ca88a8ebd8c07fa7358c64f73dfebd5841 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Mon, 15 Jun 2015 13:00:01 +0530 Subject: [PATCH 07/15] Do not fail when no columns have been selected Signed-off-by: Madhura Jayaratne --- js/pmd/history.js | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/js/pmd/history.js b/js/pmd/history.js index 2d93ef8fd1..ca6d70023a 100644 --- a/js/pmd/history.js +++ b/js/pmd/history.js @@ -731,18 +731,22 @@ function build_query(formtitle, fadin) { var q_select = "SELECT "; var temp; - for (var i = 0;i < select_field.length; i++) { - temp = check_aggregate(select_field[i]); - if (temp !== "") { - q_select += temp; - temp = check_rename(select_field[i]); - q_select += temp + ", "; - } else { - temp = check_rename(select_field[i]); - q_select += select_field[i] + temp + ", "; + if (select_field.length > 0) { + for (var i = 0; i < select_field.length; i++) { + temp = check_aggregate(select_field[i]); + if (temp !== "") { + q_select += temp; + temp = check_rename(select_field[i]); + q_select += temp + ", "; + } else { + temp = check_rename(select_field[i]); + q_select += select_field[i] + temp + ", "; + } } + q_select = q_select.substring(0, q_select.length - 2); + } else { + q_select += "* "; } - q_select = q_select.substring(0, q_select.length - 2); q_select += "\nFROM " + query_from(); if (query_where() !== "") { q_select += "\nWHERE"; From d482f096fe50ea709b7c528e939ad30d39a55409 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Mon, 15 Jun 2015 13:02:33 +0530 Subject: [PATCH 08/15] Use jQuery selectors here Signed-off-by: Madhura Jayaratne --- js/pmd/history.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/js/pmd/history.js b/js/pmd/history.js index ca6d70023a..8570d7d29e 100644 --- a/js/pmd/history.js +++ b/js/pmd/history.js @@ -755,7 +755,6 @@ function build_query(formtitle, fadin) if (query_groupby() !== "") { q_select += "\nGROUP BY " + query_groupby(); } if (query_having() !== "") { q_select += "\nHAVING " + query_having(); } if (query_orderby() !== "") { q_select += "\nORDER BY " + query_orderby(); } - var box = document.getElementById('box'); /** * @var button_options Object containing options @@ -774,7 +773,7 @@ function build_query(formtitle, fadin) $('#vqb_form').submit(); }; - var $ajaxDialog = $(box).dialog({ + var $ajaxDialog = $('#box').dialog({ width: 500, buttons: button_options, modal: true, From cdceec1741002ae273325e39d2f75359b906e0ed Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Mon, 15 Jun 2015 13:08:45 +0530 Subject: [PATCH 09/15] bug - generated query has extraneous comma at the end of group by clause Signed-off-by: Madhura Jayaratne --- js/pmd/history.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/pmd/history.js b/js/pmd/history.js index 8570d7d29e..302d8a6aa9 100644 --- a/js/pmd/history.js +++ b/js/pmd/history.js @@ -512,7 +512,7 @@ function query_groupby() str += history_array[i].get_column_name() + ", "; } } - str = str.substr(0, str.length - 1); + str = str.substr(0, str.length - 2); return str; } From de6e9b8f67162d5b3fc3c2d7554d07154982c822 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Mon, 15 Jun 2015 13:09:44 +0530 Subject: [PATCH 10/15] Backquote column names in group by clause Signed-off-by: Madhura Jayaratne --- js/pmd/history.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/pmd/history.js b/js/pmd/history.js index 302d8a6aa9..317cc3b2c6 100644 --- a/js/pmd/history.js +++ b/js/pmd/history.js @@ -509,7 +509,7 @@ function query_groupby() var str = ""; for (i = 0; i < history_array.length;i++) { if (history_array[i].get_type() == "GroupBy") { - str += history_array[i].get_column_name() + ", "; + str += '`' + history_array[i].get_column_name() + "`, "; } } str = str.substr(0, str.length - 2); From 527f6c97d4fd86666b323bfeff23007adae6a6af Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Mon, 15 Jun 2015 14:35:14 +0530 Subject: [PATCH 11/15] Use jQuery accordion to display options selected Signed-off-by: Madhura Jayaratne --- js/pmd/history.js | 29 ++++---------- js/pmd/init.js | 1 + js/pmd/move.js | 2 +- themes/pmahomme/css/pmd.css.php | 67 +++++++-------------------------- 4 files changed, 23 insertions(+), 76 deletions(-) diff --git a/js/pmd/history.js b/js/pmd/history.js index 317cc3b2c6..82f04119cd 100644 --- a/js/pmd/history.js +++ b/js/pmd/history.js @@ -12,22 +12,6 @@ var select_field = []; // Global array to store informaation for columns which var g_index; var vqb_editor = null; -/** - * function for panel, hides and shows toggle_container
,which is for history elements uses {@link JQuery}. - * - * @param index has value 1 or 0,decides wheter to hide toggle_container on load. -**/ - -function panel(index) -{ - if (!index) { - $(".toggle_container").hide(); - } - $("h2.tiger").click(function () { - $(this).toggleClass("active").next().slideToggle("slow"); - }); -} - /** * To display details of objects(where,rename,Having,aggregate,groupby,orderby,having) * @@ -98,7 +82,7 @@ function display(init, finit) str = ''; // string to store Html code for history tab for (i = 0; i < history_array.length; i++) { temp = history_array[i].get_tab(); //+ '.' + history_array[i].get_obj_no(); for Self JOIN - str += '

' + temp + '

'; + str += '

' + temp + '

'; str += '
\n'; while ((history_array[i].get_tab()) == temp) { //+ '.' + history_array[i].get_obj_no()) == temp) { str += '
'; @@ -118,10 +102,10 @@ function display(init, finit) if (i >= history_array.length) { break; } - str += '

'; + str += '
'; } i--; - str += '

'; + str += '
'; } return str; } @@ -143,7 +127,7 @@ function and_or(index) } var existingDiv = document.getElementById('ab'); existingDiv.innerHTML = display(0, 0); - panel(1); + $('#ab').accordion("refresh"); } /** @@ -164,7 +148,7 @@ function history_delete(index) history_array.splice(index, 1); var existingDiv = document.getElementById('ab'); existingDiv.innerHTML = display(0, 0); - panel(1); + $('#ab').accordion("refresh"); } /** @@ -257,7 +241,7 @@ function edit(type) } var existingDiv = document.getElementById('ab'); existingDiv.innerHTML = display(0, 0); - panel(1); + $('#ab').accordion("refresh"); } /** @@ -820,4 +804,5 @@ AJAX.registerOnload('pmd/history.js', function () { $("#ok_edit_where").click(function() { edit('Where'); }); + $('#ab').accordion({collapsible : true, active : 'none'}); }); \ No newline at end of file diff --git a/js/pmd/init.js b/js/pmd/init.js index 2719353716..871d49e915 100644 --- a/js/pmd/init.js +++ b/js/pmd/init.js @@ -13,6 +13,7 @@ AJAX.registerOnload('pmd/init.js', function () { $(".trigger").click(function () { $(".panel").toggle("fast"); $(this).toggleClass("active"); + $('#ab').accordion("refresh"); return false; }); var tables_data = $.parseJSON($("#script_tables").html()); diff --git a/js/pmd/move.js b/js/pmd/move.js index d8a75b927c..eef4ae8c5f 100644 --- a/js/pmd/move.js +++ b/js/pmd/move.js @@ -1787,7 +1787,7 @@ function add_object() var existingDiv = document.getElementById('ab'); existingDiv.innerHTML = display(init, history_array.length); Close_option(); - panel(0); + $('#ab').accordion("refresh"); } AJAX.registerTeardown('pmd/move.js', function () { diff --git a/themes/pmahomme/css/pmd.css.php b/themes/pmahomme/css/pmd.css.php index a931facbc8..2e81bd6953 100644 --- a/themes/pmahomme/css/pmd.css.php +++ b/themes/pmahomme/css/pmd.css.php @@ -398,15 +398,11 @@ a.M_butt:hover { position: fixed; top: 60px; : 0; - display: none; - background: #FFF; - border: 1px solid gray; - width: 350 px; + width: 350px; max-height: 500px; - overflow:scroll; - padding: 30px; - padding-: 30px; - color: #FFF; + display: none; + overflow: auto; + padding-top: 34px; z-index: 102; } @@ -438,53 +434,10 @@ a.active.trigger:hover { background: #fff696 url() 85% 55% no-repeat; } -h2.tiger { - background-repeat: repeat-x; - padding: 1px; - font-weight: bold; - padding: 50px 20px 50px; - margin: 0 0 5px 0; - width: 250px; - float: ; - color : #333; - text-align: center; -} - -h2.tiger a { - background-image: url(); - text-align: center; - text-decoration: none; - color : #333; - display: block; -} - -h2.tiger a:hover { - color: #000; - background-image: url(); -} - -h2.active { - background-image: url(); - background-repeat: repeat-x; - padding: 1px; - background-position: left bottom; -} - -.toggle_container { - margin: 0 0 5px; - padding: 0; - border-top: 1px solid #d6d6d6; - background: #FFF; - overflow: hidden; - font-size: 1.2em; - clear: both; -} - .toggle_container .block { background-color: #DBE4E8; - padding: 40px 15px 40px 15px; /*--Padding of Container--*/ - border:1px solid #999; - color: #000; + border-top: 1px solid #999; + cursor: pointer; } .history_table { @@ -497,6 +450,14 @@ h2.active { background-color: #DBE4E8; } +#ab { + min-width: 300px; +} + +#ab .ui-accordion-content { + padding: 0; +} + #box { display: none; } From cbf0ef1f24d8299ca98cc85f959fdaa76827b2b6 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Mon, 15 Jun 2015 14:37:26 +0530 Subject: [PATCH 12/15] Add space after WHERE Signed-off-by: Madhura Jayaratne --- js/pmd/history.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/pmd/history.js b/js/pmd/history.js index 82f04119cd..e316138f4e 100644 --- a/js/pmd/history.js +++ b/js/pmd/history.js @@ -733,7 +733,7 @@ function build_query(formtitle, fadin) } q_select += "\nFROM " + query_from(); if (query_where() !== "") { - q_select += "\nWHERE"; + q_select += "\nWHERE "; q_select += query_where(); } if (query_groupby() !== "") { q_select += "\nGROUP BY " + query_groupby(); } From 1a11a9613455f249ceda7b1a3a51cc8f13571b71 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Mon, 15 Jun 2015 14:40:53 +0530 Subject: [PATCH 13/15] Do not call these functions twice Signed-off-by: Madhura Jayaratne --- js/pmd/history.js | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/js/pmd/history.js b/js/pmd/history.js index e316138f4e..4269818d12 100644 --- a/js/pmd/history.js +++ b/js/pmd/history.js @@ -731,14 +731,28 @@ function build_query(formtitle, fadin) } else { q_select += "* "; } + q_select += "\nFROM " + query_from(); - if (query_where() !== "") { - q_select += "\nWHERE "; - q_select += query_where(); + + var q_where = query_where(); + if (q_where !== "") { + q_select += "\nWHERE " + q_where; + } + + var q_groupby = query_groupby(); + if (q_groupby !== "") { + q_select += "\nGROUP BY " + q_groupby; + } + + var q_having = query_having(); + if (q_having !== "") { + q_select += "\nHAVING " + q_having; + } + + var q_orderby = query_orderby(); + if (q_orderby !== "") { + q_select += "\nORDER BY " + q_orderby; } - if (query_groupby() !== "") { q_select += "\nGROUP BY " + query_groupby(); } - if (query_having() !== "") { q_select += "\nHAVING " + query_having(); } - if (query_orderby() !== "") { q_select += "\nORDER BY " + query_orderby(); } /** * @var button_options Object containing options From eeb20b293cf1c3657966817831a7a385753202d8 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Mon, 15 Jun 2015 14:46:07 +0530 Subject: [PATCH 14/15] Fix styles of action links Signed-off-by: Madhura Jayaratne --- themes/pmahomme/css/pmd.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/pmahomme/css/pmd.css.php b/themes/pmahomme/css/pmd.css.php index 2e81bd6953..a3a69809c2 100644 --- a/themes/pmahomme/css/pmd.css.php +++ b/themes/pmahomme/css/pmd.css.php @@ -437,12 +437,12 @@ a.active.trigger:hover { .toggle_container .block { background-color: #DBE4E8; border-top: 1px solid #999; - cursor: pointer; } .history_table { text-align: center; background-color: #9999CC; + cursor: pointer; } .history_table2 { From 957d4af6b41e1b516baf21aad3aea21f489b0200 Mon Sep 17 00:00:00 2001 From: Hauke Henningsen Date: Wed, 17 Jun 2015 05:52:54 +0200 Subject: [PATCH 15/15] Translated using Weblate (German) Currently translated at 100.0% (3102 of 3102 strings) [CI skip] --- po/de.po | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/po/de.po b/po/de.po index df48de6630..aefb4c61b6 100644 --- a/po/de.po +++ b/po/de.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-06-11 09:31-0400\n" -"PO-Revision-Date: 2015-06-04 01:38+0200\n" +"PO-Revision-Date: 2015-06-17 05:52+0200\n" "Last-Translator: Hauke Henningsen \n" -"Language-Team: German \n" +"Language-Team: German " +"\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.3-dev\n" +"X-Generator: Weblate 2.4-dev\n" #: changelog.php:37 license.php:28 #, php-format @@ -1044,15 +1044,20 @@ msgid "" "column(s) editing feature (the \"Change\" Link) on the table structure page. " "" msgstr "" +"Durch diese Operation versucht MySQL die Daten zwischen Kollationen " +"umzuwandeln. Falls die Zeichensätze inkompatibel sind, kann es zu " +"Datenverlust kommen und die verlorenen Daten sind eventuell NICHT " +"einfach durch das Zurücksetzen der Spaltenkollation wiederherstellbar. Um " +"bestehende Daten umzuwandeln, wird empfohlen, den Spaltenänderungsmodus " +"(„Bearbeiten“) auf der Tabellenstrukturseite zu verwenden." #: js/messages.php:85 -#, fuzzy #| msgid "Are you sure you wish to change the collation and convert the data?" msgid "" "Are you sure you wish to change all the column collations and convert the " "data?" msgstr "" -"Sind Sie sich sicher, dass Sie die Kollation ändern und die Daten " +"Sind Sie sich sicher, dass Sie alle Spaltenkollationen ändern und die Daten " "konvertieren wollen?" #: js/messages.php:88 @@ -9677,10 +9682,9 @@ msgid "Storage Engine" msgstr "Tabellenformat" #: libraries/operations.lib.php:995 -#, fuzzy #| msgid "Make all columns atomic" msgid "Change all column collations" -msgstr "Alle Spalten atomar machen" +msgstr "Alle Spaltenkollationen ändern" #: libraries/operations.lib.php:1164 msgid "Copy table to (database.table)"