Add dialog message support.

This commit is contained in:
Paulo Gustavo Veiga 2012-11-07 20:14:07 -03:00
parent 2f8cd121e3
commit 6a9d1c684e
10 changed files with 21 additions and 1 deletions

View File

@ -90,7 +90,7 @@ mindplot.widget.IMenu = new Class({
if (saveHistory) { if (saveHistory) {
saveElem.setStyle('cursor', 'pointer'); saveElem.setStyle('cursor', 'pointer');
if (error.severity == "INFO") { if (error.severity != "FATAL") {
$notify(error.message); $notify(error.message);
} else { } else {
$notifyModal(error.message); $notifyModal(error.message);

View File

@ -160,6 +160,7 @@ public class MindmapController {
final LockManager lockManager = this.mindmapService.getLockManager(); final LockManager lockManager = this.mindmapService.getLockManager();
if (lockManager.isLocked(mindmap) && !lockManager.isLockedBy(mindmap, collaborator)) { if (lockManager.isLocked(mindmap) && !lockManager.isLockedBy(mindmap, collaborator)) {
readOnlyMode = true; readOnlyMode = true;
model.addAttribute("mindmapLocked",true);
} else { } else {
final long session = lockManager.generateSession(); final long session = lockManager.generateSession();
final LockInfo lock = lockManager.lock(mindmap, collaborator, session); final LockInfo lock = lockManager.lock(mindmap, collaborator, session);

View File

@ -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_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 <a href\="mailto\:support@wisemapping.com">support@wisemapping.com </a> TEMPORAL_PASSWORD_SENT_SUPPORT=If you have any problem receiving the email, contact us to <a href\="mailto\:support@wisemapping.com">support@wisemapping.com </a>
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_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."

View File

@ -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 <a href\="mailto\:support@wisemapping.com">support@wisemapping.com</a> TEMPORAL_PASSWORD_SENT_SUPPORT=Si tienes algun problema o no reciviste el mail, contactanos a <a href\="mailto\:support@wisemapping.com">support@wisemapping.com</a>
TEMPORAL_PASSWORD_SENT_DETAILS=Se te ha enviado un mail con los detalles para cambiar to password. Revisa tu correo ahora. 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 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."

View File

@ -250,6 +250,7 @@ ACCESS_HAS_BEEN_REVOKED= Upps. your access permissions to this map has been revo
LICENSE=License LICENSE=License
WELCOME_TO_WISEMAPPING=Welcome to WiseMapping WELCOME_TO_WISEMAPPING=Welcome to WiseMapping
WELCOME_DETAILS=WiseMapping will enable you to create and read your mind maps everywhere. With WiseMapping you can: <ul><li>Embed mind map it in web pages and blogs</li><li>Link mind map and documents</li><li>Share your maps with friend and colleagues</li><li>Export your maps SVG,PNG,JPG and FreeMind</li></ul>. WELCOME_DETAILS=WiseMapping will enable you to create and read your mind maps everywhere. With WiseMapping you can: <ul><li>Embed mind map it in web pages and blogs</li><li>Link mind map and documents</li><li>Share your maps with friend and colleagues</li><li>Export your maps SVG,PNG,JPG and FreeMind</li></ul>.
MINDMAP_LOCKED="This map is being edited by %s <%s>. Map is opened in read only."

View File

@ -235,6 +235,7 @@ TUTORIAL.FONT_COLOR=Colore
TUTORIAL.FONT_STYLE=Stili TUTORIAL.FONT_STYLE=Stili
TUTORIAL.FONT_TYPE=Font TUTORIAL.FONT_TYPE=Font
TUTORIAL.SAMPLE_NOTE=Questa è una semplice nota !. TUTORIAL.SAMPLE_NOTE=Questa è una semplice nota !.
MINDMAP_LOCKED="This map is being edited by %s <%s>. Map is opened in read only."

View File

@ -235,4 +235,5 @@ TUTORIAL.SAMPLE_NOTE=Esta é uma nota simples !.
SUPPORT=Ajudar SUPPORT=Ajudar
FEEDBACK=Feedback FEEDBACK=Feedback
CONTACT_US=Contato CONTACT_US=Contato
MINDMAP_LOCKED="This map is being edited by %s <%s>. Map is opened in read only."

View File

@ -210,4 +210,5 @@ TERM_OF_USE=条款和条件
CONTACT_US=联系我们 CONTACT_US=联系我们
FEEDBACK=反馈 FEEDBACK=反馈
SUPPORT=支援 SUPPORT=支援
MINDMAP_LOCKED="This map is being edited by %s <%s>. Map is opened in read only."

View File

@ -210,4 +210,5 @@ TERM_OF_USE=條款和條件
CONTACT_US=聯繫我們 CONTACT_US=聯繫我們
FEEDBACK=反饋 FEEDBACK=反饋
SUPPORT=幫助 SUPPORT=幫助
MINDMAP_LOCKED="This map is being edited by %s <%s>. Map is opened in read only."

View File

@ -66,7 +66,12 @@
logStackTrace(e); logStackTrace(e);
throw e; throw e;
} }
<c:if test="${mindmapLocked}">
$notify("<spring:message code="MINDMAP_LOCKED" arguments="${lockInfo.collaborator.email}"/>", false);
</c:if>
}); });
</script> </script>
<%@ include file="/jsp/googleAnalytics.jsf" %> <%@ include file="/jsp/googleAnalytics.jsf" %>
</head> </head>
@ -102,5 +107,12 @@
<div id="mindplot" onselectstart="return false;"></div> <div id="mindplot" onselectstart="return false;"></div>
<script type="text/javascript" src="js/editor.js"></script> <script type="text/javascript" src="js/editor.js"></script>
<%--<div style="position: absolute;height: 200px; right: 20px;top:100px;width: 200px;padding: 10px; border-style: dotted; background-color: #dfcf3c">--%>
<%--<p>--%>
<%--This mindmap is being edited by pepep. Your will be able to see the content but not to modify it.--%>
<%--</p>--%>
<%--</div>--%>
</body> </body>
</html> </html>