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

Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5

Browse Source
This commit is contained in:
Michal Čihař 2012-04-13 19:01:41 +02:00
commit f6cfdcb869
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/messages.php
View File

@ -210,6 +210,8 @@ $js_messages['strAffectedRows'] = __('Affected rows:');
$js_messages['strFailedParsingConfig'] = __('Failed parsing config file. It doesn\'t seem to be valid JSON code.');
$js_messages['strFailedBuildingGrid'] = __('Failed building chart grid with imported config. Resetting to default config...');
$js_messages['strImport'] = __('Import');
$js_messages['strImportDialogTitle'] = __('Import monitor configuration');
$js_messages['strImportDialogMessage'] = __('Please select the file you want to import');
$js_messages['strAnalyzeQuery'] = __('Analyse Query');

4
js/server_status_monitor.js
View File

@ -507,8 +507,8 @@ $(function() {
});
$('a[href="#importMonitorConfig"]').click(function() {
$('div#emptyDialog').attr('title', 'Import monitor configuration');
$('div#emptyDialog').html('Please select the file you want to import:<br/><form action="file_echo.php?' + url_query + '&import=1" method="post" enctype="multipart/form-data">' +
$('div#emptyDialog').attr('title', PMA_messages['strImportDialogTitle']);
$('div#emptyDialog').html(PMA_messages['strImportDialogMessage'] + ':<br/><form action="file_echo.php?' + url_query + '&import=1" method="post" enctype="multipart/form-data">' +
'<input type="file" name="file"> <input type="hidden" name="import" value="1"> </form>');
var dlgBtns = {};