mirror of
https://bitbucket.org/wisemapping/wisemapping-open-source.git
synced 2024-08-20 12:30:44 +02:00
Improve and fix print.
Support for jetty:run fixed. Several minor fixes.
This commit is contained in:
parent
1aa4859da1
commit
a141414b4b
@ -209,8 +209,9 @@ mindplot.widget.Menu = new Class({
|
|||||||
|
|
||||||
|
|
||||||
this._addButton('print', false, false, function() {
|
this._addButton('print', false, false, function() {
|
||||||
printMap();
|
window.open('c/print.htm?mapId=' + mapId)
|
||||||
});
|
});
|
||||||
|
|
||||||
this._registerTooltip('print', "Print");
|
this._registerTooltip('print', "Print");
|
||||||
|
|
||||||
this._addButton('zoomIn', false, false, function() {
|
this._addButton('zoomIn', false, false, function() {
|
||||||
|
@ -23,10 +23,81 @@ div#footer {
|
|||||||
}
|
}
|
||||||
|
|
||||||
div#footerLogo {
|
div#footerLogo {
|
||||||
height: 65px;
|
width: 114px;
|
||||||
width: 80px;
|
height: 56px;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
background: url(../images/logo-small.png) no-repeat right top;
|
display: list-item;
|
||||||
|
list-style-image: url(../images/logo-xsmall.png);
|
||||||
|
list-style-position: inside;
|
||||||
right: 10px;
|
right: 10px;
|
||||||
top: -50px;
|
top: -30px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
div#zoomIn {
|
||||||
|
background: url(../images/zoom-in.png) no-repeat left top;
|
||||||
|
margin-top: 10px;
|
||||||
|
margin-left: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
#zoomOut {
|
||||||
|
background: url(../images/zoom-out.png) no-repeat left top;;
|
||||||
|
margin-top: 10px;
|
||||||
|
margin-left: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
.button {
|
||||||
|
width: 20px;
|
||||||
|
height: 20px;
|
||||||
|
float: left;
|
||||||
|
cursor: pointer;
|
||||||
|
white-space: nowrap;
|
||||||
|
margin: 1px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.button:hover {
|
||||||
|
float: left;
|
||||||
|
cursor: pointer;
|
||||||
|
border: 1px solid black;
|
||||||
|
border-top-color: white;
|
||||||
|
border-left-color: white;
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
div#mapDetails {
|
||||||
|
float: right;
|
||||||
|
padding-top: 10px;
|
||||||
|
margin-right: 130px;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
div#mapDetails .title {
|
||||||
|
font-weight: bold;
|
||||||
|
margin-left: 10px;
|
||||||
|
margin-right: 3px;
|
||||||
|
}
|
||||||
|
|
||||||
|
div#infoPanel {
|
||||||
|
border: 2px black solid;
|
||||||
|
position: absolute;
|
||||||
|
background: gray;
|
||||||
|
width: 100px;
|
||||||
|
height: 300px;
|
||||||
|
z-index: 100;
|
||||||
|
padding: 5px;
|
||||||
|
border-radius: 8px;
|
||||||
|
top: 150px;
|
||||||
|
right: 10px;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
div#infoPanel .textNode {
|
||||||
|
background-color: #E0E5EF;
|
||||||
|
height: 20px;
|
||||||
|
width: 80px;
|
||||||
|
border: 3px #023BB9 solid;
|
||||||
|
padding: 4px;
|
||||||
|
cursor: move
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -467,6 +467,15 @@
|
|||||||
<stopPort>9999</stopPort>
|
<stopPort>9999</stopPort>
|
||||||
<war>${project.build.directory}/wisemapping.war</war>
|
<war>${project.build.directory}/wisemapping.war</war>
|
||||||
<reload>automatic</reload>
|
<reload>automatic</reload>
|
||||||
|
<webAppConfig>
|
||||||
|
<overrideDescriptor>webdefault.xml</overrideDescriptor>
|
||||||
|
</webAppConfig>
|
||||||
|
<systemProperties>
|
||||||
|
<systemProperty>
|
||||||
|
<name>org.mortbay.util.FileResource.checkAliases</name>
|
||||||
|
<value>false</value>
|
||||||
|
</systemProperty>
|
||||||
|
</systemProperties>
|
||||||
<!--<scanIntervalSeconds>10</scanIntervalSeconds>-->
|
<!--<scanIntervalSeconds>10</scanIntervalSeconds>-->
|
||||||
</configuration>
|
</configuration>
|
||||||
<executions>
|
<executions>
|
||||||
|
@ -58,8 +58,6 @@ public class MindmapEditorController extends BaseMultiActionController {
|
|||||||
view.addObject("editorTryMode", false);
|
view.addObject("editorTryMode", false);
|
||||||
final boolean showHelp = isWelcomeMap(mindmap);
|
final boolean showHelp = isWelcomeMap(mindmap);
|
||||||
view.addObject("showHelp", showHelp);
|
view.addObject("showHelp", showHelp);
|
||||||
final String xmlMap = mindmap.getXmlAsJsLiteral();
|
|
||||||
view.addObject(MAP_XML_PARAM, xmlMap);
|
|
||||||
view.addObject("user", Utils.getUser());
|
view.addObject("user", Utils.getUser());
|
||||||
}
|
}
|
||||||
return view;
|
return view;
|
||||||
|
@ -225,7 +225,7 @@ public class MindMap {
|
|||||||
result.append("<map version=\"tango\">");
|
result.append("<map version=\"tango\">");
|
||||||
result.append("<topic central=\"true\" text=\"");
|
result.append("<topic central=\"true\" text=\"");
|
||||||
result.append(title);
|
result.append(title);
|
||||||
result.append("\"/></result>");
|
result.append("\"/></map>");
|
||||||
return result.toString();
|
return result.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -33,14 +33,8 @@ public class MindmapController {
|
|||||||
return new ModelAndView("mindmapExport", "mindmap", modelObject);
|
return new ModelAndView("mindmapExport", "mindmap", modelObject);
|
||||||
}
|
}
|
||||||
|
|
||||||
@RequestMapping(value = "edit")
|
|
||||||
public ModelAndView edit(@RequestParam(required = true) long mapId) {
|
|
||||||
final MindMapBean modelObject = findMindmapBean(mapId);
|
|
||||||
return new ModelAndView("mindmapEditor", "wisemapsList", modelObject);
|
|
||||||
}
|
|
||||||
|
|
||||||
@RequestMapping(value = "collaborator")
|
@RequestMapping(value = "collaborator")
|
||||||
public ModelAndView collaborator(@RequestParam(required = true) long mapId) {
|
public ModelAndView showCollaborator(@RequestParam(required = true) long mapId) {
|
||||||
final MindMapBean modelObject = findMindmapBean(mapId);
|
final MindMapBean modelObject = findMindmapBean(mapId);
|
||||||
return new ModelAndView("mindmapCollaborator", "mindmap", modelObject);
|
return new ModelAndView("mindmapCollaborator", "mindmap", modelObject);
|
||||||
}
|
}
|
||||||
@ -52,13 +46,21 @@ public class MindmapController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@RequestMapping(value = "detail")
|
@RequestMapping(value = "detail")
|
||||||
public ModelAndView detail(@RequestParam(required = true) long mapId) {
|
public ModelAndView showDetails(@RequestParam(required = true) long mapId) {
|
||||||
final MindMapBean modelObject = findMindmapBean(mapId);
|
final MindMapBean modelObject = findMindmapBean(mapId);
|
||||||
final ModelAndView view = new ModelAndView("mindmapDetail", "wisemapDetail", modelObject);
|
final ModelAndView view = new ModelAndView("mindmapDetail", "wisemapDetail", modelObject);
|
||||||
view.addObject("user", Utils.getUser());
|
view.addObject("user", Utils.getUser());
|
||||||
return view;
|
return view;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@RequestMapping(value = "print")
|
||||||
|
public ModelAndView showPrintPage(@RequestParam(required = true) long mapId) {
|
||||||
|
final MindMap mindmap = findMindmap(mapId);
|
||||||
|
final ModelAndView view = new ModelAndView("mindmapPrint", "mindmap", mindmap);
|
||||||
|
view.addObject("user", Utils.getUser());
|
||||||
|
return view;
|
||||||
|
}
|
||||||
|
|
||||||
@RequestMapping(value = "changeStatus")
|
@RequestMapping(value = "changeStatus")
|
||||||
public ModelAndView changeStatus(@RequestParam(required = true) long mapId) throws WiseMappingException {
|
public ModelAndView changeStatus(@RequestParam(required = true) long mapId) throws WiseMappingException {
|
||||||
final MindMap mindmap = findMindmap(mapId);
|
final MindMap mindmap = findMindmap(mapId);
|
||||||
@ -68,14 +70,6 @@ public class MindmapController {
|
|||||||
return new ModelAndView("mindmapDetail", "wisemapDetail", new MindMapBean(mindmap));
|
return new ModelAndView("mindmapDetail", "wisemapDetail", new MindMapBean(mindmap));
|
||||||
}
|
}
|
||||||
|
|
||||||
@RequestMapping(value = "editMindmap")
|
|
||||||
public ModelAndView editMindmap(@RequestParam(required = true) long mapId) throws WiseMappingException {
|
|
||||||
final MindMapBean mindmap = findMindmapBean(mapId);
|
|
||||||
final ModelAndView view = new ModelAndView("editMindmap", "mindmap", mindmap);
|
|
||||||
view.addObject("user", Utils.getUser());
|
|
||||||
return view;
|
|
||||||
}
|
|
||||||
|
|
||||||
@RequestMapping(value = "mymaps")
|
@RequestMapping(value = "mymaps")
|
||||||
public ModelAndView list(@NotNull HttpServletRequest request) {
|
public ModelAndView list(@NotNull HttpServletRequest request) {
|
||||||
final HttpSession session = request.getSession(false);
|
final HttpSession session = request.getSession(false);
|
||||||
|
@ -331,3 +331,4 @@ INSTALL_CFG_CLICK_HERE=To install Google Chrome Frame Plugin click here
|
|||||||
INVALID_EMAIL_ERROR = The e-mail was not verified
|
INVALID_EMAIL_ERROR = The e-mail was not verified
|
||||||
BROWSER_NOT_SUPPOERTED= Current Browser is not supported.
|
BROWSER_NOT_SUPPOERTED= Current Browser is not supported.
|
||||||
CHECK_BROWSERS= You can check supported browser at
|
CHECK_BROWSERS= You can check supported browser at
|
||||||
|
NO_PRODUCTION_DATABASE_CONFIGURED=Note: Although HSQLDB is bundled with WiseMapping by default during the installation, we do not recommend this database for production use. Please consider using MySQL 5.5 instead. You can find more information how to configure MySQL
|
@ -43,7 +43,7 @@
|
|||||||
<sec:intercept-url pattern="/c/*.htm" access="isFullyAuthenticated()"/>
|
<sec:intercept-url pattern="/c/*.htm" access="isFullyAuthenticated()"/>
|
||||||
<sec:form-login login-page="/c/login.htm"
|
<sec:form-login login-page="/c/login.htm"
|
||||||
default-target-url='/c/mymaps.htm'
|
default-target-url='/c/mymaps.htm'
|
||||||
always-use-default-target='true'
|
always-use-default-target='false'
|
||||||
authentication-failure-url="/c/login.htm?login_error=2"
|
authentication-failure-url="/c/login.htm?login_error=2"
|
||||||
login-processing-url="/j_spring_security_check"/>
|
login-processing-url="/j_spring_security_check"/>
|
||||||
<sec:remember-me key="wisemapping-hashed-key"/>
|
<sec:remember-me key="wisemapping-hashed-key"/>
|
||||||
|
@ -13,10 +13,9 @@
|
|||||||
<property name="paramName" value="actionId"/>
|
<property name="paramName" value="actionId"/>
|
||||||
</bean>
|
</bean>
|
||||||
|
|
||||||
|
<!--<bean id="localeResolver"-->
|
||||||
<!--<bean id="localeResolver"
|
<!--class="org.springframework.web.servlet.i18n.AcceptHeaderLocaleResolver">-->
|
||||||
class="org.springframework.web.servlet.i18n.AcceptHeaderLocaleResolver">
|
<!--</bean>-->
|
||||||
</bean>-->
|
|
||||||
|
|
||||||
<bean id="homeResolver" class="org.springframework.web.servlet.mvc.multiaction.PropertiesMethodNameResolver">
|
<bean id="homeResolver" class="org.springframework.web.servlet.mvc.multiaction.PropertiesMethodNameResolver">
|
||||||
<property name="mappings">
|
<property name="mappings">
|
||||||
|
1
wise-webapp/src/main/webapp/css/embedded.less
Symbolic link
1
wise-webapp/src/main/webapp/css/embedded.less
Symbolic link
@ -0,0 +1 @@
|
|||||||
|
../../../../../wise-editor/src/main/webapp/css/embedded.less
|
@ -1,23 +0,0 @@
|
|||||||
@import "../css/common.css";
|
|
||||||
|
|
||||||
div#printHeader {
|
|
||||||
background-color: black;
|
|
||||||
height: 55px;
|
|
||||||
color: white;
|
|
||||||
}
|
|
||||||
|
|
||||||
div#printFooter {
|
|
||||||
height: 60px;
|
|
||||||
width: 100%;
|
|
||||||
background: #E5E5E5;
|
|
||||||
border-top: 1px solid #bbb4d6;
|
|
||||||
}
|
|
||||||
|
|
||||||
div#printLogo {
|
|
||||||
height: 80px;
|
|
||||||
width: 170px;
|
|
||||||
float: right;
|
|
||||||
margin: 1px;
|
|
||||||
background: url(../images/logo-medium.png) no-repeat right top;
|
|
||||||
}
|
|
||||||
|
|
@ -1,117 +0,0 @@
|
|||||||
html {
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
|
||||||
|
|
||||||
#waitDialog {
|
|
||||||
position: absolute;
|
|
||||||
top: 10px;
|
|
||||||
left: 10px;
|
|
||||||
height: 100px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#loadingContainer {
|
|
||||||
position: relative;
|
|
||||||
top: 80px;
|
|
||||||
height: 120px;
|
|
||||||
background: #FEFEFE;
|
|
||||||
opacity: .99;
|
|
||||||
padding: 15px;
|
|
||||||
width: 100%;
|
|
||||||
border: 1px solid;
|
|
||||||
border-color: #a9a9a9;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
#loadingContainer .loadingText {
|
|
||||||
position: relative;
|
|
||||||
top: 50%;
|
|
||||||
margin-top: -35px;
|
|
||||||
font-size: 30px;
|
|
||||||
font-weight: bold;
|
|
||||||
vertical-align: text-bottom;
|
|
||||||
height: 30px;
|
|
||||||
float: left;
|
|
||||||
}
|
|
||||||
|
|
||||||
#loadingContainer .loadingIcon {
|
|
||||||
position: relative;
|
|
||||||
background: url(../images/ajax-loader2.gif) no-repeat;
|
|
||||||
top: 25px;
|
|
||||||
height: 100px;
|
|
||||||
width: 70px;
|
|
||||||
float: left;
|
|
||||||
clear: both;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ------------- Footer Styles -------------------------*/
|
|
||||||
div# <div id="footer"></div>
|
|
||||||
{
|
|
||||||
position: absolute;
|
|
||||||
height: 35px;
|
|
||||||
width: 100%;
|
|
||||||
bottom: 0;
|
|
||||||
left: 0;
|
|
||||||
border-top: 1px solid black;
|
|
||||||
background: #E5E5E5;
|
|
||||||
font-family: Arial;
|
|
||||||
}
|
|
||||||
|
|
||||||
div#logo {
|
|
||||||
height: 65px;
|
|
||||||
width: 80px;
|
|
||||||
position: absolute;
|
|
||||||
background: url(../images/logo-small.png) no-repeat right top;
|
|
||||||
right: 10px;
|
|
||||||
top: -10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.button {
|
|
||||||
width: 20px;
|
|
||||||
height: 20px;
|
|
||||||
float: left;
|
|
||||||
cursor: pointer;
|
|
||||||
white-space: nowrap;
|
|
||||||
margin: 1px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.button:hover {
|
|
||||||
float: left;
|
|
||||||
cursor: pointer;
|
|
||||||
border: 1px solid black;
|
|
||||||
border-top-color: white;
|
|
||||||
border-left-color: white;
|
|
||||||
margin: 0;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
div#zoomIn {
|
|
||||||
background: url(../images/zoom-in.png) no-repeat left top;
|
|
||||||
margin-top: 10px;
|
|
||||||
margin-left: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#zoomOut {
|
|
||||||
background: url(../images/zoom-out.png) no-repeat left top;;
|
|
||||||
margin-top: 10px;
|
|
||||||
margin-left: 5px;
|
|
||||||
}
|
|
||||||
|
|
||||||
div#mindplot {
|
|
||||||
position: relative;
|
|
||||||
top: 0;
|
|
||||||
left: 0;
|
|
||||||
width: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
div#mapDetails {
|
|
||||||
float: right;
|
|
||||||
padding-top: 10px;
|
|
||||||
margin-right: 100px;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
div#mapDetails .title {
|
|
||||||
font-weight: bold;
|
|
||||||
margin-left: 10px;
|
|
||||||
margin-right: 3px;
|
|
||||||
}
|
|
BIN
wise-webapp/src/main/webapp/images/logo-xsmall.png
Normal file
BIN
wise-webapp/src/main/webapp/images/logo-xsmall.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 13 KiB |
@ -39,7 +39,7 @@
|
|||||||
</c:if>
|
</c:if>
|
||||||
<tr>
|
<tr>
|
||||||
<td class="formLabel">
|
<td class="formLabel">
|
||||||
<spring:message code="EMAIL"/>:
|
<label for="email"><spring:message code="EMAIL"/>:</label>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<input type='text' tabindex="1" id="email" name='j_username'/>
|
<input type='text' tabindex="1" id="email" name='j_username'/>
|
||||||
@ -47,7 +47,7 @@
|
|||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td class="formLabel">
|
<td class="formLabel">
|
||||||
<spring:message code="PASSWORD"/>:
|
<label for="password"><spring:message code="PASSWORD"/>:</label>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<input type='password' tabindex="2" id="password" name='j_password'/>
|
<input type='password' tabindex="2" id="password" name='j_password'/>
|
||||||
@ -58,7 +58,7 @@
|
|||||||
<input type="checkbox" id="rememberme" name="_spring_security_remember_me"/>
|
<input type="checkbox" id="rememberme" name="_spring_security_remember_me"/>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<spring:message code="REMEMBER_ME"/>
|
<label for="rememberme"><spring:message code="REMEMBER_ME"/>:</label>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
@ -79,9 +79,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div id="register">
|
<div id="register">
|
||||||
<b>
|
<b><spring:message code="NOT_READY_A_USER"/></b>
|
||||||
<spring:message code="NOT_READY_A_USER"/>
|
|
||||||
</b>
|
|
||||||
<spring:message code="NOT_READY_A_USER_MESSAGE"/>
|
<spring:message code="NOT_READY_A_USER_MESSAGE"/>
|
||||||
<a href="userRegistration.htm">
|
<a href="userRegistration.htm">
|
||||||
<spring:message code="JOIN_NOW"/>
|
<spring:message code="JOIN_NOW"/>
|
||||||
@ -89,12 +87,9 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<c:if test="${isHsql== 'true'}">
|
<c:if test="${isHsql== 'true'}">
|
||||||
|
|
||||||
|
|
||||||
<div style="padding:10px;background-color: #E0EFFF; border-radius: 5px 5px 5px 5px;border-style:solid;border-color:gray">
|
<div style="padding:10px;background-color: #E0EFFF; border-radius: 5px 5px 5px 5px;border-style:solid;border-color:gray">
|
||||||
<img src="../images/info.png" style="margin:0 4px">Note: Although HSQLDB is bundled with WiseMapping by
|
<img src="../images/info.png" style="margin:0 4px" alt="info">
|
||||||
default during the installation, we do not recommend this database for production use. Please consider using
|
<spring:message code="NO_PRODUCTION_DATABASE_CONFIGURED"/> <a
|
||||||
MySQL 5.5 instead. You can find more information how to configure MySQL <a
|
|
||||||
href="http://www.wisemapping.org/documentation/configu">here</a>.
|
href="http://www.wisemapping.org/documentation/configu">here</a>.
|
||||||
</div>
|
</div>
|
||||||
</c:if>
|
</c:if>
|
||||||
|
@ -2,7 +2,8 @@
|
|||||||
|
|
||||||
<%--@elvariable id="mindmap" type="com.wisemapping.model.MindMap"--%>
|
<%--@elvariable id="mindmap" type="com.wisemapping.model.MindMap"--%>
|
||||||
<%--@elvariable id="editorTryMode" type="java.lang.Boolean"--%>
|
<%--@elvariable id="editorTryMode" type="java.lang.Boolean"--%>
|
||||||
<%--@elvariable id="user" type="com.wisemapping.model.User"--%>
|
<%--@elvariable id="editorTryMode" type="java.lang.String"--%>
|
||||||
|
<%--@elvariable id="mapXml" type="com.wisemapping.model.User"--%>
|
||||||
|
|
||||||
<%@ include file="/jsp/init.jsp" %>
|
<%@ include file="/jsp/init.jsp" %>
|
||||||
<c:url value="mymaps.htm" var="shareMap">
|
<c:url value="mymaps.htm" var="shareMap">
|
||||||
@ -32,7 +33,7 @@
|
|||||||
|
|
||||||
$(document).addEvent('loadcomplete', function(resource) {
|
$(document).addEvent('loadcomplete', function(resource) {
|
||||||
var mapId = '${mindmap.id}';
|
var mapId = '${mindmap.id}';
|
||||||
var mapXml = '${mapXml}';
|
var mapXml = '${mindmap.xmlAsJsLiteral}';
|
||||||
|
|
||||||
// Configure designer options ...
|
// Configure designer options ...
|
||||||
var options = loadDesignerOptions();
|
var options = loadDesignerOptions();
|
||||||
|
@ -13,6 +13,7 @@
|
|||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
<input type="radio" id="svg" name="exportFormat" value="SVG"/>
|
<input type="radio" id="svg" name="exportFormat" value="SVG"/>
|
||||||
|
<label for="svg">
|
||||||
<b>
|
<b>
|
||||||
<spring:message code="SVG_EXPORT_FORMAT"/>
|
<spring:message code="SVG_EXPORT_FORMAT"/>
|
||||||
</b>
|
</b>
|
||||||
@ -20,11 +21,13 @@
|
|||||||
<p>
|
<p>
|
||||||
<spring:message code="SVG_EXPORT_FORMAT_DETAILS"/>
|
<spring:message code="SVG_EXPORT_FORMAT_DETAILS"/>
|
||||||
</p>
|
</p>
|
||||||
|
</label>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
<input type="radio" name="exportFormat" value="PDF" id="pdf"/>
|
<input type="radio" name="exportFormat" value="PDF" id="pdf"/>
|
||||||
|
<label for="pdf">
|
||||||
<b>
|
<b>
|
||||||
<spring:message code="PDF_EXPORT_FORMAT"/>
|
<spring:message code="PDF_EXPORT_FORMAT"/>
|
||||||
</b>
|
</b>
|
||||||
@ -32,11 +35,13 @@
|
|||||||
<p>
|
<p>
|
||||||
<spring:message code="PDF_EXPORT_FORMAT_DETAILS"/>
|
<spring:message code="PDF_EXPORT_FORMAT_DETAILS"/>
|
||||||
</p>
|
</p>
|
||||||
|
</label>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
<input type="radio" id="freemind" name="exportFormat" value="FREEMIND" checked="checked"/>
|
<input type="radio" id="freemind" name="exportFormat" value="FREEMIND" checked="checked"/>
|
||||||
|
<label for="freemind">
|
||||||
<b>
|
<b>
|
||||||
<spring:message code="FREEMIND_EXPORT_FORMAT"/>
|
<spring:message code="FREEMIND_EXPORT_FORMAT"/>
|
||||||
</b>
|
</b>
|
||||||
@ -44,6 +49,7 @@
|
|||||||
<p>
|
<p>
|
||||||
<spring:message code="FREEMIND_EXPORT_FORMAT_DETAILS"/>
|
<spring:message code="FREEMIND_EXPORT_FORMAT_DETAILS"/>
|
||||||
</p>
|
</p>
|
||||||
|
</label>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
@ -55,17 +61,18 @@
|
|||||||
<option>PNG</option>
|
<option>PNG</option>
|
||||||
<option>JPEG</option>
|
<option>JPEG</option>
|
||||||
</select>
|
</select>
|
||||||
|
<label for="img">
|
||||||
<p>
|
<p>
|
||||||
<spring:message code="IMG_EXPORT_FORMAT_DETAILS"/>
|
<spring:message code="IMG_EXPORT_FORMAT_DETAILS"/>
|
||||||
</p>
|
</p>
|
||||||
|
</label>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td style="text-align:center;margin-top:10px;">
|
<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="ok" value="<spring:message code="OK"/>" class="btn-primary">
|
||||||
<input type="button" id="cancel" value="<spring:message code="CANCEL"/>" class="btn-secondary"
|
<input type="button" id="cancel" value="<spring:message code="CANCEL"/>" class="btn-secondary"
|
||||||
onclick="">
|
onclick="MooDialog.Request.active.close()">
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
|
@ -79,7 +79,7 @@
|
|||||||
|
|
||||||
<div class="leftMenu">
|
<div class="leftMenu">
|
||||||
<div class="button">
|
<div class="button">
|
||||||
<a href="newMap.htm" rel="moodalbox 500px 190px" title="<spring:message code="NEW_MAP_MSG"/>">
|
<a href="newMap.htm" title="<spring:message code="NEW_MAP_MSG"/>">
|
||||||
<spring:message code="NEW_MINDMAP"/>
|
<spring:message code="NEW_MINDMAP"/>
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
|
@ -1,7 +1,15 @@
|
|||||||
|
<!DOCTYPE HTML>
|
||||||
|
|
||||||
|
<%--@elvariable id="mindmap" type="com.wisemapping.model.MindMap"--%>
|
||||||
|
<%--@elvariable id="editorTryMode" type="java.lang.Boolean"--%>
|
||||||
|
<%--@elvariable id="editorTryMode" type="java.lang.String"--%>
|
||||||
|
<%--@elvariable id="mapXml" type="com.wisemapping.model.User"--%>
|
||||||
|
|
||||||
<%@ page import="java.text.DateFormat" %>
|
<%@ page import="java.text.DateFormat" %>
|
||||||
<%@ page import="java.text.SimpleDateFormat" %>
|
<%@ page import="java.text.SimpleDateFormat" %>
|
||||||
<%@ page import="java.util.Calendar" %>
|
<%@ page import="java.util.Calendar" %>
|
||||||
|
|
||||||
|
|
||||||
<%@ include file="/jsp/init.jsp" %>
|
<%@ include file="/jsp/init.jsp" %>
|
||||||
|
|
||||||
<%
|
<%
|
||||||
@ -10,42 +18,84 @@
|
|||||||
DateFormat dateFormat = SimpleDateFormat.getDateTimeInstance(DateFormat.DEFAULT, DateFormat.DEFAULT, request.getLocale());
|
DateFormat dateFormat = SimpleDateFormat.getDateTimeInstance(DateFormat.DEFAULT, DateFormat.DEFAULT, request.getLocale());
|
||||||
String todayString = dateFormat.format(calendar.getTime());
|
String todayString = dateFormat.format(calendar.getTime());
|
||||||
%>
|
%>
|
||||||
<!DOCTYPE HTML>
|
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
|
<base href="../"/>
|
||||||
|
<title><spring:message code="SITE.TITLE"/> - ${mindmap.title} </title>
|
||||||
|
<meta http-equiv="Content-type" content="text/html; charset=UTF-8"/>
|
||||||
|
|
||||||
<!--[if lt IE 9]>
|
<!--[if lt IE 9]>
|
||||||
<meta http-equiv="X-UA-Compatible" content="chrome=1">
|
<meta http-equiv="X-UA-Compatible" content="chrome=1">
|
||||||
<![endif]-->
|
<![endif]-->
|
||||||
<title><spring:message code="SITE.TITLE"/> - ${mindmap.title} </title>
|
|
||||||
<meta http-equiv="Content-type" content="text/html; charset=UTF-8"/>
|
<link rel="stylesheet" type="text/css" href="css/embedded.less"/>
|
||||||
<meta http-equiv="Content-type" content="text/html; charset=UTF-8"/>
|
<style type="text/css" media="print">
|
||||||
<link rel="icon" href="../images/favicon.ico" type="image/x-icon">
|
@page {
|
||||||
<link rel="shortcut icon" href="../images/favicon.ico" type="image/x-icon">
|
size: A4 landscape;
|
||||||
|
}
|
||||||
|
|
||||||
|
body {
|
||||||
|
overflow: visible
|
||||||
|
}
|
||||||
|
|
||||||
|
#embFooter {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
#footerLogo {
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
|
||||||
|
div#printLogo {
|
||||||
|
width: 114px;
|
||||||
|
height: 56px;
|
||||||
|
position: absolute;
|
||||||
|
display: list-item;
|
||||||
|
list-style-image: url(../images/logo-xsmall.png);
|
||||||
|
list-style-position: inside;
|
||||||
|
right: 10px;
|
||||||
|
bottom: -30px;
|
||||||
|
}
|
||||||
|
|
||||||
|
div#infoPanel {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<script type='text/javascript' src='js/mootools-core.js'></script>
|
||||||
|
<script type='text/javascript' src='js/mootools-more.js'></script>
|
||||||
|
<script type='text/javascript' src='js/core.js'></script>
|
||||||
|
|
||||||
|
|
||||||
<link rel="stylesheet" type="text/css" href="../css/print.css"/>
|
<link rel="icon" href="images/favicon.ico" type="image/x-icon">
|
||||||
|
<link rel="shortcut icon" href="images/favicon.ico" type="image/x-icon">
|
||||||
<script type='text/javascript' src='../js/mootools-core.js'></script>
|
|
||||||
<script type='text/javascript' src='../js/mootools-more.js'></script>
|
|
||||||
<script type='text/javascript' src='../js/core.js'></script>
|
|
||||||
|
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
var mapId = '${mindmap.id}';
|
var mapId = '${mindmap.id}';
|
||||||
var mapXml = '${mapXml}';
|
var mapXml = '${mindmap.xmlAsJsLiteral}';
|
||||||
var mindReady = false;
|
|
||||||
$(document).addEvent('loadcomplete', function(resource) {
|
$(document).addEvent('loadcomplete', function(resource) {
|
||||||
mindReady = resource == 'mind' ? true : mindReady;
|
|
||||||
if (mindReady) {
|
|
||||||
|
|
||||||
var editorProperties = {zoom:0.85,saveOnLoad:true,collab:'standalone',readOnly:true};
|
// Configure designer options ...
|
||||||
designer = buildDesigner(editorProperties);
|
var options = loadDesignerOptions();
|
||||||
|
options.size.height = options.size.height + 50;
|
||||||
|
|
||||||
|
options.persistenceManager = new mindplot.RESTPersistenceManager("service/maps/");
|
||||||
|
var userOptions = ${mindmap.properties};
|
||||||
|
options.zoom = userOptions.zoom;
|
||||||
|
|
||||||
|
// Set map id ...
|
||||||
|
options.mapId = mapId;
|
||||||
|
|
||||||
|
// Print is read only ...
|
||||||
|
options.readOnly = true;
|
||||||
|
|
||||||
|
// Build designer ...
|
||||||
|
var designer = buildDesigner(options);
|
||||||
|
|
||||||
|
// Load map from XML ...
|
||||||
var domDocument = core.Utils.createDocumentFromText(mapXml);
|
var domDocument = core.Utils.createDocumentFromText(mapXml);
|
||||||
var serializer = mindplot.persistence.XMLSerializerFactory.getSerializerFromDocument(domDocument);
|
var persistence = mindplot.PersistenceManager.getInstance();
|
||||||
var mindmap = serializer.loadFromDom(domDocument, mapId);
|
var mindmap = persistence.loadFromDom(mapId, domDocument);
|
||||||
|
|
||||||
// Now, load the map ...
|
|
||||||
designer.loadMap(mindmap);
|
designer.loadMap(mindmap);
|
||||||
|
|
||||||
$('zoomIn').addEvent('click', function() {
|
$('zoomIn').addEvent('click', function() {
|
||||||
@ -55,37 +105,32 @@
|
|||||||
$('zoomOut').addEvent('click', function() {
|
$('zoomOut').addEvent('click', function() {
|
||||||
designer.zoomOut();
|
designer.zoomOut();
|
||||||
});
|
});
|
||||||
}
|
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
</head>
|
</head>
|
||||||
<body onload="setTimeout('print()', 5)">
|
<body>
|
||||||
|
|
||||||
<div id="waitDialog" style="display:none">
|
<div id="mapContainer">
|
||||||
<div id="waitingContainer">
|
<%--<div id="infoPanel">--%>
|
||||||
<div class="loadingIcon"></div>
|
<%--<div id="dragImageNode" style="cursor: move">--%>
|
||||||
<div class="loadingText">
|
<%--</div>--%>
|
||||||
Loading ...
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div id="errorDialog" style="display:none">
|
|
||||||
<div id="errorContainer">
|
|
||||||
<div class="loadingIcon"></div>
|
|
||||||
<div class="loadingText">
|
|
||||||
Unexpected error loading your map :(
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div id="printHeader">
|
|
||||||
<div id="printLogo"></div>
|
|
||||||
<div id="headerTitle">${mindmap.title}<span id="headerSubTitle"> (<%=todayString%>)</span></div>
|
|
||||||
</div>
|
|
||||||
<center>
|
|
||||||
<div id="mindplot"></div>
|
<div id="mindplot"></div>
|
||||||
</center>
|
<div id="printLogo"></div>
|
||||||
|
|
||||||
|
<div id="embFooter">
|
||||||
|
<a href="${pageContext.request.contextPath}/c/home.htm" target="new">
|
||||||
|
<div id="footerLogo"></div>
|
||||||
|
</a>
|
||||||
|
|
||||||
|
<div id="zoomIn" class="button"></div>
|
||||||
|
<div id="zoomOut" class="button"></div>
|
||||||
|
|
||||||
|
<div id="mapDetails">
|
||||||
|
<span class="title"><spring:message code="CREATOR"/>:</span><span>${mindmap.creator}</span>
|
||||||
|
<span class="title"><spring:message code="DESCRIPTION"/>:</span><span>${mindmap.title}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<script type="text/javascript" src="../js/editor.js"></script>
|
<script type="text/javascript" src="../js/editor.js"></script>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
@ -2,15 +2,13 @@
|
|||||||
|
|
||||||
|
|
||||||
<div id="userRegistrationContent">
|
<div id="userRegistrationContent">
|
||||||
<div id="userRegistration">
|
<div id="userRegistration" class="sb">
|
||||||
<h1>
|
<h1>
|
||||||
<spring:message code="USER_REGISTRATION"/>
|
<spring:message code="USER_REGISTRATION"/>
|
||||||
</h1>
|
</h1>
|
||||||
|
|
||||||
<h2>
|
<h2>
|
||||||
<spring:message code="REGISTRATION_TITLE_MSG"/>
|
<spring:message code="REGISTRATION_TITLE_MSG"/> <spring:message code="FIELD_REQUIRED_MSG"/>
|
||||||
<br/><br/>
|
|
||||||
<spring:message code="FIELD_REQUIRED_MSG"/>
|
|
||||||
</h2>
|
</h2>
|
||||||
<form:form method="post" commandName="user">
|
<form:form method="post" commandName="user">
|
||||||
<table>
|
<table>
|
||||||
@ -18,7 +16,7 @@
|
|||||||
<tr>
|
<tr>
|
||||||
<td class="formLabel">
|
<td class="formLabel">
|
||||||
<span class="fieldRequired">*</span>
|
<span class="fieldRequired">*</span>
|
||||||
<spring:message code="EMAIL"/>:
|
<label for="email"><spring:message code="EMAIL"/>:</label>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<form:input path="email" id="email"/>
|
<form:input path="email" id="email"/>
|
||||||
@ -28,7 +26,7 @@
|
|||||||
<tr>
|
<tr>
|
||||||
<td class="formLabel">
|
<td class="formLabel">
|
||||||
<span class="fieldRequired">*</span>
|
<span class="fieldRequired">*</span>
|
||||||
<spring:message code="USERNAME"/>:
|
<label for="username"> <spring:message code="USERNAME"/>:</label>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<form:input path="username" id="username"/>
|
<form:input path="username" id="username"/>
|
||||||
@ -38,7 +36,7 @@
|
|||||||
<tr>
|
<tr>
|
||||||
<td class="formLabel">
|
<td class="formLabel">
|
||||||
<span class="fieldRequired">*</span>
|
<span class="fieldRequired">*</span>
|
||||||
<spring:message code="FIRSTNAME"/>:
|
<label for="firstname"><spring:message code="FIRSTNAME"/>:</label>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<form:input path="firstname" id="firstname"/>
|
<form:input path="firstname" id="firstname"/>
|
||||||
@ -48,7 +46,7 @@
|
|||||||
<tr>
|
<tr>
|
||||||
<td class="formLabel">
|
<td class="formLabel">
|
||||||
<span class="fieldRequired">*</span>
|
<span class="fieldRequired">*</span>
|
||||||
<spring:message code="LASTNAME"/>:
|
<label for="lastname"><spring:message code="LASTNAME"/>:</label>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<form:input path="lastname" id="lastname"/>
|
<form:input path="lastname" id="lastname"/>
|
||||||
@ -58,7 +56,7 @@
|
|||||||
<tr>
|
<tr>
|
||||||
<td class="formLabel">
|
<td class="formLabel">
|
||||||
<span class="fieldRequired">*</span>
|
<span class="fieldRequired">*</span>
|
||||||
<spring:message code="PASSWORD"/>:
|
<label for="password"><spring:message code="PASSWORD"/>:</label>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<form:password path="password" id="password"/>
|
<form:password path="password" id="password"/>
|
||||||
@ -68,7 +66,7 @@
|
|||||||
<tr>
|
<tr>
|
||||||
<td class="formLabel">
|
<td class="formLabel">
|
||||||
<span class="fieldRequired">*</span>
|
<span class="fieldRequired">*</span>
|
||||||
<spring:message code="RETYPE_PASSWORD"/>:
|
<label for="retypePassword"><spring:message code="RETYPE_PASSWORD"/>:</label>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<form:password path="retypePassword" id="retypePassword"/>
|
<form:password path="retypePassword" id="retypePassword"/>
|
||||||
|
15
wise-webapp/webdefault.xml
Normal file
15
wise-webapp/webdefault.xml
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
|
||||||
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
|
||||||
|
version="2.4">
|
||||||
|
|
||||||
|
|
||||||
|
<servlet>
|
||||||
|
<servlet-name>default</servlet-name>
|
||||||
|
<servlet-class>org.eclipse.jetty.servlet.DefaultServlet</servlet-class>
|
||||||
|
<init-param>
|
||||||
|
<param-name>aliases</param-name>
|
||||||
|
<param-value>true</param-value>
|
||||||
|
</init-param>
|
||||||
|
</servlet>
|
||||||
|
</web-app>
|
Loading…
Reference in New Issue
Block a user