vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-12-23 03:43:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Some import bug fixing stuff.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga 2012-06-06 01:19:55 -03:00
parent 79b009e29e
commit 4d3e371d05
5 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties
View File

@ -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!<br/>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

1
wise-webapp/src/main/webapp/js/mymaps.js
View File

@ -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();
}

10
wise-webapp/src/main/webapp/jsp/mindmapExport.jsp
View File

@ -1,9 +1,13 @@
<%@ include file="/jsp/init.jsp" %>
<p>
<p class="alert alert-info">
<spring:message code="EXPORT_DETAILS"/>
</p>
<p id="exportInfo">
<span class="label label-important">Warning</span> <spring:message code="EXPORT_FORMAT_RESTRICTIONS"/>
</p>
<div>
<form method="GET" class="form-horizontal" action="service/maps/${mindmap.id}"
enctype="application/x-www-form-urlencoded" id="dialogMainForm">
@ -45,10 +49,6 @@
</fieldset>
</form>
</div>
<p>
<span class="alert alert-info" id="exportInfo"><i class="icon-info-sign"></i> <spring:message
code="EXPORT_FORMAT_RESTRICTIONS"/></span>
</p>
<script type="text/javascript">

30
wise-webapp/src/main/webapp/jsp/mindmapImport.jsp
View File

@ -1,14 +1,11 @@
<%@ include file="/jsp/init.jsp" %>
<div id="messagePanel" class="alert alert-error">
</div>
<div>
<p class="well"><spring:message code="IMPORT_MINDMAP_INFO"/></p>
<p class="alert alert-info"><spring:message code="IMPORT_MINDMAP_INFO"/></p>
<form method="POST" enctype="multipart/form-data" action="#" id="dialogMainForm" class="form-horizontal">
<div class="errorMessage"></div>
<fieldset>
<div class="control-group">
<label for="mapFile" class="control-label"><spring:message code="MIND_FILE"/>: </label>
@ -16,7 +13,8 @@
</div>
<div class="control-group">
<label for="title" class="control-label"><spring:message code="NAME"/>: </label>
<input type="text" id="title" required="required" placeholder="Name of the new map to create"
<input type="text" id="title" name="title" required="required"
placeholder="Name of the new map to create"
class="control"/>
</div>
<div class="control-group">
@ -66,7 +64,25 @@
window.location = "c/maps/" + resourceId + "/edit";
},
error: function(jqXHR, textStatus, errorThrown) {
$('#messagePanel').text(textStatus);
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 = $("#dialogMainForm input[name='" + fieldName + "']");
$("#dialogMainForm").find(".errorMessage").text(message).addClass("alert alert-error");
inputField.parent().addClass('error');
}
}
} else {
console.log(errorThrown);
console.log(jqXHR);
$('#messagesPanel div').text(errorThrown).parent().show();
}
}
});
event.preventDefault();

6
wise-webapp/src/main/webapp/jsp/mindmapList.jsp
View File

@ -126,7 +126,7 @@
<fieldset>
<div class="control-group">
<label class="control-label" for="newTitle"><spring:message code="NAME"/>:</label>
<input class="control" name="title" id="newTitle" type="text" required="true"
<input class="control" name="title" id="newTitle" type="text" required="required"
placeholder="Name of the new map to create" autofocus="autofocus"/>
</div>
<div class="control-group">
@ -146,7 +146,7 @@
<!-- Duplicate map dialog -->
<div id="duplicate-dialog-modal" class="modal fade" style="display: none">
<div class="modal-header">
<button class="close" data-dismiss="modal">X</button>
<button class="close" data-dismiss="modal">x</button>
<h3 id="dupDialogTitle"></h3>
</div>
<div class="modal-body">
@ -265,7 +265,7 @@
</div>
</div>
<!-- Export Dialog Config -->
<!-- Import Dialog Config -->
<div id="import-dialog-modal" class="modal fade" style="display: none">
<div class="modal-header">
<button class="close" data-dismiss="modal">x</button>