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-04-17 09:03:26 +02:00
commit 2293ce0530
5 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/navigation.js
View File

@ -240,10 +240,10 @@ $(function () {
event.preventDefault();
$self = $(this);
var anchor_id = $self.attr("id");
if($self.attr('favtargetn') != null)
if($('a[favtargets="' + $self.attr('favtargetn') + '"]').length > 0)
if($self.data("favtargetn") != null)
if($('a[data-favtargets="' + $self.data("favtargetn") + '"]').length > 0)
{
$('a[favtargets="' + $self.attr('favtargetn') + '"]').trigger('click');
$('a[data-favtargets="' + $self.data("favtargetn") + '"]').trigger('click');
return;
}

2
libraries/RecentFavoriteTable.class.php
View File

@ -215,7 +215,7 @@ class PMA_RecentFavoriteTable
. PMA_URL_getCommon($fav_params);
$html .= 'href="' . $fav_rm_url
. '" title="' . __("Remove from Favorites")
. '" favtargetn="' . $table['db'] . "." . $table['table']
. '" data-favtargetn="' . $table['db'] . "." . $table['table']
. '" >'
. PMA_Util::getIcon('b_favorite.png')
. '</a>';

2
libraries/structure.lib.php
View File

@ -2727,7 +2727,7 @@ function PMA_getHtmlForFavoriteAnchor($db, $current_table, $titles)
$html_output .= 'href="' . $fav_url
. '" title="' . ($already_favorite ? __("Remove from Favorites")
: __("Add to Favorites"))
. '" favtargets="' . $db . "." . $current_table['TABLE_NAME']
. '" data-favtargets="' . $db . "." . $current_table['TABLE_NAME']
. '" >'
. (!$already_favorite ? $titles['NoFavorite']
: $titles['Favorite']) . '</a>';

15
themes/original/css/navigation.css.php
View File

@ -345,15 +345,24 @@ li.fast_filter.db_fast_filter {
display: none;
z-index: 802;
}
#pma_quick_warp .drop_list:hover ul{
#pma_quick_warp .drop_list:hover ul {
display: block;
}
#pma_quick_warp .drop_list li {
padding: 2px .3em;
white-space: nowrap;
}
#pma_quick_warp .drop_list li img {
vertical-align: sub;
}
#pma_quick_warp .drop_list li:hover {
background: #f2f2f2;
}
}
#pma_quick_warp .drop_list a {
display: block;
padding: .1em .3em;
}
#pma_quick_warp .drop_list a.favorite_table_anchor {
clear: left;
float: left;
padding: .1em .3em 0;
}

17
themes/pmahomme/css/navigation.css.php
View File

@ -318,7 +318,7 @@ li.fast_filter.db_fast_filter {
margin-<?php echo $left; ?>: 3px;
padding: 2px 0;
}
#pma_quick_warp .drop_button{
#pma_quick_warp .drop_button {
padding: 0 .3em;
border: 1px solid #ddd;
border-radius: .3em;
@ -347,15 +347,24 @@ li.fast_filter.db_fast_filter {
display: none;
z-index: 802;
}
#pma_quick_warp .drop_list:hover ul{
#pma_quick_warp .drop_list:hover ul {
display: block;
}
#pma_quick_warp .drop_list li {
padding: 2px .3em;
white-space: nowrap;
}
#pma_quick_warp .drop_list li img {
vertical-align: sub;
}
#pma_quick_warp .drop_list li:hover {
background: #f2f2f2;
}
}
#pma_quick_warp .drop_list a {
display: block;
padding: .2em .3em;
}
#pma_quick_warp .drop_list a.favorite_table_anchor {
clear: left;
float: left;
padding: .1em .3em 0;
}