diff --git a/wise-webapp/src/main/java/com/wisemapping/controller/ExportController.java b/wise-webapp/src/main/java/com/wisemapping/controller/ExportController.java index fd2e6daf..572a2cce 100644 --- a/wise-webapp/src/main/java/com/wisemapping/controller/ExportController.java +++ b/wise-webapp/src/main/java/com/wisemapping/controller/ExportController.java @@ -25,6 +25,7 @@ import com.wisemapping.view.MindMapBean; import com.wisemapping.exporter.ExportProperties; import com.wisemapping.filter.UserAgent; import org.apache.batik.transcoder.TranscoderException; +import org.jetbrains.annotations.NotNull; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.multiaction.NoSuchRequestHandlingMethodException; @@ -109,14 +110,14 @@ public class ExportController extends BaseMultiActionController { return null; } - private void setBaseBaseImgUrl(ExportFormat format, ExportProperties properties) { + private void setBaseBaseImgUrl(ExportFormat format, @NotNull ExportProperties properties) { final String baseUrl; if (format == ExportFormat.SVG) { baseUrl = "http://www.wisemapping.com/images"; } else { final ServletContext servletContext = this.getServletContext(); - baseUrl = "file://" + servletContext.getRealPath("/images/"); + baseUrl = "file://" + servletContext.getRealPath("/icons/"); } properties.setBaseImagePath(baseUrl); } diff --git a/wise-webapp/src/main/java/com/wisemapping/exporter/SvgExporter.java b/wise-webapp/src/main/java/com/wisemapping/exporter/SvgExporter.java index f8d44d60..823e4d18 100644 --- a/wise-webapp/src/main/java/com/wisemapping/exporter/SvgExporter.java +++ b/wise-webapp/src/main/java/com/wisemapping/exporter/SvgExporter.java @@ -187,13 +187,18 @@ public class SvgExporter { Element elem = (Element) node; // Cook image href ... - String imgName = elem.getAttribute("href"); - int index = imgName.lastIndexOf("/"); + final String imgUrl = elem.getAttribute("href"); + int index = imgUrl.lastIndexOf("/"); elem.removeAttribute("href"); - if (index != -1) - { - imgName = imgName.substring(index); - final String imgPath = imgBaseUrl + imgName; + if (index != -1) { + final String iconName = imgUrl.substring(index); + // Hack for backward compatibility . This can be removed in 2012. :) + String imgPath; + if (imgUrl.contains("images")) { + imgPath = imgBaseUrl + "../images/" + imgUrl; + } else { + imgPath = imgBaseUrl + imgUrl; + } elem.setAttribute("xlink:href", imgPath); } } @@ -231,7 +236,7 @@ public class SvgExporter { final NodeList groupChildren = node.getChildNodes(); for (int idx = 0; idx < groupChildren.getLength(); idx++) { final Node rectNode = groupChildren.item(idx); - float curentHeight = 0 ; + float curentHeight = 0; float curentWidth = 0; // If has a rect use the rect to calcular the real width of the topic diff --git a/wise-webapp/src/main/java/com/wisemapping/filter/UserAgent.java b/wise-webapp/src/main/java/com/wisemapping/filter/UserAgent.java index 30e58deb..91b2acf7 100644 --- a/wise-webapp/src/main/java/com/wisemapping/filter/UserAgent.java +++ b/wise-webapp/src/main/java/com/wisemapping/filter/UserAgent.java @@ -332,8 +332,7 @@ public class UserAgent implements Serializable { // Is it a supported browser ?. 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)); - - result = result || product == UserAgent.Product.EXPLORER && this.isVersionGreatedOrEqualThan(6, 0) && this.getOs() == UserAgent.OS.WINDOWS; + result = result || product == UserAgent.Product.EXPLORER && this.isVersionGreatedOrEqualThan(7, 0) && this.getOs() == UserAgent.OS.WINDOWS; 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.SAFARI && this.isVersionGreatedOrEqualThan(3, 0); diff --git a/wise-webapp/src/main/webapp/css/bubble.css b/wise-webapp/src/main/webapp/css/bubble.css index 0deef7b0..ecdf537c 100644 --- a/wise-webapp/src/main/webapp/css/bubble.css +++ b/wise-webapp/src/main/webapp/css/bubble.css @@ -1,13 +1,13 @@ .bubbleContainer { - position:absolute; - z-index:50; - opacity:0; - width:auto; - overflow:hidden; - padding:20px; + position: absolute; + z-index: 50; + opacity: 0; + width: auto; + overflow: hidden; + padding: 20px; -moz-border-radius: 5px; border-radius: 5px; - background-color:#BCCCE1; + background-color: #BCCCE1; -moz-box-shadow: 5px 5px 5px #888; -webkit-box-shadow: 5px 5px 5px #888; box-shadow: 5px 5px 5px #888; @@ -15,215 +15,215 @@ } .bublePartContainer { - clear:both; + clear: both; } .bubblePart { - float:left; + float: left; } .bubbleLeft { background: transparent url(../images/bubbleTip_left.png) top left; - width:12px; - height:4px; + width: 12px; + height: 4px; } .bubbleCenter { - background-color:#362d2e; - text-align:center; - z-index:60; + background-color: #362d2e; + text-align: center; + z-index: 60; } .bubbleRight { background: transparent url(../images/bubbleTip_right.png) top left; - width:23px; - height:4px; + width: 23px; + height: 4px; } .bubbleTopLeft { background: transparent url(../images/bubbleTip_corner_top_left.png) top left; - width:12px; - height:12px; + width: 12px; + height: 12px; } .bubbleHintTopLeft { background: transparent url(../images/bubbleTip_pico_corner_top_left.png) top left; - width:12px; - height:57px; + width: 12px; + height: 57px; } .bubbleTopRight { background: transparent url(../images/bubbleTip_corner_top_right.png) top left; - width:23px; - height:12px; + width: 23px; + height: 12px; } .bubbleHintTopRight { background: transparent url(../images/bubbleTip_pico_corner_top_right.png) top left; - width:23px; - height:57px; + width: 23px; + height: 57px; } .bubbleTop { background: transparent url(../images/bubbleTip_top.png) top left; - height:12px; - width:4px; + height: 12px; + width: 4px; } .bubbleHintTop { background: transparent url(../images/bubbleTip_pico_top.png) top left; - height:57px; - width:4px; + height: 57px; + width: 4px; } .bubbleBottomLeft { background: transparent url(../images/bubbleTip_corner_bottom_left.png) top left; - width:12px; - height:26px; + width: 12px; + height: 26px; } .bubbleHintBottomLeft { background: transparent url(../images/bubbleTip_pico_corner_bottom_left.png) top left; - width:12px; - height:62px; + width: 12px; + height: 62px; } .bubbleBottomRight { background: transparent url(../images/bubbleTip_corner_bottom_right.png) top left; - width:23px; - height:26px; + width: 23px; + height: 26px; } .bubbleHintBottomRight { background: transparent url(../images/bubbleTip_pico_corner_bottom_right.png) top left; - width:23px; - height:62px; + width: 23px; + height: 62px; } .bubbleBottom { background: transparent url(../images/bubbleTip_bottom.png) top left; - height:26px; - width:4px; + height: 26px; + width: 4px; } .bubbleHintBottom { background: transparent url(../images/bubbleTip_pico_bottom.png) top left; - height:62px; - width:4px; + height: 62px; + width: 4px; } + .bubbleBottomHint { background: transparent url(../images/bubbleTip_bottom_pico.png) top left; - width:58px; - height:62px; + width: 58px; + height: 62px; } .bubbleTopHint { background: transparent url(../images/bubbleTip_top_pico.png) top left; - width:58px; - height:57px; + width: 58px; + height: 57px; } .bubbleLeftBlue { background: transparent url(../images/bubbleTip_left_blue.gif) top left; - width:12px; - height:4px; + width: 12px; + height: 4px; } .bubbleCenterBlue { - background-color:#BCCCE1; - z-index:60; - overflow:'hidden'; + background-color: #BCCCE1; + z-index: 60; + overflow: hidden; } .bubbleRightBlue { background: transparent url(../images/bubbleTip_right_blue.gif) top left; - width:23px; - height:3px; + width: 23px; + height: 3px; } .bubbleTopLeftBlue { background: transparent url(../images/bubbleTip_corner_top_left_blue.gif) top left; - width:12px; - height:18px; + width: 12px; + height: 18px; } .bubbleHintTopLeftBlue { background: transparent url(../images/bubbleTip_pico_corner_top_left_blue.gif) top left; - width:13px; - height:61px; + width: 13px; + height: 61px; } .bubbleTopRightBlue { background: transparent url(../images/bubbleTip_corner_top_right_blue.gif) top left; - width:23px; - height:18px; + width: 23px; + height: 18px; } .bubbleHintTopRightBlue { background: transparent url(../images/bubbleTip_pico_corner_top_right_blue.gif) top left; - width:23px; - height:61px; + width: 23px; + height: 61px; } .bubbleTopBlue { background: transparent url(../images/bubbleTip_top_blue.gif) top left; - height:18px; - width:3px; + height: 18px; + width: 3px; } .bubbleHintTopBlue { background: transparent url(../images/bubbleTip_pico_top_blue.gif) top left; - height:61px; - width:3px; + height: 61px; + width: 3px; } .bubbleBottomLeftBlue { background: transparent url(../images/bubbleTip_corner_bottom_left_blue.gif) top left; - width:13px; - height:32px; + width: 13px; + height: 32px; } .bubbleHintBottomLeftBlue { background: transparent url(../images/bubbleTip_pico_corner_bottom_left_blue.gif) top left; - width:12px; - height:62px; + width: 12px; + height: 62px; } .bubbleBottomRightBlue { background: transparent url(../images/bubbleTip_corner_bottom_right_blue.gif) top left; - width:23px; - height:32px; + width: 23px; + height: 32px; } .bubbleHintBottomRightBlue { background: transparent url(../images/bubbleTip_pico_corner_bottom_right_blue.gif) top left; - width:23px; - height:62px; + width: 23px; + height: 62px; } .bubbleBottomBlue { background: transparent url(../images/bubbleTip_bottom_blue.gif) top left; - height:32px; - width:3px; + height: 32px; + width: 3px; } .bubbleHintBottomBlue { background: transparent url(../images/bubbleTip_pico_bottom_blue.gif) top left; - height:62px; - width:3px; + height: 62px; + width: 3px; } + .bubbleBottomHintBlue { background: transparent url(../images/bubbleTip_bottom_pico_blue.png) top left; - width:58px; - height:62px; - behavior: url( ../css/iepngfix.htc ); + width: 58px; + height: 62px; } .bubbleTopHintBlue { background: transparent url(../images/bubbleTip_top_pico_blue.png) top left; - width:58px; - height:61px; - behavior: url( ../css/iepngfix.htc ); + width: 58px; + height: 61px; } .btn-primary { diff --git a/wise-webapp/src/main/webapp/css/common.css b/wise-webapp/src/main/webapp/css/common.css index 81288dc4..b4c83e1d 100644 --- a/wise-webapp/src/main/webapp/css/common.css +++ b/wise-webapp/src/main/webapp/css/common.css @@ -45,13 +45,13 @@ abbr, acronym { */ body { font: 13px arial, helvetica, clean, sans-serif; -* font-size : small; -* font : x-small; + font-size: small; + font: x-small; } table { font-size: inherit; - font: 100%; + font-size: 100%; } /** @@ -66,7 +66,7 @@ select, input, textarea { */ pre, code { font: 115% monospace; -* font-size : 100 %; + font-size: 100%; } /** @@ -118,12 +118,13 @@ a:hover, a:active { } h2 { - font: 160%; + font-size: 160%; color: #8e9181; } h1 { - font: normal 180%; + font-style: normal; + font-size: 180%; color: white; padding-bottom: 2px; } @@ -131,13 +132,15 @@ h1 { h3 { /* use as subhead on main body */ clear: left; - font: normal 130%; + font-style: normal; + font-size: 130%; color: #6b6f5b; } h4 { /* use as headers in footer */ - font: bold 120%; + font-weight: bold; + font-size: 120%; border-bottom: 1px solid #8e9181; color: #e2e3dd; padding-bottom: 10px; @@ -185,9 +188,7 @@ h4 { margin-top: 8px; height: 80px; width: 134px; - background-image: url( "../images/logo-small.png" ); - behavior: url( ../css/iepngfix.htc ); - background-repeat: no-repeat; + background: url("../images/logo-small.png") no-repeat; position: absolute; top: 0; left: 0; @@ -199,7 +200,7 @@ h4 { margin-top: 8px; height: 1em; width: 100px; - top: 47px; + top: 40px; left: 137px; white-space: nowrap; padding-left: 7px; @@ -213,7 +214,7 @@ h4 { left: 150px; } -#newsLink, #blogLink, #aboutLink, #newsLink, #faqLink, #feedbackLink, #supportLink, #logoutLink{ +#newsLink, #blogLink, #aboutLink, #newsLink, #faqLink, #feedbackLink, #supportLink, #logoutLink { float: right; z-index: 300; } @@ -345,8 +346,7 @@ div#printLogo { width: 80px; float: right; margin: 1px; - background: url( ../images/logo-vsmall.png ) no-repeat right top; - behavior: url( ../css/iepngfix.htc ); + background: url(../images/logo-vsmall.png) no-repeat right top; } .btn-primary { @@ -382,7 +382,7 @@ div#paypal { #headerLoading { padding-left: 40px; - background: url( '../images/ajax-loader.gif' ) #BBB4D6 no-repeat left; + background: url('../images/ajax-loader.gif') #BBB4D6 no-repeat left; position: absolute; right: 3px; top: 5px; @@ -390,7 +390,8 @@ div#paypal { height: 20px; color: white; font-weight: bold; - border: 1px solid whitesmoke; + border: 1px solid; + border-color: #f5f5f5; background-position: 5px 2px; visibility: hidden; } @@ -420,16 +421,16 @@ div#headerActions a:hover, div#headerActions a:active, div#headerActions a:link, } div.header_languages { - position:absolute; - right:0px; + position: absolute; + right: 0; top: 30px; - width:100px; - height:20px; + width: 100px; + height: 20px; } div.header_language_flag { - float:left; - margin-right:3px; + float: left; + margin-right: 3px; } /*--- Modal Dialog Form ---*/ @@ -451,7 +452,7 @@ div.modalDialog h1 { div.modalDialog h2 { color: gray; font-size: 110%; - margin: 9px 0px; + margin: 9px 0; } div.modalDialog h5 { @@ -483,7 +484,7 @@ div.pageBodyContent h2 { color: gray; font-size: 150%; border-bottom: 1px dashed #BBB4D6; - margin: 20px 0px; + margin: 20px 0; } div.pageBodyContent ul { @@ -536,8 +537,8 @@ td.formLabel { span.fieldRequired { font-weight: bold; - color: orangered; - margin: 0px 4px; + color: #ff4500; + margin: 0 4px; } #keyboardTable { @@ -545,7 +546,7 @@ span.fieldRequired { width: 100%; height: 300px; overflow: auto; - border: 0px solid gray; + border: 0 solid gray; background-color: white; z-index: 2; position: relative; @@ -553,7 +554,7 @@ span.fieldRequired { #keyboardTable table { width: 100%; - border: 0px solid gray; + border: 0 solid gray; } #keyboardTable thead { diff --git a/wise-webapp/src/main/webapp/css/editor.css b/wise-webapp/src/main/webapp/css/editor.css index 85b32a95..84a8555f 100644 --- a/wise-webapp/src/main/webapp/css/editor.css +++ b/wise-webapp/src/main/webapp/css/editor.css @@ -32,7 +32,8 @@ html { opacity: .99; padding: 15px; width: 100%; - border: 1px solid darkgray; + border: 1px solid; + border-color:#a9a9a9; } @@ -108,7 +109,7 @@ html { } #operationsContainer a { - padding: 0px 5px; + padding: 0 5px; } #user { @@ -145,7 +146,7 @@ div#toolbar .buttonContainer { color: #BBB4D6; font-size: 11px; text-align: right; - margin: 0px; + margin: 0; -moz-margin-start: 7px; -moz-margin-end: 7px; } @@ -154,7 +155,7 @@ div#toolbar .button { width: 32px; height: 36px; float: left; - margin: 0px 2px 2px 2px; + margin: 0 2px 2px 2px; cursor: pointer; text-align: center; } @@ -167,7 +168,7 @@ div#toolbar .button:hover { width: 32px; height: 36px; float: left; - margin: 0px 1px; + margin: 0 1px; cursor: pointer; border: 1px solid black; border-top-color: white; @@ -225,37 +226,30 @@ div#share { div#saveButton { background: url(../images/save.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); } div#discardButton { background: url(../images/close.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); } div#history { background: url(../images/history.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); } div#print { background: url(../images/file_printer.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); } div#undoEdition { background: url(../images/file_undo_dis.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); } div#redoEdition { background: url(../images/file_redo_dis.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); } #export { background: url(../images/file_export.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); position:relative; } @@ -269,91 +263,75 @@ div#redoEdition { div#zoomIn { background: url(../images/zoom_in.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); } #zoomOut { background: url(../images/zoom_out.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); } #addTopic { background: url(../images/topic_add.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); } #deleteTopic { background: url(../images/topic_delete.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); } div#topicColor { background: url(../images/topic_bgcolor.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); z-index: 4; } div#topicIcon { background: url(../images/topic_icon.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); z-index: 4; } div#topicNote { background: url(../images/note.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); z-index: 4; } div#topicLink { background: url(../images/topic_link.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); z-index: 4; } div#topicNote { background-image: url(../images/note.png); - behavior: url(../css/iepngfix.htc); z-index: 4; } #topicBorder { background: url(../images/topic_border.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); width: 30px; } #fontFamily { background: url(../images/font_type.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); } #topicShape { background: url(../images/topic_shape.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); width: 30px; } #fontBold { background: url(../images/font_bold.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); } #fontItalic { background: url(../images/font_italic.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); } div#fontColor { background: url(../images/font_color.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); z-index: 4; } #fontSize { float: left; background: url(../images/font_size.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); } #font-size { @@ -371,18 +349,14 @@ div#fontColor { #shareIt { background: url(../images/collab_share.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); } #publishIt { background: url(../images/collab_publish.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); - } #tagIt { background: url(../images/collab_tag.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); } #colorPalette { @@ -414,7 +388,7 @@ div.toolbarPanelLink { font-size: 14px; color: black; font-weight: bold; - padding: 0 3px 0px 4px; + padding: 0 3px 0 4px; margin: 1px; } @@ -422,7 +396,7 @@ div.toolbarPanelLink { cursor: pointer; font-size: 12px; font-weight: bold; - padding: 0px 3px 0px 4px; + padding: 0 3px 0 4px; margin: 1px; } @@ -436,7 +410,7 @@ div.toolbarPanelLinkSelectedLink { cursor: pointer; color: white; font-weight: bold; - padding: 0px 3px 0px 4px; + padding: 0 3px 0 4px; margin: 1px; background-color: #c3def5; } @@ -485,7 +459,6 @@ div#actionsContainer { width: 6px; height: 25px; background: url(../images/btnStart2.png) no-repeat left top; - behavior: url(../css/iepngfix.htc); float: left; } @@ -493,8 +466,7 @@ div#actionsContainer { background: url(../images/btnBody2.png); float: left; height: 18px; - padding: 0px 5px; - padding-top: 5px; + padding: 5px 5px 0; text-align: center; color: black; } @@ -503,7 +475,6 @@ div#actionsContainer { width: 7px; height: 23px; background: url(../images/btnEnd2.png) no-repeat right top; - behavior: url(../css/iepngfix.htc); float: left; } @@ -523,7 +494,6 @@ div#footerEditor { float: right; margin: 5px; background: url(../images/logo-vsmall.png) no-repeat right top; - behavior: url(../css/iepngfix.htc); } #footerEditor .msgLoggerContainer { @@ -695,7 +665,7 @@ span#lastSaved { } #tryEditorWarning h1 { - color: whitesmoke; + color: #f5f5f5; font-weight: bold; margin-bottom: 5px; font-size: 15px; @@ -718,13 +688,13 @@ div#helpContainer { div#helpContent h1 { font-weight: bold; - color: whitesmoke; + color: #f5f5f5; font-size: 15px; } div#helpContent h2 { font-weight: bold; - padding: 20px 0px 10px 0px; + padding: 20px 0 10px 0; color: #bfbfbf; } @@ -754,14 +724,12 @@ div#small_error_icon { div#toolbar .topicRelation { width:56px; background: url(../images/topic_relationship.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); z-index: 4; } div#toolbar .topicRelation:hover { width:56px; background: url(../images/topic_relationship.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); z-index: 4; } diff --git a/wise-webapp/src/main/webapp/css/embedded.css b/wise-webapp/src/main/webapp/css/embedded.css index 06c1c832..76915fd0 100644 --- a/wise-webapp/src/main/webapp/css/embedded.css +++ b/wise-webapp/src/main/webapp/css/embedded.css @@ -31,7 +31,8 @@ html { opacity: .99; padding: 15px; width: 100%; - border: 1px solid darkgray; + border: 1px solid; + border-color:#a9a9a9; } @@ -62,7 +63,7 @@ div#embFooter { height: 35px; width: 100%; bottom: 0; - left: 0px; + left: 0; border-top: 1px solid black; background: #E5E5E5; } @@ -72,7 +73,6 @@ div#logo { width: 80px; position: absolute; background: url( ../images/logo-vvsmall.png ) no-repeat right top; - behavior: url( ../css/iepngfix.htc ); right: 10px; top: -10px; } @@ -95,14 +95,12 @@ div#logo { #zoomIn { background: url( ../images/zoom_in.png ) no-repeat left top;; - behavior: url( ../css/iepngfix.htc ); margin-top: 10px; margin-left: 10px; } #zoomOut { background: url( ../images/zoom_out.png ) no-repeat left top;; - behavior: url( ../css/iepngfix.htc ); margin-top: 10px } diff --git a/wise-webapp/src/main/webapp/css/iepngfix.htc b/wise-webapp/src/main/webapp/css/iepngfix.htc deleted file mode 100644 index 6d15f325..00000000 --- a/wise-webapp/src/main/webapp/css/iepngfix.htc +++ /dev/null @@ -1,68 +0,0 @@ - - - - - \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/css/mymaps.css b/wise-webapp/src/main/webapp/css/mymaps.css index 286779e8..16f6f9b6 100644 --- a/wise-webapp/src/main/webapp/css/mymaps.css +++ b/wise-webapp/src/main/webapp/css/mymaps.css @@ -6,8 +6,7 @@ width: 100px; font-size: 12px; font-weight: bold; - padding: 5px; - padding-left: 0; + padding: 10px 5px 5px 0; color: #808080; } @@ -17,11 +16,10 @@ } #recentFiles { - margin: 10px auto; + margin: 10px auto 5px; width: 900px; height: 100%; padding: 8px; - margin-bottom: 5px; } #recentFiles a { @@ -36,18 +34,20 @@ #recentFiles .recentItemContainer { height: 20px; background-color: white; + padding: 0 0 0 7px; + margin-top: 4px; } #recentFiles .recentItemIcon { float: left; width: 20px; height: 15px; - background: url( ../images/icon_list.png ) no-repeat left; + background: url(../images/icon_list.png) no-repeat left; } #recentFiles .recentItemTitle { float: left; - padding-left: 0px; + padding-left: 0; padding-right: 10px; font-size: 12px; } @@ -91,8 +91,7 @@ float: left; position: relative; top: 50%; - margin: 0px 5px; - margin-top: -12px; + margin: -12px 5px 0; height: 24px; } @@ -105,29 +104,28 @@ float: left; width: 3px; height: 24px; - background: url( ../images/start_btn.gif ) no-repeat left; + background: url(../images/start_btn.gif) no-repeat left; } #toolbar .buttonBody { float: left; height: 19px; - padding: 5px 5px 0px; - background: url( ../images/body_btn.gif ); + padding: 5px 5px 0; + background: url(../images/body_btn.gif); } #toolbar .buttonEnd { float: left; width: 3px; height: 24px; - background: url( ../images/end_btn.gif ) no-repeat left; + background: url(../images/end_btn.gif) no-repeat left; } #actionsBtn { float: left; position: relative; top: 50%; - margin: 0px 5px; - margin-top: -15px; + margin: -15px 5px 0; width: 78px; height: 30px; } @@ -136,8 +134,7 @@ float: left; position: relative; top: 50%; - margin: 0px 5px; - margin-top: -15px; + margin: -15px 5px 0; width: 78px; height: 30px; } @@ -158,7 +155,7 @@ width: 100%; height: 250px; overflow: auto; - border: 0px solid gray; + border: 0 solid gray; background-color: white; z-index: 2; position: relative; @@ -166,7 +163,7 @@ #docTable table { width: 100%; - border: 0px solid gray; + border: 0 solid gray; } #docTable thead { diff --git a/wise-webapp/src/main/webapp/css/thirdparty.css b/wise-webapp/src/main/webapp/css/thirdparty.css index 77171f92..55bf8488 100644 --- a/wise-webapp/src/main/webapp/css/thirdparty.css +++ b/wise-webapp/src/main/webapp/css/thirdparty.css @@ -291,7 +291,7 @@ div.windoo-wise a.windoo-maximize-disabled, div.windoo-wise a.windoo-maximize-di } div.windoo-wise a.windoo-minimize { - top: 0px; + top: 0; right: 56px; 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 { display: none; - top: 0px; + top: 0; right: 15px; background-position: -46px 0; } diff --git a/wise-webapp/src/main/webapp/css/wisehome.css b/wise-webapp/src/main/webapp/css/wisehome.css index 47478088..c3e17636 100644 --- a/wise-webapp/src/main/webapp/css/wisehome.css +++ b/wise-webapp/src/main/webapp/css/wisehome.css @@ -27,7 +27,7 @@ float: left; width: 510px; height: 210px; - margin: 40px 12px 0px 10px; + margin: 40px 12px 0 10px; } .contentImage { @@ -77,7 +77,7 @@ width: 100%; height: 550px; overflow: auto; - border: 0px solid gray; + border: 0 solid gray; background-color: white; z-index: 2; position: relative; @@ -86,7 +86,7 @@ #searchResultTable table { width: 100%; - border: 0px solid gray; + border: 0 solid gray; background-color: white; } @@ -145,14 +145,13 @@ clear: both; width: 200px; font-size: 12px; - padding: 9px 9px 0px; + padding: 9px 9px 0; } #searchTitleContainer { background: url( ../images/search3.png ) no-repeat left; padding-left: 35px; padding-bottom: 10px; - behavior: url( ../css/iepngfix.htc ); } #searchTitle { @@ -189,7 +188,6 @@ width: 6px; height: 25px; background: url( ../images/btnStart.png ) no-repeat left top; - behavior: url( ../css/iepngfix.htc ); float: left; } @@ -197,8 +195,7 @@ background: url( ../images/btnBody.png ); height: 18px; float: left; - padding: 0px 0px; - padding-top: 5px; + padding: 5px 0 0; text-align: center; color: black; } @@ -207,7 +204,6 @@ width: 7px; height: 25px; background: url( ../images/btnEnd.png ) no-repeat right top; - behavior: url( ../css/iepngfix.htc ); float: left; } @@ -228,7 +224,6 @@ div#tryNow .tryBtnStart { width: 10px; height: 70px; background: url( ../images/tryItStartBtn2.png ) no-repeat left top; - behavior: url( ../css/iepngfix.htc ); float: left; } @@ -247,7 +242,7 @@ div#tryNow .tryBtnEnd { } div#tryNow .tryBtnText { - padding: 0px 20px; + padding: 0 20px; position: relative; height: 70px; font-size: 20px; @@ -288,7 +283,6 @@ div#video .videoBtnStart { width: 10px; height: 51px; background: url( ../images/videoStart.png ) no-repeat left top; - behavior: url( ../css/iepngfix.htc ); float: left; } @@ -379,7 +373,6 @@ div#signUpButton .signUpStartBtn { width: 5px; height: 25px; background: url( ../images/signUpStartBtn.png ) no-repeat left top; - behavior: url( ../css/iepngfix.htc ); float: left; } @@ -396,12 +389,11 @@ div#signUpButton .signUpEndBtn { width: 7px; height: 25px; background: url( ../images/signUpEndBtn.png ) no-repeat right top; - behavior: url( ../css/iepngfix.htc ); float: left; } div#signUpButton .signUpText { - padding: 0px 20px; + padding: 0 20px; position: relative; height: 25px; color: #093A9D; @@ -546,12 +538,10 @@ div#mainBody { } div#news li { - background: transparent url( ../images/icon_triangle_grey_12x13.gif ) no-repeat scroll 0pt; - list-style-image: none; - list-style-position: outside; - list-style-type: none; + background: transparent url( ../images/icon_triangle_grey_12x13.gif ) no-repeat scroll 0; + list-style: none outside none; margin-bottom: 12px; - padding: 2px 0pt 5px 20px; + padding: 2px 0 5px 20px; } div#news ul { diff --git a/wise-webapp/src/main/webapp/js/editor.js b/wise-webapp/src/main/webapp/js/editor.js index 41f1061d..9d3b3226 100644 --- a/wise-webapp/src/main/webapp/js/editor.js +++ b/wise-webapp/src/main/webapp/js/editor.js @@ -589,15 +589,16 @@ function fontFamilyPanel() function shapeTypePanel() { - var shapeTypePanel = ['rectagle','rounded rectagle','line','elipse']; + var shapeTypePanel = ['rectagle','rounded_rectagle','line','elipse']; var updateFunction = function(value) { - designer.setShape2SelectedNode(value); + designer.setShape2SelectedNode(value.replace('_',' ')); }; var onFocusValue = function(selectedNode) { - return selectedNode.getShapeType(); + + return selectedNode.getShapeType().replace(' ','_'); }; buildPanel('topicShape', 'topicShapePanel', shapeTypePanel, updateFunction, onFocusValue); diff --git a/wise-webapp/src/main/webapp/jsp/footer.jsp b/wise-webapp/src/main/webapp/jsp/footer.jsp index 279ddb53..c0702506 100644 --- a/wise-webapp/src/main/webapp/jsp/footer.jsp +++ b/wise-webapp/src/main/webapp/jsp/footer.jsp @@ -10,15 +10,18 @@
- + - +
- - HTML5 Powered with CSS3 / Styling, Graphics, 3D & Effects, and Semantics - -
+ + HTML5 Powered with Graphics, 3D & Effects + \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/jsp/mindmapDetail.jsp b/wise-webapp/src/main/webapp/jsp/mindmapDetail.jsp index 63dbecaf..9605db3e 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapDetail.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapDetail.jsp @@ -22,11 +22,11 @@ - "/> + <spring:message code=" title=""/> () - "/> + <spring:message code=" title=""/> () @@ -64,7 +64,7 @@ - &mapId=${wisemapDetail.id}" rel="moodalbox 780px 530px wizard" + &mapId=${wisemapDetail.id}" rel="moodalbox 780px 530px wizard" title=""> @@ -137,7 +137,7 @@ : -