Improve and fix print.
Support for jetty:run fixed. Several minor fixes.
This commit is contained in:
@@ -39,7 +39,7 @@
|
||||
</c:if>
|
||||
<tr>
|
||||
<td class="formLabel">
|
||||
<spring:message code="EMAIL"/>:
|
||||
<label for="email"><spring:message code="EMAIL"/>:</label>
|
||||
</td>
|
||||
<td>
|
||||
<input type='text' tabindex="1" id="email" name='j_username'/>
|
||||
@@ -47,7 +47,7 @@
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="formLabel">
|
||||
<spring:message code="PASSWORD"/>:
|
||||
<label for="password"><spring:message code="PASSWORD"/>:</label>
|
||||
</td>
|
||||
<td>
|
||||
<input type='password' tabindex="2" id="password" name='j_password'/>
|
||||
@@ -58,7 +58,7 @@
|
||||
<input type="checkbox" id="rememberme" name="_spring_security_remember_me"/>
|
||||
</td>
|
||||
<td>
|
||||
<spring:message code="REMEMBER_ME"/>
|
||||
<label for="rememberme"><spring:message code="REMEMBER_ME"/>:</label>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
@@ -79,9 +79,7 @@
|
||||
</div>
|
||||
|
||||
<div id="register">
|
||||
<b>
|
||||
<spring:message code="NOT_READY_A_USER"/>
|
||||
</b>
|
||||
<b><spring:message code="NOT_READY_A_USER"/></b>
|
||||
<spring:message code="NOT_READY_A_USER_MESSAGE"/>
|
||||
<a href="userRegistration.htm">
|
||||
<spring:message code="JOIN_NOW"/>
|
||||
@@ -89,12 +87,9 @@
|
||||
</div>
|
||||
|
||||
<c:if test="${isHsql== 'true'}">
|
||||
|
||||
|
||||
<div style="padding:10px;background-color: #E0EFFF; border-radius: 5px 5px 5px 5px;border-style:solid;border-color:gray">
|
||||
<img src="../images/info.png" style="margin:0 4px">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 <a
|
||||
<img src="../images/info.png" style="margin:0 4px" alt="info">
|
||||
<spring:message code="NO_PRODUCTION_DATABASE_CONFIGURED"/> <a
|
||||
href="http://www.wisemapping.org/documentation/configu">here</a>.
|
||||
</div>
|
||||
</c:if>
|
||||
|
@@ -2,7 +2,8 @@
|
||||
|
||||
<%--@elvariable id="mindmap" type="com.wisemapping.model.MindMap"--%>
|
||||
<%--@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" %>
|
||||
<c:url value="mymaps.htm" var="shareMap">
|
||||
@@ -32,7 +33,7 @@
|
||||
|
||||
$(document).addEvent('loadcomplete', function(resource) {
|
||||
var mapId = '${mindmap.id}';
|
||||
var mapXml = '${mapXml}';
|
||||
var mapXml = '${mindmap.xmlAsJsLiteral}';
|
||||
|
||||
// Configure designer options ...
|
||||
var options = loadDesignerOptions();
|
||||
|
@@ -13,37 +13,43 @@
|
||||
<tr>
|
||||
<td>
|
||||
<input type="radio" id="svg" name="exportFormat" value="SVG"/>
|
||||
<b>
|
||||
<spring:message code="SVG_EXPORT_FORMAT"/>
|
||||
</b>
|
||||
<label for="svg">
|
||||
<b>
|
||||
<spring:message code="SVG_EXPORT_FORMAT"/>
|
||||
</b>
|
||||
|
||||
<p>
|
||||
<spring:message code="SVG_EXPORT_FORMAT_DETAILS"/>
|
||||
</p>
|
||||
<p>
|
||||
<spring:message code="SVG_EXPORT_FORMAT_DETAILS"/>
|
||||
</p>
|
||||
</label>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<input type="radio" name="exportFormat" value="PDF" id="pdf"/>
|
||||
<b>
|
||||
<spring:message code="PDF_EXPORT_FORMAT"/>
|
||||
</b>
|
||||
<label for="pdf">
|
||||
<b>
|
||||
<spring:message code="PDF_EXPORT_FORMAT"/>
|
||||
</b>
|
||||
|
||||
<p>
|
||||
<spring:message code="PDF_EXPORT_FORMAT_DETAILS"/>
|
||||
</p>
|
||||
<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"/>
|
||||
<b>
|
||||
<spring:message code="FREEMIND_EXPORT_FORMAT"/>
|
||||
</b>
|
||||
<label for="freemind">
|
||||
<b>
|
||||
<spring:message code="FREEMIND_EXPORT_FORMAT"/>
|
||||
</b>
|
||||
|
||||
<p>
|
||||
<spring:message code="FREEMIND_EXPORT_FORMAT_DETAILS"/>
|
||||
</p>
|
||||
<p>
|
||||
<spring:message code="FREEMIND_EXPORT_FORMAT_DETAILS"/>
|
||||
</p>
|
||||
</label>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
@@ -55,17 +61,18 @@
|
||||
<option>PNG</option>
|
||||
<option>JPEG</option>
|
||||
</select>
|
||||
|
||||
<p>
|
||||
<spring:message code="IMG_EXPORT_FORMAT_DETAILS"/>
|
||||
</p>
|
||||
<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="">
|
||||
onclick="MooDialog.Request.active.close()">
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
|
@@ -79,7 +79,7 @@
|
||||
|
||||
<div class="leftMenu">
|
||||
<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"/>
|
||||
</a>
|
||||
</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.SimpleDateFormat" %>
|
||||
<%@ page import="java.util.Calendar" %>
|
||||
|
||||
|
||||
<%@ include file="/jsp/init.jsp" %>
|
||||
|
||||
<%
|
||||
@@ -10,82 +18,119 @@
|
||||
DateFormat dateFormat = SimpleDateFormat.getDateTimeInstance(DateFormat.DEFAULT, DateFormat.DEFAULT, request.getLocale());
|
||||
String todayString = dateFormat.format(calendar.getTime());
|
||||
%>
|
||||
<!DOCTYPE HTML>
|
||||
<html>
|
||||
<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]>
|
||||
<meta http-equiv="X-UA-Compatible" content="chrome=1">
|
||||
<![endif]-->
|
||||
<title><spring:message code="SITE.TITLE"/> - ${mindmap.title} </title>
|
||||
<meta http-equiv="Content-type" content="text/html; charset=UTF-8"/>
|
||||
<meta http-equiv="Content-type" content="text/html; charset=UTF-8"/>
|
||||
<link rel="icon" href="../images/favicon.ico" type="image/x-icon">
|
||||
<link rel="shortcut icon" href="../images/favicon.ico" type="image/x-icon">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/embedded.less"/>
|
||||
<style type="text/css" media="print">
|
||||
@page {
|
||||
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"/>
|
||||
|
||||
<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="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">
|
||||
var mapId = '${mindmap.id}';
|
||||
var mapXml = '${mapXml}';
|
||||
var mindReady = false;
|
||||
var mapXml = '${mindmap.xmlAsJsLiteral}';
|
||||
$(document).addEvent('loadcomplete', function(resource) {
|
||||
mindReady = resource == 'mind' ? true : mindReady;
|
||||
if (mindReady) {
|
||||
|
||||
var editorProperties = {zoom:0.85,saveOnLoad:true,collab:'standalone',readOnly:true};
|
||||
designer = buildDesigner(editorProperties);
|
||||
// Configure designer options ...
|
||||
var options = loadDesignerOptions();
|
||||
options.size.height = options.size.height + 50;
|
||||
|
||||
var domDocument = core.Utils.createDocumentFromText(mapXml);
|
||||
var serializer = mindplot.persistence.XMLSerializerFactory.getSerializerFromDocument(domDocument);
|
||||
var mindmap = serializer.loadFromDom(domDocument, mapId);
|
||||
options.persistenceManager = new mindplot.RESTPersistenceManager("service/maps/");
|
||||
var userOptions = ${mindmap.properties};
|
||||
options.zoom = userOptions.zoom;
|
||||
|
||||
// Now, load the map ...
|
||||
designer.loadMap(mindmap);
|
||||
// Set map id ...
|
||||
options.mapId = mapId;
|
||||
|
||||
$('zoomIn').addEvent('click', function() {
|
||||
designer.zoomIn();
|
||||
});
|
||||
// Print is read only ...
|
||||
options.readOnly = true;
|
||||
|
||||
$('zoomOut').addEvent('click', function() {
|
||||
designer.zoomOut();
|
||||
});
|
||||
}
|
||||
// Build designer ...
|
||||
var designer = buildDesigner(options);
|
||||
|
||||
// Load map from XML ...
|
||||
var domDocument = core.Utils.createDocumentFromText(mapXml);
|
||||
var persistence = mindplot.PersistenceManager.getInstance();
|
||||
var mindmap = persistence.loadFromDom(mapId, domDocument);
|
||||
designer.loadMap(mindmap);
|
||||
|
||||
$('zoomIn').addEvent('click', function() {
|
||||
designer.zoomIn();
|
||||
});
|
||||
|
||||
$('zoomOut').addEvent('click', function() {
|
||||
designer.zoomOut();
|
||||
});
|
||||
});
|
||||
</script>
|
||||
</head>
|
||||
<body onload="setTimeout('print()', 5)">
|
||||
<body>
|
||||
|
||||
<div id="waitDialog" style="display:none">
|
||||
<div id="waitingContainer">
|
||||
<div class="loadingIcon"></div>
|
||||
<div class="loadingText">
|
||||
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="mapContainer">
|
||||
<%--<div id="infoPanel">--%>
|
||||
<%--<div id="dragImageNode" style="cursor: move">--%>
|
||||
<%--</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>
|
||||
</body>
|
||||
</html>
|
||||
|
@@ -2,15 +2,13 @@
|
||||
|
||||
|
||||
<div id="userRegistrationContent">
|
||||
<div id="userRegistration">
|
||||
<div id="userRegistration" class="sb">
|
||||
<h1>
|
||||
<spring:message code="USER_REGISTRATION"/>
|
||||
</h1>
|
||||
|
||||
<h2>
|
||||
<spring:message code="REGISTRATION_TITLE_MSG"/>
|
||||
<br/><br/>
|
||||
<spring:message code="FIELD_REQUIRED_MSG"/>
|
||||
<spring:message code="REGISTRATION_TITLE_MSG"/> <spring:message code="FIELD_REQUIRED_MSG"/>
|
||||
</h2>
|
||||
<form:form method="post" commandName="user">
|
||||
<table>
|
||||
@@ -18,7 +16,7 @@
|
||||
<tr>
|
||||
<td class="formLabel">
|
||||
<span class="fieldRequired">*</span>
|
||||
<spring:message code="EMAIL"/>:
|
||||
<label for="email"><spring:message code="EMAIL"/>:</label>
|
||||
</td>
|
||||
<td>
|
||||
<form:input path="email" id="email"/>
|
||||
@@ -28,7 +26,7 @@
|
||||
<tr>
|
||||
<td class="formLabel">
|
||||
<span class="fieldRequired">*</span>
|
||||
<spring:message code="USERNAME"/>:
|
||||
<label for="username"> <spring:message code="USERNAME"/>:</label>
|
||||
</td>
|
||||
<td>
|
||||
<form:input path="username" id="username"/>
|
||||
@@ -38,7 +36,7 @@
|
||||
<tr>
|
||||
<td class="formLabel">
|
||||
<span class="fieldRequired">*</span>
|
||||
<spring:message code="FIRSTNAME"/>:
|
||||
<label for="firstname"><spring:message code="FIRSTNAME"/>:</label>
|
||||
</td>
|
||||
<td>
|
||||
<form:input path="firstname" id="firstname"/>
|
||||
@@ -48,7 +46,7 @@
|
||||
<tr>
|
||||
<td class="formLabel">
|
||||
<span class="fieldRequired">*</span>
|
||||
<spring:message code="LASTNAME"/>:
|
||||
<label for="lastname"><spring:message code="LASTNAME"/>:</label>
|
||||
</td>
|
||||
<td>
|
||||
<form:input path="lastname" id="lastname"/>
|
||||
@@ -58,7 +56,7 @@
|
||||
<tr>
|
||||
<td class="formLabel">
|
||||
<span class="fieldRequired">*</span>
|
||||
<spring:message code="PASSWORD"/>:
|
||||
<label for="password"><spring:message code="PASSWORD"/>:</label>
|
||||
</td>
|
||||
<td>
|
||||
<form:password path="password" id="password"/>
|
||||
@@ -68,7 +66,7 @@
|
||||
<tr>
|
||||
<td class="formLabel">
|
||||
<span class="fieldRequired">*</span>
|
||||
<spring:message code="RETYPE_PASSWORD"/>:
|
||||
<label for="retypePassword"><spring:message code="RETYPE_PASSWORD"/>:</label>
|
||||
</td>
|
||||
<td>
|
||||
<form:password path="retypePassword" id="retypePassword"/>
|
||||
@@ -81,7 +79,7 @@
|
||||
</td>
|
||||
<td>
|
||||
<form:errors path="captcha" cssClass="errorMsg"/>
|
||||
${requestScope.captchaHtml}
|
||||
${requestScope.captchaHtml}
|
||||
</td>
|
||||
</tr>
|
||||
</c:if>
|
||||
|
Reference in New Issue
Block a user