diff --git a/mindplot/src/main/javascript/widget/IMenu.js b/mindplot/src/main/javascript/widget/IMenu.js index 3a79afb9..07c60863 100644 --- a/mindplot/src/main/javascript/widget/IMenu.js +++ b/mindplot/src/main/javascript/widget/IMenu.js @@ -90,7 +90,7 @@ mindplot.widget.IMenu = new Class({ if (saveHistory) { saveElem.setStyle('cursor', 'pointer'); - if (error.severity == "INFO") { + if (error.severity != "FATAL") { $notify(error.message); } else { $notifyModal(error.message); diff --git a/wise-webapp/src/main/java/com/wisemapping/ncontroller/MindmapController.java b/wise-webapp/src/main/java/com/wisemapping/ncontroller/MindmapController.java index 4c7d4cca..6ede94ae 100644 --- a/wise-webapp/src/main/java/com/wisemapping/ncontroller/MindmapController.java +++ b/wise-webapp/src/main/java/com/wisemapping/ncontroller/MindmapController.java @@ -160,6 +160,7 @@ public class MindmapController { final LockManager lockManager = this.mindmapService.getLockManager(); if (lockManager.isLocked(mindmap) && !lockManager.isLockedBy(mindmap, collaborator)) { readOnlyMode = true; + model.addAttribute("mindmapLocked",true); } else { final long session = lockManager.generateSession(); final LockInfo lock = lockManager.lock(mindmap, collaborator, session); diff --git a/wise-webapp/src/main/resources/messages_en.properties b/wise-webapp/src/main/resources/messages_en.properties index e8bf5ea9..a51224ab 100644 --- a/wise-webapp/src/main/resources/messages_en.properties +++ b/wise-webapp/src/main/resources/messages_en.properties @@ -250,6 +250,7 @@ TEMPORAL_PASSWORD_SENT=Your temporal password has been sent TEMPORAL_PASSWORD_SENT_DETAILS=We've sent you an email that will allow you to reset your password. Please check your email now. TEMPORAL_PASSWORD_SENT_SUPPORT=If you have any problem receiving the email, contact us to support@wisemapping.com MINDMAP_TIMESTAMP_OUTDATED=It's not possible to save your changes because your mindmap has been modified by '%s'. Refresh the page and try again. +MINDMAP_LOCKED="This map is being edited by %s <%s>. Map is opened in read only." diff --git a/wise-webapp/src/main/resources/messages_es.properties b/wise-webapp/src/main/resources/messages_es.properties index 6edc4269..57da7d25 100644 --- a/wise-webapp/src/main/resources/messages_es.properties +++ b/wise-webapp/src/main/resources/messages_es.properties @@ -248,6 +248,7 @@ DIRECT_LINK_EXPLANATION=Copie y pegue el este enlace para compartir su mapa ment TEMPORAL_PASSWORD_SENT_SUPPORT=Si tienes algun problema o no reciviste el mail, contactanos a support@wisemapping.com TEMPORAL_PASSWORD_SENT_DETAILS=Se te ha enviado un mail con los detalles para cambiar to password. Revisa tu correo ahora. TEMPORAL_PASSWORD_SENT=Tu contraseña temporal ha sido enviada +MINDMAP_LOCKED="This map is being edited by %s <%s>. Map is opened in read only." diff --git a/wise-webapp/src/main/resources/messages_fr.properties b/wise-webapp/src/main/resources/messages_fr.properties index da8758d7..af79a722 100644 --- a/wise-webapp/src/main/resources/messages_fr.properties +++ b/wise-webapp/src/main/resources/messages_fr.properties @@ -250,6 +250,7 @@ ACCESS_HAS_BEEN_REVOKED= Upps. your access permissions to this map has been revo LICENSE=License WELCOME_TO_WISEMAPPING=Welcome to WiseMapping WELCOME_DETAILS=WiseMapping will enable you to create and read your mind maps everywhere. With WiseMapping you can: . +MINDMAP_LOCKED="This map is being edited by %s <%s>. Map is opened in read only." diff --git a/wise-webapp/src/main/resources/messages_it.properties b/wise-webapp/src/main/resources/messages_it.properties index 9720aec2..632a17cb 100644 --- a/wise-webapp/src/main/resources/messages_it.properties +++ b/wise-webapp/src/main/resources/messages_it.properties @@ -235,6 +235,7 @@ TUTORIAL.FONT_COLOR=Colore TUTORIAL.FONT_STYLE=Stili TUTORIAL.FONT_TYPE=Font TUTORIAL.SAMPLE_NOTE=Questa è una semplice nota !. +MINDMAP_LOCKED="This map is being edited by %s <%s>. Map is opened in read only." diff --git a/wise-webapp/src/main/resources/messages_pt_BR.properties b/wise-webapp/src/main/resources/messages_pt_BR.properties index b21b4b0c..b5395913 100644 --- a/wise-webapp/src/main/resources/messages_pt_BR.properties +++ b/wise-webapp/src/main/resources/messages_pt_BR.properties @@ -235,4 +235,5 @@ TUTORIAL.SAMPLE_NOTE=Esta é uma nota simples !. SUPPORT=Ajudar FEEDBACK=Feedback CONTACT_US=Contato +MINDMAP_LOCKED="This map is being edited by %s <%s>. Map is opened in read only." diff --git a/wise-webapp/src/main/resources/messages_zh_CN.properties b/wise-webapp/src/main/resources/messages_zh_CN.properties index 6fbe7de4..697acbcf 100644 --- a/wise-webapp/src/main/resources/messages_zh_CN.properties +++ b/wise-webapp/src/main/resources/messages_zh_CN.properties @@ -210,4 +210,5 @@ TERM_OF_USE=条款和条件 CONTACT_US=联系我们 FEEDBACK=反馈 SUPPORT=支援 +MINDMAP_LOCKED="This map is being edited by %s <%s>. Map is opened in read only." diff --git a/wise-webapp/src/main/resources/messages_zh_TW.properties b/wise-webapp/src/main/resources/messages_zh_TW.properties index 86496bc9..96901979 100644 --- a/wise-webapp/src/main/resources/messages_zh_TW.properties +++ b/wise-webapp/src/main/resources/messages_zh_TW.properties @@ -210,4 +210,5 @@ TERM_OF_USE=條款和條件 CONTACT_US=聯繫我們 FEEDBACK=反饋 SUPPORT=幫助 +MINDMAP_LOCKED="This map is being edited by %s <%s>. Map is opened in read only." diff --git a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp index 6220266e..6826ad78 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp @@ -66,7 +66,12 @@ logStackTrace(e); throw e; } + + + $notify("", false); + }); + <%@ include file="/jsp/googleAnalytics.jsf" %> @@ -102,5 +107,12 @@
+<%--
--%> +<%--

--%> +<%--This mindmap is being edited by pepep. Your will be able to see the content but not to modify it.--%> +<%--

--%> +<%--
--%> + +