vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-11-22 14:17:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://wisemapping.com/var/git-repos/wise-source

Browse Source
This commit is contained in:
Pablo Luna 2011-03-29 16:34:30 +01:00
commit 9a0de7ed21
18 changed files with 217 additions and 342 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wise-webapp/src/main/java/com/wisemapping/controller/ExportController.java
View File

@ -25,6 +25,7 @@ import com.wisemapping.view.MindMapBean;
import com.wisemapping.exporter.ExportProperties; import com.wisemapping.exporter.ExportProperties;
import com.wisemapping.filter.UserAgent; import com.wisemapping.filter.UserAgent;
import org.apache.batik.transcoder.TranscoderException; import org.apache.batik.transcoder.TranscoderException;
import org.jetbrains.annotations.NotNull;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.mvc.multiaction.NoSuchRequestHandlingMethodException; import org.springframework.web.servlet.mvc.multiaction.NoSuchRequestHandlingMethodException;
@ -109,14 +110,14 @@ public class ExportController extends BaseMultiActionController {
return null; return null;
} }
private void setBaseBaseImgUrl(ExportFormat format, ExportProperties properties) { private void setBaseBaseImgUrl(ExportFormat format, @NotNull ExportProperties properties) {
final String baseUrl; final String baseUrl;
if (format == ExportFormat.SVG) { if (format == ExportFormat.SVG) {
baseUrl = "http://www.wisemapping.com/images"; baseUrl = "http://www.wisemapping.com/images";
} else { } else {
final ServletContext servletContext = this.getServletContext(); final ServletContext servletContext = this.getServletContext();
baseUrl = "file://" + servletContext.getRealPath("/images/"); baseUrl = "file://" + servletContext.getRealPath("/icons/");
} }
properties.setBaseImagePath(baseUrl); properties.setBaseImagePath(baseUrl);
} }

17
wise-webapp/src/main/java/com/wisemapping/exporter/SvgExporter.java
View File

@ -187,13 +187,18 @@ public class SvgExporter {
Element elem = (Element) node; Element elem = (Element) node;
// Cook image href ... // Cook image href ...
String imgName = elem.getAttribute("href"); final String imgUrl = elem.getAttribute("href");
int index = imgName.lastIndexOf("/"); int index = imgUrl.lastIndexOf("/");
elem.removeAttribute("href"); elem.removeAttribute("href");
if (index != -1) if (index != -1) {
{ final String iconName = imgUrl.substring(index);
imgName = imgName.substring(index); // Hack for backward compatibility . This can be removed in 2012. :)
final String imgPath = imgBaseUrl + imgName; String imgPath;
if (imgUrl.contains("images")) {
imgPath = imgBaseUrl + "../images/" + imgUrl;
} else {
imgPath = imgBaseUrl + imgUrl;
}
elem.setAttribute("xlink:href", imgPath); elem.setAttribute("xlink:href", imgPath);
} }
} }

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

@ -332,8 +332,7 @@ public class UserAgent implements Serializable {
// Is it a supported browser ?. // Is it a supported browser ?.
final UserAgent.Product product = this.getProduct(); final UserAgent.Product product = this.getProduct();
boolean result = product == UserAgent.Product.FIREFOX && ((this.isVersionGreatedOrEqualThan(1, 5) && this.getOs() != UserAgent.OS.MAC) || (this.isVersionGreatedOrEqualThan(3, 0) && this.getOs() == UserAgent.OS.MAC)); boolean result = product == UserAgent.Product.FIREFOX && ((this.isVersionGreatedOrEqualThan(1, 5) && this.getOs() != UserAgent.OS.MAC) || (this.isVersionGreatedOrEqualThan(3, 0) && this.getOs() == UserAgent.OS.MAC));
result = result || product == UserAgent.Product.EXPLORER && this.isVersionGreatedOrEqualThan(7, 0) && this.getOs() == UserAgent.OS.WINDOWS;
result = result || product == UserAgent.Product.EXPLORER && this.isVersionGreatedOrEqualThan(6, 0) && this.getOs() == UserAgent.OS.WINDOWS;
result = result || product == UserAgent.Product.OPERA && this.isVersionGreatedOrEqualThan(9, 2); result = result || product == UserAgent.Product.OPERA && this.isVersionGreatedOrEqualThan(9, 2);
result = result || product == UserAgent.Product.CHROME && this.isVersionGreatedOrEqualThan(7, 0); result = result || product == UserAgent.Product.CHROME && this.isVersionGreatedOrEqualThan(7, 0);
result = result || product == UserAgent.Product.SAFARI && this.isVersionGreatedOrEqualThan(3, 0); result = result || product == UserAgent.Product.SAFARI && this.isVersionGreatedOrEqualThan(3, 0);

6
wise-webapp/src/main/webapp/css/bubble.css
View File

@ -111,6 +111,7 @@
height: 62px; height: 62px;
width: 4px; width: 4px;
} }
.bubbleBottomHint { .bubbleBottomHint {
background: transparent url(../images/bubbleTip_bottom_pico.png) top left; background: transparent url(../images/bubbleTip_bottom_pico.png) top left;
width: 58px; width: 58px;
@ -132,7 +133,7 @@
.bubbleCenterBlue { .bubbleCenterBlue {
background-color: #BCCCE1; background-color: #BCCCE1;
z-index: 60; z-index: 60;
overflow:'hidden'; overflow: hidden;
} }
.bubbleRightBlue { .bubbleRightBlue {
@ -212,18 +213,17 @@
height: 62px; height: 62px;
width: 3px; width: 3px;
} }
.bubbleBottomHintBlue { .bubbleBottomHintBlue {
background: transparent url(../images/bubbleTip_bottom_pico_blue.png) top left; background: transparent url(../images/bubbleTip_bottom_pico_blue.png) top left;
width: 58px; width: 58px;
height: 62px; height: 62px;
behavior: url( ../css/iepngfix.htc );
} }
.bubbleTopHintBlue { .bubbleTopHintBlue {
background: transparent url(../images/bubbleTip_top_pico_blue.png) top left; background: transparent url(../images/bubbleTip_top_pico_blue.png) top left;
width: 58px; width: 58px;
height: 61px; height: 61px;
behavior: url( ../css/iepngfix.htc );
} }
.btn-primary { .btn-primary {

43
wise-webapp/src/main/webapp/css/common.css
View File

@ -45,13 +45,13 @@ abbr, acronym {
*/ */
body { body {
font: 13px arial, helvetica, clean, sans-serif; font: 13px arial, helvetica, clean, sans-serif;
* font-size : small; font-size: small;
* font : x-small; font: x-small;
} }
table { table {
font-size: inherit; font-size: inherit;
font: 100%; font-size: 100%;
} }
/** /**
@ -66,7 +66,7 @@ select, input, textarea {
*/ */
pre, code { pre, code {
font: 115% monospace; font: 115% monospace;
* font-size : 100 %; font-size: 100%;
} }
/** /**
@ -118,12 +118,13 @@ a:hover, a:active {
} }
h2 { h2 {
font: 160%; font-size: 160%;
color: #8e9181; color: #8e9181;
} }
h1 { h1 {
font: normal 180%; font-style: normal;
font-size: 180%;
color: white; color: white;
padding-bottom: 2px; padding-bottom: 2px;
} }
@ -131,13 +132,15 @@ h1 {
h3 { h3 {
/* use as subhead on main body */ /* use as subhead on main body */
clear: left; clear: left;
font: normal 130%; font-style: normal;
font-size: 130%;
color: #6b6f5b; color: #6b6f5b;
} }
h4 { h4 {
/* use as headers in footer */ /* use as headers in footer */
font: bold 120%; font-weight: bold;
font-size: 120%;
border-bottom: 1px solid #8e9181; border-bottom: 1px solid #8e9181;
color: #e2e3dd; color: #e2e3dd;
padding-bottom: 10px; padding-bottom: 10px;
@ -185,9 +188,7 @@ h4 {
margin-top: 8px; margin-top: 8px;
height: 80px; height: 80px;
width: 134px; width: 134px;
background-image: url( "../images/logo-small.png" ); background: url("../images/logo-small.png") no-repeat;
behavior: url( ../css/iepngfix.htc );
background-repeat: no-repeat;
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
@ -199,7 +200,7 @@ h4 {
margin-top: 8px; margin-top: 8px;
height: 1em; height: 1em;
width: 100px; width: 100px;
top: 47px; top: 40px;
left: 137px; left: 137px;
white-space: nowrap; white-space: nowrap;
padding-left: 7px; padding-left: 7px;
@ -346,7 +347,6 @@ div#printLogo {
float: right; float: right;
margin: 1px; margin: 1px;
background: url(../images/logo-vsmall.png) no-repeat right top; background: url(../images/logo-vsmall.png) no-repeat right top;
behavior: url( ../css/iepngfix.htc );
} }
.btn-primary { .btn-primary {
@ -390,7 +390,8 @@ div#paypal {
height: 20px; height: 20px;
color: white; color: white;
font-weight: bold; font-weight: bold;
border: 1px solid whitesmoke; border: 1px solid;
border-color: #f5f5f5;
background-position: 5px 2px; background-position: 5px 2px;
visibility: hidden; visibility: hidden;
} }
@ -421,7 +422,7 @@ div#headerActions a:hover, div#headerActions a:active, div#headerActions a:link,
div.header_languages { div.header_languages {
position: absolute; position: absolute;
right:0px; right: 0;
top: 30px; top: 30px;
width: 100px; width: 100px;
height: 20px; height: 20px;
@ -451,7 +452,7 @@ div.modalDialog h1 {
div.modalDialog h2 { div.modalDialog h2 {
color: gray; color: gray;
font-size: 110%; font-size: 110%;
margin: 9px 0px; margin: 9px 0;
} }
div.modalDialog h5 { div.modalDialog h5 {
@ -483,7 +484,7 @@ div.pageBodyContent h2 {
color: gray; color: gray;
font-size: 150%; font-size: 150%;
border-bottom: 1px dashed #BBB4D6; border-bottom: 1px dashed #BBB4D6;
margin: 20px 0px; margin: 20px 0;
} }
div.pageBodyContent ul { div.pageBodyContent ul {
@ -536,8 +537,8 @@ td.formLabel {
span.fieldRequired { span.fieldRequired {
font-weight: bold; font-weight: bold;
color: orangered; color: #ff4500;
margin: 0px 4px; margin: 0 4px;
} }
#keyboardTable { #keyboardTable {
@ -545,7 +546,7 @@ span.fieldRequired {
width: 100%; width: 100%;
height: 300px; height: 300px;
overflow: auto; overflow: auto;
border: 0px solid gray; border: 0 solid gray;
background-color: white; background-color: white;
z-index: 2; z-index: 2;
position: relative; position: relative;
@ -553,7 +554,7 @@ span.fieldRequired {
#keyboardTable table { #keyboardTable table {
width: 100%; width: 100%;
border: 0px solid gray; border: 0 solid gray;
} }
#keyboardTable thead { #keyboardTable thead {

58
wise-webapp/src/main/webapp/css/editor.css
View File

@ -32,7 +32,8 @@ html {
opacity: .99; opacity: .99;
padding: 15px; padding: 15px;
width: 100%; width: 100%;
border: 1px solid darkgray; border: 1px solid;
border-color:#a9a9a9;
} }
@ -108,7 +109,7 @@ html {
} }
#operationsContainer a { #operationsContainer a {
padding: 0px 5px; padding: 0 5px;
} }
#user { #user {
@ -145,7 +146,7 @@ div#toolbar .buttonContainer {
color: #BBB4D6; color: #BBB4D6;
font-size: 11px; font-size: 11px;
text-align: right; text-align: right;
margin: 0px; margin: 0;
-moz-margin-start: 7px; -moz-margin-start: 7px;
-moz-margin-end: 7px; -moz-margin-end: 7px;
} }
@ -154,7 +155,7 @@ div#toolbar .button {
width: 32px; width: 32px;
height: 36px; height: 36px;
float: left; float: left;
margin: 0px 2px 2px 2px; margin: 0 2px 2px 2px;
cursor: pointer; cursor: pointer;
text-align: center; text-align: center;
} }
@ -167,7 +168,7 @@ div#toolbar .button:hover {
width: 32px; width: 32px;
height: 36px; height: 36px;
float: left; float: left;
margin: 0px 1px; margin: 0 1px;
cursor: pointer; cursor: pointer;
border: 1px solid black; border: 1px solid black;
border-top-color: white; border-top-color: white;
@ -225,37 +226,30 @@ div#share {
div#saveButton { div#saveButton {
background: url(../images/save.png) no-repeat center top; background: url(../images/save.png) no-repeat center top;
behavior: url(../css/iepngfix.htc);
} }
div#discardButton { div#discardButton {
background: url(../images/close.png) no-repeat center top; background: url(../images/close.png) no-repeat center top;
behavior: url(../css/iepngfix.htc);
} }
div#history { div#history {
background: url(../images/history.png) no-repeat center top; background: url(../images/history.png) no-repeat center top;
behavior: url(../css/iepngfix.htc);
} }
div#print { div#print {
background: url(../images/file_printer.png) no-repeat center top; background: url(../images/file_printer.png) no-repeat center top;
behavior: url(../css/iepngfix.htc);
} }
div#undoEdition { div#undoEdition {
background: url(../images/file_undo_dis.png) no-repeat center top; background: url(../images/file_undo_dis.png) no-repeat center top;
behavior: url(../css/iepngfix.htc);
} }
div#redoEdition { div#redoEdition {
background: url(../images/file_redo_dis.png) no-repeat center top; background: url(../images/file_redo_dis.png) no-repeat center top;
behavior: url(../css/iepngfix.htc);
} }
#export { #export {
background: url(../images/file_export.png) no-repeat center top; background: url(../images/file_export.png) no-repeat center top;
behavior: url(../css/iepngfix.htc);
position:relative; position:relative;
} }
@ -269,91 +263,75 @@ div#redoEdition {
div#zoomIn { div#zoomIn {
background: url(../images/zoom_in.png) no-repeat center top; background: url(../images/zoom_in.png) no-repeat center top;
behavior: url(../css/iepngfix.htc);
} }
#zoomOut { #zoomOut {
background: url(../images/zoom_out.png) no-repeat center top; background: url(../images/zoom_out.png) no-repeat center top;
behavior: url(../css/iepngfix.htc);
} }
#addTopic { #addTopic {
background: url(../images/topic_add.png) no-repeat center top; background: url(../images/topic_add.png) no-repeat center top;
behavior: url(../css/iepngfix.htc);
} }
#deleteTopic { #deleteTopic {
background: url(../images/topic_delete.png) no-repeat center top; background: url(../images/topic_delete.png) no-repeat center top;
behavior: url(../css/iepngfix.htc);
} }
div#topicColor { div#topicColor {
background: url(../images/topic_bgcolor.png) no-repeat center top; background: url(../images/topic_bgcolor.png) no-repeat center top;
behavior: url(../css/iepngfix.htc);
z-index: 4; z-index: 4;
} }
div#topicIcon { div#topicIcon {
background: url(../images/topic_icon.png) no-repeat center top; background: url(../images/topic_icon.png) no-repeat center top;
behavior: url(../css/iepngfix.htc);
z-index: 4; z-index: 4;
} }
div#topicNote { div#topicNote {
background: url(../images/note.png) no-repeat center top; background: url(../images/note.png) no-repeat center top;
behavior: url(../css/iepngfix.htc);
z-index: 4; z-index: 4;
} }
div#topicLink { div#topicLink {
background: url(../images/topic_link.png) no-repeat center top; background: url(../images/topic_link.png) no-repeat center top;
behavior: url(../css/iepngfix.htc);
z-index: 4; z-index: 4;
} }
div#topicNote { div#topicNote {
background-image: url(../images/note.png); background-image: url(../images/note.png);
behavior: url(../css/iepngfix.htc);
z-index: 4; z-index: 4;
} }
#topicBorder { #topicBorder {
background: url(../images/topic_border.png) no-repeat center top; background: url(../images/topic_border.png) no-repeat center top;
behavior: url(../css/iepngfix.htc);
width: 30px; width: 30px;
} }
#fontFamily { #fontFamily {
background: url(../images/font_type.png) no-repeat center top; background: url(../images/font_type.png) no-repeat center top;
behavior: url(../css/iepngfix.htc);
} }
#topicShape { #topicShape {
background: url(../images/topic_shape.png) no-repeat center top; background: url(../images/topic_shape.png) no-repeat center top;
behavior: url(../css/iepngfix.htc);
width: 30px; width: 30px;
} }
#fontBold { #fontBold {
background: url(../images/font_bold.png) no-repeat center top; background: url(../images/font_bold.png) no-repeat center top;
behavior: url(../css/iepngfix.htc);
} }
#fontItalic { #fontItalic {
background: url(../images/font_italic.png) no-repeat center top; background: url(../images/font_italic.png) no-repeat center top;
behavior: url(../css/iepngfix.htc);
} }
div#fontColor { div#fontColor {
background: url(../images/font_color.png) no-repeat center top; background: url(../images/font_color.png) no-repeat center top;
behavior: url(../css/iepngfix.htc);
z-index: 4; z-index: 4;
} }
#fontSize { #fontSize {
float: left; float: left;
background: url(../images/font_size.png) no-repeat center top; background: url(../images/font_size.png) no-repeat center top;
behavior: url(../css/iepngfix.htc);
} }
#font-size { #font-size {
@ -371,18 +349,14 @@ div#fontColor {
#shareIt { #shareIt {
background: url(../images/collab_share.png) no-repeat center top; background: url(../images/collab_share.png) no-repeat center top;
behavior: url(../css/iepngfix.htc);
} }
#publishIt { #publishIt {
background: url(../images/collab_publish.png) no-repeat center top; background: url(../images/collab_publish.png) no-repeat center top;
behavior: url(../css/iepngfix.htc);
} }
#tagIt { #tagIt {
background: url(../images/collab_tag.png) no-repeat center top; background: url(../images/collab_tag.png) no-repeat center top;
behavior: url(../css/iepngfix.htc);
} }
#colorPalette { #colorPalette {
@ -414,7 +388,7 @@ div.toolbarPanelLink {
font-size: 14px; font-size: 14px;
color: black; color: black;
font-weight: bold; font-weight: bold;
padding: 0 3px 0px 4px; padding: 0 3px 0 4px;
margin: 1px; margin: 1px;
} }
@ -422,7 +396,7 @@ div.toolbarPanelLink {
cursor: pointer; cursor: pointer;
font-size: 12px; font-size: 12px;
font-weight: bold; font-weight: bold;
padding: 0px 3px 0px 4px; padding: 0 3px 0 4px;
margin: 1px; margin: 1px;
} }
@ -436,7 +410,7 @@ div.toolbarPanelLinkSelectedLink {
cursor: pointer; cursor: pointer;
color: white; color: white;
font-weight: bold; font-weight: bold;
padding: 0px 3px 0px 4px; padding: 0 3px 0 4px;
margin: 1px; margin: 1px;
background-color: #c3def5; background-color: #c3def5;
} }
@ -485,7 +459,6 @@ div#actionsContainer {
width: 6px; width: 6px;
height: 25px; height: 25px;
background: url(../images/btnStart2.png) no-repeat left top; background: url(../images/btnStart2.png) no-repeat left top;
behavior: url(../css/iepngfix.htc);
float: left; float: left;
} }
@ -493,8 +466,7 @@ div#actionsContainer {
background: url(../images/btnBody2.png); background: url(../images/btnBody2.png);
float: left; float: left;
height: 18px; height: 18px;
padding: 0px 5px; padding: 5px 5px 0;
padding-top: 5px;
text-align: center; text-align: center;
color: black; color: black;
} }
@ -503,7 +475,6 @@ div#actionsContainer {
width: 7px; width: 7px;
height: 23px; height: 23px;
background: url(../images/btnEnd2.png) no-repeat right top; background: url(../images/btnEnd2.png) no-repeat right top;
behavior: url(../css/iepngfix.htc);
float: left; float: left;
} }
@ -523,7 +494,6 @@ div#footerEditor {
float: right; float: right;
margin: 5px; margin: 5px;
background: url(../images/logo-vsmall.png) no-repeat right top; background: url(../images/logo-vsmall.png) no-repeat right top;
behavior: url(../css/iepngfix.htc);
} }
#footerEditor .msgLoggerContainer { #footerEditor .msgLoggerContainer {
@ -695,7 +665,7 @@ span#lastSaved {
} }
#tryEditorWarning h1 { #tryEditorWarning h1 {
color: whitesmoke; color: #f5f5f5;
font-weight: bold; font-weight: bold;
margin-bottom: 5px; margin-bottom: 5px;
font-size: 15px; font-size: 15px;
@ -718,13 +688,13 @@ div#helpContainer {
div#helpContent h1 { div#helpContent h1 {
font-weight: bold; font-weight: bold;
color: whitesmoke; color: #f5f5f5;
font-size: 15px; font-size: 15px;
} }
div#helpContent h2 { div#helpContent h2 {
font-weight: bold; font-weight: bold;
padding: 20px 0px 10px 0px; padding: 20px 0 10px 0;
color: #bfbfbf; color: #bfbfbf;
} }
@ -754,14 +724,12 @@ div#small_error_icon {
div#toolbar .topicRelation { div#toolbar .topicRelation {
width:56px; width:56px;
background: url(../images/topic_relationship.png) no-repeat center top; background: url(../images/topic_relationship.png) no-repeat center top;
behavior: url(../css/iepngfix.htc);
z-index: 4; z-index: 4;
} }
div#toolbar .topicRelation:hover { div#toolbar .topicRelation:hover {
width:56px; width:56px;
background: url(../images/topic_relationship.png) no-repeat center top; background: url(../images/topic_relationship.png) no-repeat center top;
behavior: url(../css/iepngfix.htc);
z-index: 4; z-index: 4;
} }

8
wise-webapp/src/main/webapp/css/embedded.css
View File

@ -31,7 +31,8 @@ html {
opacity: .99; opacity: .99;
padding: 15px; padding: 15px;
width: 100%; width: 100%;
border: 1px solid darkgray; border: 1px solid;
border-color:#a9a9a9;
} }
@ -62,7 +63,7 @@ div#embFooter {
height: 35px; height: 35px;
width: 100%; width: 100%;
bottom: 0; bottom: 0;
left: 0px; left: 0;
border-top: 1px solid black; border-top: 1px solid black;
background: #E5E5E5; background: #E5E5E5;
} }
@ -72,7 +73,6 @@ div#logo {
width: 80px; width: 80px;
position: absolute; position: absolute;
background: url( ../images/logo-vvsmall.png ) no-repeat right top; background: url( ../images/logo-vvsmall.png ) no-repeat right top;
behavior: url( ../css/iepngfix.htc );
right: 10px; right: 10px;
top: -10px; top: -10px;
} }
@ -95,14 +95,12 @@ div#logo {
#zoomIn { #zoomIn {
background: url( ../images/zoom_in.png ) no-repeat left top;; background: url( ../images/zoom_in.png ) no-repeat left top;;
behavior: url( ../css/iepngfix.htc );
margin-top: 10px; margin-top: 10px;
margin-left: 10px; margin-left: 10px;
} }
#zoomOut { #zoomOut {
background: url( ../images/zoom_out.png ) no-repeat left top;; background: url( ../images/zoom_out.png ) no-repeat left top;;
behavior: url( ../css/iepngfix.htc );
margin-top: 10px margin-top: 10px
} }

68
wise-webapp/src/main/webapp/css/iepngfix.htc
View File

@ -1,68 +0,0 @@
<public:component>
<public:attach event="onpropertychange" onevent="doFix()" />
<script type="text/javascript">
// IE5.5+ PNG Alpha Fix v1.0RC4
// (c) 2004-2005 Angus Turnbull http://www.twinhelix.com
// This is licensed under the CC-GNU LGPL, version 2.1 or later.
// For details, see: http://creativecommons.org/licenses/LGPL/2.1/
// This must be a path to a blank image. That's all the configuration you need.
if (typeof blankImg == 'undefined') var blankImg = 'blank.gif';
var f = 'DXImageTransform.Microsoft.AlphaImageLoader';
function filt(s, m)
{
if (filters[f])
{
filters[f].enabled = s ? true : false;
if (s) with (filters[f]) { src = s; sizingMethod = m }
}
else if (s) style.filter = 'progid:'+f+'(src="'+s+'",sizingMethod="'+m+'")';
}
function doFix()
{
// Assume IE7 is OK.
if (!/MSIE (5\.5|6\.)/.test(navigator.userAgent) ||
(event && !/(background|src)/.test(event.propertyName))) return;
var bgImg = currentStyle.backgroundImage || style.backgroundImage;
if (tagName == 'IMG')
{
if ((/\.png$/i).test(src))
{
if (currentStyle.width == 'auto' && currentStyle.height == 'auto')
style.width = offsetWidth + 'px';
filt(src, 'scale');
src = blankImg;
}
else if (src.indexOf(blankImg) < 0) filt();
}
else if (bgImg && bgImg != 'none')
{
if (bgImg.match(/^url[("']+(.*\.png)[)"']+$/i))
{
var s = RegExp.$1;
if (currentStyle.width == 'auto' && currentStyle.height == 'auto')
style.width = offsetWidth + 'px';
style.backgroundImage = 'none';
filt(s, 'crop');
// IE link fix.
for (var n = 0; n < childNodes.length; n++)
if (childNodes[n].style) childNodes[n].style.position = 'relative';
}
else filt();
}
}
doFix();
</script>
</public:component>

25
wise-webapp/src/main/webapp/css/mymaps.css
View File

@ -6,8 +6,7 @@
width: 100px; width: 100px;
font-size: 12px; font-size: 12px;
font-weight: bold; font-weight: bold;
padding: 5px; padding: 10px 5px 5px 0;
padding-left: 0;
color: #808080; color: #808080;
} }
@ -17,11 +16,10 @@
} }
#recentFiles { #recentFiles {
margin: 10px auto; margin: 10px auto 5px;
width: 900px; width: 900px;
height: 100%; height: 100%;
padding: 8px; padding: 8px;
margin-bottom: 5px;
} }
#recentFiles a { #recentFiles a {
@ -36,6 +34,8 @@
#recentFiles .recentItemContainer { #recentFiles .recentItemContainer {
height: 20px; height: 20px;
background-color: white; background-color: white;
padding: 0 0 0 7px;
margin-top: 4px;
} }
#recentFiles .recentItemIcon { #recentFiles .recentItemIcon {
@ -47,7 +47,7 @@
#recentFiles .recentItemTitle { #recentFiles .recentItemTitle {
float: left; float: left;
padding-left: 0px; padding-left: 0;
padding-right: 10px; padding-right: 10px;
font-size: 12px; font-size: 12px;
} }
@ -91,8 +91,7 @@
float: left; float: left;
position: relative; position: relative;
top: 50%; top: 50%;
margin: 0px 5px; margin: -12px 5px 0;
margin-top: -12px;
height: 24px; height: 24px;
} }
@ -111,7 +110,7 @@
#toolbar .buttonBody { #toolbar .buttonBody {
float: left; float: left;
height: 19px; height: 19px;
padding: 5px 5px 0px; padding: 5px 5px 0;
background: url(../images/body_btn.gif); background: url(../images/body_btn.gif);
} }
@ -126,8 +125,7 @@
float: left; float: left;
position: relative; position: relative;
top: 50%; top: 50%;
margin: 0px 5px; margin: -15px 5px 0;
margin-top: -15px;
width: 78px; width: 78px;
height: 30px; height: 30px;
} }
@ -136,8 +134,7 @@
float: left; float: left;
position: relative; position: relative;
top: 50%; top: 50%;
margin: 0px 5px; margin: -15px 5px 0;
margin-top: -15px;
width: 78px; width: 78px;
height: 30px; height: 30px;
} }
@ -158,7 +155,7 @@
width: 100%; width: 100%;
height: 250px; height: 250px;
overflow: auto; overflow: auto;
border: 0px solid gray; border: 0 solid gray;
background-color: white; background-color: white;
z-index: 2; z-index: 2;
position: relative; position: relative;
@ -166,7 +163,7 @@
#docTable table { #docTable table {
width: 100%; width: 100%;
border: 0px solid gray; border: 0 solid gray;
} }
#docTable thead { #docTable thead {

4
wise-webapp/src/main/webapp/css/thirdparty.css
View File

@ -291,7 +291,7 @@ div.windoo-wise a.windoo-maximize-disabled, div.windoo-wise a.windoo-maximize-di
} }
div.windoo-wise a.windoo-minimize { div.windoo-wise a.windoo-minimize {
top: 0px; top: 0;
right: 56px; right: 56px;
background-position: 0 0; background-position: 0 0;
} }
@ -308,7 +308,7 @@ div.windoo-wise a.windoo-minimize-disabled, div.windoo-wise a.windoo-minimize-di
div.windoo-wise a.windoo-restore { div.windoo-wise a.windoo-restore {
display: none; display: none;
top: 0px; top: 0;
right: 15px; right: 15px;
background-position: -46px 0; background-position: -46px 0;
} }

30
wise-webapp/src/main/webapp/css/wisehome.css
View File

@ -27,7 +27,7 @@
float: left; float: left;
width: 510px; width: 510px;
height: 210px; height: 210px;
margin: 40px 12px 0px 10px; margin: 40px 12px 0 10px;
} }
.contentImage { .contentImage {
@ -77,7 +77,7 @@
width: 100%; width: 100%;
height: 550px; height: 550px;
overflow: auto; overflow: auto;
border: 0px solid gray; border: 0 solid gray;
background-color: white; background-color: white;
z-index: 2; z-index: 2;
position: relative; position: relative;
@ -86,7 +86,7 @@
#searchResultTable table { #searchResultTable table {
width: 100%; width: 100%;
border: 0px solid gray; border: 0 solid gray;
background-color: white; background-color: white;
} }
@ -145,14 +145,13 @@
clear: both; clear: both;
width: 200px; width: 200px;
font-size: 12px; font-size: 12px;
padding: 9px 9px 0px; padding: 9px 9px 0;
} }
#searchTitleContainer { #searchTitleContainer {
background: url( ../images/search3.png ) no-repeat left; background: url( ../images/search3.png ) no-repeat left;
padding-left: 35px; padding-left: 35px;
padding-bottom: 10px; padding-bottom: 10px;
behavior: url( ../css/iepngfix.htc );
} }
#searchTitle { #searchTitle {
@ -189,7 +188,6 @@
width: 6px; width: 6px;
height: 25px; height: 25px;
background: url( ../images/btnStart.png ) no-repeat left top; background: url( ../images/btnStart.png ) no-repeat left top;
behavior: url( ../css/iepngfix.htc );
float: left; float: left;
} }
@ -197,8 +195,7 @@
background: url( ../images/btnBody.png ); background: url( ../images/btnBody.png );
height: 18px; height: 18px;
float: left; float: left;
padding: 0px 0px; padding: 5px 0 0;
padding-top: 5px;
text-align: center; text-align: center;
color: black; color: black;
} }
@ -207,7 +204,6 @@
width: 7px; width: 7px;
height: 25px; height: 25px;
background: url( ../images/btnEnd.png ) no-repeat right top; background: url( ../images/btnEnd.png ) no-repeat right top;
behavior: url( ../css/iepngfix.htc );
float: left; float: left;
} }
@ -228,7 +224,6 @@ div#tryNow .tryBtnStart {
width: 10px; width: 10px;
height: 70px; height: 70px;
background: url( ../images/tryItStartBtn2.png ) no-repeat left top; background: url( ../images/tryItStartBtn2.png ) no-repeat left top;
behavior: url( ../css/iepngfix.htc );
float: left; float: left;
} }
@ -247,7 +242,7 @@ div#tryNow .tryBtnEnd {
} }
div#tryNow .tryBtnText { div#tryNow .tryBtnText {
padding: 0px 20px; padding: 0 20px;
position: relative; position: relative;
height: 70px; height: 70px;
font-size: 20px; font-size: 20px;
@ -288,7 +283,6 @@ div#video .videoBtnStart {
width: 10px; width: 10px;
height: 51px; height: 51px;
background: url( ../images/videoStart.png ) no-repeat left top; background: url( ../images/videoStart.png ) no-repeat left top;
behavior: url( ../css/iepngfix.htc );
float: left; float: left;
} }
@ -379,7 +373,6 @@ div#signUpButton .signUpStartBtn {
width: 5px; width: 5px;
height: 25px; height: 25px;
background: url( ../images/signUpStartBtn.png ) no-repeat left top; background: url( ../images/signUpStartBtn.png ) no-repeat left top;
behavior: url( ../css/iepngfix.htc );
float: left; float: left;
} }
@ -396,12 +389,11 @@ div#signUpButton .signUpEndBtn {
width: 7px; width: 7px;
height: 25px; height: 25px;
background: url( ../images/signUpEndBtn.png ) no-repeat right top; background: url( ../images/signUpEndBtn.png ) no-repeat right top;
behavior: url( ../css/iepngfix.htc );
float: left; float: left;
} }
div#signUpButton .signUpText { div#signUpButton .signUpText {
padding: 0px 20px; padding: 0 20px;
position: relative; position: relative;
height: 25px; height: 25px;
color: #093A9D; color: #093A9D;
@ -546,12 +538,10 @@ div#mainBody {
} }
div#news li { div#news li {
background: transparent url( ../images/icon_triangle_grey_12x13.gif ) no-repeat scroll 0pt; background: transparent url( ../images/icon_triangle_grey_12x13.gif ) no-repeat scroll 0;
list-style-image: none; list-style: none outside none;
list-style-position: outside;
list-style-type: none;
margin-bottom: 12px; margin-bottom: 12px;
padding: 2px 0pt 5px 20px; padding: 2px 0 5px 20px;
} }
div#news ul { div#news ul {

7
wise-webapp/src/main/webapp/js/editor.js
View File

@ -589,15 +589,16 @@ function fontFamilyPanel()
function shapeTypePanel() function shapeTypePanel()
{ {
var shapeTypePanel = ['rectagle','rounded rectagle','line','elipse']; var shapeTypePanel = ['rectagle','rounded_rectagle','line','elipse'];
var updateFunction = function(value) var updateFunction = function(value)
{ {
designer.setShape2SelectedNode(value); designer.setShape2SelectedNode(value.replace('_',' '));
}; };
var onFocusValue = function(selectedNode) var onFocusValue = function(selectedNode)
{ {
return selectedNode.getShapeType();
return selectedNode.getShapeType().replace(' ','_');
}; };
buildPanel('topicShape', 'topicShapePanel', shapeTypePanel, updateFunction, onFocusValue); buildPanel('topicShape', 'topicShapePanel', shapeTypePanel, updateFunction, onFocusValue);

15
wise-webapp/src/main/webapp/jsp/footer.jsp
View File

@ -10,15 +10,18 @@
<div style="float:left; text-align:left;padding:5px;"> <div style="float:left; text-align:left;padding:5px;">
<form action="https://www.paypal.com/cgi-bin/webscr" method="post"> <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
<input type="hidden" name="cmd" value="_s-xclick"/> <input type="hidden" name="cmd" value="_s-xclick"/>
<input type="image" src="https://www.paypal.com/en_US/i/btn/x-click-but04.gif" name="submit" alt="Make payments with PayPal - it's fast, free and secure!"/> <input type="image" src="https://www.paypal.com/en_US/i/btn/x-click-but04.gif" name="submit"
alt="Make payments with PayPal - it's fast, free and secure!"/>
<img alt="" style="border: 0;width:1;height:1;" src="https://www.paypal.com/en_US/i/scr/pixel.gif"/> <img alt="" style="border: 0;width:1;height:1;" src="https://www.paypal.com/en_US/i/scr/pixel.gif"/>
<input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----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-----END PKCS7-----"/> <input type="hidden" name="encrypted"
value="-----BEGIN PKCS7-----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-----END PKCS7-----"/>
</form> </form>
</div> </div>
<div style="float:left; text-align:left;padding:5px;"> <div style="float:left; text-align:left;padding:5px;">
<a href="http://www.w3.org/html/logo/" target="_blank"> <a href="http://www.w3.org/html/logo/">
<img src="http://www.w3.org/html/logo/badge/html5-badge-h-css3-graphics-semantics.png" width="100" height="32" alt="HTML5 Powered with CSS3 / Styling, Graphics, 3D &amp; Effects, and Semantics" title="HTML5 Powered with CSS3 / Styling, Graphics, 3D &amp; Effects, and Semantics"> <img src="http://www.w3.org/html/logo/badge/html5-badge-h-graphics.png" width="66" height="32"
</a> alt="HTML5 Powered with Graphics, 3D &amp; Effects"
</div> title="HTML5 Powered with Graphics, 3D &amp; Effects">
</a></div>
</div> </div>

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

@ -22,11 +22,11 @@
<c:out value="${wisemapDetail.title}"/> <c:out value="${wisemapDetail.title}"/>
<c:choose> <c:choose>
<c:when test="${not wisemapDetail.public}"> <c:when test="${not wisemapDetail.public}">
<img src="../images/key.png" title="<spring:message code="PRIVATE"/>"/> <img src="../images/key.png" alt="<spring:message code="PRIVATE"/>" title="<spring:message code="PRIVATE"/>"/>
<span>(<spring:message code="PRIVATE"/>)</span> <span>(<spring:message code="PRIVATE"/>)</span>
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<img src="../images/world2.png " title="<spring:message code="PUBLIC"/>"/> <img src="../images/world2.png" alt="<spring:message code="PUBLIC"/>" title="<spring:message code="PUBLIC"/>"/>
<span>(<spring:message code="PUBLIC"/>)</span> <span>(<spring:message code="PUBLIC"/>)</span>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
@ -64,7 +64,7 @@
<td class="formLabel"> <td class="formLabel">
<c:choose> <c:choose>
<c:when test="${wisemapDetail.owner==requestScope.user}"> <c:when test="${wisemapDetail.owner==requestScope.user}">
<a href="<c:out value="${shareMap}"/>&mapId=${wisemapDetail.id}" rel="moodalbox 780px 530px wizard" <a href="<c:out value="${shareMap}"/>&amp;mapId=${wisemapDetail.id}" rel="moodalbox 780px 530px wizard"
title="<spring:message code="SHARE_DETAILS"/>"> title="<spring:message code="SHARE_DETAILS"/>">
<spring:message code="COLLABORATORS"/> <spring:message code="COLLABORATORS"/>
</a> </a>
@ -137,7 +137,7 @@
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
: :
<div id="divSendLink"/> <div id="divSendLink"></div>
</td> </td>
<td> <td>
<c:choose> <c:choose>
@ -184,7 +184,7 @@
readonly="readonly"> readonly="readonly">
&lt;iframe &lt;iframe
style="border:0;width:600px;height:400px;border: 1px solid black" style="border:0;width:600px;height:400px;border: 1px solid black"
src="http://www.wisemapping.com/c/embeddedView.htm?mapId=${wisemapDetail.id}&zoom=1"&gt; src="http://www.wisemapping.com/c/embeddedView.htm?mapId=${wisemapDetail.id}&amp;amzoom=1"&gt;
&lt;/iframe&gt; &lt;/iframe&gt;
</textarea> </textarea>

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

@ -103,7 +103,7 @@
<div id="topicShapePanel" class="toolbarPanel"> <div id="topicShapePanel" class="toolbarPanel">
<!--<div id="automatic" class="toolbarPanelLink">Automatic</div>--> <!--<div id="automatic" class="toolbarPanelLink">Automatic</div>-->
<div id="rectagle" class="toolbarPanelLink"><img src="../images/shape-rectangle.png" alt="Rectangle" width="40" height="25"></div> <div id="rectagle" class="toolbarPanelLink"><img src="../images/shape-rectangle.png" alt="Rectangle" width="40" height="25"></div>
<div id="rounded rectagle" class="toolbarPanelLink"><img src="../images/shape-rectangle-rounded.png" alt="Rounded Rectangle" width="40" height="25"></div> <div id="rounded_rectagle" class="toolbarPanelLink"><img src="../images/shape-rectangle-rounded.png" alt="Rounded Rectangle" width="40" height="25"></div>
<div id="line" class="toolbarPanelLink"><img src="../images/shape-line.png" alt="Line" width="40" height="7"></div> <div id="line" class="toolbarPanelLink"><img src="../images/shape-line.png" alt="Line" width="40" height="7"></div>
<div id="elipse" class="toolbarPanelLink"><img src="../images/shape-elipse.png" alt="Elipse" width="40" height="25"></div> <div id="elipse" class="toolbarPanelLink"><img src="../images/shape-elipse.png" alt="Elipse" width="40" height="25"></div>
</div> </div>

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

@ -1,4 +1,4 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <!DOCTYPE HTML>
<%@ page import="com.wisemapping.view.MindMapBean" %> <%@ page import="com.wisemapping.view.MindMapBean" %>
<%@ page import="java.util.List" %> <%@ page import="java.util.List" %>
@ -103,7 +103,7 @@
}, },
'onConfirm':function(){ 'onConfirm':function(){
$(document.toolbarForm.mindmapIds).value=$('selectedMapIds').value; $(document.toolbarForm.mindmapIds).value=$('selectedMapIds').value;
$(document.toolbarForm).action='${deleteSelectedMapUrl}'; $(document.toolbarForm).action='<c:out value="${deleteSelectedMapUrl}" escapeXml="true"/>';
$(document.toolbarForm).submit(); $(document.toolbarForm).submit();
} }
});"> });">
@ -131,19 +131,19 @@
<div id="docTable"> <div id="docTable">
<table> <table>
<colgroup> <colgroup>
<col width="3%"/> <col style="width:3%;"/>
<col width="3%"/> <col style="width:3%;"/>
<col width="15%"/> <col style="width:15%;"/>
<col width="30%"/> <col style="width:30%;"/>
<col width="14%"/> <col style="width:14%;"/>
<col width="10%"/> <col style="width:10%;"/>
<col width="20%"/> <col style="width:20%;"/>
<col width="5%"/> <col style="width:5%;"/>
</colgroup> </colgroup>
<thead> <thead>
<tr> <tr>
<th style="text-align:center"> <th style="text-align:center">
<input id="checkAll" type="checkbox" onchange="selectAllMaps(this);"> <label for="checkAll"></label><input id="checkAll" type="checkbox" onchange="selectAllMaps(this);">
</th> </th>
<th> <th>
<spring:message code="FILE"/> <spring:message code="FILE"/>
@ -172,29 +172,21 @@
<c:forEach items="${wisemapsList}" var="mindmap"> <c:forEach items="${wisemapsList}" var="mindmap">
<tr> <tr>
<td> <td>
<div align="center"><input type="checkbox" name="chk" id="chk${mindmap.id}" <div style="text-align:center;"><input type="checkbox" name="chk" id="chk${mindmap.id}" onclick="addToSelectedMapList(this);"></div>
onclick="addToSelectedMapList(this);"></div>
</td> </td>
<td> <td>
<div class="leftMenu"> <div class="leftMenu">
<img src="../images/icon_list.png" border="0" class="button" <img src="../images/icon_list.png" class="button" style="display:block;border:0;">
style="display:block;">
<div class="subMenu2"> <div class="subMenu2">
<a href="javascript:openMap('${mindmap.id}')" <a href="javascript:openMap('${mindmap.id}')" title="<spring:message code="OPEN_MSG"/>">
title="<spring:message code="OPEN_MSG"/>">
<spring:message code="OPEN"/> <spring:message code="OPEN"/>
</a> </a>
<c:if test="${mindmap.owner==requestScope.user}"> <c:if test="${mindmap.owner==requestScope.user}">
<a href="renameMap.htm?mapId=${mindmap.id}" <a href="renameMap.htm?mapId=${mindmap.id}" rel="moodalbox 400px 180px wizard" title="<spring:message code="RENAME_DETAILS"/>">
rel="moodalbox 400px 180px wizard"
title="<spring:message code="RENAME_DETAILS"/>">
<spring:message code="RENAME"/> <spring:message code="RENAME"/>
</a> </a>
</c:if> </c:if>
<a href="history.htm?action=list&goToMindmapList&mapId=${mindmap.id}" <a href="history.htm?action=list&amp;goToMindmapList&amp;mapId=${mindmap.id}" rel="moodalbox 600px 400px wizard" title="<spring:message code="HISTORY_INFO"/>">
rel="moodalbox 600px 400px wizard"
title="<spring:message code="HISTORY_INFO"/>">
<spring:message code="HISTORY"/> <spring:message code="HISTORY"/>
</a> </a>
@ -204,26 +196,20 @@
title:'<spring:message code="DELETE_MAP"/>' title:'<spring:message code="DELETE_MAP"/>'
}, },
'onConfirm':function(){ 'onConfirm':function(){
var form = new Element('form').setProperties({action: '${deleteMapUrl}&mapId=${mindmap.id}', method:'post'}).injectInside(document.body); var form = new Element('form').setProperties({action: '<c:out value="${deleteMapUrl}" escapeXml="true"/>&amp;mapId=${mindmap.id}', method:'post'}).injectInside(document.body);
form.submit(); form.submit();
} }
});"> });">
<spring:message code="DELETE"/> <spring:message code="DELETE"/>
</div> </div>
<a href="tags.htm?mapId=${mindmap.id}" <a href="tags.htm?mapId=${mindmap.id}" rel="moodalbox 400px 200px wizard" title="<spring:message code="TAGS_DETAILS"/>">
rel="moodalbox 400px 200px wizard"
title="<spring:message code="TAGS_DETAILS"/>">
<spring:message code="TAGS"/> <spring:message code="TAGS"/>
</a> </a>
<c:if test="${mindmap.owner==requestScope.user}"> <c:if test="${mindmap.owner==requestScope.user}">
<a href="${shareMap}&mapId=${mindmap.id}" <a href="<c:out value="${shareMap}" escapeXml="true"/>&amp;mapId=${mindmap.id}" rel="moodalbox 780px 530px wizard" title="<spring:message code="SHARE_DETAILS"/>">
rel="moodalbox 780px 530px wizard"
title="<spring:message code="SHARE_DETAILS"/>">
<spring:message code="COLLABORATION"/> <spring:message code="COLLABORATION"/>
</a> </a>
<a class="subMenu2Sep" href="publish.htm?mapId=${mindmap.id}" <a class="subMenu2Sep" href="publish.htm?mapId=${mindmap.id}" rel="moodalbox 600px 400px wizard" title="<spring:message code="PUBLISH_MSG"/>">
rel="moodalbox 600px 400px wizard"
title="<spring:message code="PUBLISH_MSG"/>">
<spring:message code="PUBLISH"/> <spring:message code="PUBLISH"/>
</a> </a>
</c:if> </c:if>
@ -260,16 +246,14 @@
alt="<spring:message code="PRIVATE"/>"/> alt="<spring:message code="PRIVATE"/>"/>
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<img src="../images/world2.png " <img src="../images/world2.png" title="<spring:message code="PUBLIC"/>: <spring:message code="ALL_VIEW_PUBLIC"/>" alt="World"
title="<spring:message code="PUBLIC"/>: <spring:message code="ALL_VIEW_PUBLIC"/>"
alt="title="
<spring:message code="PUBLIC"/> <spring:message code="PUBLIC"/>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
</td> </td>
<td>${mindmap.creationUser}</td> <td>${mindmap.creationUser}</td>
<td>${mindmap.lastEditDate} by ${mindmap.lastEditor}</td> <td>${mindmap.lastEditDate} by ${mindmap.lastEditor}</td>
<td><a href="${mapDetail}&mapId=${mindmap.id}"> <td><a href="<c:out value="${mapDetail}" escapeXml="true"/>&amp;mapId=${mindmap.id}">
<spring:message code="DETAIL"/> <spring:message code="DETAIL"/>
</a> </a>
</td> </td>
@ -282,24 +266,20 @@
</div> </div>
<div id="ds1" class="submenu" style="display:none;"> <div id="ds1" class="submenu" style="display:none;">
<a href="${deleteSelectedMapUrl}&mindmapIds=" rel="moodalbox 300px 120px">Delete</a> <a href="<c:out value="${deleteSelectedMapUrl}" escapeXml="true"/>&amp;mindmapIds=" rel="moodalbox 300px 120px">Delete</a>
<a href="#">Tag</a> <a href="#">Tag</a>
<a href="#">Publish</a> <a href="#">Publish</a>
</div> </div>
<div id="ds2" class="submenu" style="position:absolute; display:none;"> <div id="ds2" class="submenu" style="position:absolute; display:none;">
<a href="${shareMap}&mapId=" rel="moodalbox 780px 530px" <a href="<c:out value="${shareMap}" escapeXml="true"/>&amp;mapId=" rel="moodalbox 780px 530px" title="Share WiseMap">Share</a>
title="Share WiseMap">Share</a> <a href="publish.htm?mapId=" rel="moodalbox 600px 400px wizard" title="<spring:message code="PUBLISH_DETAILS"/>">
<a href="publish.htm?mapId=" rel="moodalbox 600px 400px wizard"
title="<spring:message code="PUBLISH_DETAILS"/>">
<spring:message code="PUBLISH"/> <spring:message code="PUBLISH"/>
</a> </a>
<a href="${deleteMapUrl}&mapId=" rel="moodalbox 300px 120px" <a href="<c:out value="${deleteMapUrl}" escapeXml="true"/>&amp;mapId=" rel="moodalbox 300px 120px" title="Delete Confirmation">
title="Delete Confirmation">
Delete Delete
</a> </a>
<a href="export.htm?mapId=" rel="moodalbox 750px 400px" <a href="export.htm?mapId=" rel="moodalbox 750px 400px" title="<spring:message code="EXPORT_DETAILS"/>">
title="<spring:message code="EXPORT_DETAILS"/>">
<spring:message code="EXPORT"/> <spring:message code="EXPORT"/>
</a> </a>

0
wise-webapp/src/test/data/svg/map4.png Normal file
View File

2
wise-webapp/src/test/java/com/wisemapping/test/export/ExportTest.java
View File

@ -42,7 +42,7 @@ public class ExportTest {
final ExportProperties properties = ExportProperties.create(format); final ExportProperties properties = ExportProperties.create(format);
final ExportProperties.ImageProperties imageProperties = (ExportProperties.ImageProperties) properties; final ExportProperties.ImageProperties imageProperties = (ExportProperties.ImageProperties) properties;
imageProperties.setSize(ExportProperties.ImageProperties.Size.LARGE); imageProperties.setSize(ExportProperties.ImageProperties.Size.LARGE);
String baseUrl = "file://"+svgFile.getParentFile().getAbsolutePath()+"/../../../main/webapp/images"; String baseUrl = "file://"+svgFile.getParentFile().getAbsolutePath()+"/../../../main/webapp/icons/";
properties.setBaseImagePath(baseUrl); properties.setBaseImagePath(baseUrl);
// Write content ... // Write content ...