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

translate "More" tab

Browse Source 
cleanup code
This commit is contained in:
Crack
2010-07-26 21:30:57 +02:00
parent b2674e9d59
commit edaf7ce86c
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
js/functions.js
View File

@@ -1742,7 +1742,7 @@ function menuResize()
var submenu = cnt.find('.submenu'); var submenu = cnt.find('.submenu');
var submenu_w = submenu.outerWidth(true); var submenu_w = submenu.outerWidth(true);
var submenu_ul = submenu.find('ul'); var submenu_ul = submenu.find('ul');
var li = $('#topmenu > li'); var li = cnt.find('> li');
var li2 = submenu_ul.find('li'); var li2 = submenu_ul.find('li');
var more_shown = li2.length > 0; var more_shown = li2.length > 0;
var w = more_shown ? submenu_w : 0; var w = more_shown ? submenu_w : 0;
@@ -1777,7 +1777,8 @@ function menuResize()
for (var i = 0; i < li2.length; i++) { for (var i = 0; i < li2.length; i++) {
//console.log(li2[i], submenu_w); //console.log(li2[i], submenu_w);
w += $(li2[i]).data('width'); w += $(li2[i]).data('width');
if (w+submenu_w < wmax ) {//|| (i == li2.length-1 && w < wmax) // item fits or (it is the last item and it would fit if More got removed)
if (w+submenu_w < wmax || (i == li2.length-1 && w < wmax)) {
$(li2[i]).insertBefore(submenu); $(li2[i]).insertBefore(submenu);
if (i == li2.length-1) { if (i == li2.length-1) {
submenu.hide(); submenu.hide();
@@ -1800,21 +1801,18 @@ $(function() {
return; return;
} }
// create submenu container // create submenu container
var link = $('<a />') var link = $('<a />', {href: '#', 'class': 'tab'})
.attr({href: '#', 'class': 'tab'}) .text(PMA_messages['strMore'])
.text('More')
.click(function(e) { .click(function(e) {
e.preventDefault(); e.preventDefault();
}); });
var img = topmenu.find('li:first-child').find('img'); var img = topmenu.find('li:first-child img');
if (img.length) { if (img.length) {
img = img.clone(); img.clone().attr('src', img.attr('src').replace(/\/[^\/]+$/, '/b_more.png')).prependTo(link);
img.attr('src', img.attr('src').replace(/\/[^\/]+$/, '/b_more.png')).prependTo(link);
} }
var submenu = $('<li />') var submenu = $('<li />', {'class': 'submenu'})
.attr('class', 'submenu')
.append(link) .append(link)
.append($('<ul />').append($('#topmenu li.subitem'))) .append($('<ul />'))
.mouseenter(function() { .mouseenter(function() {
if ($(this).find('ul .tabactive').length == 0) { if ($(this).find('ul .tabactive').length == 0) {
$(this).addClass('submenuhover').find('> a').addClass('tabactive'); $(this).addClass('submenuhover').find('> a').addClass('tabactive');

3
js/messages.php
View File

@@ -66,6 +66,9 @@ $js_messages['strChangeDisplay'] = __('Choose column to display');
$js_messages['strGeneratePassword'] = __('Generate password'); $js_messages['strGeneratePassword'] = __('Generate password');
$js_messages['strGenerate'] = __('Generate'); $js_messages['strGenerate'] = __('Generate');
/* navigation tabs */
$js_messages['strMore'] = __('More');
echo "var PMA_messages = new Array();\n"; echo "var PMA_messages = new Array();\n";
foreach ($js_messages as $name => $js_message) { foreach ($js_messages as $name => $js_message) {
PMA_printJsValue("PMA_messages['" . $name . "']", $js_message); PMA_printJsValue("PMA_messages['" . $name . "']", $js_message);