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 2015-07-22 08:06:42 +02:00
commit d9f7ccc17b
3 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/ajax.js
View File

@ -446,10 +446,12 @@ var AJAX = {
.insertAfter('#selflink')
.append(data._errors);
// bind for php error reporting forms (bottom)
$("#pma_ignore_errors_bottom").bind("click", function() {
$("#pma_ignore_errors_bottom").bind("click", function(e) {
e.preventDefault();
PMA_ignorePhpErrors();
});
$("#pma_ignore_all_errors_bottom").bind("click", function() {
$("#pma_ignore_all_errors_bottom").bind("click", function(e) {
e.preventDefault();
PMA_ignorePhpErrors(false);
});
// In case of 'sendErrorReport'='always'

7
js/messages.php
View File

@ -572,14 +572,15 @@ $js_messages['strTooManyInputs'] = __(
$js_messages['phpErrorsFound'] = '<div class="error">'
. __('Some errors have been detected on the server!')
. '<div>'
. '<br/>'
. __('Please look at the bottom of this window.')
. '<div>'
. '<input id="pma_ignore_errors_popup" type="submit" value="'
. __('Ignore')
. '" style="float: right; margin: 20px;">'
. '" class="floatright" style="margin-top: 20px;">'
. '<input id="pma_ignore_all_errors_popup" type="submit" value="'
. __('Ignore All')
. '" style="float: right; margin: 20px;">'
. '" class="floatright" style="margin-top: 20px;">'
. '</div></div>';
$js_messages['phpErrorsBeingSubmitted'] = '<div class="error">'

18
libraries/Error_Handler.class.php
View File

@ -331,25 +331,23 @@ class PMA_Error_Handler
. '<input type="hidden" name="send_error_report" value="1" />'
. '<input type="submit" value="'
. __('Report')
. '" id="pma_report_errors" style="float: right; margin: 20px;">'
. '" id="pma_report_errors" class="floatright">'
. '<input type="checkbox" name="always_send"'
. ' id="always_send_checkbox" value="true"/>'
. '<label for="always_send_checkbox">'
. __('Automatically send report next time')
. '</label>'
. '</form>';
. '</label>';
if ($GLOBALS['cfg']['SendErrorReports'] == 'ask') {
// add ignore buttons
$retval .= '<input type="submit" value="'
. __('Ignore')
. '" id="pma_ignore_errors_bottom"'
. ' style="float: right; margin: 20px;">';
. '" id="pma_ignore_errors_bottom" class="floatright">';
}
$retval .= '<input type="submit" value="'
. __('Ignore All')
. '" id="pma_ignore_all_errors_bottom"'
. ' style="float: right; margin: 20px;">';
. '" id="pma_ignore_all_errors_bottom" class="floatright">';
$retval .= '</form>';
}
return $retval;
}
@ -537,11 +535,13 @@ class PMA_Error_Handler
function() {
PMA_ignorePhpErrors(false)
});'
. '$("#pma_ignore_errors_bottom").bind("click", function() {
. '$("#pma_ignore_errors_bottom").bind("click", function(e) {
e.preventDefaulut();
PMA_ignorePhpErrors()
});'
. '$("#pma_ignore_all_errors_bottom").bind("click",
function() {
function(e) {
e.preventDefault();
PMA_ignorePhpErrors(false)
});'
. '$("html, body").animate({