zhouxy108/wisemapping-open-source
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix import.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga
2012-04-15 08:00:51 -03:00
parent b245b97db3
commit 873e635b9a
14 changed files with 109 additions and 761 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,7 @@
<%@ include file="/jsp/init.jsp" %>
<div id="loginContent">
<div id="news" class="sb">
<div class="sb loginNews">
<h1>What is New: </h1>
<ul>
<li>Links Between Nodes</li>
@@ -67,7 +67,7 @@
<input type="submit" class="btn-primary" id="submitButton"
value="<spring:message code="SIGN_IN"/>">
<div style="text-align:right;"><a href="<c:url value="forgotPassword.htm"/>">
<div style="text-align:right;"><a href="<c:url value="/c/forgotPassword.htm"/>">
<spring:message code="FORGOT_PASSWORD"/>
</a></div>
</td>
@@ -81,7 +81,7 @@
<div id="register">
<b><spring:message code="NOT_READY_A_USER"/></b>
<spring:message code="NOT_READY_A_USER_MESSAGE"/>
<a href="userRegistration.htm">
<a href="c/userRegistration.htm">
<spring:message code="JOIN_NOW"/>
</a>
</div>

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

@@ -1,12 +1,11 @@
<%@ include file="/jsp/init.jsp" %>
<div>
<div id="importContainer">
<form:form method="post" commandName="importMap" enctype="multipart/form-data">
<table>
<tr>
<td class="formLabel">
<span class="fieldRequired">*</span>
<spring:message code="NAME"/>
:
<spring:message code="NAME"/>:
</td>
<td>
<form:input path="title" id="title" tabindex="1"/>
@@ -15,39 +14,29 @@
</tr>
<tr>
<td class="formLabel">
<spring:message code="DESCRIPTION"/>
:
<spring:message code="DESCRIPTION"/>:
</td>
<td>
<form:input path="description" id="description" tabindex="2"/>
<form:errors path="description" cssClass="errorMsg"/>
</td>
</tr>
<tr>
<tr>
<td class="formLabel">
<span class="fieldRequired">*</span>
<spring:message code="FREE_MIND_FILE"/>
:
<spring:message code="FREE_MIND_FILE"/>:
</td>
<td>
<input type="file" name="mapFile"/>
<form:errors path="mapFile" cssClass="errorMsg"/>
<form:errors path="mapFile" cssClass="errorMsg"/>
</td>
</tr>
<tr>
<td>&nbsp;</td>
<td>
<input type="submit" value="<spring:message code="SUBMIT"/>" class="btn-primary">
<c:choose>
<c:when test="${!errorView}">
<input type="button" value="<spring:message code="CANCEL"/>" class="btn-primary"
onclick="MOOdalBox.close();">
</c:when>
<c:otherwise>
<input type="button" value="<spring:message code="BACK"/>" class="btn-primary"
onclick="window.location='mymaps.htm'">
</c:otherwise>
</c:choose>
<input type="submit" value="<spring:message code="IMPORT"/>" class="btn-primary">
<input type="button" value="<spring:message code="CANCEL"/>" class="btn-secondary"
onclick="window.location='/c/mymaps.htm'">
</td>
</tr>
</table>

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

@@ -193,7 +193,7 @@
// Initialize dialog ...
$("#duplicate-dialog-modal").dialogForm({
modal: true,
acceptButtonLabel : "Duplicated",
acceptButtonLabel : "Duplicate",
cancelButtonLabel : "Cancel",
redirect: "c/map/{header.resourceId}/edit.htm",
url : "../service/maps/" + mapId
@@ -263,7 +263,9 @@
$("#buttons .importMap").button({
icons: { primary: "ui-icon-trash" }
});
}).click(function() {
window.open('c/map/import.htm');
});
$("#buttons .printMap").button({
icons: { primary: "ui-icon-print" }
@@ -272,12 +274,24 @@
if (mapIds.length > 0) {
window.open('c/map/' + mapIds[0] + '/print.htm');
}
});
});
$("#buttons .publishMap").button({
icons: { primary: "ui-icon-print" }
}).click(function() {
});
$("#buttons .shareMap").button({
icons: { primary: "ui-icon-print" }
}).click(function() {
});
$("#buttons .tagMap").button({
icons: { primary: "ui-icon-print" }
}).click(function() {
});
$("#buttons .moreActions").button({
icons: { primary: "ui-icon-triangle-1-s" }
});
});
// Register time update functions ....
@@ -300,6 +314,18 @@
</div>
<div id="buttons">
<button class="newMap">New</button>
<button class="importMap">Import</button>
<button class="duplicateMap">Duplicate</button>
<button class="delete">Delete</button>
<button class="renameMap">Rename</button>
<button class="printMap">Print</button>
<button class="publishMap">Publish</button>
<button class="shareMap">Collaborate</button>
<button class="tagMap">Tag</button>
</div>
<div>
<div id="delete-dialog-modal" title="Delete maps" style="display: none">
<p>Are you sure you want to delete maps <span></span> ?</p>
</div>
@@ -384,13 +410,6 @@
<div id="share-dialog-modal" title="Share maps" style="display: none">
<p>Are you sure you want to share maps <span></span> ?</p>
</div>
<button class="newMap">New</button>
<button class="duplicateMap">Duplicate</button>
<button class="delete">Delete</button>
<button class="renameMap">Rename</button>
<button class="importMap">Import</button>
<button class="printMap">Print</button>
<button class="moreActions">More</button>
</div>
<div>