Merge remote-tracking branch 'origin/master'

This commit is contained in:
Pootle server 2011-08-16 12:40:16 +02:00
commit e16bd0bb79
4 changed files with 15 additions and 4 deletions

View File

@ -15,6 +15,9 @@
// Add a tablesorter parser to properly handle thousands seperated numbers and SI prefixes
$(function() {
// Show all javascript related parts of the page
$('.jsfeature').show();
jQuery.tablesorter.addParser({
id: "fancyNumber",
is: function(s) {
@ -110,7 +113,7 @@ $(function() {
menuResize();
// Load Server status monitor
if (ui.tab.hash == '#statustabs_charting' && ! monitorLoaded) {
$('div#statustabs_charting').append(
$('div#statustabs_charting').append( //PMA_messages['strLoadingMonitor'] + ' ' +
'<img class="ajaxIcon" id="loadingMonitorIcon" src="' +
pmaThemeImage + 'ajax_clock_small.gif" alt="">'
);
@ -144,9 +147,6 @@ $(function() {
tabStatus[$(this).attr('id')] = 'static';
});
// Display button links
$('div.buttonlinks').show();
// Handles refresh rate changing
$('.buttonlinks select').change(function() {
var chart = tabChart[$(this).parents('div.ui-tabs-panel').attr('id')];

View File

@ -1869,4 +1869,9 @@ $(function() {
$('a[href="#clearMonitorConfig"]').show();
}
});
// Run the monitor once loaded
$(function() {
$('a[href="#pauseCharts"]').trigger('click');
});

View File

@ -1126,6 +1126,9 @@ img.sortableIcon {
.buttonlinks {
float: <?php echo $right; ?>;
white-space: nowrap;
}
.jsfeature {
display: none; /* Made visible with js */
}

View File

@ -1348,6 +1348,9 @@ img.sortableIcon {
.buttonlinks {
float: <?php echo $right; ?>;
white-space: nowrap;
}
.jsfeature {
display: none; /* Made visible with js */
}