ZhouXY108
/
wisemapping-open-source
mirror of https://github.com/wisemapping/wisemapping-open-source.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor fix for some wrong paths ...

main
Paulo Gustavo Veiga 2012-07-01 22:34:01 -03:00
parent 4c4a8d9553
commit 4770601190
5 changed files with 56 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
distribution/package-bin.sh
View File

@ -9,8 +9,8 @@ BASE_DIR=`pwd`
TARGET_DIR=$BASE_DIR/target TARGET_DIR=$BASE_DIR/target
JETTY_DIR=$TARGET_DIR/wisemapping-$WISE_VERSION JETTY_DIR=$TARGET_DIR/wisemapping-$WISE_VERSION
WISE_WEBAPP_DIR=$JETTY_DIR/webapps/wisemapping WISE_WEBAPP_DIR=$JETTY_DIR/webapps/wisemapping
JETTY_DIST_DIR=jetty-distribution-8.1.4.v20120524.zip JETTY_DIST_DIR=jetty-distribution-8.1.4.v20120524
JETTY_ZIP=${JETTY_DIST_DIR} JETTY_ZIP=${JETTY_DIST_DIR}.zip
# Clean ... # Clean ...
mvn -o -f $BASE_DIR/../pom.xml clean mvn -o -f $BASE_DIR/../pom.xml clean
@ -19,7 +19,7 @@ rm -fr ${JETTY_DIR}
rm -fr ${TARGET_DIR}/${JETTY_DIST_DIR} rm -fr ${TARGET_DIR}/${JETTY_DIST_DIR}
# Prepare resources .. # Prepare resources ..
mvn -o -f $BASE_DIR/../pom.xml install -Dmaven.test.skip=true mvn -o -f $BASE_DIR/../pom.xml package -Dmaven.test.skip=true
if [ ! -f ./target/${JETTY_ZIP} ] if [ ! -f ./target/${JETTY_ZIP} ]
then then
@ -30,16 +30,22 @@ fi
echo "Unzip Jetty ...:" echo "Unzip Jetty ...:"
unzip ${TARGET_DIR}/${JETTY_ZIP} -d ${TARGET_DIR}/ > /dev/null unzip ${TARGET_DIR}/${JETTY_ZIP} -d ${TARGET_DIR}/ > /dev/null
mv ${TARGET_DIR}/${JETTY_DIST_DIR} ${JETTY_DIR} mv ${TARGET_DIR}/${JETTY_DIST_DIR} ${JETTY_DIR}
# Clean unsed files ... # Clean unsed files ...
rm -rf $JETTY_DIR/webapps/* rm -rf $JETTY_DIR/webapps/*
rm -rf $JETTY_DIR/contexts/* rm -rf $JETTY_DIR/contexts/*
rm -rf $JETTY_DIR/javadoc
# Now, start wise-webapps customization ... # Now, start wise-webapps customization ...
echo "Unzip wisemappig.war ..." echo "Unzip wisemappig.war ..."
mkdir $WISE_WEBAPP_DIR mkdir $WISE_WEBAPP_DIR
unzip $BASE_DIR/../wise-webapp/target/wisemapping.war -d $WISE_WEBAPP_DIR >/dev/null unzip $BASE_DIR/../wise-webapp/target/wisemapping.war -d $WISE_WEBAPP_DIR >/dev/null
# DB Configuration ...
sed 's/target\/db\/wisemapping/webapps\/wisemapping\/WEB-INF\/database\/wisemapping/' $WISE_WEBAPP_DIR/WEB-INF/app.properties > $WISE_WEBAPP_DIR/WEB-INF/app.properties2
mv $WISE_WEBAPP_DIR/WEB-INF/app.properties2 $WISE_WEBAPP_DIR/WEB-INF/app.properties
mkdir $WISE_WEBAPP_DIR/WEB-INF/database mkdir $WISE_WEBAPP_DIR/WEB-INF/database
cp -r $BASE_DIR/../wise-webapp/target/db/* $WISE_WEBAPP_DIR/WEB-INF/database/ cp -r $BASE_DIR/../wise-webapp/target/db/* $WISE_WEBAPP_DIR/WEB-INF/database/
cp $BASE_DIR/wisemapping.xml $JETTY_DIR/contexts/ cp $BASE_DIR/wisemapping.xml $JETTY_DIR/contexts/

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

@ -207,7 +207,7 @@ mindplot.widget.Menu = new Class({
} }
this._addButton('export', false, false, function () { this._addButton('export', false, false, function () {
var reqDialog = new MooDialog.Request('/c/iframeWrapper.htm?url=c/maps/' + mapId + "/exportf", null, var reqDialog = new MooDialog.Request('c/iframeWrapper.htm?url=c/maps/' + mapId + "/exportf", null,
{'class':'modalDialog exportModalDialog', {'class':'modalDialog exportModalDialog',
closeButton:true, closeButton:true,
destroyOnClose:true, destroyOnClose:true,
@ -223,7 +223,7 @@ mindplot.widget.Menu = new Class({
this._registerTooltip('export', $msg('EXPORT')); this._registerTooltip('export', $msg('EXPORT'));
this._addButton('print', false, false, function () { this._addButton('print', false, false, function () {
window.open('/c/maps/' + mapId + '/print'); window.open('c/maps/' + mapId + '/print');
}); });
this._registerTooltip('print', $msg('PRINT')); this._registerTooltip('print', $msg('PRINT'));
@ -348,7 +348,7 @@ mindplot.widget.Menu = new Class({
var shareElem = $('shareIt'); var shareElem = $('shareIt');
if (shareElem) { if (shareElem) {
this._addButton('shareIt', false, false, function () { this._addButton('shareIt', false, false, function () {
var reqDialog = new MooDialog.Request('/c/iframeWrapper?url=c/maps/' + mapId + "/sharef", null, var reqDialog = new MooDialog.Request('c/iframeWrapper?url=c/maps/' + mapId + "/sharef", null,
{'class':'modalDialog shareModalDialog', {'class':'modalDialog shareModalDialog',
closeButton:true, closeButton:true,
destroyOnClose:true, destroyOnClose:true,
@ -368,7 +368,7 @@ mindplot.widget.Menu = new Class({
var publishElem = $('publishIt'); var publishElem = $('publishIt');
if (publishElem) { if (publishElem) {
this._addButton('publishIt', false, false, function () { this._addButton('publishIt', false, false, function () {
var reqDialog = new MooDialog.Request('/c/iframeWrapper?url=c/maps/' + mapId + "/publishf", null, var reqDialog = new MooDialog.Request('c/iframeWrapper?url=c/maps/' + mapId + "/publishf", null,
{'class':'modalDialog publishModalDialog', {'class':'modalDialog publishModalDialog',
closeButton:true, closeButton:true,
destroyOnClose:true, destroyOnClose:true,
@ -389,7 +389,7 @@ mindplot.widget.Menu = new Class({
if (historyElem) { if (historyElem) {
this._addButton('history', false, false, function () { this._addButton('history', false, false, function () {
var reqDialog = new MooDialog.Request('/c/iframeWrapper?url=c/maps/' + mapId + "/historyf", null, var reqDialog = new MooDialog.Request('c/iframeWrapper?url=c/maps/' + mapId + "/historyf", null,
{'class':'modalDialog historyModalDialog', {'class':'modalDialog historyModalDialog',
closeButton:true, closeButton:true,
destroyOnClose:true, destroyOnClose:true,

28
wise-webapp/src/main/webapp/js/mindmapList.js
View File

@ -263,8 +263,8 @@ $(function() {
$("#newBtn").click( $("#newBtn").click(
function() { function() {
$("#new-dialog-modal").dialogForm({ $("#new-dialog-modal").dialogForm({
redirect: "/c/maps/{header.resourceId}/edit", redirect: "c/maps/{header.resourceId}/edit",
url : "../service/maps" url : "service/maps"
}); });
}); });
@ -283,8 +283,8 @@ $(function() {
// Initialize dialog ... // Initialize dialog ...
$("#duplicate-dialog-modal").dialogForm({ $("#duplicate-dialog-modal").dialogForm({
redirect: "/c/maps/{header.resourceId}/edit", redirect: "c/maps/{header.resourceId}/edit",
url : "../service/maps/" + mapId url : "service/maps/" + mapId
}); });
} }
}); });
@ -318,7 +318,7 @@ $(function() {
rowData.description = reqBodyData.description; rowData.description = reqBodyData.description;
dataTable.fnAddData(JSON.parse(JSON.stringify(rowData))); dataTable.fnAddData(JSON.parse(JSON.stringify(rowData)));
}, },
url : "../service/maps/" + mapId url : "service/maps/" + mapId
}); });
} }
}); });
@ -336,7 +336,7 @@ $(function() {
// Remove old entry ... // Remove old entry ...
tableUI.dataTableExt.removeSelectedRows(); tableUI.dataTableExt.removeSelectedRows();
}, },
url : "../service/maps/batch?ids=" + jQuery.makeArray(mapIds).join(',') url : "service/maps/batch?ids=" + jQuery.makeArray(mapIds).join(',')
}); });
} }
}); });
@ -344,32 +344,32 @@ $(function() {
$("#printBtn").click(function() { $("#printBtn").click(function() {
var mapIds = $('#mindmapListTable').dataTableExt.getSelectedMapsIds(); var mapIds = $('#mindmapListTable').dataTableExt.getSelectedMapsIds();
if (mapIds.length > 0) { if (mapIds.length > 0) {
window.open('/c/maps/' + mapIds[0] + '/print'); window.open('c/maps/' + mapIds[0] + '/print');
} }
}); });
$("#infoBtn").click(function() { $("#infoBtn").click(function() {
showEmbeddedDialog("/c/maps/{mapId}/details", 'info-dialog-modal'); showEmbeddedDialog("c/maps/{mapId}/details", 'info-dialog-modal');
}); });
$("#historyBtn").click(function() { $("#historyBtn").click(function() {
showEmbeddedDialog("/c/maps/{mapId}/history", 'history-dialog-modal'); showEmbeddedDialog("c/maps/{mapId}/history", 'history-dialog-modal');
}); });
$("#publishBtn").click(function() { $("#publishBtn").click(function() {
showEmbeddedDialog("/c/maps/{mapId}/publish", "publish-dialog-modal"); showEmbeddedDialog("c/maps/{mapId}/publish", "publish-dialog-modal");
}); });
$("#exportBtn").click(function() { $("#exportBtn").click(function() {
showEmbeddedDialog("/c/maps/{mapId}/export", 'export-dialog-modal'); showEmbeddedDialog("c/maps/{mapId}/export", 'export-dialog-modal');
}); });
$("#importBtn").click(function() { $("#importBtn").click(function() {
showEmbeddedDialog("/c/maps/import", 'import-dialog-modal', true); showEmbeddedDialog("c/maps/import", 'import-dialog-modal', true);
}); });
$("#shareBtn").click(function() { $("#shareBtn").click(function() {
showEmbeddedDialog("/c/maps/{mapId}/share", 'share-dialog-modal', true); showEmbeddedDialog("c/maps/{mapId}/share", 'share-dialog-modal', true);
}); });
var showEmbeddedDialog = function(urlTemplate, dialogElemId, ignore) { var showEmbeddedDialog = function(urlTemplate, dialogElemId, ignore) {
@ -397,7 +397,7 @@ $(function() {
$('#foldersContainer .active i').addClass('icon-white'); $('#foldersContainer .active i').addClass('icon-white');
// Reload the table data ... // Reload the table data ...
dataTable.fnReloadAjax("../service/maps/?q=" + $(this).attr('data-filter'), callbackOnTableInit, true); dataTable.fnReloadAjax("service/maps/?q=" + $(this).attr('data-filter'), callbackOnTableInit, true);
event.preventDefault(); event.preventDefault();
}); });
}); });

50
wise-webapp/src/main/webapp/jsp/mindmapEditorToolbar.jsf
View File

@ -4,97 +4,97 @@
<div id="persist" class="buttonContainer"> <div id="persist" class="buttonContainer">
<c:if test="${!readOnlyMode}"> <c:if test="${!readOnlyMode}">
<div id="save" class="buttonOn"> <div id="save" class="buttonOn">
<img src="../images/save.png"/> <img src="images/save.png"/>
</div> </div>
<div id="discard" class="buttonOn"> <div id="discard" class="buttonOn">
<img src="../images/discard.png"/> <img src="images/discard.png"/>
</div> </div>
</c:if> </c:if>
<div id="print" class="buttonOn"> <div id="print" class="buttonOn">
<img src="../images/print.png"/> <img src="images/print.png"/>
</div> </div>
</div> </div>
<c:if test="${!readOnlyMode}"> <c:if test="${!readOnlyMode}">
<div id="edit" class="buttonContainer"> <div id="edit" class="buttonContainer">
<div id="undoEdition" class="buttonOn"> <div id="undoEdition" class="buttonOn">
<img src="../images/undo.png"/> <img src="images/undo.png"/>
</div> </div>
<div id="redoEdition" class="buttonOn"> <div id="redoEdition" class="buttonOn">
<img src="../images/redo.png"/> <img src="images/redo.png"/>
</div> </div>
</div> </div>
</c:if> </c:if>
<div id="zoom" class="buttonContainer"> <div id="zoom" class="buttonContainer">
<div id="zoomIn" class="buttonOn"> <div id="zoomIn" class="buttonOn">
<img src="../images/zoom-in.png"/> <img src="images/zoom-in.png"/>
</div> </div>
<div id="zoomOut" class="buttonOn"> <div id="zoomOut" class="buttonOn">
<img src="../images/zoom-out.png"/> <img src="images/zoom-out.png"/>
</div> </div>
</div> </div>
<c:if test="${!readOnlyMode}"> <c:if test="${!readOnlyMode}">
<div id="node" class="buttonContainer"> <div id="node" class="buttonContainer">
<div id="topicShape" class="buttonExtOn"> <div id="topicShape" class="buttonExtOn">
<img src="../images/topic-shape.png"/> <img src="images/topic-shape.png"/>
</div> </div>
<div id="addTopic" class="buttonOn"> <div id="addTopic" class="buttonOn">
<img src="../images/topic-add.png"/> <img src="images/topic-add.png"/>
</div> </div>
<div id="deleteTopic" class="buttonOn"> <div id="deleteTopic" class="buttonOn">
<img src="../images/topic-delete.png"/> <img src="images/topic-delete.png"/>
</div> </div>
<div id="topicBorder" class="buttonExtOn"> <div id="topicBorder" class="buttonExtOn">
<img src="../images/topic-border.png"/> <img src="images/topic-border.png"/>
</div> </div>
<div id="topicColor" class="buttonExtOn"> <div id="topicColor" class="buttonExtOn">
<img src="../images/topic-color.png"/> <img src="images/topic-color.png"/>
</div> </div>
<div id="topicIcon" class="buttonExtOn"> <div id="topicIcon" class="buttonExtOn">
<img src="../images/topic-icon.png"/> <img src="images/topic-icon.png"/>
</div> </div>
<div id="topicNote" class="buttonOn"> <div id="topicNote" class="buttonOn">
<img src="../images/topic-note.png"/> <img src="images/topic-note.png"/>
</div> </div>
<div id="topicLink" class="buttonOn"> <div id="topicLink" class="buttonOn">
<img src="../images/topic-link.png"/> <img src="images/topic-link.png"/>
</div> </div>
<div id="topicRelation" class="buttonOn"> <div id="topicRelation" class="buttonOn">
<img src="../images/topic-relation.png"/> <img src="images/topic-relation.png"/>
</div> </div>
</div> </div>
<div id="font" class="buttonContainer"> <div id="font" class="buttonContainer">
<div id="fontFamily" class="buttonOn"> <div id="fontFamily" class="buttonOn">
<img src="../images/font-type.png"/> <img src="images/font-type.png"/>
</div> </div>
<div id="fontSize" class="buttonExtOn"> <div id="fontSize" class="buttonExtOn">
<img src="../images/font-size.png"/> <img src="images/font-size.png"/>
</div> </div>
<div id="fontBold" class="buttonOn"> <div id="fontBold" class="buttonOn">
<img src="../images/font-bold.png"/> <img src="images/font-bold.png"/>
</div> </div>
<div id="fontItalic" class="buttonOn"> <div id="fontItalic" class="buttonOn">
<img src="../images/font-italic.png"/> <img src="images/font-italic.png"/>
</div> </div>
<div id="fontColor" class="buttonExtOn"> <div id="fontColor" class="buttonExtOn">
<img src="../images/font-color.png"/> <img src="images/font-color.png"/>
</div> </div>
</div> </div>
</c:if> </c:if>
<div id="collaboration" class="buttonContainer"> <div id="collaboration" class="buttonContainer">
<c:if test="${mindmap.owner && !readOnlyMode}"> <c:if test="${mindmap.owner && !readOnlyMode}">
<div id="shareIt" class="buttonOn"> <div id="shareIt" class="buttonOn">
<img src="../images/share.png"/> <img src="images/share.png"/>
</div> </div>
<div id="publishIt" class="buttonOn"> <div id="publishIt" class="buttonOn">
<img src="../images/public.png"/> <img src="images/public.png"/>
</div> </div>
</c:if> </c:if>
<div id="export" class="buttonOn"> <div id="export" class="buttonOn">
<img src="../images/export.png"/> <img src="images/export.png"/>
</div> </div>
<c:if test="${!readOnlyMode}"> <c:if test="${!readOnlyMode}">
<div id="history" class="buttonOn"> <div id="history" class="buttonOn">
<img src="../images/history.png"/> <img src="images/history.png"/>
</div> </div>
</c:if> </c:if>
</div> </div>

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

@ -5,7 +5,7 @@
<html> <html>
<head> <head>
<base href="${baseURL}"> <base href="${baseURL}/">
<title><spring:message code="SITE.TITLE"/></title> <title><spring:message code="SITE.TITLE"/></title>
<!--[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">
@ -33,7 +33,7 @@
$(function () { $(function () {
$('#mindmapListTable').dataTable({ $('#mindmapListTable').dataTable({
bProcessing:true, bProcessing:true,
sAjaxSource:"../service/maps/", sAjaxSource:"service/maps/",
sAjaxDataProp:'mindmapsInfo', sAjaxDataProp:'mindmapsInfo',
fnInitComplete:function () { fnInitComplete:function () {
$('#mindmapListTable tbody').change(updateStatusToolbar); $('#mindmapListTable tbody').change(updateStatusToolbar);