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

Finish export dialog.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga 2012-06-06 01:42:24 -03:00
parent 4d3e371d05
commit 907f31c030
7 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wise-editor/src/main/webapp/css/editor.less
View File

@ -186,7 +186,7 @@ div.modalDialog .title
}
.exportModalDialog .content{
height:370px;
height:400px;
}

13
wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java
View File

@ -293,12 +293,17 @@ public class MindmapController extends BaseController {
@RequestMapping(method = RequestMethod.POST, value = "/maps", consumes = {"application/freemind"})
@ResponseStatus(value = HttpStatus.CREATED)
public void createMapFromFreemind(@RequestBody byte[] freemindXml, @RequestParam(required = true) String title, @RequestParam(required = false) String description, @NotNull HttpServletResponse response) throws IOException, WiseMappingException, ImporterException {
public void createMapFromFreemind(@RequestBody byte[] freemindXml, @RequestParam(required = true) String title, @RequestParam(required = false) String description, @NotNull HttpServletResponse response) throws IOException, WiseMappingException {
// Convert map ...
final Importer importer = ImporterFactory.getInstance().getImporter(ImportFormat.FREEMIND);
final ByteArrayInputStream stream = new ByteArrayInputStream(freemindXml);
final MindMap mindMap = importer.importMap(title, "", stream);
final MindMap mindMap;
try {
final Importer importer = ImporterFactory.getInstance().getImporter(ImportFormat.FREEMIND);
final ByteArrayInputStream stream = new ByteArrayInputStream(freemindXml);
mindMap = importer.importMap(title, "", stream);
} catch (ImporterException e) {
throw buildValidationException("xml", "The selected file does not seems to be a valid Freemind or WiseMapping file. Contact support in case the problem persists.");
}
// Save new map ...
final User user = Utils.getUser();

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

@ -303,7 +303,7 @@ INSTALL_CFG_CLICK_HERE=To install Google Chrome Frame Plugin click here
INVALID_EMAIL_ERROR = The e-mail was not verified
BROWSER_NOT_SUPPOERTED= Current Browser is not supported.
CHECK_BROWSERS= You can check supported browser at
NO_PRODUCTION_DATABASE_CONFIGURED=Note: Although HSQLDB is bundled with WiseMapping by default during the installation, we do not recommend this database for production use. Please consider using MySQL 5.5 instead. You can find more information how to configure MySQL
NO_PRODUCTION_DATABASE_CONFIGURED=Although HSQLDB is bundled with WiseMapping by default during the installation, we do not recommend this database for production use. Please consider using MySQL 5.5 instead. You can find more information how to configure MySQL
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.

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

@ -252,10 +252,10 @@ function updateStarred(spanElem) {
function callbackOnTableInit() {
// Register starred events ...
console.log($('#mindmapListTable .starredOff, #mindmapListTable .starredOn'));
$('#mindmapListTable .starredOff, #mindmapListTable .starredOn').click(function() {
updateStarred(this);
});
updateStatusToolbar();
}
$(function() {

5
wise-webapp/src/main/webapp/jsp/login.jsp
View File

@ -68,9 +68,8 @@
</div>
<c:if test="${isHsql== 'true'}">
<div style="padding:10px;background-color: #E0EFFF; border-radius: 5px 5px 5px 5px;border-style:solid;border-color:gray">
<img src="../images/info.png" style="margin:0 4px" alt="info">
<spring:message code="NO_PRODUCTION_DATABASE_CONFIGURED"/>&nbsp;<a
<div class="alert alert-info">
<span class="label label-important">Warning</span> <spring:message code="NO_PRODUCTION_DATABASE_CONFIGURED"/>&nbsp;<a
href="http://www.wisemapping.org/documentation/configu">here</a>.
</div>
</c:if>

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

@ -3,11 +3,6 @@
<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">
@ -51,6 +46,12 @@
</div>
<p id="exportInfo">
<span class="label label-important">Warning</span> <spring:message code="EXPORT_FORMAT_RESTRICTIONS"/>
</p>
<script type="text/javascript">
// No way to obtain map svg. Hide panels..

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

@ -9,7 +9,7 @@
<fieldset>
<div class="control-group">
<label for="mapFile" class="control-label"><spring:message code="MIND_FILE"/>: </label>
<input type="file" name="mapFile" id="mapFile" required="required" class="control"/>
<input type="file" name="file" id="mapFile" required="required" class="control"/>
</div>
<div class="control-group">
<label for="title" class="control-label"><spring:message code="NAME"/>: </label>
@ -30,11 +30,6 @@
<script type="text/javascript">
// @Todo: Pending: report errors, manage corrupted mapsmanage case,escape url parameters, import with same title tries to save in post XML, explanation.
$('#messagePanel').hide();
// Save status on click ...
var contentType = null;
var fileContent = null;