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:
Weblate 2014-08-05 04:01:55 +02:00
commit e2bf8f31c2
2 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
js/navigation.js
View File

@ -72,6 +72,36 @@ $(function () {
});
});
/**
* Register event handler to toggle
* the 'link with main panel' icon on mouseenter.
*/
$(document).on('mouseenter', '#pma_navigation_sync', function (event) {
event.preventDefault();
var synced = $('#pma_navigation_tree').hasClass('synced');
var $img = $('#pma_navigation_sync').children('img');
if (synced) {
$img.removeClass('ic_s_link').addClass('ic_s_unlink');
} else {
$img.removeClass('ic_s_unlink').addClass('ic_s_link');
}
});
/**
* Register event handler to toggle
* the 'link with main panel' icon on mouseout.
*/
$(document).on('mouseout', '#pma_navigation_sync', function (event) {
event.preventDefault();
var synced = $('#pma_navigation_tree').hasClass('synced');
var $img = $('#pma_navigation_sync').children('img');
if (synced) {
$img.removeClass('ic_s_unlink').addClass('ic_s_link');
} else {
$img.removeClass('ic_s_link').addClass('ic_s_unlink');
}
});
/**
* Register event handler to toggle
* the linking with main panel behavior

6
libraries/navigation/NavigationTree.class.php
View File

@ -1132,11 +1132,11 @@ class PMA_NavigationTree
's_collapseall.png',
'pma_navigation_collapse'
);
$syncImage = 's_link.png';
$syncImage = 's_unlink.png';
$title = __('Link with main panel');
if ($GLOBALS['cfg']['NavigationLinkWithMainPanel']) {
$syncImage = 's_unlink.png';
$title = __('Unlink from main panel');
$syncImage = 's_link.png';
$title = __('Unlink with main panel');
}
$retval .= PMA_Util::getNavigationLink(
'#',