From 4d3e371d05378dc8600d192bc2cf60bf2de1165d Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Wed, 6 Jun 2012 01:19:55 -0300 Subject: [PATCH] Some import bug fixing stuff. --- .../WEB-INF/classes/messages.properties | 6 ++-- wise-webapp/src/main/webapp/js/mymaps.js | 1 - .../src/main/webapp/jsp/mindmapExport.jsp | 10 +++---- .../src/main/webapp/jsp/mindmapImport.jsp | 30 ++++++++++++++----- .../src/main/webapp/jsp/mindmapList.jsp | 6 ++-- 5 files changed, 34 insertions(+), 19 deletions(-) diff --git a/wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties b/wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties index f3ca1965..59f8b456 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties +++ b/wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties @@ -231,11 +231,11 @@ UNEXPECTED_ERROR_SERVER_ERROR=We're sorry, an error has occurred and we can't pr 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. SHARING=Sharing -IMPORT_MINDMAP_INFO=You can import FreeMind 0.9 maps and WiseMapping maps to your list of maps. Select the file you want to import. +IMPORT_MINDMAP_INFO=You can import FreeMind 0.9 and WiseMapping maps to your list of maps. Select the file you want to import. PRINT=Print MIND_FILE=File IMPORT_MAP_ERROR=FreeMind file could not be imported. {0} -MAP_TITLE_ALREADY_EXISTS=A map already exists with this name. +MAP_TITLE_ALREADY_EXISTS=You have already a map with the same name EMBEDDED_VIEWER=Embed a map viewer in your own web site, blog or post! EMBEDDED_VIEWER_MESSAGE=Once you make your map public, you will be able to embed a mind map viewer in your own web site, blog or post just as we did it here!
Try it!!, you can drag nodes, pan the map, and zoom in and out. FREEMIND_EXPORT_IMPORT=Import and Export maps from/to FreeMind @@ -307,5 +307,5 @@ NO_PRODUCTION_DATABASE_CONFIGURED=Note: Although HSQLDB is bundled with WiseMapp IMPORT=Import EMBEDDED_MAP_SIZE=* Note: You can change embedded map size modifying 'height' and 'width' style properties. You can also adjust the zoom factor modifying 'zoom' parameter from the URL. -EXPORT_FORMAT_RESTRICTIONS=Important: Exporting to Image, PDF or SVG is available only in the editor toolbar only. +EXPORT_FORMAT_RESTRICTIONS=Exporting to Image, PDF or SVG is available only in the editor toolbar. STARRED=Starred \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/js/mymaps.js b/wise-webapp/src/main/webapp/js/mymaps.js index f1b759e4..6ab1a2b8 100644 --- a/wise-webapp/src/main/webapp/js/mymaps.js +++ b/wise-webapp/src/main/webapp/js/mymaps.js @@ -157,7 +157,6 @@ jQuery.fn.dialogForm = function(options) { } else { console.log(errorThrown); console.log(jqXHR); - dialogElem.modal('hide'); $('#messagesPanel div').text(errorThrown).parent().show(); } diff --git a/wise-webapp/src/main/webapp/jsp/mindmapExport.jsp b/wise-webapp/src/main/webapp/jsp/mindmapExport.jsp index 125b77f7..90078b38 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapExport.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapExport.jsp @@ -1,9 +1,13 @@ <%@ include file="/jsp/init.jsp" %> -

+

+

+ Warning +

+
@@ -45,10 +49,6 @@
-

- -