gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Pootle server 2011-09-25 14:40:09 +02:00
commit 3780a13a07
4 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -60,6 +60,7 @@ phpMyAdmin - ChangeLog
- bug #3411535 [display] Full text button unchecks results display options
- bug #3411224 [display] Broken binary column when 'Show binary contents' is not set
- bug #3411633 [core] Call to undefined function PMA_isSuperuser()
- bug #3413743 [interface] Display options link missing after search
3.4.5.0 (2011-09-14)
- bug #3375325 [interface] Page list in navigation frame looks odd

4
js/pmd/history.js
View File

@ -68,10 +68,10 @@ function display(init,finit)
str +='<div class="block"> <table width ="250">';
str += '<thead><tr><td>';
if(history_array[i].get_and_or()){
str +='<img src="pmd/images/or_icon.png" onclick="and_or('+i+')" title="OR"/></td>';
str +='<img src="' + pmaThemeImage + 'pmd/or_icon.png" onclick="and_or('+i+')" title="OR"/></td>';
}
else {
str +='<img src="pmd/images/and_icon.png" onclick="and_or('+i+')" title="AND"/></td>';
str +='<img src="' + pmaThemeImage + 'pmd/and_icon.png" onclick="and_or('+i+')" title="AND"/></td>';
}
str +='<td style="padding-left: 5px;" align="right"><img class="icon ic_b_sbrowse" src="themes/dot.gif" title="column name"/></td><td width="175" style="padding-left: 5px">' + history_array[i].get_column_name();
if (history_array[i].get_type() == "GroupBy" || history_array[i].get_type() == "OrderBy") {

20
js/pmd/move.js
View File

@ -636,7 +636,7 @@ function Small_tab_all(id_this) // max/min all tables
}
}
id_this.alt = ">";
id_this.src = "pmd/images/rightarrow1.png";
id_this.src = pmaThemeImage + "pmd/rightarrow1.png";
} else {
for (key in j_tabs) {
if (document.getElementById('id_hide_tbody_'+key).innerHTML != "v") {
@ -644,7 +644,7 @@ function Small_tab_all(id_this) // max/min all tables
}
}
id_this.alt = "v";
id_this.src = "pmd/images/downarrow1.png";
id_this.src = pmaThemeImage + "pmd/downarrow1.png";
}
Re_load();
}
@ -803,10 +803,10 @@ function Hide_tab_all(id_this) // max/min all tables
{
if (id_this.alt == 'v') {
id_this.alt = '>';
id_this.src = "pmd/images/rightarrow1.png";
id_this.src = pmaThemeImage + "pmd/rightarrow1.png";
} else {
id_this.alt = 'v';
id_this.src = "pmd/images/downarrow1.png";
id_this.src = pmaThemeImage + "pmd/downarrow1.png";
}
var E = document.form1;
for (i = 0; i < E.elements.length; i++) {
@ -847,10 +847,10 @@ function No_have_constr(id_this)
if (id_this.alt == 'v') {
id_this.alt = '>';
id_this.src = "pmd/images/rightarrow2.png";
id_this.src = pmaThemeImage + "pmd/rightarrow2.png";
} else {
id_this.alt = 'v';
id_this.src = "pmd/images/downarrow2.png";
id_this.src = pmaThemeImage + "pmd/downarrow2.png";
}
var E = document.form1;
for (i = 0; i < E.elements.length; i++) {
@ -921,7 +921,7 @@ function Show_left_menu(id_this) // max/min all tables
document.getElementById("layer_menu").style.left = pos.left + 'px';
document.getElementById("layer_menu").style.display = 'block';
id_this.alt = ">";
id_this.src = "pmd/images/uparrow2_m.png";
id_this.src = pmaThemeImage + "pmd/uparrow2_m.png";
if (isIE) {
General_scroll();
}
@ -929,7 +929,7 @@ function Show_left_menu(id_this) // max/min all tables
document.getElementById("layer_menu").style.top = -1000 + 'px'; //fast scroll
document.getElementById("layer_menu").style.display = 'none';
id_this.alt = "v";
id_this.src = "pmd/images/downarrow2_m.png";
id_this.src = pmaThemeImage + "pmd/downarrow2_m.png";
}
}
//------------------------------------------------------------------------------
@ -938,11 +938,11 @@ function Top_menu_right(id_this)
if (id_this.alt == ">") {
document.getElementById('top_menu').style.marginLeft = document.getElementById('top_menu').offsetWidth + 'px'; // = 350
id_this.alt = "<";
id_this.src = "pmd/images/2leftarrow_m.png";
id_this.src = pmaThemeImage + "pmd/2leftarrow_m.png";
} else {
document.getElementById('top_menu').style.marginLeft = 0;
id_this.alt = ">";
id_this.src = "pmd/images/2rightarrow_m.png";
id_this.src = pmaThemeImage + "pmd/2rightarrow_m.png";
}
}
//------------------------------------------------------------------------------

2
js/tbl_select.js
View File

@ -77,6 +77,8 @@ $(document).ready(function() {
$('#togglesearchformdiv')
// now it's time to show the div containing the link
.show();
// needed for the display options slider in the results
PMA_init_slider();
} else {
// error message (zero rows)
$("#sqlqueryresults").html(response['message']);