From 51787c25acbb53721e52e324d20abcdd9923cbff Mon Sep 17 00:00:00 2001
From: til-schneider <github@murfman.de>
Date: Thu, 24 Dec 2015 13:45:06 +0100
Subject: [PATCH] Showing error message if RPC fails

---
 src/client/js/app-edit.js             | 11 +++++++++++
 src/client/less/custom-bootstrap.less |  2 +-
 src/client/less/view.less             | 14 ++++++++++++++
 src/server/i18n/de.php                |  1 +
 src/server/i18n/en.php                |  1 +
 src/server/layout/page.php            |  1 +
 6 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/client/js/app-edit.js b/src/client/js/app-edit.js
index 20ca145..89bc1cd 100644
--- a/src/client/js/app-edit.js
+++ b/src/client/js/app-edit.js
@@ -46,6 +46,7 @@
       callRpc('editor', 'createUserConfig', [ user, pass ], function(result, error) {
         if (error) {
           console.error('Creating user config failed:', error);
+          showErrorLogged();
         } else {
           var resultBoxElem = document.getElementById('result-box');
           resultBoxElem.style.display = 'block';
@@ -72,6 +73,7 @@
 
           if (error) {
             console.error('Saving article failed:', error);
+            showErrorLogged();
           } else {
             document.getElementById('content').innerHTML = result;
             slimwiki.View.updateSyntaxHighlighting();
@@ -125,4 +127,13 @@
     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);
diff --git a/src/client/less/custom-bootstrap.less b/src/client/less/custom-bootstrap.less
index 4aad084..42801e7 100644
--- a/src/client/less/custom-bootstrap.less
+++ b/src/client/less/custom-bootstrap.less
@@ -36,7 +36,7 @@
 //@import "@{bootstrap-src}/badges.less";
 //@import "@{bootstrap-src}/jumbotron.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}/media.less";
 //@import "@{bootstrap-src}/list-group.less";
diff --git a/src/client/less/view.less b/src/client/less/view.less
index ffac447..01c8559 100644
--- a/src/client/less/view.less
+++ b/src/client/less/view.less
@@ -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 {
   background-color: white;
 
diff --git a/src/server/i18n/de.php b/src/server/i18n/de.php
index b074503..8fb4493 100644
--- a/src/server/i18n/de.php
+++ b/src/server/i18n/de.php
@@ -3,6 +3,7 @@
 $i18n = array(
     '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.errorLogged' => 'Es ist ein Fehler aufgetreten. Bitte prüfen Sie die Log-Datei.',
     'button.cancel' => 'Abbrechen',
     'button.back' => 'Zurück',
     'button.edit' => 'Bearbeiten',
diff --git a/src/server/i18n/en.php b/src/server/i18n/en.php
index 89d1a67..3a59185 100644
--- a/src/server/i18n/en.php
+++ b/src/server/i18n/en.php
@@ -3,6 +3,7 @@
 $i18n = array(
     '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.errorLogged' => 'An error has occurred. Please have a look to the log file.',
     'button.cancel' => 'Cancel',
     'button.back' => 'Back',
     'button.edit' => 'Edit',
diff --git a/src/server/layout/page.php b/src/server/layout/page.php
index bdd4f28..c816655 100644
--- a/src/server/layout/page.php
+++ b/src/server/layout/page.php
@@ -72,6 +72,7 @@ if ($mode != 'view') {
       }
     })();
   </script>
+  <div id="error-alert"><div class="alert alert-warning"><?php echo $i18n['error.errorLogged']; ?></div></div>
   <?php
 }