Merge remote-tracking branch 'origin/develop' into feature/WISE-16-remove_user

README.md

@@ -58,7 +58,8 @@ Now open a browser using the URL http://localhost:8000/wise-editor/src/main/weba
 
 ### Individual Controbutors
 
-   * Ezequiel Bergamaschi
+   * Ezequiel Bergamaschi <ezequielbergamaschi@gmail.com>
+   * Claudio Barril <claudiobarril@gmail.com>
 
 ### Past Individual Contributors
 

wise-webapp/src/main/resources/messages_ca.properties

@@ -108,7 +108,6 @@ YOUR_ROLE=El teu rol
 CHANGE_PASSWORD_SUCCESS=Contrasenya canviada amb èxit
 CONFIRM_NEW_PASSWORD=Confirmar Contrasenya
 COPYRIGHT=Impulsat per WiseMapping
-UNEXPECTED_ERROR_SERVER_ERROR=Ho sentim, s'ha produït un error i no és possible processar la seva comanda. Torni-ho a intentar i si el problema continua, contacti amb nosaltres a support@wisemapping.com
 SHARE=Compartir
 SEND_ME_A_NEW_PASSWORD=Enviar nova Contrasenya
 ALL_MAPS=Tots

wise-webapp/src/main/resources/messages_de.properties

@@ -97,7 +97,6 @@ HISTORY=Historie
 SHARE=Veröffentlichen
 UNEXPECTED_ERROR=Outch!!. Ein unerwarteter Fehler ist aufgetreten.
 UNEXPECTED_ERROR_DETAILS=Es tut uns Leid! Es ist ein Fehler aufgetreten der es uns nicht ermöglicht Ihre Anfrage zu bearbeiten. Bitte versuchen Sie es noch einmal oder gehen Sie zur Anfangsseite.
-UNEXPECTED_ERROR_SERVER_ERROR=Es tut uns Leid! Es ist ein Fehler aufgetreten der es uns nicht ermöglicht Ihre Anfrage zu bearbeiten. Aktualisieren Sie diese Seite und versuchen es erneut. Falls der Fehler wieder auftritt, kontaktieren Sie bitte support@wisemapping.com 
 NO_ENOUGH_PERMISSIONS=Outch!!. Diese map ist nicht mehr verfügbar.
 NO_ENOUGH_PERMISSIONS_DETAILS=Sie haben nicht die erforderlichen Rechte, um sich diese map anzusehen. Diese map ist entweder privat oder wurde gelöscht.
 IMPORT_MINDMAP_INFO=Sie können FreeMind 0.9 und WiseMapping maps in Ihre List von maps importieren. Wählen Sie die Datei zum Import.

wise-webapp/src/main/resources/messages_en.properties

@@ -99,7 +99,7 @@ HISTORY=History
 SHARE=Share
 UNEXPECTED_ERROR=Outch!!. An unexpected error has occurred.
 UNEXPECTED_ERROR_DETAILS=We're sorry, an error has occurred and we can't process your request. Please try again, or go to the home page.
-UNEXPECTED_ERROR_SERVER_ERROR=We're sorry, an error has occurred and we can't process your request. Refresh the page and try again. If the problem persist, contactenos a support@wisemapping.com
+UNEXPECTED_ERROR_SERVER_ERROR=We're sorry, an error has occurred and we can't process your request. Refresh the page and try again. If the problem persist, click below on "Raise An Issue" to open a ticket.
 NO_ENOUGH_PERMISSIONS=Outch!!. This  map is not available anymore.
 NO_ENOUGH_PERMISSIONS_DETAILS=You do not have enough right access to see this map. This map has been changed to private or deleted.
 IMPORT_MINDMAP_INFO=You can import FreeMind 0.9 and WiseMapping maps to your list of maps. Select the file you want to import.

wise-webapp/src/main/resources/messages_es.properties

@@ -108,7 +108,7 @@ YOUR_ROLE=Tu Role
 CHANGE_PASSWORD_SUCCESS=Contraseña cambiada exitosamente
 CONFIRM_NEW_PASSWORD=Confirmar Contraseña
 COPYRIGHT=Impulsado por WiseMapping
-UNEXPECTED_ERROR_SERVER_ERROR=Lo sentimos, un error ha ocurrido y no es posible procesar su pedido. Recargue la página y intentelo nuevamente. Si el problema persiste, contactenos a support@wisemapping.com
+UNEXPECTED_ERROR_SERVER_ERROR=Lo sentimos, un error ha ocurrido y no es posible procesar su pedido. Recargue la página y intentelo nuevamente. Si el problema persiste, hace un click en "Reportar un Problema" para abrir un ticket.
 SHARE=Compartir
 SEND_ME_A_NEW_PASSWORD=Enviar Nueva Contraseña
 ALL_MAPS=Todos

wise-webapp/src/main/resources/messages_fr.properties

@@ -102,7 +102,6 @@ HISTORY=Historique
 SHARE=Partager
 UNEXPECTED_ERROR=Aïe!!. Une erreur inattendue est survenue.
 UNEXPECTED_ERROR_DETAILS=Désolé, une erreur s'est produite et nous ne pouvons pas exécuter votre demande. Essayez à nouveau, ou retournez à la page d'accueil. 
-UNEXPECTED_ERROR_SERVER_ERROR=Désolé, une erreur s'est produite et nous ne pouvons pas exécuter votre demande. Rafraîchissez la page et essayez à nouveau. Si le problème persiste, contactez-nous à support@wisemapping.com
 NO_ENOUGH_PERMISSIONS=Aïe!!. Cette carte n'est plus accessible.
 NO_ENOUGH_PERMISSIONS_DETAILS=Vous n'avez pas les droits d'accès suffisants pour voir cette carte. Cette carte est devenue privée, ou a été détruite. 
 IMPORT_MINDMAP_INFO=Vous pouvez importer des cartes FreeMind 0.9 et WiseMapping dans votre liste de cartes. Choisissez le fichier à importer. 

wise-webapp/src/main/resources/messages_it.properties

@@ -97,7 +97,6 @@ HISTORY=Cronologia
 SHARE=Condividi
 UNEXPECTED_ERROR=Oops!! Si è verificato un errore inaspettato.
 UNEXPECTED_ERROR_DETAILS=Siamo spiacenti, si è verificato un errore e non possiamo procedere nella tua richiesta. Prego, provare più tardi o torna alla home page.
-UNEXPECTED_ERROR_SERVER_ERROR=Siamo spiacenti, si è verificato un errore e non possiamo procedere alla sua richiesta. Aggiornare la pagina e provare di nuovo. Se il problema persiste, contattare support@wisemapping.com
 NO_ENOUGH_PERMISSIONS=Oops!!. Questa mappa non è più disponibile.
 NO_ENOUGH_PERMISSIONS_DETAILS=Non hai sufficienti diritti per visualizzare questa mappa. Il suo stato è cambiato in Privato oppure è stata eliminata.
 IMPORT_MINDMAP_INFO=Puoi importare mappe da FreeMind 0.9 e da WiseMapping sulla tua lista di mappe. Seleziona il file da importare.

wise-webapp/src/main/resources/messages_pt_BR.properties

@@ -95,7 +95,6 @@ HISTORY=História
 SHARE=Compartilhar
 UNEXPECTED_ERROR=Opa!!. Ocorreu um erro inesperado.
 UNEXPECTED_ERROR_DETAILS=Lamentamos, ocorreu um erro e não podemos processar a sua solicitação. Por favor, tente novamente ou vá para a página Inicial.
-UNEXPECTED_ERROR_SERVER_ERROR=Lamentamos, ocorreu um erro e não podemos processar a sua solicitação. Atualize a página e tente novamente. Se o problema persistir, contacte-nos em support@wisemapping.com
 NO_ENOUGH_PERMISSIONS=Opa!!. Este mapa não está mais disponível.
 NO_ENOUGH_PERMISSIONS_DETAILS=Você não tem privilégios suficientes para ver este mapa. Este mapa foi alterado para privado ou deletado.
 IMPORT_MINDMAP_INFO=Você pode importar mapas do FreeMind 0.9 e do WiseMapping para sua lista de mapas. Selecione o arquivo que você quer importar.

wise-webapp/src/main/resources/messages_zh_CN.properties

@@ -97,7 +97,6 @@ HISTORY=历史
 SHARE=共享
 UNEXPECTED_ERROR=晕！！不可预知的错误。
 UNEXPECTED_ERROR_DETAILS=抱歉，突遭错误，我们无法处理你的请求。 请重试或者访问首页。
-UNEXPECTED_ERROR_SERVER_ERROR=抱歉，突遭错误，我们无法处理你的请求。 刷新并重试。如果问题依然存在请联系support@wisemapping.com
 NO_ENOUGH_PERMISSIONS=晕！！此图不可访问。
 NO_ENOUGH_PERMISSIONS_DETAILS=你没有权限访问这张图。此图已修改访问权限或者已删除。
 IMPORT_MINDMAP_INFO=你可以导入 FreeMind 0.9 和 WiseMapping 格式的思维导图。选择你想要导入的文件。

wise-webapp/src/main/resources/messages_zh_TW.properties

@@ -97,7 +97,6 @@ HISTORY=歷史
 SHARE=共用
 UNEXPECTED_ERROR=暈！！不可預知的錯誤。
 UNEXPECTED_ERROR_DETAILS=抱歉，突遭錯誤，我們無法處理你的請求。 請重試或者訪問首頁。
-UNEXPECTED_ERROR_SERVER_ERROR=抱歉，突遭錯誤，我們無法處理你的請求。 刷新並重試。如果問題依然存在請聯繫support@wisemapping.com
 NO_ENOUGH_PERMISSIONS=暈！！此圖不可訪問。
 NO_ENOUGH_PERMISSIONS_DETAILS=你沒有許可權訪問這張圖。此圖已修改訪問許可權或者已刪除。
 IMPORT_MINDMAP_INFO=你可以導入 FreeMind 0.9 和 WiseMapping 格式的思維導圖。選擇你想要導入的檔。

wise-webapp/src/main/webapp/js/mindmapList.js

@@ -1,3 +1,8 @@
+// Hack for bootstrap issue with IE10. https://github.com/twbs/bootstrap/issues/3672
+if ($.browser.msie && $.browser.version > 9) {
+    $('.modal').removeClass('fade');
+}
+
 $.fn.dataTableExt.oApi.fnReloadAjax = function (oSettings, sNewSource, fnCallback, bStandingRedraw) {
     if (typeof sNewSource != 'undefined' && sNewSource != null) {
         oSettings.sAjaxSource = sNewSource;
@@ -98,55 +103,69 @@ jQuery.fn.dialogForm = function (options) {
         $('#' + containerId + ' input').each(function (index, elem) {
             formData[elem.name] = elem.value;
         });
+
+        // Success actions ...
+        var onSuccess = function (jqXHR, textStatus, data) {
+            if (options.redirect) {
+                var resourceId = jqXHR.getResponseHeader("ResourceId");
+                var redirectUrl = options.redirect;
+                redirectUrl = redirectUrl.replace("{header.resourceId}", resourceId);
+
+                // Hack: IE ignore the base href tag ...
+                var baseUrl = window.location.href.substring(0, window.location.href.lastIndexOf("c/maps/"));
+                window.open(baseUrl + redirectUrl, '_self');
+
+            } else if (options.postUpdate) {
+                options.postUpdate(formData);
+            }
+            dialogElem.modal('hide');
+        };
+
+        // On error message
+        var onFailure = function (jqXHR, textStatus, data) {
+            var errors = JSON.parse(jqXHR.responseText);
+            // Mark fields with errors ...
+            var fieldErrors = errors.fieldErrors;
+            if (fieldErrors) {
+                for (var fieldName in fieldErrors) {
+                    // Mark the field with errors ...
+                    var message = fieldErrors[fieldName];
+                    var inputField = $("#" + containerId + " input[name='" + fieldName + "']");
+
+                    $("#" + containerId).find(".errorMessage").text(message).addClass("alert alert-error");
+                    inputField.parent().addClass('error');
+                }
+            }
+            var acceptBtn = $('#' + containerId + ' .btn-accept');
+            acceptBtn.button('reset');
+        };
+
+        var onError = function (jqXHR, textStatus, errorThrown) {
+            console.log(errorThrown);
+            console.log(jqXHR);
+            dialogElem.modal('hide');
+            $('#messagesPanel div div').text(errorThrown);
+            $('#messagesPanel').show()
+            var acceptBtn = $('#' + containerId + ' .btn-accept');
+            acceptBtn.button('reset');
+        };
+
         $(acceptBtn).button('loading');
         var dialogElem = this;
         jQuery.ajax(url, {
-            async:false,
+            async: false,
-            dataType:'json',
+            dataType: 'json',
-            data:JSON.stringify(formData),
+            data: JSON.stringify(formData),
-            type:options.type ? options.type : 'POST',
+            type: options.type ? options.type : 'POST',
-            contentType:"application/json; charset=utf-8",
+            contentType: "application/json; charset=utf-8",
-            success:function (data, textStatus, jqXHR) {
+            statusCode: {
-                if (options.redirect) {
+                200: onSuccess,
-                    var resourceId = jqXHR.getResponseHeader("ResourceId");
+                201: onSuccess,
-                    var redirectUrl = options.redirect;
+                204: onSuccess,
-                    redirectUrl = redirectUrl.replace("{header.resourceId}", resourceId);
+                400: onFailure,
-
+                444: onError,
-                    // Hack: IE ignore the base href tag ...
+                500: onError,
-                    var baseUrl = window.location.href.substring(0, window.location.href.lastIndexOf("c/maps/"));
+                501: onError
-                    window.open(baseUrl + redirectUrl, '_self');
-
-                } else if (options.postUpdate) {
-                    options.postUpdate(formData);
-                }
-                dialogElem.modal('hide');
-            },
-            error:function (jqXHR, textStatus, errorThrown) {
-                if (jqXHR.status == 400) {
-                    var errors = JSON.parse(jqXHR.responseText);
-                    // Mark fields with errors ...
-                    var fieldErrors = errors.fieldErrors;
-                    if (fieldErrors) {
-                        for (var fieldName in fieldErrors) {
-                            // Mark the field with errors ...
-                            var message = fieldErrors[fieldName];
-                            var inputField = $("#" + containerId + " input[name='" + fieldName + "']");
-
-                            $("#" + containerId).find(".errorMessage").text(message).addClass("alert alert-error");
-                            inputField.parent().addClass('error');
-                        }
-                    }
-
-                } else {
-                    console.log(errorThrown);
-                    console.log(jqXHR);
-                    dialogElem.modal('hide');
-                    $('#messagesPanel div div').text(errorThrown);
-                    $('#messagesPanel').show()
-                }
-                var acceptBtn = $('#' + containerId + ' .btn-accept');
-                acceptBtn.button('reset');
-
             }
         });
     }.bind(this));
@@ -213,12 +232,12 @@ function updateStarred(spanElem) {
     }
 
     jQuery.ajax("c/restful/maps/" + mapId + "/starred", {
-        async:false,
+        async: false,
-        dataType:'json',
+        dataType: 'json',
-        data:"" + starred,
+        data: "" + starred,
-        type:'PUT',
+        type: 'PUT',
-        contentType:"text/plain",
+        contentType: "text/plain",
-        success:function () {
+        success: function () {
             if (starred) {
                 $(spanElem).removeClass('starredOff');
                 $(spanElem).addClass('starredOn');
@@ -227,7 +246,7 @@ function updateStarred(spanElem) {
                 $(spanElem).addClass('starredOff');
             }
         },
-        error:function (jqXHR, textStatus, errorThrown) {
+        error: function (jqXHR, textStatus, errorThrown) {
             $('#messagesPanel div').text(errorThrown).parent().show();
         }
     });
@@ -249,8 +268,8 @@ $(function () {
     $("#newBtn").click(
         function () {
             $("#new-dialog-modal").dialogForm({
-                redirect:"c/maps/{header.resourceId}/edit",
+                redirect: "c/maps/{header.resourceId}/edit",
-                url:"c/restful/maps"
+                url: "c/restful/maps"
             });
         });
 
@@ -269,8 +288,8 @@ $(function () {
 
             // Initialize dialog ...
             $("#duplicate-dialog-modal").dialogForm({
-                redirect:"c/maps/{header.resourceId}/edit",
+                redirect: "c/maps/{header.resourceId}/edit",
-                url:"c/restful/maps/" + mapId
+                url: "c/restful/maps/" + mapId
             });
         }
     });
@@ -295,16 +314,16 @@ $(function () {
 
             // Initialize dialog ...
             $("#rename-dialog-modal").dialogForm({
-                type:'PUT',
+                type: 'PUT',
-                clearForm:false,
+                clearForm: false,
-                postUpdate:function (reqBodyData) {
+                postUpdate: function (reqBodyData) {
                     tableElem.dataTableExt.removeSelectedRows();
 
                     rowData.title = reqBodyData.title;
                     rowData.description = reqBodyData.description;
                     dataTable.fnAddData(JSON.parse(JSON.stringify(rowData)));
                 },
-                url:"c/restful/maps/" + mapId
+                url: "c/restful/maps/" + mapId
             });
         }
     });
@@ -317,12 +336,12 @@ $(function () {
         if (mapIds.length > 0) {
             // Initialize dialog ...
             $("#delete-dialog-modal").dialogForm({
-                type:'DELETE',
+                type: 'DELETE',
-                postUpdate:function () {
+                postUpdate: function () {
                     // Remove old entry ...
                     tableUI.dataTableExt.removeSelectedRows();
                 },
-                url:"c/restful/maps/batch?ids=" + jQuery.makeArray(mapIds).join(',')
+                url: "c/restful/maps/batch?ids=" + jQuery.makeArray(mapIds).join(',')
             });
         }
     });

wise-webapp/src/main/webapp/jsp/dialogFullTemplate.jsp

@@ -20,7 +20,7 @@
     <!--[if lt IE 9]>
     <meta http-equiv="X-UA-Compatible" content="chrome=1">
     <![endif]-->
-    <script type="text/javascript" language="javascript" src="js/jquery-1.7.2.min.js"></script>
+    <script type="text/javascript" language="javascript" src="js/jquery-2.1.0.min.js"></script>
     <script type="text/javascript" language="javascript" src="bootstrap/js/bootstrap.js"></script>
     <link rel="stylesheet" type="text/css" href="bootstrap/css/bootstrap.min.css"/>
     <link rel="stylesheet" type="text/css" href="bootstrap/css/bootstrap-responsive.min.css"/>

wise-webapp/src/main/webapp/jsp/login.jsp

@@ -3,7 +3,7 @@
 
 <%--@elvariable id="isHsql" type="boolean"--%>
 
-<script type="text/javascript" src="js/jquery-1.7.2.min.js"></script>
+<script type="text/javascript" src="js/jquery-2.1.0.min.js"></script>
 <script type="text/javascript" language="javascript">
     $(function () {
         $('#loginForm').submit(function () {

wise-webapp/src/main/webapp/jsp/loginOpenId.jsp

@@ -4,7 +4,7 @@
 <%--@elvariable id="isHsql" type="boolean"--%>
 <!-- Simple OpenID Selector -->
 <link type="text/css" rel="stylesheet" href="css/openid.css"/>
-<script type="text/javascript" language="javascript" src="js/jquery-1.7.2.min.js"></script>
+<script type="text/javascript" language="javascript" src="js/jquery-2.1.0.min.js"></script>
 <script type="text/javascript" language="javascript" src="js/openid-jquery.js"></script>
 <script type="text/javascript" language="javascript" src="js/openid-en.js"></script>
 <!-- /Simple OpenID Selector -->
@@ -14,7 +14,7 @@
     });
 </script>
 
-<script type="text/javascript" src="js/jquery-1.7.2.min.js"></script>
+<script type="text/javascript" src="js/jquery-2.1.0.min.js"></script>
 <script type="text/javascript" language="javascript">
     $(function () {
         $('#loginForm').submit(function () {

wise-webapp/src/main/webapp/jsp/mindmapList.jsp

@@ -16,7 +16,7 @@
 
     <link rel="stylesheet/less" type="text/css" href="css/mindmapList.less"/>
 
-    <script type="text/javascript" language="javascript" src="js/jquery-1.7.2.min.js"></script>
+    <script type="text/javascript" language="javascript" src="js/jquery-2.1.0.min.js"></script>
     <script type="text/javascript" language="javascript" src="bootstrap/js/bootstrap.js"></script>
     <script src="js/less.js" type="text/javascript"></script>