vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-11-05 07:03:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

- Remove .htm

Browse Source 
- Keep working on export.
This commit is contained in:
Paulo Gustavo Veiga 2012-06-03 11:16:38 -03:00
parent 71793c38b8
commit f52a75ac79
62 changed files with 398 additions and 376 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mindplot/src/main/javascript/widget/Menu.js
View File

@ -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,

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

@ -185,5 +185,9 @@ div.modalDialog .title
height:420px;
}
.exportModalDialog .content{
height:370px;
}

4
wise-webapp/pom.xml
View File

@ -126,7 +126,7 @@
<groupId>org.springframework</groupId>
<artifactId>spring-oxm</artifactId>
<version>${org.springframework.version}</version>
<scope>runtime</scope>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@ -426,7 +426,7 @@
<targetPath>css</targetPath>
<includes>
<include>**/*.css</include>
<include>**/*.html</include>
<include>**/*l</include>
</includes>
</overlay>
<overlay>

4
wise-webapp/src/main/java/com/wisemapping/controller/HistoryController.java
View File

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

2
wise-webapp/src/main/java/com/wisemapping/controller/ImportController.java
View File

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

4
wise-webapp/src/main/java/com/wisemapping/controller/LoginController.java
View File

@ -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) {

2
wise-webapp/src/main/java/com/wisemapping/controller/MindmapCooker.java
View File

@ -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 {

2
wise-webapp/src/main/java/com/wisemapping/controller/MindmapEditorController.java
View File

@ -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 {

4
wise-webapp/src/main/java/com/wisemapping/exporter/ExportFormat.java
View File

@ -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;

2
wise-webapp/src/main/java/com/wisemapping/filter/UserAgent.java
View File

@ -270,7 +270,7 @@ public class UserAgent implements Serializable {
/**
* All known robot user-agent headers (list can be found
* <a href="http://www.robotstxt.org/wc/active.html">here</a>).
* <a href="http://www.robotstxt.org/wc/activel">here</a>).
* <p/>
* <p>NOTE: To avoid bad detection:</p>
* <p/>

1
wise-webapp/src/main/java/com/wisemapping/ncontroller/ExtensionsController.java
View File

@ -28,7 +28,6 @@ import org.springframework.web.servlet.ModelAndView;
import java.io.IOException;
@Controller
@RequestMapping("/c/")
public class ExtensionsController {
@Autowired
private MindmapService mindmapService;

24
wise-webapp/src/main/java/com/wisemapping/ncontroller/MindmapController.java
View File

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

1
wise-webapp/src/main/java/com/wisemapping/ncontroller/PublicPagesController.java
View File

@ -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;

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

@ -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<String, Object> values = new HashMap<String, Object>();
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<String, Object> values = new HashMap<String, Object>();
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()));
}
}

15
wise-webapp/src/main/java/com/wisemapping/rest/TransformerController.java
View File

@ -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<String, Object> values = new HashMap<String, Object>();
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);

11
wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmap.java
View File

@ -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) {
}

10
wise-webapp/src/main/java/com/wisemapping/rest/view/TransformView.java
View File

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

2
wise-webapp/src/main/java/com/wisemapping/service/MindmapServiceImpl.java
View File

@ -92,7 +92,7 @@ public class MindmapServiceImpl
return mindmapManager.getMindmapById(mindmapId);
}
public List<MindmapUser> getMindmapUserByUser(User user) {
public List<MindmapUser> getMindmapUserByUser(@NotNull User user) {
return mindmapManager.getMindmapUserByCollaborator(user.getId());
}

2
wise-webapp/src/main/java/com/wisemapping/service/UserServiceImpl.java
View File

@ -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,

3
wise-webapp/src/main/webapp/WEB-INF/classes/log4j.properties
View File

@ -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

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

@ -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. <br/>We'll solve this problem as soon as possible. Please, click <a href="mymaps.htm">here</a> to return to your mindmap list.
EDITOR.ERROR_LOADING=An unexpected error has occurred initializing this page. <br/>We'll solve this problem as soon as possible. Please, click <a href="maps/">here</a> 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.\

1
wise-webapp/src/main/webapp/WEB-INF/classes/messages_es.properties
View File

@ -259,3 +259,4 @@ SEARCH_PUBLIC=Buscar mapas p&uacute;blicos
UNDO_EDITION=Undo Edition
REDO_EDITION=Redo Edition
REVERT=revert
EXPORT_FORMAT_RESTRICTIONS=Important: Exporting to Image, PDF or SVG is available only in the editor toolbar only.\

1
wise-webapp/src/main/webapp/WEB-INF/classes/messages_fr.properties
View File

@ -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.\

18
wise-webapp/src/main/webapp/WEB-INF/defs/definitions.xml
View File

@ -118,13 +118,13 @@
<put name="body" value="/jsp/changePassword.jsp"/>
</definition>
<definition name="mindmapTags" extends="dialogTemplate">
<definition name="mindmapExport" extends="dialogTemplate">
<put name="title" value=""/>
<put name="details" value=""/>
<put name="body" value="/jsp/mindmapTags.jsp"/>
<put name="body" value="/jsp/mindmapExport.jsp"/>
</definition>
<definition name="mindmapExport" extends="dialogTemplate">
<definition name="mindmapExportFull" extends="dialogFullTemplate">
<put name="title" value=""/>
<put name="details" value=""/>
<put name="body" value="/jsp/mindmapExport.jsp"/>
@ -142,6 +142,18 @@
<put name="body" value="/jsp/mindmapPublish.jsp"/>
</definition>
<definition name="mindmapShare" extends="dialogTemplate">
<put name="title" value=""/>
<put name="details" value=""/>
<put name="body" value="/jsp/mindmapShare.jsp"/>
</definition>
<definition name="mindmapShareFull" extends="dialogFullTemplate">
<put name="title" value=""/>
<put name="details" value=""/>
<put name="body" value="/jsp/mindmapShare.jsp"/>
</definition>
<definition name="mindmapCollaborator" extends="dialogTemplate">
<put name="title" value=""/>
<put name="details" value=""/>

4
wise-webapp/src/main/webapp/WEB-INF/web.xml
View File

@ -90,7 +90,7 @@
<init-param>
<param-name>contextConfigLocation</param-name>
<param-value>
/WEB-INF/wisemapping-nservlet.xml
/WEB-INF/wisemapping-nservlet.xml
/WEB-INF/wisemapping-servlet.xml
</param-value>
</init-param>
@ -113,7 +113,7 @@
<servlet-mapping>
<servlet-name>mvc-servlet</servlet-name>
<url-pattern>*.htm</url-pattern>
<url-pattern>/c/*</url-pattern>
</servlet-mapping>
<servlet-mapping>

20
wise-webapp/src/main/webapp/WEB-INF/wisemapping-nservlet.xml
View File

@ -66,17 +66,17 @@
<list>
<value>/</value>
<value>/index.jsp</value>
<value>/c/home.htm</value>
<value>/c/login.htm</value>
<value>/c/userRegistration.htm</value>
<value>/c/captcha.htm</value>
<value>/c/publicView.htm</value>
<value>/c/home</value>
<value>/c/login</value>
<value>/c/userRegistration</value>
<value>/c/captcha</value>
<value>/c/publicView</value>
<value>/service/*</value>
<value>/c/search.htm</value>
<value>/c/keyboard.htm</value>
<value>/c/renameMap.htm</value>
<value>/c/embeddedView.htm</value>
<value>/c/forgotPassword.htm</value>
<value>/c/search</value>
<value>/c/keyboard</value>
<value>/c/renameMap</value>
<value>/c/embeddedView</value>
<value>/c/forgotPassword</value>
</list>
</property>
</bean>

5
wise-webapp/src/main/webapp/WEB-INF/wisemapping-rest.xml
View File

@ -29,7 +29,6 @@
<bean class="org.springframework.web.servlet.view.ContentNegotiatingViewResolver">
<property name="defaultContentType" value="application/json"/>
<property name="favorPathExtension" value="true"/>
<property name="mediaTypes">
<map>
<entry key="html" value="text/html"/>
@ -41,7 +40,7 @@
<entry key="jpeg" value="image/jpg"/>
<entry key="svg" value="image/svg+xml"/>
<entry key="svg" value="application/svg+xml"/>
<entry key="wise" value="application/wisemapping+xml"/>
<entry key="wxml" value="application/wisemapping+xml"/>
</map>
</property>
<property name="viewResolvers">
@ -86,7 +85,7 @@
<constructor-arg value="image/svg+xml"/>
</bean>
<bean id="transformViewWise" class="com.wisemapping.rest.view.ImportTransformationView">
<bean id="transformViewWise" class="com.wisemapping.rest.view.TransformView">
<constructor-arg value="application/wisemapping+xml"/>
</bean>

35
wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml
View File

@ -21,17 +21,18 @@
<sec:http pattern="/images/**" security="none"/>
<sec:http pattern="/icons/**" security="none"/>
<sec:http pattern="/favicon.ico" security="none"/>
<sec:http pattern="/c/login.htm" security="none"/>
<sec:http pattern="/c/userregistration.htm" security="none"/>
<sec:http pattern="/c/activation.htm" security="none"/>
<sec:http pattern="/c/forgotpassword.htm" security="none"/>
<sec:http pattern="/c/home.htm" security="none"/>
<sec:http pattern="/c/try.htm" security="none"/>
<sec:http pattern="/c/search.htm" security="none"/>
<sec:http pattern="/c/keyboard.htm" security="none"/>
<sec:http pattern="/c/embeddedview.htm" security="none"/>
<sec:http pattern="/c/publicview.htm" security="none"/>
<sec:http pattern="/service/transform*" security="none"/>
<sec:http pattern="/c/login" security="none"/>
<sec:http pattern="/c/userregistration" security="none"/>
<sec:http pattern="/c/activation" security="none"/>
<sec:http pattern="/c/forgotpassword" security="none"/>
<sec:http pattern="/c/home" security="none"/>
<sec:http pattern="/c/try" security="none"/>
<sec:http pattern="/c/search" security="none"/>
<sec:http pattern="/c/keyboard" security="none"/>
<sec:http pattern="/c/embeddedview" security="none"/>
<sec:http pattern="/c/publicview" security="none"/>
<sec:http pattern="/c/termsOfUse" security="none"/>
<sec:http use-expressions="true" create-session="never" pattern="/service/**">
<sec:intercept-url pattern="/service/admin/users/**" access="isAuthenticated() and hasRole('ROLE_ADMIN')"/>
@ -39,15 +40,15 @@
<sec:http-basic/>
</sec:http>
<sec:http use-expressions="true" access-denied-page="/c/login.htm">
<sec:intercept-url pattern="/c/*.htm" access="isFullyAuthenticated()"/>
<sec:form-login login-page="/c/login.htm"
default-target-url='/c/mymaps.htm'
<sec:http use-expressions="true" access-denied-page="/c/login">
<sec:intercept-url pattern="/c/**" access="isFullyAuthenticated()"/>
<sec:form-login login-page="/c/login"
default-target-url='/c/maps/'
always-use-default-target='false'
authentication-failure-url="/c/login.htm?login_error=2"
authentication-failure-url="/c/login?login_error=2"
login-processing-url="/c/j_spring_security_check"/>
<sec:remember-me key="wisemapping-hashed-key"/>
<sec:logout logout-url="/c/logout.htm" invalidate-session="true" logout-success-url="/c/login.htm"/>
<sec:logout logout-url="/c/logout" invalidate-session="true" logout-success-url="/c/login"/>
</sec:http>
<sec:authentication-manager alias="authenticationManager">

32
wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml
View File

@ -20,8 +20,8 @@
<bean id="homeResolver" class="org.springframework.web.servlet.mvc.multiaction.PropertiesMethodNameResolver">
<property name="mappings">
<props>
<prop key="/c/try.htm">tryEditor</prop>
<prop key="/c/installCFG.htm">installCFG</prop>
<prop key="try">tryEditor</prop>
<prop key="installCFG">installCFG</prop>
</props>
</property>
</bean>
@ -80,7 +80,7 @@
<bean id="settingResolver" class="org.springframework.web.servlet.mvc.multiaction.PropertiesMethodNameResolver">
<property name="mappings">
<props>
<prop key="/c/settings.htm">settings</prop>
<prop key="settings">settings</prop>
</props>
</property>
</bean>
@ -166,23 +166,23 @@
</property>
<property name="mappings">
<props>
<prop key="/c/maps/import.htm">importMapController</prop>
<prop key="maps/import">importMapController</prop>
<!-- Review -->
<prop key="/c/publicView.htm">publicView</prop>
<prop key="/c/embeddedView.htm">embeddedView</prop>
<prop key="publicView">publicView</prop>
<prop key="embeddedView">embeddedView</prop>
<!-- Forms based -->
<prop key="/c/userRegistration.htm">userController</prop>
<prop key="/c/sharing.htm">sharingController</prop>
<prop key="/c/login.htm">loginController</prop>
<prop key="/c/forgotPassword.htm">forgotPasswordController</prop>
<prop key="/c/activation.htm">activationController</prop>
<prop key="/c/changePassword.htm">changePasswordController</prop>
<prop key="/c/cooker.htm">cookerController</prop>
<prop key="/c/settings.htm">settingsController</prop>
<prop key="/c/editProfile.htm">editProfileController</prop>
<prop key="/c/history.htm">historyController</prop>
<prop key="userRegistration">userController</prop>
<prop key="sharing">sharingController</prop>
<prop key="login">loginController</prop>
<prop key="forgotPassword">forgotPasswordController</prop>
<prop key="activation">activationController</prop>
<prop key="changePassword">changePasswordController</prop>
<prop key="cooker">cookerController</prop>
<prop key="settings">settingsController</prop>
<prop key="editProfile">editProfileController</prop>
<prop key="history">historyController</prop>
</props>
</property>
</bean>

0
wise-webapp/src/main/webapp/favicon.ico Normal file
View File

2
wise-webapp/src/main/webapp/index.html
View File

@ -1,6 +1,6 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<meta HTTP-EQUIV="REFRESH" content="0; url=/c/home.htm">
<meta HTTP-EQUIV="REFRESH" content="0; url=/c/home">
</head>
</html>

2
wise-webapp/src/main/webapp/index.jsp
View File

@ -1,3 +1,3 @@
<%
response.sendRedirect("c/home.htm");
response.sendRedirect("c/home");
%>

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

@ -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 '<a href="c/maps/' + obj.aData.id + '/edit.htm">' + obj.aData.title + '</a>';
return '<a href="c/maps/' + obj.aData.id + '/edit">' + obj.aData.title + '</a>';
}
},
{
@ -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() {
});

8
wise-webapp/src/main/webapp/jsp/editorHeader.jsp
View File

@ -13,14 +13,14 @@
<div id="headerActions">
<spring:message code="WELCOME"/>
, ${principal.firstname}
| <a href="${pageContext.request.contextPath}/c/mymaps.htm" title="<spring:message code="MY_WISEMAPS"/>">
| <a href="${pageContext.request.contextPath}/c/maps/" title="<spring:message code="MY_WISEMAPS"/>">
<spring:message code="MY_WISEMAPS"/>
</a>
| <a href="${pageContext.request.contextPath}/c/settings.htm" rel="moodalbox 400px 250px wizard"
| <a href="${pageContext.request.contextPath}/c/settings" rel="moodalbox 400px 250px wizard"
title="<spring:message code="SETTINGS_DETAIL"/>">
<spring:message code="SETTINGS"/>
</a>
| <a href="${pageContext.request.contextPath}/c/logout.htm" title="<spring:message code="LOGOUT"/>">
| <a href="${pageContext.request.contextPath}/c/logout" title="<spring:message code="LOGOUT"/>">
<spring:message code="LOGOUT"/>
</a>
</div>
@ -28,7 +28,7 @@
<c:when test="${param.removeSignin!=true}">
<div id="signUpHeader">
<spring:message code="ALREADY_A_MEMBER"/>
<a href="${pageContext.request.contextPath}/c/login.htm" title="<spring:message code="SIGN_IN"/>">
<a href="${pageContext.request.contextPath}/c/login" title="<spring:message code="SIGN_IN"/>">
<spring:message code="SIGN_IN"/>
</a>
</div>

2
wise-webapp/src/main/webapp/jsp/embeddedView.jsp
View File

@ -89,7 +89,7 @@
<div id="mapContainer">
<div id="mindplot"></div>
<div id="embFooter">
<a href="${pageContext.request.contextPath}/c/home.htm" target="new">
<a href="${pageContext.request.contextPath}/c/home" target="new">
<div id="logo"></div>
</a>

2
wise-webapp/src/main/webapp/jsp/embeddedViewError.jsp
View File

@ -24,7 +24,7 @@
</p>
</div>
<div id="embFooter">
<a href="${pageContext.request.contextPath}/c/home.htm" target="new">
<a href="${pageContext.request.contextPath}/c/home" target="new">
<div id="logo"></div>
</a>
</div>

4
wise-webapp/src/main/webapp/jsp/forgotPassword.jsp
View File

@ -16,7 +16,7 @@
<input type="submit" value="<spring:message code="SUBMIT"/>" class="btn btn-primary"/>
<input type="button" value="<spring:message code="CANCEL"/>" class="btn"
onclick="window.location='<c:url value="c/mymaps.htm"/>'"/>
onclick="window.location='<c:url value="c/maps/"/>'"/>
</fieldset>
</form:form>
</div>
@ -27,7 +27,7 @@
<spring:message code="NOT_READY_A_USER"/>
</b>
<spring:message code="NOT_READY_A_USER_MESSAGE"/>
<a href="userRegistration.htm">
<a href="userRegistration">
<spring:message code="JOIN_NOW"/>
</a>
</div>

2
wise-webapp/src/main/webapp/jsp/gcfPluginNeeded.jsp
View File

@ -8,6 +8,6 @@
<div class="installCFG">
<spring:message code="INSTALL_CFG_REASON"/>
<br/><br/>
<a href="${pageContext.request.contextPath}/c/installCFG.htm?mapId=${mapId}"><spring:message code="INSTALL_CFG_CLICK_HERE"/></a>
<a href="${pageContext.request.contextPath}/c/installCFG?mapId=${mapId}"><spring:message code="INSTALL_CFG_CLICK_HERE"/></a>
</div>

12
wise-webapp/src/main/webapp/jsp/header.jsp
View File

@ -9,15 +9,15 @@
<c:when test="${principal != null}">
<div id="headerActions">
<spring:message code="WELCOME"/>, ${principal.firstname}
| <span><a href="${pageContext.request.contextPath}/c/mymaps.htm"><spring:message code="MY_WISEMAPS"/></a></span>
| <span><a href="${pageContext.request.contextPath}/c/settings.htm" title="<spring:message code="SETTINGS_DETAIL"/>"><spring:message code="SETTINGS"/></a></span>
| <span><a href="${pageContext.request.contextPath}/c/logout.htm" title="<spring:message code="LOGOUT"/>"><spring:message code="LOGOUT"/></a></span>
| <span><a href="${pageContext.request.contextPath}/c/maps/"><spring:message code="MY_WISEMAPS"/></a></span>
| <span><a href="${pageContext.request.contextPath}/c/settings" title="<spring:message code="SETTINGS_DETAIL"/>"><spring:message code="SETTINGS"/></a></span>
| <span><a href="${pageContext.request.contextPath}/c/logout" title="<spring:message code="LOGOUT"/>"><spring:message code="LOGOUT"/></a></span>
</div>
</c:when>
<c:when test="${param.removeSignin!=true}">
<div id="headerActions">
<spring:message code="ALREADY_A_MEMBER"/>
<span><a href="${pageContext.request.contextPath}/c/login.htm" title="<spring:message code="SIGN_IN"/>">
<span><a href="${pageContext.request.contextPath}/c/login" title="<spring:message code="SIGN_IN"/>">
<spring:message code="SIGN_IN"/>
</a></span>
</div>
@ -40,12 +40,12 @@
<div id="headerContent">
<div id="headerButtons">
<%--<div id="blogLink">--%>
<%--<a href="${pageContext.request.contextPath}/c/blog.htm" title="<spring:message code="BLOG_TITLE"/>">--%>
<%--<a href="${pageContext.request.contextPath}/c/blog" title="<spring:message code="BLOG_TITLE"/>">--%>
<%--<spring:message code="BLOG"/>--%>
<%--</a>--%>
<%--</div>--%>
</div>
<a href="${pageContext.request.contextPath}/c/home.htm" title="Homepage">
<a href="${pageContext.request.contextPath}/c/home" title="Homepage">
<div id="headerLogo">&nbsp;</div>
</a>

2
wise-webapp/src/main/webapp/jsp/homepage.jsp
View File

@ -1,3 +1,3 @@
<%
response.sendRedirect(request.getContextPath() + "/c/mymaps.htm");
response.sendRedirect(request.getContextPath() + "/c/maps/");
%>

2
wise-webapp/src/main/webapp/jsp/installCFG.jsp
View File

@ -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")
});
</script>

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

@ -45,14 +45,14 @@
</div>
</fieldset>
</form>
<a href="<c:url value="/c/forgotPassword.htm"/>"><spring:message code="FORGOT_PASSWORD"/></a>
<a href="<c:url value="/c/forgotPassword"/>"><spring:message code="FORGOT_PASSWORD"/></a>
</div>
</div>
<div id="register">
<b><spring:message code="NOT_READY_A_USER"/></b>
<spring:message code="NOT_READY_A_USER_MESSAGE"/>
<a href="c/userRegistration.htm">
<a href="c/userRegistration">
<spring:message code="JOIN_NOW"/>
</a>
</div>

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

@ -1,9 +1,9 @@
<%@ include file="/jsp/init.jsp" %>
<c:url value="mymaps.htm" var="shareMap">
<c:url value="maps/" var="shareMap">
<c:param name="action" value="removeCollaborator"/>
<c:param name="userEmail" value="${pageContext.request.userPrincipal.name}"/>
</c:url>
<c:url value="sharing.htm" var="removeCollaborator">
<c:url value="sharing" var="removeCollaborator">
<c:param name="actionId" value="removeCollaborator"/>
<c:param name="mapId" value="${mindmap.id}"/>
</c:url>
@ -13,7 +13,7 @@
<div id="addCollaboratorPanel">
<form method="post" name="sharingForm"
action="${pageContext.request.contextPath}/c/sharing.htm?mapId=${mindmap.id}">
action="${pageContext.request.contextPath}/c/sharing?mapId=${mindmap.id}">
<div id="userEmails">
<h2>

2
wise-webapp/src/main/webapp/jsp/mindmapCooker.jsp
View File

@ -3,7 +3,7 @@
<h1>Mindmap Cooker</h1>
<div>
<form action='<c:url value="/c/cooker.htm"/>' method="post">
<form action='<c:url value="/c/cooker"/>' method="post">
<input type="hidden" name="action" value="save"/>
<input type="hidden" name="mapId" value="${mindmap.id}"/>
<table>

4
wise-webapp/src/main/webapp/jsp/mindmapDetail.jsp
View File

@ -44,11 +44,11 @@
<li><strong><spring:message code="URL"/>:</strong>
<li><input name="url"
value="http://www.wisemapping.com/c/publicView.htm?mapId=${wisemapDetail.id}"
value="http://www.wisemapping.com/c/publicView?mapId=${wisemapDetail.id}"
style="width:400px" readonly="readonly"/>
</li>
<li><strong><spring:message code="BLOG_SNIPPET"/></strong>
<pre>&lt;iframe style="border:0;width:600px;height:400px;border: 1px solid black" src="http://www.wisemapping.com/c/embeddedView.htm?mapId=${wisemapDetail.id}&amp;amzoom=1"&gt;&lt;/iframe&gt;</pre>
<pre>&lt;iframe style="border:0;width:600px;height:400px;border: 1px solid black" src="http://www.wisemapping.com/c/embeddedView?mapId=${wisemapDetail.id}&amp;amzoom=1"&gt;&lt;/iframe&gt;</pre>
</li>
<li><spring:message code="EMBEDDED_MAP_SIZE"/></li>
</ul>

12
wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp
View File

@ -6,7 +6,7 @@
<%--@elvariable id="mapXml" type="com.wisemapping.model.User"--%>
<%@ include file="/jsp/init.jsp" %>
<c:url value="mymaps.htm" var="shareMap">
<c:url value="maps/" var="shareMap">
<c:param name="action" value="collaborator"/>
<c:param name="userEmail" value="${pageContext.request.userPrincipal.name}"/>
</c:url>
@ -61,7 +61,7 @@
<div id="actionsContainer"></div>
<div>
<c:url value="mymaps.htm" var="shareMap">
<c:url value="maps/" var="shareMap">
<c:param name="action" value="collaborator"/>
<c:param name="userEmail" value="${pageContext.request.userPrincipal.name}"/>
</c:url>
@ -72,14 +72,14 @@
<div id="headerActions">
<spring:message code="WELCOME"/>, ${principal.firstname}|<span><a
href="${pageContext.request.contextPath}/c/mymaps.htm"><spring:message code="MY_WISEMAPS"/></a></span> |
<span><a id="settings" href="${pageContext.request.contextPath}/c/settings.htm"
href="${pageContext.request.contextPath}/c/maps/"><spring:message code="MY_WISEMAPS"/></a></span> |
<span><a id="settings" href="${pageContext.request.contextPath}/c/settings"
title="<spring:message code="SETTINGS_DETAIL"/>"><spring:message code="SETTINGS"/></a></span>
| <span><a href="${pageContext.request.contextPath}/c/logout.htm" title="<spring:message code="LOGOUT"/>">
| <span><a href="${pageContext.request.contextPath}/c/logout" title="<spring:message code="LOGOUT"/>">
<spring:message code="LOGOUT"/>
</a></span>
</div>
<a href="${pageContext.request.contextPath}/c/mymaps.htm">
<a href="${pageContext.request.contextPath}/c/maps/">
<div id="headerLogo"></div>
</a>

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

@ -1,125 +1,100 @@
<%@ include file="/jsp/init.jsp" %>
<h1>
<spring:message code="EXPORT"/>'${mindmap.title}'</h1>
<p>
<spring:message code="EXPORT_DETAILS"/>
</p>
<div>
<form method="POST" id="exportForm" name="exportForm" action="<c:url value="/service/transform"/>"
style="height:100%;" enctype="application/x-www-form-urlencoded">
<input name="svgXml" value="" type="hidden"/>
<input name="mapXml" value="" type="hidden"/>
<input name="filename" value="${mindmap.title}" type="hidden"/>
<table>
<tbody>
<tr>
<td>
<input type="radio" id="svg" name="exportFormat" value="SVG"/>
<label for="svg">
<b>
<spring:message code="SVG_EXPORT_FORMAT"/>
</b>
<form method="GET" class="form-horizontal" action="service/maps/${mindmap.id}"
enctype="application/x-www-form-urlencoded" id="dialogMainForm">
<input name="svgXml" id="svgXml" value="" type="hidden"/>
<input name="download" type="hidden" value="mm"/>
<fieldset>
<label for="freemind">
<input type="radio" id="freemind" name="exportFormat" value="mm" checked="checked"/>
<strong><spring:message code="FREEMIND_EXPORT_FORMAT"/></strong><br/>
<spring:message code="FREEMIND_EXPORT_FORMAT_DETAILS"/>
</label>
<label for="wisemapping">
<input type="radio" id="wisemapping" name="exportFormat" value="wxml"/>
<strong><spring:message code="WISEMAPPING_EXPORT_FORMAT"/></strong><br/>
<spring:message code="WISEMAPPING_EXPORT_FORMAT_DETAILS"/>
</label>
<label for="svg">
<input type="radio" id="svg" name="exportFormat" value="svg"/>
<strong><spring:message code="SVG_EXPORT_FORMAT"/></strong><br/>
<spring:message code="SVG_EXPORT_FORMAT_DETAILS"/>
</label>
<p>
<spring:message code="SVG_EXPORT_FORMAT_DETAILS"/>
</p>
</label>
</td>
</tr>
<tr>
<td>
<input type="radio" name="exportFormat" value="PDF" id="pdf"/>
<label for="pdf">
<b>
<spring:message code="PDF_EXPORT_FORMAT"/>
</b>
<label for="pdf">
<input type="radio" name="exportFormat" value="pdf" id="pdf"/>
<strong><spring:message code="PDF_EXPORT_FORMAT"/></strong><br/>
<spring:message code="PDF_EXPORT_FORMAT_DETAILS"/>
</label>
<p>
<spring:message code="PDF_EXPORT_FORMAT_DETAILS"/>
</p>
</label>
</td>
</tr>
<tr>
<td>
<input type="radio" id="freemind" name="exportFormat" value="FREEMIND" checked="checked"/>
<label for="freemind">
<b>
<spring:message code="FREEMIND_EXPORT_FORMAT"/>
</b>
<label for="img">
<input type="radio" name="exportFormat" id="img" value="image"/>
<strong><spring:message code="IMG_EXPORT_FORMAT"/></strong><br/>
<spring:message code="IMG_EXPORT_FORMAT_DETAILS"/>
<p>
<spring:message code="FREEMIND_EXPORT_FORMAT_DETAILS"/>
</p>
</label>
</td>
</tr>
<tr>
<td>
<input type="radio" name="exportFormat" id="img" value="IMG_EXPORT_FORMAT"/>
<b>
<spring:message code="IMG_EXPORT_FORMAT"/>
</b><select name="imgFormat" id="imgFormat" style="visibility:hidden;margin-left:5px;">
<option>PNG</option>
<option>JPEG</option>
<select name="imgFormat" id="imgFormat" style="display:none">
<option value='png'>PNG</option>
<option value='jpeg'>JPEG</option>
</select>
<label for="img">
<p>
<spring:message code="IMG_EXPORT_FORMAT_DETAILS"/>
</p>
</label>
</td>
</tr>
<tr>
<td style="text-align:center;margin-top:10px;">
<input type="button" id="ok" value="<spring:message code="OK"/>" class="btn-primary">
<input type="button" id="cancel" value="<spring:message code="CANCEL"/>" class="btn-secondary"
onclick="MooDialog.Request.active.close()">
</td>
</tr>
</tbody>
</table>
</label>
</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">
$('img').addEvent('click', function(event) {
$('imgFormat').setStyle('visibility', 'visible');
});
$('pdf').addEvent('click', function(event) {
$('imgFormat').setStyle('visibility', 'hidden');
});
$('svg').addEvent('click', function(event) {
$('imgFormat').setStyle('visibility', 'hidden');
});
$('ok').addEvent('click', function(event) {
// No way to obtain map svg. Hide panels..
if (window.location.pathname.indexOf('exportf') != -1) {
$('#exportInfo').hide();
$('#freemind,#pdf,#svg').click('click', function(event) {
$('#imgFormat').hide();
});
var form = $('exportForm');
$('#img').click('click', function(event) {
$('#imgFormat').show();
});
} else {
$('#pdf,#svg,#img').parent().hide();
}
function submitDialogForm() {
// If the map is opened, use the latest model ...
var formatType = $('#dialogMainForm input:checked').attr('value');
var form = $('#dialogMainForm');
// Restore default ..
form.attr('action', 'service/maps/${mindmap.id}.' + formatType);
if (formatType == 'image' || formatType == 'svg' || formatType == 'pdf') {
// Look for the selected format and append export suffix...
if (formatType == 'image') {
formatType = $('#dialogMainForm option:selected').attr('value');
}
// Change to transform url ...
form.attr('method', "POST");
form.attr('action', 'service/transform.' + formatType);
// Load page SVG ...
var svg = window.parent.document.getElementById('workspaceContainer').innerHTML;
$('#svgXml').attr('value', svg);
// Look for the selected format and append export suffix...
var value = $$('input[name=exportFormat]:checked')[0].get('value');
var suffix;
if (value == 'IMG_EXPORT_FORMAT') {
var selected = $('imgFormat');
suffix = selected.options[selected.selectedIndex].value;
} else {
suffix = value;
}
suffix = suffix.toLowerCase();
form.action = form.action + "." + suffix;
// Store SVG o native map...
if (suffix == "freemind") {
var mindmap = designer.getMindmap();
var serializer = mindplot.persistence.XMLSerializerFactory.getSerializerFromMindmap(mindmap);
var domMap = serializer.toXML(mindmap);
form.mapXml.value = core.Utils.innerXML(domMap);
} else {
form.svgXml.value = $("workspaceContainer").innerHTML;
}
// Finally, submit map ...
$('#dialogMainForm input[name=download]').attr('value', formatType);
form.submit();
MooDialog.Request.active.close();
});
// Close dialog ...
$('#export-dialog-modal').modal('hide');
}
</script>

2
wise-webapp/src/main/webapp/jsp/mindmapHistory.jsp
View File

@ -58,7 +58,7 @@
%>
</tbody>
</table>
<form name="revertForm" action="<c:url value="history.htm"/>">
<form name="revertForm" action="<c:url value="history"/>">
<input type="hidden" name="action" value="revert"/>
<%
if (request.getAttribute("goToMindmapList") != null)

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

@ -23,7 +23,7 @@
<input type="submit" value="<spring:message code="IMPORT"/>" class="btn btn-primary"/>
<input type="button" value="<spring:message code="CANCEL"/>" class="btn"
onclick="window.location='/c/mymaps.htm'">
onclick="window.location='/c/maps/'">
</form:form>
</div>

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

@ -37,15 +37,14 @@
<div style="min-height: 500px">
<div id="messagesPanel" class="alert alert-error alert-block fade in hide" style="margin-top: 10px">
<strong><spring:message code="UNEXPECTED_ERROR"/></strong>
<p><spring:message code="UNEXPECTED_ERROR_SERVER_ERROR"/></p>
<div></div>
</div>
<div id="mindmapListContainer">
<div id="messagesPanel" class="alert alert-error alert-block fade in hide" style="margin-top: 10px">
<strong><spring:message code="UNEXPECTED_ERROR"/></strong>
<p><spring:message code="UNEXPECTED_ERROR_SERVER_ERROR"/></p>
<div></div>
</div>
<div id="foldersContainer">
<ul class="nav nav-list">
<li class="nav-header">Filters</li>
@ -84,10 +83,12 @@
<li id="duplicateBtn"><a href="#" onclick="return false"><i class="icon-plus-sign"></i>
Duplicate</a></li>
<li id="renameBtn"><a href="#" onclick="return false"><i class="icon-edit"></i> Rename</a></li>
<li id="printBtn"><a href="#" onclick="return false"><i class="icon-print"></i> Print</a></li>
<li id="publishBtn"><a href="#" onclick="return false"><i class="icon-globe"></i> Publish</a>
</li>
<li id="shareBtn"><a href="#" onclick="return false"><i class="icon-share"></i> Share</a></li>
<li id="exportBtn"><a href="#" onclick="return false"><i class="icon-download"></i> Export</a>
</li>
<li id="printBtn"><a href="#" onclick="return false"><i class="icon-print"></i> Print</a></li>
<li id="historyBtn"><a href="#" onclick="return false"><i class="icon-time"></i> History</a>
</li>
</ul>
@ -247,6 +248,22 @@
<button class="btn btn-cancel" data-dismiss="modal">Cancel</button>
</div>
</div>
<!-- Export Dialog Config -->
<div id="export-dialog-modal" class="modal fade" style="display: none">
<div class="modal-header">
<button class="close" data-dismiss="modal">x</button>
<h3>Export</h3>
</div>
<div class="modal-body">
</div>
<div class="modal-footer">
<button class="btn btn-primary btn-accept" data-loading-text="Exporting...">Export</button>
<button class="btn btn-cancel" data-dismiss="modal">Cancel</button>
</div>
</div>
</div>
</body>
</html>

2
wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp
View File

@ -114,7 +114,7 @@
<div id="printLogo"></div>
<div id="embFooter">
<a href="${pageContext.request.contextPath}/c/home.htm" target="new">
<a href="${pageContext.request.contextPath}/c/home" target="new">
<div id="footerLogo"></div>
</a>

2
wise-webapp/src/main/webapp/jsp/mindmapPublicView.jsp
View File

@ -4,7 +4,7 @@
</h1>
<c:url value="embeddedView.htm?mapId=${mindmap.id}&fullView=true"
<c:url value="embeddedView?mapId=${mindmap.id}&fullView=true"
var="embeddedUrl"/>

4
wise-webapp/src/main/webapp/jsp/mindmapPublish.jsp
View File

@ -45,12 +45,12 @@
</div>
<label><spring:message code="BLOG_SNIPPET"/></label>
<pre id="embedCode">&lt;iframe style="width:600px;height:400px;border: 1px
solid black" src="http://www.wisemapping.com/c/embeddedView.htm?mapId=${mindmap.id}&zoom=1"&gt; &lt;/iframe&gt;</pre>
solid black" src="http://www.wisemapping.com/c/embeddedView?mapId=${mindmap.id}&zoom=1"&gt; &lt;/iframe&gt;</pre>
</div>
<div class="tab-pane fade" id="publicUrlTab">
<spring:message code="URL"/>:
<input name="url" value="http://www.wisemapping.com/c/publicView.htm?mapId=${mindmap.id}"
<input name="url" value="http://www.wisemapping.com/c/publicView?mapId=${mindmap.id}"
style="width:400px"
readonly="readonly"/>
</div>

36
wise-webapp/src/main/webapp/jsp/mindmapRename.jsp
View File

@ -1,36 +0,0 @@
<%@ include file="/jsp/init.jsp" %>
<div>
<form:form method="post" commandName="renameMap">
<table>
<tr>
<td class="formLabel">
<span class="fieldRequired">*</span>
<spring:message code="NAME"/>
:
</td>
<td>
<form:input path="title" id="title" tabindex="1"/>
<form:errors path="title" cssClass="errorMsg"/>
</td>
</tr>
<tr>
<td class="formLabel">
<spring:message code="DESCRIPTION"/>
:
</td>
<td>
<form:input path="description" id="description" tabindex="2"/>
<form:errors path="description" cssClass="errorMsg"/>
</td>
</tr>
<tr>
<td>&nbsp;</td>
<td>
<input type="submit" value="<spring:message code="SUBMIT"/>" class="btn-primary">
<input type="button" value="<spring:message code="CANCEL"/>" class="btn-primary"
onclick="MOOdalBox.close();">
</td>
</tr>
</table>
</form:form>
</div>

39
wise-webapp/src/main/webapp/jsp/mindmapShare.jsp Normal file
View File

@ -0,0 +1,39 @@
<%@ include file="/jsp/init.jsp" %>
<style type="text/css">
#sharingContainer {
height: 300px;
width: 300px;
overflow: scroll;
}
</style>
<p>Who has access</p>
<div id="sharingContainer">
<table class="table">
<tbody>
<tr>
<td>Name</td>
<td>Email</td>
<td><a href="">Action</a></td>
</tr>
</tbody>
</table>
</div>
<form method="post" id="dialogMainForm" action="#" class="well form-inline">
<label for="collabEmails" class="control-label">Add People:
<input type="text" id="collabEmails" name="collabEmail" placeholder="Enter collaborators emails separared by comas."/>
</label>
</form>
<script type="text/javascript">
// Hook for interaction with the main parent window ...
var submitDialogForm = function() {
$('#dialogMainForm').submit();
}
</script>

36
wise-webapp/src/main/webapp/jsp/mindmapTags.jsp
View File

@ -1,36 +0,0 @@
<%@ include file="/jsp/init.jsp" %>
<h1><spring:message code="TAG"/>'${tag.mindmapTitle}'</h1>
<h2>
<spring:message code="TAGS_MSG"/>
</h2>
<div>
<form:form method="post" commandName="tag">
<table>
<tbody>
<tr>
<td class="formLabel"> &nbsp;</td>
<td>
<form:input path="mindmapTags" id="mindmapTags" tabindex="0"/>
<form:errors path="mindmapTags" cssClass="errorMsg"/>
</td>
</tr>
<tr>
<td>&nbsp;</td>
<td style="padding: 5px">
<input type="submit" value="<spring:message code="SUBMIT"/>" class="btn-primary">
<input type="button" value="<spring:message code="CANCEL"/>" class="btn-secondary" id="cancelBtn">
</td>
</tr>
</tbody>
</table>
</form:form>
</div>
<script type="text/javascript">
$('cancelBtn').addEvent('click', function(event) {
MooDialog.Request.active.close();
});
</script>

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

@ -25,7 +25,7 @@
<div>${mindmap.description}</div>
<div>${mindmap.userRole}</div>
<form method="post" action="<c:url value="sharing.htm"/>">
<form method="post" action="<c:url value="sharing"/>">
<input type="hidden" name="action" value="addViewer"/>
<input type="hidden" name="mapId" value="${mindmap.id}"/>
@ -46,7 +46,7 @@
<textarea name="userEmails" id="viewers" tabindex="1" cols="50" rows="5"></textarea><br/>
<input type="submit" value="<spring:message code="ADD"/>">
<input type="button" value="<spring:message code="CANCEL"/>"
onclick="window.location='<c:url value="mymaps.htm"/>'">
onclick="window.location='<c:url value="maps/"/>'">
</div>
</td>
<td>
@ -77,7 +77,7 @@
</div>
</form>
<form name="removeViewerForm" action="<c:url value="sharing.htm"/>">
<form name="removeViewerForm" action="<c:url value="sharing"/>">
<input type="hidden" name="action" value="removeViewer"/>
<input type="hidden" name="mapId" value="${mindmap.id}"/>
<input type="hidden" name="userEmail" value=""/>

4
wise-webapp/src/main/webapp/jsp/setting.jsp
View File

@ -2,13 +2,13 @@
<div>
<ul>
<li><a rel="moodalbox 400px 200px wizard"
href="<c:out value="${pageContext.request.contextPath}/c/changePassword.htm"/>"
href="<c:out value="${pageContext.request.contextPath}/c/changePassword"/>"
title="<spring:message code="CHANGE_PASSWORD"/>">
<spring:message code="CHANGE_PASSWORD"/>
</a>
</li>
<li><a rel="moodalbox 400px 250px wizard"
href="<c:out value="${pageContext.request.contextPath}/c/editProfile.htm"/>"
href="<c:out value="${pageContext.request.contextPath}/c/editProfile"/>"
title="<spring:message code="EDIT_PROFILE"/>">
<spring:message code="EDIT_PROFILE"/>
</a>

4
wise-webapp/src/main/webapp/jsp/userRegistration.jsp
View File

@ -42,7 +42,7 @@
<div>
<p>
<spring:message code="TERM_OF_THE_SERVICE"/>
<spring:message code="WISEMAPPING_ACCOUNT_MESSAGE"/> <a href="termsOfUse.htm"><spring:message
<spring:message code="WISEMAPPING_ACCOUNT_MESSAGE"/> <a href="c/termsOfUse"><spring:message
code="HERE"/></a>
<spring:message code="REGISTRATION_CLICK_ADVICE"/>
</p>
@ -51,7 +51,7 @@
<input type="submit" value="<spring:message code="REGISTER" />" id="submitButton"
class="btn btn-primary">
<input type="button" value="<spring:message code="CANCEL"/>"
onclick="window.location='<c:url value="mymaps.htm"/>'" class="btn">
onclick="window.location='c/<c:url value="maps/"/>'" class="btn">
</form:form>
</div>
</div>

2
wise-webapp/src/main/webapp/jsp/userRegistrationConfirmation.jsp
View File

@ -24,7 +24,7 @@
</c:if>
<c:if test="${confirmByEmail==false}">
<p>
Your account has been created successfully, click <a href="login.htm">here</a> to sign in and start enjoying WiseMapping.
Your account has been created successfully, click <a href="c/login">here</a> to sign in and start enjoying WiseMapping.
</p>
</c:if>
</div>

1
wise-webapp/src/test/sql/hsql/drop-schemas.sql
View File

@ -1,4 +1,5 @@
DROP TABLE TAG;
DROP TABLE MINDMAP_COLLABORATOR_PROPERTIES;
DROP TABLE MINDMAP_COLABORATOR;
DROP TABLE MINDMAP_HISTORY;
DROP TABLE MINDMAP;

1
wise-webapp/src/test/sql/mysql/drop-schemas.sql
View File

@ -1,4 +1,5 @@
DROP TABLE TAG;
DROP TABLE MINDMAP_COLLABORATOR_PROPERTIES;
DROP TABLE MINDMAP_COLABORATOR;
DROP TABLE MINDMAP_HISTORY;
DROP TABLE MINDMAP;