From f52a75ac79583b3efc857c6d3a95d3dd81514cae Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Sun, 3 Jun 2012 11:16:38 -0300 Subject: [PATCH] - Remove .htm - Keep working on export. --- mindplot/src/main/javascript/widget/Menu.js | 7 +- wise-editor/src/main/webapp/css/editor.less | 4 + wise-webapp/pom.xml | 4 +- .../controller/HistoryController.java | 4 +- .../controller/ImportController.java | 2 +- .../controller/LoginController.java | 4 +- .../wisemapping/controller/MindmapCooker.java | 2 +- .../controller/MindmapEditorController.java | 2 +- .../wisemapping/exporter/ExportFormat.java | 4 +- .../com/wisemapping/filter/UserAgent.java | 2 +- .../ncontroller/ExtensionsController.java | 1 - .../ncontroller/MindmapController.java | 24 ++- .../ncontroller/PublicPagesController.java | 1 - .../wisemapping/rest/MindmapController.java | 78 ++++---- .../rest/TransformerController.java | 15 +- .../wisemapping/rest/model/RestMindmap.java | 11 +- .../wisemapping/rest/view/TransformView.java | 10 + .../service/MindmapServiceImpl.java | 2 +- .../wisemapping/service/UserServiceImpl.java | 2 +- .../webapp/WEB-INF/classes/log4j.properties | 3 +- .../WEB-INF/classes/messages.properties | 10 +- .../WEB-INF/classes/messages_es.properties | 3 +- .../WEB-INF/classes/messages_fr.properties | 1 + .../main/webapp/WEB-INF/defs/definitions.xml | 18 +- wise-webapp/src/main/webapp/WEB-INF/web.xml | 4 +- .../webapp/WEB-INF/wisemapping-nservlet.xml | 20 +- .../main/webapp/WEB-INF/wisemapping-rest.xml | 5 +- .../webapp/WEB-INF/wisemapping-security.xml | 35 ++-- .../webapp/WEB-INF/wisemapping-servlet.xml | 32 +-- wise-webapp/src/main/webapp/favicon.ico | 0 wise-webapp/src/main/webapp/index.html | 2 +- wise-webapp/src/main/webapp/index.jsp | 2 +- wise-webapp/src/main/webapp/js/mymaps.js | 33 ++- .../src/main/webapp/jsp/editorHeader.jsp | 8 +- .../src/main/webapp/jsp/embeddedView.jsp | 2 +- .../src/main/webapp/jsp/embeddedViewError.jsp | 2 +- .../src/main/webapp/jsp/forgotPassword.jsp | 4 +- .../src/main/webapp/jsp/gcfPluginNeeded.jsp | 2 +- wise-webapp/src/main/webapp/jsp/header.jsp | 12 +- wise-webapp/src/main/webapp/jsp/homepage.jsp | 2 +- .../src/main/webapp/jsp/installCFG.jsp | 2 +- wise-webapp/src/main/webapp/jsp/login.jsp | 4 +- .../main/webapp/jsp/mindmapCollaborator.jsp | 6 +- .../src/main/webapp/jsp/mindmapCooker.jsp | 2 +- .../src/main/webapp/jsp/mindmapDetail.jsp | 4 +- .../src/main/webapp/jsp/mindmapEditor.jsp | 12 +- .../src/main/webapp/jsp/mindmapExport.jsp | 189 ++++++++---------- .../src/main/webapp/jsp/mindmapHistory.jsp | 2 +- .../src/main/webapp/jsp/mindmapImport.jsp | 2 +- .../src/main/webapp/jsp/mindmapList.jsp | 35 +++- .../src/main/webapp/jsp/mindmapPrint.jsp | 2 +- .../src/main/webapp/jsp/mindmapPublicView.jsp | 2 +- .../src/main/webapp/jsp/mindmapPublish.jsp | 4 +- .../src/main/webapp/jsp/mindmapRename.jsp | 36 ---- .../src/main/webapp/jsp/mindmapShare.jsp | 39 ++++ .../src/main/webapp/jsp/mindmapTags.jsp | 36 ---- .../src/main/webapp/jsp/mindmapViewer.jsp | 6 +- wise-webapp/src/main/webapp/jsp/setting.jsp | 4 +- .../src/main/webapp/jsp/userRegistration.jsp | 4 +- .../jsp/userRegistrationConfirmation.jsp | 2 +- .../src/test/sql/hsql/drop-schemas.sql | 1 + .../src/test/sql/mysql/drop-schemas.sql | 1 + 62 files changed, 398 insertions(+), 376 deletions(-) create mode 100644 wise-webapp/src/main/webapp/favicon.ico delete mode 100755 wise-webapp/src/main/webapp/jsp/mindmapRename.jsp create mode 100644 wise-webapp/src/main/webapp/jsp/mindmapShare.jsp delete mode 100755 wise-webapp/src/main/webapp/jsp/mindmapTags.jsp diff --git a/mindplot/src/main/javascript/widget/Menu.js b/mindplot/src/main/javascript/widget/Menu.js index 12f95c30..d94d08c3 100644 --- a/mindplot/src/main/javascript/widget/Menu.js +++ b/mindplot/src/main/javascript/widget/Menu.js @@ -192,7 +192,7 @@ mindplot.widget.Menu = new Class({ this._addButton('export', false, false, function() { - var reqDialog = new MooDialog.Request('c/map/' + mapId + '/export.htm', null, + var reqDialog = new MooDialog.Request('c/iframeWrapper.htm?url=c/maps/' + mapId + "/exportf", null, {'class': 'modalDialog exportModalDialog', closeButton:true, destroyOnClose:true, @@ -207,9 +207,8 @@ mindplot.widget.Menu = new Class({ }); this._registerTooltip('export', "Export"); - this._addButton('print', false, false, function() { - window.open('c/map/' + mapId + '/print.htm'); + window.open('c/map/' + mapId + '/print'); }); this._registerTooltip('print', "Print"); @@ -354,7 +353,7 @@ mindplot.widget.Menu = new Class({ var publishElem = $('publishIt'); if (publishElem) { this._addButton('publishIt', false, false, function() { - var reqDialog = new MooDialog.Request('c/iframeWrapper.htm?url=c/maps/' + mapId + "/publishf.htm", null, + var reqDialog = new MooDialog.Request('c/iframeWrapper.htm?url=c/maps/' + mapId + "/publishf", null, {'class': 'modalDialog publishModalDialog', closeButton:true, destroyOnClose:true, diff --git a/wise-editor/src/main/webapp/css/editor.less b/wise-editor/src/main/webapp/css/editor.less index 29a801e3..06ae9d8d 100644 --- a/wise-editor/src/main/webapp/css/editor.less +++ b/wise-editor/src/main/webapp/css/editor.less @@ -185,5 +185,9 @@ div.modalDialog .title height:420px; } +.exportModalDialog .content{ + height:370px; +} + diff --git a/wise-webapp/pom.xml b/wise-webapp/pom.xml index 68eecd27..c0811c8f 100644 --- a/wise-webapp/pom.xml +++ b/wise-webapp/pom.xml @@ -126,7 +126,7 @@ org.springframework spring-oxm ${org.springframework.version} - runtime + compile org.springframework @@ -426,7 +426,7 @@ css **/*.css - **/*.html + **/*l diff --git a/wise-webapp/src/main/java/com/wisemapping/controller/HistoryController.java b/wise-webapp/src/main/java/com/wisemapping/controller/HistoryController.java index fa3e0e88..57aff50f 100755 --- a/wise-webapp/src/main/java/com/wisemapping/controller/HistoryController.java +++ b/wise-webapp/src/main/java/com/wisemapping/controller/HistoryController.java @@ -60,11 +60,11 @@ public class HistoryController String goToMindmapList = request.getParameter("goToMindmapList"); if (goToMindmapList != null) { - redirectionTo.append("mymaps.htm"); + redirectionTo.append("maps/"); } else { - redirectionTo.append("editor.htm?mapId="); + redirectionTo.append("editor?mapId="); redirectionTo.append(map.getId()); redirectionTo.append("&action=open"); } diff --git a/wise-webapp/src/main/java/com/wisemapping/controller/ImportController.java b/wise-webapp/src/main/java/com/wisemapping/controller/ImportController.java index d1d70c91..d97ff5ff 100644 --- a/wise-webapp/src/main/java/com/wisemapping/controller/ImportController.java +++ b/wise-webapp/src/main/java/com/wisemapping/controller/ImportController.java @@ -57,7 +57,7 @@ public class ImportController final MindmapService mindmapService = this.getMindmapService(); mindmapService.addMindmap(mindMap, user); - final StringBuilder redirectionTo = new StringBuilder("redirect:" + mindMap.getId() + "/edit.htm"); + final StringBuilder redirectionTo = new StringBuilder("redirect:" + mindMap.getId() + "/edit"); return new ModelAndView(redirectionTo.toString()); } diff --git a/wise-webapp/src/main/java/com/wisemapping/controller/LoginController.java b/wise-webapp/src/main/java/com/wisemapping/controller/LoginController.java index 0d8751d3..adc518c8 100755 --- a/wise-webapp/src/main/java/com/wisemapping/controller/LoginController.java +++ b/wise-webapp/src/main/java/com/wisemapping/controller/LoginController.java @@ -38,7 +38,7 @@ public class LoginController ModelAndView result; if (user != null) { - result = new ModelAndView("forward:/c/mymaps.htm"); + result = new ModelAndView("forward:/c/maps/"); } else { result = new ModelAndView("login"); @@ -59,7 +59,7 @@ public class LoginController userLogin.setEmail(username); //userManager.auditLogin(userLogin); - return new ModelAndView("forward:/c/mymaps.htm"); + return new ModelAndView("forward:/c/maps/"); } public void setDriver(String driver) { diff --git a/wise-webapp/src/main/java/com/wisemapping/controller/MindmapCooker.java b/wise-webapp/src/main/java/com/wisemapping/controller/MindmapCooker.java index 6ad5ddbd..94f4e701 100644 --- a/wise-webapp/src/main/java/com/wisemapping/controller/MindmapCooker.java +++ b/wise-webapp/src/main/java/com/wisemapping/controller/MindmapCooker.java @@ -26,7 +26,7 @@ import javax.servlet.http.HttpServletResponse; import com.wisemapping.model.MindMap; /** - * Usage: http://localhost:8080/wisemapping/c/cooker.htm?action=edit&mapId=12 + * Usage: http://localhost:8080/wisemapping/c/cooker?action=edit&mapId=12 */ public class MindmapCooker extends BaseMultiActionController { diff --git a/wise-webapp/src/main/java/com/wisemapping/controller/MindmapEditorController.java b/wise-webapp/src/main/java/com/wisemapping/controller/MindmapEditorController.java index 106d775f..bf98ca22 100644 --- a/wise-webapp/src/main/java/com/wisemapping/controller/MindmapEditorController.java +++ b/wise-webapp/src/main/java/com/wisemapping/controller/MindmapEditorController.java @@ -34,7 +34,7 @@ public class MindmapEditorController extends BaseMultiActionController { public static final String MAP_XML_PARAM = "mapXml"; public ModelAndView handleNoSuchRequestHandlingMethod(NoSuchRequestHandlingMethodException noSuchRequestHandlingMethodException, HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception { - return new ModelAndView(new RedirectView("mymaps.htm")); + return new ModelAndView(new RedirectView("maps/")); } public ModelAndView open(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception { diff --git a/wise-webapp/src/main/java/com/wisemapping/exporter/ExportFormat.java b/wise-webapp/src/main/java/com/wisemapping/exporter/ExportFormat.java index da5bb3a7..a0d846be 100644 --- a/wise-webapp/src/main/java/com/wisemapping/exporter/ExportFormat.java +++ b/wise-webapp/src/main/java/com/wisemapping/exporter/ExportFormat.java @@ -25,7 +25,9 @@ public enum ExportFormat { JPEG("image/jpeg", "jpg"), PNG("image/png", "png"), PDF("application/pdf", "pdf"), - FREEMIND("application/freemind", "mm"); + FREEMIND("application/freemind", "mm"), + WISEMAPPING("application/wisemapping+xml", "wxml"); + private String contentType; private String fileExtension; diff --git a/wise-webapp/src/main/java/com/wisemapping/filter/UserAgent.java b/wise-webapp/src/main/java/com/wisemapping/filter/UserAgent.java index 48b81fcc..669d6539 100644 --- a/wise-webapp/src/main/java/com/wisemapping/filter/UserAgent.java +++ b/wise-webapp/src/main/java/com/wisemapping/filter/UserAgent.java @@ -270,7 +270,7 @@ public class UserAgent implements Serializable { /** * All known robot user-agent headers (list can be found - * here). + * here). *

*

NOTE: To avoid bad detection:

*

diff --git a/wise-webapp/src/main/java/com/wisemapping/ncontroller/ExtensionsController.java b/wise-webapp/src/main/java/com/wisemapping/ncontroller/ExtensionsController.java index cb2a06cf..356282a2 100644 --- a/wise-webapp/src/main/java/com/wisemapping/ncontroller/ExtensionsController.java +++ b/wise-webapp/src/main/java/com/wisemapping/ncontroller/ExtensionsController.java @@ -28,7 +28,6 @@ import org.springframework.web.servlet.ModelAndView; import java.io.IOException; @Controller -@RequestMapping("/c/") public class ExtensionsController { @Autowired private MindmapService mindmapService; 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 3dff6c34..db8a3d56 100644 --- a/wise-webapp/src/main/java/com/wisemapping/ncontroller/MindmapController.java +++ b/wise-webapp/src/main/java/com/wisemapping/ncontroller/MindmapController.java @@ -22,17 +22,22 @@ import java.util.ArrayList; import java.util.List; @Controller -@RequestMapping("/c/") public class MindmapController { @Autowired private MindmapService mindmapService; @RequestMapping(value = "maps/{id}/export") - public ModelAndView export(@PathVariable int id) throws IOException { + public ModelAndView showExportPage(@PathVariable int id) throws IOException { final MindMapBean modelObject = findMindmapBean(id); return new ModelAndView("mindmapExport", "mindmap", modelObject); } + @RequestMapping(value = "maps/{id}/exportf") + public ModelAndView showExportPageFull(@PathVariable int id) throws IOException { + final MindMapBean modelObject = findMindmapBean(id); + return new ModelAndView("mindmapExportFull", "mindmap", modelObject); + } + @RequestMapping(value = "maps/{id}/details") public ModelAndView showDetails(@PathVariable int id) { final MindMapBean modelObject = findMindmapBean(id); @@ -47,6 +52,18 @@ public class MindmapController { return new ModelAndView("mindmapPrint", "mindmap", mindmap); } + @RequestMapping(value = "maps/{id}/share") + public ModelAndView showSharePage(@PathVariable int id) { + final MindMap mindmap = findMindmap(id); + return new ModelAndView("mindmapShare", "mindmap", mindmap); + } + + @RequestMapping(value = "maps/{id}/sharef") + public ModelAndView showSharePageFull(@PathVariable int id) { + final MindMap mindmap = findMindmap(id); + return new ModelAndView("mindmapShareFull", "mindmap", mindmap); + } + @RequestMapping(value = "maps/{id}/publish") public ModelAndView showPublishPage(@PathVariable int id) { final MindMap mindmap = findMindmap(id); @@ -59,6 +76,7 @@ public class MindmapController { return new ModelAndView("mindmapPublishFull", "mindmap", mindmap); } + @RequestMapping(value = "maps/{id}/edit") public ModelAndView editMap(@PathVariable int id, @NotNull HttpServletRequest request) { ModelAndView view; @@ -99,7 +117,7 @@ public class MindmapController { return new ModelAndView("mindmapDetail", "wisemapDetail", new MindMapBean(mindmap)); } - @RequestMapping(value = "mymaps") + @RequestMapping(value = "maps/") public ModelAndView list(@NotNull HttpServletRequest request) { final HttpSession session = request.getSession(false); diff --git a/wise-webapp/src/main/java/com/wisemapping/ncontroller/PublicPagesController.java b/wise-webapp/src/main/java/com/wisemapping/ncontroller/PublicPagesController.java index 70acad43..e207d1ef 100644 --- a/wise-webapp/src/main/java/com/wisemapping/ncontroller/PublicPagesController.java +++ b/wise-webapp/src/main/java/com/wisemapping/ncontroller/PublicPagesController.java @@ -26,7 +26,6 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.servlet.ModelAndView; @Controller -@RequestMapping("/c/") public class PublicPagesController { @Autowired private MindmapService mindmapService; diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java b/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java index 0b7fa7b5..8e7439b9 100644 --- a/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java +++ b/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java @@ -20,6 +20,7 @@ package com.wisemapping.rest; import com.wisemapping.exceptions.WiseMappingException; +import com.wisemapping.exporter.ExportFormat; import com.wisemapping.model.MindMap; import com.wisemapping.model.MindmapUser; import com.wisemapping.model.User; @@ -30,6 +31,7 @@ import com.wisemapping.security.Utils; import com.wisemapping.service.MindmapService; import com.wisemapping.validator.MapInfoValidator; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Controller; @@ -38,11 +40,10 @@ import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.List; +import java.util.*; @Controller @@ -50,17 +51,43 @@ public class MindmapController extends BaseController { @Autowired private MindmapService mindmapService; - @RequestMapping(method = RequestMethod.GET, value = "/maps/{id}", produces = {"application/json", "text/html", "application/xml"}) + + @RequestMapping(method = RequestMethod.GET, value = "/maps/{id}", produces = {"application/json", "application/xml", "text/html"}) @ResponseBody - public ModelAndView getMindmap(@PathVariable int id) throws IOException { + public ModelAndView retrieve(@PathVariable int id) throws IOException { final User user = com.wisemapping.security.Utils.getUser(); final MindMap mindMap = mindmapService.getMindmapById(id); final RestMindmap map = new RestMindmap(mindMap, user); + return new ModelAndView("mapView", "map", map); } + @RequestMapping(method = RequestMethod.GET, value = "/maps/{id}", produces = {"application/wisemapping+xml"}, params = {"download=wxml"}) + @ResponseBody + public ModelAndView retrieveAsWise(@PathVariable int id) throws IOException { + final MindMap mindMap = mindmapService.getMindmapById(id); + final Map values = new HashMap(); + + final User user = com.wisemapping.security.Utils.getUser(); + values.put("mindmap", new RestMindmap(mindMap, user)); + values.put("filename", mindMap.getTitle()); + return new ModelAndView("transformViewWise", values); + } + + + @RequestMapping(method = RequestMethod.GET, value = "/maps/{id}", produces = {"application/freemind"}, params = {"download=mm"}) + @ResponseBody + public ModelAndView retrieveDocumentAsFreemind(@PathVariable int id) throws IOException { + final MindMap mindMap = mindmapService.getMindmapById(id); + final Map values = new HashMap(); + values.put("content", mindMap.getXmlStr()); + values.put("filename", mindMap.getTitle()); + return new ModelAndView("transformViewFreemind", values); + } + + @RequestMapping(method = RequestMethod.GET, value = "/maps", produces = {"application/json", "text/html", "application/xml"}) - public ModelAndView getMindmaps(@RequestParam(required = false) String q) throws IOException { + public ModelAndView retrieveList(@RequestParam(required = false) String q) throws IOException { final User user = com.wisemapping.security.Utils.getUser(); final MindmapFilter filter = MindmapFilter.parse(q); @@ -99,7 +126,7 @@ public class MindmapController extends BaseController { mindMap.setXmlStr(xml); // Update map ... - updateMindmap(minor, mindMap, user); + saveMindmap(minor, mindMap, user); } @@ -108,7 +135,7 @@ public class MindmapController extends BaseController { */ @RequestMapping(method = RequestMethod.PUT, value = "/maps/{id}", consumes = {"application/xml", "application/json"}, produces = {"application/json", "text/html", "application/xml"}) @ResponseStatus(value = HttpStatus.NO_CONTENT) - public void updateMap(@RequestBody RestMindmap restMindmap, @PathVariable int id, @RequestParam(required = false) boolean minor) throws IOException, WiseMappingException { + public void update(@RequestBody RestMindmap restMindmap, @PathVariable int id, @RequestParam(required = false) boolean minor) throws IOException, WiseMappingException { final MindMap mindMap = mindmapService.getMindmapById(id); final User user = Utils.getUser(); @@ -144,7 +171,7 @@ public class MindmapController extends BaseController { } // Update map ... - updateMindmap(minor, mindMap, user); + saveMindmap(minor, mindMap, user); } private ValidationException buildValidationException(@NotNull String fieldName, @NotNull String message) throws ValidationException { @@ -156,7 +183,7 @@ public class MindmapController extends BaseController { @RequestMapping(method = RequestMethod.PUT, value = "/maps/{id}/title", consumes = {"text/plain"}, produces = {"application/json", "text/html", "application/xml"}) @ResponseStatus(value = HttpStatus.NO_CONTENT) - public void updateMapTitle(@RequestBody String title, @PathVariable int id) throws WiseMappingException { + public void updateTitle(@RequestBody String title, @PathVariable int id) throws WiseMappingException { final MindMap mindMap = mindmapService.getMindmapById(id); final User user = Utils.getUser(); @@ -170,12 +197,12 @@ public class MindmapController extends BaseController { // Update map ... final MindMap mindmap = mindmapService.getMindmapById(id); mindmap.setTitle(title); - updateMindmap(true, mindMap, user); + saveMindmap(true, mindMap, user); } @RequestMapping(method = RequestMethod.PUT, value = "/maps/{id}/description", consumes = {"text/plain"}, produces = {"application/json", "text/html", "application/xml"}) @ResponseStatus(value = HttpStatus.NO_CONTENT) - public void updateMapDescription(@RequestBody String description, @PathVariable int id) throws WiseMappingException { + public void updateDescription(@RequestBody String description, @PathVariable int id) throws WiseMappingException { final MindMap mindMap = mindmapService.getMindmapById(id); final User user = Utils.getUser(); @@ -183,7 +210,7 @@ public class MindmapController extends BaseController { // Update map ... final MindMap mindmap = mindmapService.getMindmapById(id); mindmap.setDescription(description); - updateMindmap(true, mindMap, user); + saveMindmap(true, mindMap, user); } @RequestMapping(method = RequestMethod.PUT, value = "/maps/{id}/publish", consumes = {"text/plain"}, produces = {"application/json", "text/html", "application/xml"}) @@ -199,7 +226,7 @@ public class MindmapController extends BaseController { // Update map status ... mindMap.setPublic(Boolean.parseBoolean(value)); - updateMindmap(true, mindMap, user); + saveMindmap(true, mindMap, user); } @@ -212,7 +239,7 @@ public class MindmapController extends BaseController { // Update map status ... mindMap.setStarred(user, Boolean.parseBoolean(value)); - updateMindmap(true, mindMap, user); + saveMindmap(true, mindMap, user); } @RequestMapping(method = RequestMethod.DELETE, value = "/maps/{id}") @@ -234,23 +261,7 @@ public class MindmapController extends BaseController { } } - @RequestMapping(method = RequestMethod.PUT, value = "/maps/{id}/xml", consumes = {"application/xml"}, produces = {"application/json", "text/html", "application/xml"}) - @ResponseStatus(value = HttpStatus.NO_CONTENT) - public void updateMapXml(@RequestBody String xml, @PathVariable int id, @RequestParam(required = false) boolean minor) throws IOException, WiseMappingException { - - final MindMap mindMap = mindmapService.getMindmapById(id); - final User user = Utils.getUser(); - - if (xml == null || xml.isEmpty()) { - throw new IllegalArgumentException("Map xml can not be null"); - } - mindMap.setXmlStr(xml); - - // Update map ... - updateMindmap(minor, mindMap, user); - } - - private void updateMindmap(boolean minor, @NotNull final MindMap mindMap, @NotNull final User user) throws WiseMappingException { + private void saveMindmap(boolean minor, @NotNull final MindMap mindMap, @NotNull final User user) throws WiseMappingException { final Calendar now = Calendar.getInstance(); mindMap.setLastModificationTime(now); mindMap.setLastModifierUser(user.getUsername()); @@ -290,7 +301,7 @@ public class MindmapController extends BaseController { @RequestMapping(method = RequestMethod.POST, value = "/maps/{id}", consumes = {"application/xml", "application/json"}) @ResponseStatus(value = HttpStatus.CREATED) - public void copyMap(@RequestBody RestMindmapInfo restMindmap, @PathVariable int id, @NotNull HttpServletResponse response) throws IOException, WiseMappingException { + public void createDuplicate(@RequestBody RestMindmapInfo restMindmap, @PathVariable int id, @NotNull HttpServletResponse response) throws IOException, WiseMappingException { // Validate ... final BindingResult result = new BeanPropertyBindingResult(restMindmap, ""); new MapInfoValidator(mindmapService).validate(restMindmap.getDelegated(), result); @@ -315,5 +326,4 @@ public class MindmapController extends BaseController { response.setHeader("Location", "/service/maps/" + clonedMap.getId()); response.setHeader("ResourceId", Integer.toString(clonedMap.getId())); } - } diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/TransformerController.java b/wise-webapp/src/main/java/com/wisemapping/rest/TransformerController.java index a7b7d548..4347b173 100644 --- a/wise-webapp/src/main/java/com/wisemapping/rest/TransformerController.java +++ b/wise-webapp/src/main/java/com/wisemapping/rest/TransformerController.java @@ -99,21 +99,8 @@ public class TransformerController extends BaseController { return new ModelAndView("transformViewFreemind", values); } - - @RequestMapping(method = RequestMethod.POST, value = "/transform", produces = {"application/wisemapping+xml"}, consumes = {"application/freemind"}) - @ResponseBody - public ModelAndView transformWisemapping(@RequestBody @Nullable final String content) throws IOException { - final Map values = new HashMap(); - if (content == null || content.length() == 0) { - throw new IllegalArgumentException("Body can not be null."); - } - values.put("content", content); - return new ModelAndView("transformViewWise", values); - } - @RequestMapping(method = RequestMethod.POST, value = "/transform", consumes = {"application/x-www-form-urlencoded"}) - public ModelAndView transform(@NotNull HttpServletRequest request, - @NotNull HttpServletResponse response) throws IOException { + public ModelAndView transform(@NotNull HttpServletRequest request) throws IOException { final String svg = request.getParameter(PARAM_SVG_XML); final String mapXml = request.getParameter(PARAM_WISE_MAP_XML); final String filename = request.getParameter(PARAM_FILENAME); diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmap.java b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmap.java index 9f24595f..7ae6850c 100644 --- a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmap.java +++ b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmap.java @@ -8,9 +8,7 @@ import org.codehaus.jackson.annotate.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.*; import java.io.IOException; import java.text.SimpleDateFormat; import java.util.Calendar; @@ -105,6 +103,7 @@ public class RestMindmap { return mindmap.getXmlStr(); } + public void setXml(@Nullable String xml) throws IOException { if (xml != null) @@ -127,10 +126,14 @@ public class RestMindmap { mindmap.setDescription(description); } - public void setOwner(User owner) { + public void setOwner(String owner) { } + public String getOwner() { + return mindmap.getOwner().getEmail(); + } + public void setCreator(String creatorUser) { } diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/view/TransformView.java b/wise-webapp/src/main/java/com/wisemapping/rest/view/TransformView.java index 0d62fc2c..3a1a8e87 100644 --- a/wise-webapp/src/main/java/com/wisemapping/rest/view/TransformView.java +++ b/wise-webapp/src/main/java/com/wisemapping/rest/view/TransformView.java @@ -22,19 +22,25 @@ import com.wisemapping.exporter.ExportFormat; import com.wisemapping.exporter.ExportProperties; import com.wisemapping.exporter.ExporterFactory; import org.jetbrains.annotations.NotNull; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.oxm.jaxb.Jaxb2Marshaller; import org.springframework.web.servlet.view.AbstractView; import javax.servlet.ServletContext; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import javax.xml.transform.stream.StreamResult; import java.io.ByteArrayOutputStream; +import java.nio.charset.Charset; import java.util.Map; public class TransformView extends AbstractView { private String contentType; private ExportFormat exportFormat; + @Autowired + private Jaxb2Marshaller jaxbMarshaller; public TransformView(@NotNull final String contentType) { this.contentType = contentType; @@ -75,6 +81,10 @@ public class TransformView extends AbstractView { final ServletOutputStream outputStream = response.getOutputStream(); if (exportFormat == ExportFormat.FREEMIND) { ExporterFactory.export(properties, content, outputStream, null); + } else if (exportFormat == ExportFormat.WISEMAPPING) { + final Object mindmap = viewMap.get("mindmap"); + StreamResult result = new StreamResult(outputStream); + jaxbMarshaller.marshal(mindmap, result); } else { ExporterFactory.export(properties, null, outputStream, content); } diff --git a/wise-webapp/src/main/java/com/wisemapping/service/MindmapServiceImpl.java b/wise-webapp/src/main/java/com/wisemapping/service/MindmapServiceImpl.java index e73eab93..6b93ba3c 100755 --- a/wise-webapp/src/main/java/com/wisemapping/service/MindmapServiceImpl.java +++ b/wise-webapp/src/main/java/com/wisemapping/service/MindmapServiceImpl.java @@ -92,7 +92,7 @@ public class MindmapServiceImpl return mindmapManager.getMindmapById(mindmapId); } - public List getMindmapUserByUser(User user) { + public List getMindmapUserByUser(@NotNull User user) { return mindmapManager.getMindmapUserByCollaborator(user.getId()); } diff --git a/wise-webapp/src/main/java/com/wisemapping/service/UserServiceImpl.java b/wise-webapp/src/main/java/com/wisemapping/service/UserServiceImpl.java index 75158993..f134eeb3 100755 --- a/wise-webapp/src/main/java/com/wisemapping/service/UserServiceImpl.java +++ b/wise-webapp/src/main/java/com/wisemapping/service/UserServiceImpl.java @@ -129,7 +129,7 @@ public class UserServiceImpl model.put("user", user); - final String activationUrl = "http://wisemapping.com/c/activation.htm?code=" + user.getActivationCode(); + final String activationUrl = "http://wisemapping.com/c/activation?code=" + user.getActivationCode(); logger.info("create User - acrivationUrl: " + activationUrl); model.put("emailcheck", activationUrl); mailer.sendEmail(mailer.getRegistrationEmail(), user.getEmail(), "Welcome to Wisemapping!", model, diff --git a/wise-webapp/src/main/webapp/WEB-INF/classes/log4j.properties b/wise-webapp/src/main/webapp/WEB-INF/classes/log4j.properties index 3f39eb83..fd586b37 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/classes/log4j.properties +++ b/wise-webapp/src/main/webapp/WEB-INF/classes/log4j.properties @@ -1,8 +1,7 @@ log4j.rootLogger=WARN, stdout, R log4j.logger.com.wisemapping=WARN,stdout,R -log4j.logger.org.springframework=WARN,stdout,R +log4j.logger.org.springframework=DEBUG,stdout,R log4j.logger.org.codehaus.jackson=WARN,stdout,R -log4j.logger.org.hibernate.SQL=DEBUG, stdout,R log4j.additivity.org.hibernate.SQL=false 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 70a6b064..cd5a4c65 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties +++ b/wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties @@ -54,8 +54,9 @@ JPEG_EXPORT_FORMAT=JPEG PNG_EXPORT_FORMAT=Portable Network Graphics (PNG) SVG_EXPORT_FORMAT=Scalable Vector Graphics (SVG) PDF_EXPORT_FORMAT=Portable Document Format (PDF) -IMG_EXPORT_FORMAT=Image File +IMG_EXPORT_FORMAT=Image File (PNG/JPEG) FREEMIND_EXPORT_FORMAT = Freemind (version 0.9.0) +WISEMAPPING_EXPORT_FORMAT = WiseMapping FILE=File FILE_URL=File URL @@ -71,7 +72,7 @@ YES=yes NO=no EDITOR.LOADING=Loading ... -EDITOR.ERROR_LOADING=An unexpected error has occurred initializing this page.
We'll solve this problem as soon as possible. Please, click here to return to your mindmap list. +EDITOR.ERROR_LOADING=An unexpected error has occurred initializing this page.
We'll solve this problem as soon as possible. Please, click here to return to your mindmap list. SITE.TITLE=WiseMapping SITE.SLOGAN=Visual Thinking Evolution SAVE=Save @@ -161,11 +162,13 @@ SVG_EXPORT_FORMAT_DETAILS=Scalable Vector Graphics (SVG) is an XML markup langua PDF_EXPORT_FORMAT_DETAILS=Get your map as Portable Document Format(PDF) to share use in your presentations. IMG_EXPORT_FORMAT_DETAILS=Get a graphic representation of your map including all colors and shapes to reuse in documents or for archiving FREEMIND_EXPORT_FORMAT_DETAILS = FreeMind is a nice desktop mind mapping application that has the great benefit of being free. +WISEMAPPING_EXPORT_FORMAT_DETAILS = Export you map as native WiseMapping document format. + DELETE_MAP=Delete Confirmation TERMSOFUSE=Terms of Use PRIVACYPOLICY= Privacy Policy -EXPORT_DETAILS=Export this map in the format that you want and start using it in your presentations +EXPORT_DETAILS=Export this map in the format that you want and start using it in your presentations or sharing by email PUBLIC_MAP_VIEW=Public Map Info HERE=here DETAILS=Details @@ -307,3 +310,4 @@ 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.\ diff --git a/wise-webapp/src/main/webapp/WEB-INF/classes/messages_es.properties b/wise-webapp/src/main/webapp/WEB-INF/classes/messages_es.properties index 790c0d97..63cfc9c2 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/classes/messages_es.properties +++ b/wise-webapp/src/main/webapp/WEB-INF/classes/messages_es.properties @@ -258,4 +258,5 @@ SEARCH_MSG=Search and discover mind maps created by people like you. SEARCH_PUBLIC=Buscar mapas públicos UNDO_EDITION=Undo Edition REDO_EDITION=Redo Edition -REVERT=revert \ No newline at end of file +REVERT=revert +EXPORT_FORMAT_RESTRICTIONS=Important: Exporting to Image, PDF or SVG is available only in the editor toolbar only.\ \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/WEB-INF/classes/messages_fr.properties b/wise-webapp/src/main/webapp/WEB-INF/classes/messages_fr.properties index e5a63f08..6f8d6507 100755 --- a/wise-webapp/src/main/webapp/WEB-INF/classes/messages_fr.properties +++ b/wise-webapp/src/main/webapp/WEB-INF/classes/messages_fr.properties @@ -255,3 +255,4 @@ USABILITY_EDITOR_IMPROVED= Usability Improvement USABILITY_EDITOR_IMPROVED_SHRINK= Usability Improvement EDITOR_LINKS=Mind Map feature NEWS_ADD_ICON=Mind Map feature +EXPORT_FORMAT_RESTRICTIONS=Important: Exporting to Image, PDF or SVG is available only in the editor toolbar only.\ diff --git a/wise-webapp/src/main/webapp/WEB-INF/defs/definitions.xml b/wise-webapp/src/main/webapp/WEB-INF/defs/definitions.xml index 4a374818..ee90f37c 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/defs/definitions.xml +++ b/wise-webapp/src/main/webapp/WEB-INF/defs/definitions.xml @@ -118,13 +118,13 @@ - + - + - + @@ -142,6 +142,18 @@ + + + + + + + + + + + + diff --git a/wise-webapp/src/main/webapp/WEB-INF/web.xml b/wise-webapp/src/main/webapp/WEB-INF/web.xml index a778bb6f..a01fafaa 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/web.xml +++ b/wise-webapp/src/main/webapp/WEB-INF/web.xml @@ -90,7 +90,7 @@ contextConfigLocation - /WEB-INF/wisemapping-nservlet.xml + /WEB-INF/wisemapping-nservlet.xml /WEB-INF/wisemapping-servlet.xml @@ -113,7 +113,7 @@ mvc-servlet - *.htm + /c/* diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-nservlet.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-nservlet.xml index 64ab8a1d..d94c86fd 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-nservlet.xml +++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-nservlet.xml @@ -66,17 +66,17 @@ / /index.jsp - /c/home.htm - /c/login.htm - /c/userRegistration.htm - /c/captcha.htm - /c/publicView.htm + /c/home + /c/login + /c/userRegistration + /c/captcha + /c/publicView /service/* - /c/search.htm - /c/keyboard.htm - /c/renameMap.htm - /c/embeddedView.htm - /c/forgotPassword.htm + /c/search + /c/keyboard + /c/renameMap + /c/embeddedView + /c/forgotPassword diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-rest.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-rest.xml index 892b65da..436456f3 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-rest.xml +++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-rest.xml @@ -29,7 +29,6 @@ - @@ -41,7 +40,7 @@ - + @@ -86,7 +85,7 @@ - + diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml index ee18ffd0..e2399bfb 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml +++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml @@ -21,17 +21,18 @@ - - - - - - - - - - - + + + + + + + + + + + + @@ -39,15 +40,15 @@ - - - + + - + diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml index 4f8c6c05..44ba5ba3 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml +++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml @@ -20,8 +20,8 @@ - tryEditor - installCFG + tryEditor + installCFG @@ -80,7 +80,7 @@ - settings + settings @@ -166,23 +166,23 @@ - importMapController + importMapController - publicView - embeddedView + publicView + embeddedView - userController - sharingController - loginController - forgotPasswordController - activationController - changePasswordController - cookerController - settingsController - editProfileController - historyController + userController + sharingController + loginController + forgotPasswordController + activationController + changePasswordController + cookerController + settingsController + editProfileController + historyController diff --git a/wise-webapp/src/main/webapp/favicon.ico b/wise-webapp/src/main/webapp/favicon.ico new file mode 100644 index 00000000..e69de29b diff --git a/wise-webapp/src/main/webapp/index.html b/wise-webapp/src/main/webapp/index.html index 8867024f..c20c0193 100644 --- a/wise-webapp/src/main/webapp/index.html +++ b/wise-webapp/src/main/webapp/index.html @@ -1,6 +1,6 @@ - + diff --git a/wise-webapp/src/main/webapp/index.jsp b/wise-webapp/src/main/webapp/index.jsp index 5e6bb412..f5c10307 100644 --- a/wise-webapp/src/main/webapp/index.jsp +++ b/wise-webapp/src/main/webapp/index.jsp @@ -1,3 +1,3 @@ <% - response.sendRedirect("c/home.htm"); + response.sendRedirect("c/home"); %> \ 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 7b451590..9451f589 100644 --- a/wise-webapp/src/main/webapp/js/mymaps.js +++ b/wise-webapp/src/main/webapp/js/mymaps.js @@ -75,7 +75,6 @@ jQuery.fn.dataTableExt.selectAllMaps = function() { }; jQuery.fn.dataTableExt.getSelectedMapsIds = function() { - console.log(this) var selectedRows = $('#mindmapListTable').dataTableExt.getSelectedRows(); var dataTable = $('#mindmapListTable').dataTable(); return selectedRows.map(function() { @@ -286,7 +285,7 @@ $(function() { bUseRendered : false, mDataProp: "title", fnRender : function(obj) { - return '' + obj.aData.title + ''; + return '' + obj.aData.title + ''; } }, { @@ -344,13 +343,13 @@ $(function() { $("#newBtn").click( function() { $("#new-dialog-modal").dialogForm({ - redirect: "c/maps/{header.resourceId}/edit.htm", + redirect: "c/maps/{header.resourceId}/edit", url : "../service/maps" }); }); $("#importBtn").click(function() { - window.open('c/maps/import.htm'); + window.open('c/maps/import'); }); $("#duplicateBtn").click(function() { @@ -368,7 +367,7 @@ $(function() { // Initialize dialog ... $("#duplicate-dialog-modal").dialogForm({ - redirect: "c/maps/{header.resourceId}/edit.htm", + redirect: "c/maps/{header.resourceId}/edit", url : "../service/maps/" + mapId }); } @@ -412,15 +411,16 @@ $(function() { var tableUI = $('#mindmapListTable'); var mapIds = tableUI.dataTableExt.getSelectedMapsIds(); + if (mapIds.length > 0) { // Initialize dialog ... $("#delete-dialog-modal").dialogForm({ type: 'DELETE', - postUpdate: function(reqBodyData) { + postUpdate: function() { // Remove old entry ... tableUI.dataTableExt.removeSelectedRows(); }, - url : "../service/maps/batch?ids=" + mapIds.join(',') + url : "../service/maps/batch?ids=" + jQuery.makeArray(mapIds).join(',') }); } }); @@ -428,14 +428,14 @@ $(function() { $("#printBtn").click(function() { var mapIds = $('#mindmapListTable').dataTableExt.getSelectedMapsIds(); if (mapIds.length > 0) { - window.open('c/maps/' + mapIds[0] + '/print.htm'); + window.open('c/maps/' + mapIds[0] + '/print'); } }); $("#infoBtn").click(function() { var mapIds = $('#mindmapListTable').dataTableExt.getSelectedMapsIds(); if (mapIds.length > 0) { - $('#info-dialog-modal .modal-body').load("c/maps/" + mapIds[0] + "/details.htm", function() { + $('#info-dialog-modal .modal-body').load("c/maps/" + mapIds[0] + "/details", function() { $('#info-dialog-modal').modal(); }); @@ -445,7 +445,7 @@ $(function() { $("#publishBtn").click(function() { var mapIds = $('#mindmapListTable').dataTableExt.getSelectedMapsIds(); if (mapIds.length > 0) { - $('#publish-dialog-modal .modal-body').load("c/maps/" + mapIds[0] + "/publish.htm", + $('#publish-dialog-modal .modal-body').load("c/maps/" + mapIds[0] + "/publish", function() { $('#publish-dialog-modal .btn-accept').click(function() { submitDialogForm(); @@ -455,6 +455,19 @@ $(function() { } }); + $("#exportBtn").click(function() { + var mapIds = $('#mindmapListTable').dataTableExt.getSelectedMapsIds(); + if (mapIds.length > 0) { + $('#export-dialog-modal .modal-body').load("c/maps/" + mapIds[0] + "/export", + function() { + $('#export-dialog-modal .btn-accept').click(function() { + submitDialogForm(); + }); + $('#export-dialog-modal').modal(); + }); + } + }); + $("#actionButtons .shareMap").click(function() { }); diff --git a/wise-webapp/src/main/webapp/jsp/editorHeader.jsp b/wise-webapp/src/main/webapp/jsp/editorHeader.jsp index 914aca1b..002f1b5d 100644 --- a/wise-webapp/src/main/webapp/jsp/editorHeader.jsp +++ b/wise-webapp/src/main/webapp/jsp/editorHeader.jsp @@ -13,14 +13,14 @@

, ${principal.firstname} - | "> + | "> - | "> - | "> + | ">
@@ -28,7 +28,7 @@ diff --git a/wise-webapp/src/main/webapp/jsp/embeddedView.jsp b/wise-webapp/src/main/webapp/jsp/embeddedView.jsp index 584cf5af..4c7b661c 100644 --- a/wise-webapp/src/main/webapp/jsp/embeddedView.jsp +++ b/wise-webapp/src/main/webapp/jsp/embeddedView.jsp @@ -89,7 +89,7 @@
- + diff --git a/wise-webapp/src/main/webapp/jsp/embeddedViewError.jsp b/wise-webapp/src/main/webapp/jsp/embeddedViewError.jsp index 30ed98ad..d6dcfcd6 100644 --- a/wise-webapp/src/main/webapp/jsp/embeddedViewError.jsp +++ b/wise-webapp/src/main/webapp/jsp/embeddedViewError.jsp @@ -24,7 +24,7 @@

diff --git a/wise-webapp/src/main/webapp/jsp/forgotPassword.jsp b/wise-webapp/src/main/webapp/jsp/forgotPassword.jsp index a21d309e..292d05f1 100755 --- a/wise-webapp/src/main/webapp/jsp/forgotPassword.jsp +++ b/wise-webapp/src/main/webapp/jsp/forgotPassword.jsp @@ -16,7 +16,7 @@ " class="btn btn-primary"/> " class="btn" - onclick="window.location=''"/> + onclick="window.location=''"/>
@@ -27,7 +27,7 @@ - + \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/jsp/gcfPluginNeeded.jsp b/wise-webapp/src/main/webapp/jsp/gcfPluginNeeded.jsp index f3b3a158..217818d9 100644 --- a/wise-webapp/src/main/webapp/jsp/gcfPluginNeeded.jsp +++ b/wise-webapp/src/main/webapp/jsp/gcfPluginNeeded.jsp @@ -8,6 +8,6 @@


- +
diff --git a/wise-webapp/src/main/webapp/jsp/header.jsp b/wise-webapp/src/main/webapp/jsp/header.jsp index 6d8978bf..e765f3ec 100644 --- a/wise-webapp/src/main/webapp/jsp/header.jsp +++ b/wise-webapp/src/main/webapp/jsp/header.jsp @@ -9,15 +9,15 @@
, ${principal.firstname} - | - | "> - | "> + | + | "> + | ">
@@ -40,12 +40,12 @@
<%----%>
- + diff --git a/wise-webapp/src/main/webapp/jsp/homepage.jsp b/wise-webapp/src/main/webapp/jsp/homepage.jsp index e412f9cc..6e64d817 100644 --- a/wise-webapp/src/main/webapp/jsp/homepage.jsp +++ b/wise-webapp/src/main/webapp/jsp/homepage.jsp @@ -1,3 +1,3 @@ <% - response.sendRedirect(request.getContextPath() + "/c/mymaps.htm"); + response.sendRedirect(request.getContextPath() + "/c/maps/"); %> \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/jsp/installCFG.jsp b/wise-webapp/src/main/webapp/jsp/installCFG.jsp index f048aff5..f00f528f 100644 --- a/wise-webapp/src/main/webapp/jsp/installCFG.jsp +++ b/wise-webapp/src/main/webapp/jsp/installCFG.jsp @@ -22,6 +22,6 @@ CFInstall.check({ mode: "inline", node:"prompt", - destination:"${pageContext.request.contextPath}/c/editor.htm?mapId="+getURLParameter("mapId") + destination:"${pageContext.request.contextPath}/c/editor?mapId="+getURLParameter("mapId") }); \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/jsp/login.jsp b/wise-webapp/src/main/webapp/jsp/login.jsp index c99a0e86..19abcbbc 100644 --- a/wise-webapp/src/main/webapp/jsp/login.jsp +++ b/wise-webapp/src/main/webapp/jsp/login.jsp @@ -45,14 +45,14 @@
- "> + "> diff --git a/wise-webapp/src/main/webapp/jsp/mindmapCollaborator.jsp b/wise-webapp/src/main/webapp/jsp/mindmapCollaborator.jsp index 09ff42cf..0104c39e 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapCollaborator.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapCollaborator.jsp @@ -1,9 +1,9 @@ <%@ include file="/jsp/init.jsp" %> - + - + @@ -13,7 +13,7 @@
+ action="${pageContext.request.contextPath}/c/sharing?mapId=${mindmap.id}">

diff --git a/wise-webapp/src/main/webapp/jsp/mindmapCooker.jsp b/wise-webapp/src/main/webapp/jsp/mindmapCooker.jsp index a9d7031e..e9d28b5c 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapCooker.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapCooker.jsp @@ -3,7 +3,7 @@

Mindmap Cooker

- + diff --git a/wise-webapp/src/main/webapp/jsp/mindmapDetail.jsp b/wise-webapp/src/main/webapp/jsp/mindmapDetail.jsp index 5f15d9b3..62cf2fd3 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapDetail.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapDetail.jsp @@ -44,11 +44,11 @@
  • :
  • - 
    <iframe style="border:0;width:600px;height:400px;border: 1px solid black" src="http://www.wisemapping.com/c/embeddedView.htm?mapId=${wisemapDetail.id}&amzoom=1"></iframe>
    + 
    <iframe style="border:0;width:600px;height:400px;border: 1px solid black" src="http://www.wisemapping.com/c/embeddedView?mapId=${wisemapDetail.id}&amzoom=1"></iframe>
    • diff --git a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp index 35c35acf..8e7a116b 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp @@ -6,7 +6,7 @@ <%--@elvariable id="mapXml" type="com.wisemapping.model.User"--%> <%@ include file="/jsp/init.jsp" %> - + @@ -61,7 +61,7 @@
    - + @@ -72,14 +72,14 @@
    , ${principal.firstname}| | - | + "> - | "> + | ">
    - + diff --git a/wise-webapp/src/main/webapp/jsp/mindmapExport.jsp b/wise-webapp/src/main/webapp/jsp/mindmapExport.jsp index 0532510a..014492e0 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapExport.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapExport.jsp @@ -1,125 +1,100 @@ <%@ include file="/jsp/init.jsp" %> -

    - '${mindmap.title}'

    + +

    + +

    - " - style="height:100%;" enctype="application/x-www-form-urlencoded"> - - - -
    - - - - - - - - - - - - - - - - - -
    - -
    - - -
    - -
    - - - - + + - -
    - " class="btn-primary"> - " class="btn-secondary" - onclick="MooDialog.Request.active.close()"> -
    + +
    +

    + +

    + \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/jsp/mindmapHistory.jsp b/wise-webapp/src/main/webapp/jsp/mindmapHistory.jsp index 84b5a493..8bbf36be 100755 --- a/wise-webapp/src/main/webapp/jsp/mindmapHistory.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapHistory.jsp @@ -58,7 +58,7 @@ %> -
    "> +"> <% if (request.getAttribute("goToMindmapList") != null) diff --git a/wise-webapp/src/main/webapp/jsp/mindmapImport.jsp b/wise-webapp/src/main/webapp/jsp/mindmapImport.jsp index 7cc7753d..d1cea459 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapImport.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapImport.jsp @@ -23,7 +23,7 @@ " class="btn btn-primary"/> " class="btn" - onclick="window.location='/c/mymaps.htm'"> + onclick="window.location='/c/maps/'">
    diff --git a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp index 6a35cd80..8be8b985 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp @@ -37,15 +37,14 @@
    -
    - - -

    - -
    -
    -
    +
    + +

    + +
    +
    +
    @@ -247,6 +248,22 @@
    + + + +
    diff --git a/wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp b/wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp index 673e4f8e..9b087e2c 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp @@ -114,7 +114,7 @@
    - + diff --git a/wise-webapp/src/main/webapp/jsp/mindmapPublicView.jsp b/wise-webapp/src/main/webapp/jsp/mindmapPublicView.jsp index a40b29f5..fce049d7 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapPublicView.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapPublicView.jsp @@ -4,7 +4,7 @@ - diff --git a/wise-webapp/src/main/webapp/jsp/mindmapPublish.jsp b/wise-webapp/src/main/webapp/jsp/mindmapPublish.jsp index fadce6e3..27f486b2 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapPublish.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapPublish.jsp @@ -45,12 +45,12 @@ 
    <iframe style="width:600px;height:400px;border: 1px
-solid black" src="http://www.wisemapping.com/c/embeddedView.htm?mapId=${mindmap.id}&zoom=1"> </iframe>
    +solid black" src="http://www.wisemapping.com/c/embeddedView?mapId=${mindmap.id}&zoom=1"> </iframe>
    : -
    diff --git a/wise-webapp/src/main/webapp/jsp/mindmapRename.jsp b/wise-webapp/src/main/webapp/jsp/mindmapRename.jsp deleted file mode 100755 index 5a4a76e5..00000000 --- a/wise-webapp/src/main/webapp/jsp/mindmapRename.jsp +++ /dev/null @@ -1,36 +0,0 @@ -<%@ include file="/jsp/init.jsp" %> -
    - - - - - - - - - - - - - - -
    - * - - : - - - -
    - - : - - - -
      - " class="btn-primary"> - " class="btn-primary" - onclick="MOOdalBox.close();"> -
    -     -
    diff --git a/wise-webapp/src/main/webapp/jsp/mindmapShare.jsp b/wise-webapp/src/main/webapp/jsp/mindmapShare.jsp new file mode 100644 index 00000000..c759c973 --- /dev/null +++ b/wise-webapp/src/main/webapp/jsp/mindmapShare.jsp @@ -0,0 +1,39 @@ +<%@ include file="/jsp/init.jsp" %> + + +

    Who has access

    + +
    + + + + + + + + +
    NameEmailAction
    + +
    + + + + + + + + diff --git a/wise-webapp/src/main/webapp/jsp/mindmapTags.jsp b/wise-webapp/src/main/webapp/jsp/mindmapTags.jsp deleted file mode 100755 index bf405058..00000000 --- a/wise-webapp/src/main/webapp/jsp/mindmapTags.jsp +++ /dev/null @@ -1,36 +0,0 @@ -<%@ include file="/jsp/init.jsp" %> -

    '${tag.mindmapTitle}'

    - -

    - -

    - -
    - - - - - - - - - - - - - -
      - - -
      - " class="btn-primary"> - " class="btn-secondary" id="cancelBtn"> -
    -     -
    - - diff --git a/wise-webapp/src/main/webapp/jsp/mindmapViewer.jsp b/wise-webapp/src/main/webapp/jsp/mindmapViewer.jsp index 99c3c9d5..6501a292 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapViewer.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapViewer.jsp @@ -25,7 +25,7 @@
    ${mindmap.description}
    ${mindmap.userRole}
    -
    "> +"> @@ -46,7 +46,7 @@
    "> " - onclick="window.location=''"> + onclick="window.location=''"> @@ -77,7 +77,7 @@ -
    "> +"> diff --git a/wise-webapp/src/main/webapp/jsp/setting.jsp b/wise-webapp/src/main/webapp/jsp/setting.jsp index 3ef3907f..a745f039 100755 --- a/wise-webapp/src/main/webapp/jsp/setting.jsp +++ b/wise-webapp/src/main/webapp/jsp/setting.jsp @@ -2,13 +2,13 @@
    • " + href="" title="">
    • " + href="" title=""> diff --git a/wise-webapp/src/main/webapp/jsp/userRegistration.jsp b/wise-webapp/src/main/webapp/jsp/userRegistration.jsp index cca1f547..d73f0ffe 100644 --- a/wise-webapp/src/main/webapp/jsp/userRegistration.jsp +++ b/wise-webapp/src/main/webapp/jsp/userRegistration.jsp @@ -42,7 +42,7 @@

      -

      @@ -51,7 +51,7 @@ " id="submitButton" class="btn btn-primary"> " - onclick="window.location=''" class="btn"> + onclick="window.location='c/'" class="btn">
    diff --git a/wise-webapp/src/main/webapp/jsp/userRegistrationConfirmation.jsp b/wise-webapp/src/main/webapp/jsp/userRegistrationConfirmation.jsp index 4068a57e..811defee 100644 --- a/wise-webapp/src/main/webapp/jsp/userRegistrationConfirmation.jsp +++ b/wise-webapp/src/main/webapp/jsp/userRegistrationConfirmation.jsp @@ -24,7 +24,7 @@

    - Your account has been created successfully, click here to sign in and start enjoying WiseMapping. + Your account has been created successfully, click here to sign in and start enjoying WiseMapping.

    diff --git a/wise-webapp/src/test/sql/hsql/drop-schemas.sql b/wise-webapp/src/test/sql/hsql/drop-schemas.sql index a47b3b2b..5295ad9b 100644 --- a/wise-webapp/src/test/sql/hsql/drop-schemas.sql +++ b/wise-webapp/src/test/sql/hsql/drop-schemas.sql @@ -1,4 +1,5 @@ DROP TABLE TAG; +DROP TABLE MINDMAP_COLLABORATOR_PROPERTIES; DROP TABLE MINDMAP_COLABORATOR; DROP TABLE MINDMAP_HISTORY; DROP TABLE MINDMAP; diff --git a/wise-webapp/src/test/sql/mysql/drop-schemas.sql b/wise-webapp/src/test/sql/mysql/drop-schemas.sql index 0cb786d5..8c02fe84 100644 --- a/wise-webapp/src/test/sql/mysql/drop-schemas.sql +++ b/wise-webapp/src/test/sql/mysql/drop-schemas.sql @@ -1,4 +1,5 @@ DROP TABLE TAG; +DROP TABLE MINDMAP_COLLABORATOR_PROPERTIES; DROP TABLE MINDMAP_COLABORATOR; DROP TABLE MINDMAP_HISTORY; DROP TABLE MINDMAP;