1
0
mirror of https://github.com/til-schneider/slim-wiki.git synced 2025-08-06 08:37:31 +02:00

Showing error message if RPC fails

This commit is contained in:
til-schneider
2015-12-24 13:45:06 +01:00
parent 0dca0f2247
commit 51787c25ac
6 changed files with 29 additions and 1 deletions

View File

@@ -46,6 +46,7 @@
callRpc('editor', 'createUserConfig', [ user, pass ], function(result, error) { callRpc('editor', 'createUserConfig', [ user, pass ], function(result, error) {
if (error) { if (error) {
console.error('Creating user config failed:', error); console.error('Creating user config failed:', error);
showErrorLogged();
} else { } else {
var resultBoxElem = document.getElementById('result-box'); var resultBoxElem = document.getElementById('result-box');
resultBoxElem.style.display = 'block'; resultBoxElem.style.display = 'block';
@@ -72,6 +73,7 @@
if (error) { if (error) {
console.error('Saving article failed:', error); console.error('Saving article failed:', error);
showErrorLogged();
} else { } else {
document.getElementById('content').innerHTML = result; document.getElementById('content').innerHTML = result;
slimwiki.View.updateSyntaxHighlighting(); slimwiki.View.updateSyntaxHighlighting();
@@ -125,4 +127,13 @@
request.send(JSON.stringify(requestJson)); request.send(JSON.stringify(requestJson));
} }
function showErrorLogged() {
var errorElem = document.getElementById('error-alert');
errorElem.style.display = 'block';
window.setTimeout(function() {
errorElem.style.display = 'none';
}, 5000);
}
})(window, document, slimwiki, console, CodeMirror); })(window, document, slimwiki, console, CodeMirror);

View File

@@ -36,7 +36,7 @@
//@import "@{bootstrap-src}/badges.less"; //@import "@{bootstrap-src}/badges.less";
//@import "@{bootstrap-src}/jumbotron.less"; //@import "@{bootstrap-src}/jumbotron.less";
//@import "@{bootstrap-src}/thumbnails.less"; //@import "@{bootstrap-src}/thumbnails.less";
//@import "@{bootstrap-src}/alerts.less"; @import "@{bootstrap-src}/alerts.less";
//@import "@{bootstrap-src}/progress-bars.less"; //@import "@{bootstrap-src}/progress-bars.less";
//@import "@{bootstrap-src}/media.less"; //@import "@{bootstrap-src}/media.less";
//@import "@{bootstrap-src}/list-group.less"; //@import "@{bootstrap-src}/list-group.less";

View File

@@ -20,6 +20,20 @@ body {
} }
} }
#error-alert {
display: none;
position: fixed;
left: 0;
right: 0;
top: 100px;
z-index: 100;
text-align: center;
.alert {
display: inline-block;
}
}
.breadcrumbs { .breadcrumbs {
background-color: white; background-color: white;

View File

@@ -3,6 +3,7 @@
$i18n = array( $i18n = array(
'error.noJavaScript' => 'Bitte aktivieren Sie JavaScript in den Einstellungen Ihres Browser um diese Seite verwenden zu können.', 'error.noJavaScript' => 'Bitte aktivieren Sie JavaScript in den Einstellungen Ihres Browser um diese Seite verwenden zu können.',
'error.browserNotSupported' => 'Ihr Browser wird nicht unterstützt. Bitte verwenden Sie einen aktuellen Browser.', 'error.browserNotSupported' => 'Ihr Browser wird nicht unterstützt. Bitte verwenden Sie einen aktuellen Browser.',
'error.errorLogged' => 'Es ist ein Fehler aufgetreten. Bitte prüfen Sie die Log-Datei.',
'button.cancel' => 'Abbrechen', 'button.cancel' => 'Abbrechen',
'button.back' => 'Zurück', 'button.back' => 'Zurück',
'button.edit' => 'Bearbeiten', 'button.edit' => 'Bearbeiten',

View File

@@ -3,6 +3,7 @@
$i18n = array( $i18n = array(
'error.noJavaScript' => 'Please activate JavaScript in the settings of your browser in order to use this site.', 'error.noJavaScript' => 'Please activate JavaScript in the settings of your browser in order to use this site.',
'error.browserNotSupported' => 'Your browser is not supported. Please use an up-to-date browser.', 'error.browserNotSupported' => 'Your browser is not supported. Please use an up-to-date browser.',
'error.errorLogged' => 'An error has occurred. Please have a look to the log file.',
'button.cancel' => 'Cancel', 'button.cancel' => 'Cancel',
'button.back' => 'Back', 'button.back' => 'Back',
'button.edit' => 'Edit', 'button.edit' => 'Edit',

View File

@@ -72,6 +72,7 @@ if ($mode != 'view') {
} }
})(); })();
</script> </script>
<div id="error-alert"><div class="alert alert-warning"><?php echo $i18n['error.errorLogged']; ?></div></div>
<?php <?php
} }