Fix embedded view.

2011-10-16 21:42:02 -03:00
parent cb6302bf50
commit 0133f127b8
26 changed files with 713 additions and 235 deletions
--- a/wise-webapp/src/main/java/com/wisemapping/exporter/ExporterFactory.java
+++ b/wise-webapp/src/main/java/com/wisemapping/exporter/ExporterFactory.java
@@ -134,7 +134,9 @@ public class ExporterFactory {

        final DocumentBuilder documentBuilder = getDocumentBuilder();
        svgXml = svgXml.replaceFirst("<svg ", "<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" ");
-
+        // @Todo: This must not happen...
+        svgXml = svgXml.replaceAll("NaN,", "0");
+        svgXml = svgXml.replaceAll(",NaN", "0");

        Document document;
        try {
--- a/wise-webapp/src/main/webapp/css/common.css
+++ b/wise-webapp/src/main/webapp/css/common.css
@@ -239,7 +239,7 @@ div#headerTitle {

 div#printHeader {
    background-color: black;
-    height: 35px;
+    height: 55px;
    color: white;
 }

@@ -338,11 +338,11 @@ div#printFooter {
 }

 div#printLogo {
-    height: 50px;
-    width: 80px;
+    height: 80px;
+    width: 170px;
    float: right;
    margin: 1px;
-    background: url(../images/logo-vsmall.png) no-repeat right top;
+    background: url(../nicons/logo-medium.png) no-repeat right top;
 }

 div#paypal {
--- a/wise-webapp/src/main/webapp/css/editor2.css
+++ b/wise-webapp/src/main/webapp/css/editor2.css
@@ -704,7 +704,7 @@ div#small_error_icon {
 /** */
 /* Modal dialogs definitions */

-.tagItModalDialog, .historyModalDialog, .shareItModalDialog, .exportModalDialog {
+.tagItModalDialog, .historyModalDialog, .shareItModalDialog, .exportModalDialog, .publishModalDialog {
    position: fixed;
    top: 50%;
    left: 50%;
@@ -733,7 +733,11 @@ div#small_error_icon {
    width: 500px;
 }

-.tagItModalDialog .title, .historyModalDialog .title, .shareItModalDialog .title, .exportModalDialog .title {
+.publishModalDialog {
+    width: 600px;
+}
+
+.tagItModalDialog .title, .historyModalDialog .title, .shareItModalDialog .title, .exportModalDialog .title, .publishModalDialog .title {
    position: absolute;
    top: 0;
    left: 0;
@@ -762,6 +766,10 @@ div#small_error_icon {
    height: 280px;
 }

+.publishModalDialog  .content {
+    height: 330px;
+}
+
 .modalDialog h1 {
    font-size: 14px;
 }
@@ -771,4 +779,9 @@ div#small_error_icon {
    margin: 5px;
 }

-
+td.formLabel {
+    text-align: right;
+    padding: 2px 10px;
+    font-weight: bolder;
+    vertical-align: top;
+}
--- a/wise-webapp/src/main/webapp/css/embedded.css
+++ b/wise-webapp/src/main/webapp/css/embedded.css
@@ -69,17 +69,18 @@ div#logo {
    height: 65px;
    width: 80px;
    position: absolute;
-    background: url(../images/logo-vvsmall.png) no-repeat right top;
+    background: url(../nicons/logo-small.png) no-repeat right top;
    right: 10px;
    top: -10px;
 }

 .button {
-    width: 18px;
-    height: 16px;
+    width: 20px;
+    height: 20px;
    float: left;
    cursor: pointer;
    white-space: nowrap;
+    margin: 1px;
 }

 .button:hover {
@@ -88,17 +89,20 @@ div#logo {
    border: 1px solid black;
    border-top-color: white;
    border-left-color: white;
+    margin: 0px;
+
 }

-#zoomIn {
-    background: url(../images/zoom_in.png) no-repeat left top;;
+div#zoomIn {
+    background: url(../nicons/zoom-in.png) no-repeat left top;
    margin-top: 10px;
    margin-left: 10px;
 }

 #zoomOut {
-    background: url(../images/zoom_out.png) no-repeat left top;;
-    margin-top: 10px
+    background: url(../nicons/zoom-out.png) no-repeat left top;;
+    margin-top: 10px;
+    margin-left: 5px;
 }

 div#mindplot {
@@ -119,6 +123,8 @@ div#mapDetails {
    float: right;
    padding-top: 10px;
    margin-right: 100px;
+    font-family: arial,serif;
+    font-size: 11px;
 }

 div#mapDetails .title {
--- a/wise-webapp/src/main/webapp/html/embedded.html
+++ b/wise-webapp/src/main/webapp/html/embedded.html
@@ -0,0 +1,4 @@
+<iframe
+        style="border:0;width:600px;height:400px;border: 1px solid black"
+        src="http://localhost:8080/wise-webapp/c/embeddedView.htm?mapId=1">
+</iframe>
--- a/wise-webapp/src/main/webapp/js/editor.js
+++ b/wise-webapp/src/main/webapp/js/editor.js
@@ -76,7 +76,8 @@ function buildDesigner(editorProperties, isTryMode) {
        width:  parseInt(window.innerWidth)
    });

-    setUpToolbar(designer, isTryMode);
-
+    if ($('toolbar')) {
+        setUpToolbar(designer, isTryMode);
+    }
    return designer;
 }
--- a/wise-webapp/src/main/webapp/js/embedded.js
+++ b/wise-webapp/src/main/webapp/js/embedded.js
@@ -1,73 +0,0 @@
-/*
- *    Copyright [2011] [wisemapping]
- *
- *   Licensed under WiseMapping Public License, Version 1.0 (the "License").
- *   It is basically the Apache License, Version 2.0 (the "License") plus the
- *   "powered by wisemapping" text requirement on every single page;
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the license at
- *
- *       http://www.wisemapping.org/license
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- */
-
-Asset.javascript('../js/mindplot-min.js', {
-    id: 'MindplotSVGLib',
-    onLoad: function() {
-        afterMindpotLibraryLoading();
-    }
-});
-
-function afterMindpotLibraryLoading() {
-    buildMindmapDesigner();
-
-    $('zoomIn').addEvent('click', function(event) {
-        designer.zoomIn();
-    });
-
-    $('zoomOut').addEvent('click', function(event) {
-        designer.zoomOut();
-    });
-
-
-    // If not problem has occured, I close the dialod ...
-    var closeDialog = function() {
-
-        if (!window.hasUnexpectedErrors) {
-            waitDialog.deactivate();
-        }
-    }.delay(500);
-
-}
-
-function setCurrentColorPicker(colorPicker) {
-    this.currentColorPicker = colorPicker;
-}
-
-
-function buildMindmapDesigner() {
-
-    var container = $('mindplot');
-
-    // Initialize Editor ...
-
-    var screenWidth = window.getWidth();
-    var screenHeight = window.getHeight();
-
-    // body margin ...
-    editorProperties.width = screenWidth;
-    editorProperties.height = screenHeight;
-    editorProperties.readOnly = true;
-
-    designer = new mindplot.Designer(editorProperties, container);
-    designer.loadFromXML(mapId, mapXml);
-
-    // If a node has focus, focus can be move to another node using the keys.
-    designer._cleanScreen = function() {
-    };
-}
--- a/wise-webapp/src/main/webapp/jsp/embeddedView.jsp
+++ b/wise-webapp/src/main/webapp/jsp/embeddedView.jsp
@@ -4,43 +4,89 @@

 <html>
 <head>
-    <meta http-equiv="Content-type" value="text/html; charset=utf-8">
-    <link rel="stylesheet" type="text/css" href="../css/embedded.css">
-    <link rel="stylesheet" type="text/css" href="../css/bubble.css">
+     <!--[if lt IE 9]>
+    <meta http-equiv="X-UA-Compatible" content="chrome=1">
+    <![endif]-->
+    <title><spring:message code="SITE.TITLE"/> - ${mindmap.title} </title>
+    <meta http-equiv="Content-type" content="text/html; charset=UTF-8"/>

-    <script type='text/javascript' src='../js/mootools-core-1.3.2-full-compat.js'></script>
+    <link rel="stylesheet" type="text/css" href="../css/embedded.css"/>
+
+    <script type='text/javascript'
+            src='https://ajax.googleapis.com/ajax/libs/mootools/1.3.2/mootools-yui-compressed.js'></script>
+    <script type='text/javascript' src='../js/libraries/mootools/mootools-more-1.3.2.1-yui.js'></script>
    <script type='text/javascript' src='../js/core.js'></script>

+
+    <script type="text/javascript">
+        var mapId = '${mindmap.id}';
+        var mapXml = '${mapXml}';
+        var mindReady = false;
+        $(document).addEvent('loadcomplete', function(resource) {
+            mindReady = resource == 'mind' ? true : mindReady;
+            if (mindReady) {
+
+                var editorProperties = {zoom:${zoom},saveOnLoad:true,collab:'standalone'};
+
+                var isTryMode = false;
+                designer = buildDesigner(editorProperties, true);
+
+                var domDocument = core.Utils.createDocumentFromText(mapXml);
+                var serializer = mindplot.XMLMindmapSerializerFactory.getSerializerFromDocument(domDocument);
+                var mindmap = serializer.loadFromDom(domDocument, mapId);
+
+                // Now, load the map ...
+                designer.loadMap(mindmap);
+
+                // If not problem has arisen, close the dialog ...
+                if (!window.hasUnexpectedErrors) {
+                    waitDialog.deactivate();
+                }
+
+                $('zoomIn').addEvent('click', function() {
+                    designer.zoomIn();
+                });
+
+                $('zoomOut').addEvent('click', function() {
+                    designer.zoomOut();
+                });
+            }
+        });
+    </script>
 </head>
 <body>

 <div id="waitDialog" style="display:none">
-    <div id="loadingContainer">
+    <div id="waitingContainer">
        <div class="loadingIcon"></div>
        <div class="loadingText">
-            <spring:message code="EDITOR.LOADING"/>
+            Loading ...
        </div>
    </div>
 </div>
+
+<div id="errorDialog" style="display:none">
+    <div id="errorContainer">
+        <div class="loadingIcon"></div>
+        <div class="loadingText">
+            Unexpected error loading your map :(
+        </div>
+    </div>
+</div>
+
 <script type="text/javascript">

-    //Dialog box display ...
    var waitDialog = new core.WaitDialog();
    waitDialog.activate(true, $("waitDialog"));
-
    $(window).addEvent("error", function(event) {

        // Show error dialog ...
        waitDialog.changeContent($("errorDialog"), false);
        return false;
    });
-
-
-    var mapId = '${mindmap.id}';
-    var mapXml = '${mapXml}';
-    var editorProperties = {zoom:${zoom}};
 </script>

+
 <div id="mapContainer">
    <div id="mindplot"></div>
    <div id="embFooter">
@@ -51,12 +97,11 @@
        <div id="zoomIn" class="button"></div>
        <div id="zoomOut" class="button"></div>
        <div id="mapDetails">
-            <span class="title"><spring:message code="CREATOR"/>:</span><span>${mindmap.creator}</span>
-            <span class="title"><spring:message code="DESCRIPTION"/>:</span><span>${mindmap.description}</span>
+            <%--<span class="title"><spring:message code="CREATOR"/>:</span><span>${mindmap.creator}</span>--%>
+            <span class="title"><spring:message code="DESCRIPTION"/>:</span><span>${mindmap.title}</span>
        </div>
    </div>
 </div>
-<div id="ffoxworkarround" style="display:none;"><input id="ffoxWorkarroundInput" type="text"></div>
-<script type="text/javascript" src="../js/embedded.js"></script>
+<script type="text/javascript" src="../js/editor.js"></script>
 </body>
 </html>
--- a/wise-webapp/src/main/webapp/jsp/mindmapCollaborator.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapCollaborator.jsp
@@ -8,7 +8,7 @@
    <c:param name="mapId" value="${mindmap.id}"/>
 </c:url>
 <h1>
-    <spring:message code="COLLABORATION"/>:<spring:message code="SHARING"/>  
+    <spring:message code="COLLABORATION"/>:<spring:message code="SHARING"/>
    '${mindmap.title}'</h1>

 <div id="addCollaboratorPanel">
@@ -40,7 +40,8 @@
                    <spring:message code="INVITATION"/>
                </h2>
                <span><spring:message code="SUBJECT"/>: </span><input name="subject" type="text"
-                                                                      value="${principal.firstname} <spring:message code="SUBJECT_MESSAGE"/>" style="width:80%;">
+                                                                      value="${principal.firstname} <spring:message code="SUBJECT_MESSAGE"/>"
+                                                                      style="width:80%;">
                <br>
                <span><spring:message code="MESSAGE"/>:</span>

@@ -52,8 +53,7 @@

            <br/>
            <input id="invitationButton" type="submit" value="Invite Collaborators" class="btn-primary">
-            <input type="button" value="<spring:message code="CANCEL"/>" onclick="MOOdalBox.close();"
-                   class="btn-secondary"/>
+            <input type="button" value="<spring:message code="CANCEL"/>" class="btn-secondary" id="cancelBtn"/>
        </div>

        <div id="currentUsers">
@@ -61,34 +61,40 @@
                <spring:message code="CURRENT_COLLABORATORS"/> (${mindmap.countColaborators})
            </h2>
            <table>
-                <colgroup><col width="95%"/></colgroup>
-            <c:forEach items="${mindmap.collaborators}" var="mindmapCollaborator">
-                <tr>
-                    <td>
-                        ${mindmapCollaborator.username}
-                    </td>
-                    <td>
-                        <a href="${removeCollaborator}&colaboratorId=${mindmapCollaborator.id}"><img src="../images/close12_1.gif" alt="<spring:message code="DELETE"/>" border="0"/></a>
-                    </td>
-                </tr>
-            </c:forEach>
+                <colgroup>
+                    <col width="95%"/>
+                </colgroup>
+                <c:forEach items="${mindmap.collaborators}" var="mindmapCollaborator">
+                    <tr>
+                        <td>
+                                ${mindmapCollaborator.username}
+                        </td>
+                        <td>
+                            <a href="${removeCollaborator}&colaboratorId=${mindmapCollaborator.id}"><img
+                                    src="../images/close12_1.gif" alt="<spring:message code="DELETE"/>" border="0"/></a>
+                        </td>
+                    </tr>
+                </c:forEach>
            </table>

            <h2>
                <spring:message code="CURRENT_VIEWERS"/> (${mindmap.countViewers})
            </h2>
            <table>
-                <colgroup><col width="95%"/></colgroup>
-            <c:forEach items="${mindmap.viewers}" var="mindmapViewer">
-                <tr>
-                    <td>
-                        ${mindmapViewer.username}
-                    </td>
-                    <td>
-                        <a href="${removeCollaborator}&colaboratorId=${mindmapViewer.id}"><img src="../images/close12_1.gif" alt="<spring:message code="DELETE"/>" border="0"/></a>
-                    </td>
-                </tr>
-            </c:forEach>
+                <colgroup>
+                    <col width="95%"/>
+                </colgroup>
+                <c:forEach items="${mindmap.viewers}" var="mindmapViewer">
+                    <tr>
+                        <td>
+                                ${mindmapViewer.username}
+                        </td>
+                        <td>
+                            <a href="${removeCollaborator}&colaboratorId=${mindmapViewer.id}"><img
+                                    src="../images/close12_1.gif" alt="<spring:message code="DELETE"/>" border="0"/></a>
+                        </td>
+                    </tr>
+                </c:forEach>
            </table>
        </div>
        <input type="hidden" name="actionId" value="addCollaborator"/>
@@ -98,6 +104,10 @@
 </div>

 <script type="text/javascript">
+    $('cancelBtn').addEvent('click', function(event) {
+        MooDialog.Request.active.close();
+    });
+
    function toogleUserType(buttonValue) {
        var collaboratorButton = $("collaboratorButton");
        var viewerButton = $("viewerButton");
@@ -127,4 +137,5 @@
        return false;
    }

+
 </script>
--- a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp
@@ -29,7 +29,6 @@
    <script type="text/javascript" src="../dwr/interface/LoggerService.js"></script>

    <script type='text/javascript' src='../js/core.js'></script>
-    <script type='text/javascript' src='../js/editorLib.js'></script>
    <script type='text/javascript' src='../js/less-1.1.3.min.js'></script>


@@ -116,10 +115,6 @@
    </c:url>
 </div>

-<div id="colorPalette">
-    <div id="paletteHeader"></div>
-</div>
-
 <div id="header">
    <div id="headerInfo">
        <div id="headerActions">
@@ -143,8 +138,8 @@
            <div id="save" class="buttonOn" title="Save">
                <img src="../nicons/save.png"/>
            </div>
-            <div id="discart" class="buttonOn" title="Discard">
-                <img src="../nicons/discart.png"/>
+            <div id="discard" class="buttonOn" title="Discard">
+                <img src="../nicons/discard.png"/>
            </div>
            <div id="print" class="buttonOn" title="Print">
                <img src="../nicons/print.png"/>
--- a/wise-webapp/src/main/webapp/jsp/mindmapExport.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapExport.jsp
@@ -10,68 +10,69 @@
        <input type="hidden" name="mapSvg" value=""/>
        <table>
            <tbody>
-                <tr>
-                    <td>
-                        <input type="radio" id="svg" name="exportFormat" value="SVG"/>
-                        <b>
-                            <spring:message code="SVG_EXPORT_FORMAT"/>
-                        </b>
+            <tr>
+                <td>
+                    <input type="radio" id="svg" name="exportFormat" value="SVG"/>
+                    <b>
+                        <spring:message code="SVG_EXPORT_FORMAT"/>
+                    </b>

-                        <p>
-                            <spring:message code="SVG_EXPORT_FORMAT_DETAILS"/>
-                        </p>
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <input type="radio" name="exportFormat" value="PDF" id="pdf"/>
-                        <b>
-                            <spring:message code="PDF_EXPORT_FORMAT"/>
-                        </b>
+                    <p>
+                        <spring:message code="SVG_EXPORT_FORMAT_DETAILS"/>
+                    </p>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <input type="radio" name="exportFormat" value="PDF" id="pdf"/>
+                    <b>
+                        <spring:message code="PDF_EXPORT_FORMAT"/>
+                    </b>

-                        <p>
-                            <spring:message code="PDF_EXPORT_FORMAT_DETAILS"/>
-                        </p>
-                    </td>
-                </tr>
-                 <tr>
-                    <td>
-                        <input type="radio" id="freemind" name="exportFormat" value="FREEMIND" checked="checked"/>
-                        <b>
-                            <spring:message code="FREEMIND_EXPORT_FORMAT"/>
-                        </b>
+                    <p>
+                        <spring:message code="PDF_EXPORT_FORMAT_DETAILS"/>
+                    </p>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <input type="radio" id="freemind" name="exportFormat" value="FREEMIND" checked="checked"/>
+                    <b>
+                        <spring:message code="FREEMIND_EXPORT_FORMAT"/>
+                    </b>

-                        <p>
-                            <spring:message code="FREEMIND_EXPORT_FORMAT_DETAILS"/>
-                        </p>
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <input type="radio" name="exportFormat" id="img" value="IMG_EXPORT_FORMAT"/>
-                        <b>
-                            <spring:message code="IMG_EXPORT_FORMAT"/>
-                        </b><select name="imgFormat" id="imgFormat" style="visibility:hidden;margin-left:5px;">
-                        <option>PNG</option>
-                        <option>JPEG</option>
-                    </select>
+                    <p>
+                        <spring:message code="FREEMIND_EXPORT_FORMAT_DETAILS"/>
+                    </p>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <input type="radio" name="exportFormat" id="img" value="IMG_EXPORT_FORMAT"/>
+                    <b>
+                        <spring:message code="IMG_EXPORT_FORMAT"/>
+                    </b><select name="imgFormat" id="imgFormat" style="visibility:hidden;margin-left:5px;">
+                    <option>PNG</option>
+                    <option>JPEG</option>
+                </select>

-                        <p>
-                            <spring:message code="IMG_EXPORT_FORMAT_DETAILS"/>
-                        </p>
-                    </td>
-                </tr>
-                <tr>
-                    <td style="text-align:center;margin-top:10px;">
-                        <input type="button" id="ok" value="<spring:message code="OK"/>" class="btn-primary">
-                        <input type="button" value="<spring:message code="CANCEL"/>" class="btn-secondary"
-                               onclick="MOOdalBox.close();">
-                    </td>
-                </tr>
+                    <p>
+                        <spring:message code="IMG_EXPORT_FORMAT_DETAILS"/>
+                    </p>
+                </td>
+            </tr>
+            <tr>
+                <td style="text-align:center;margin-top:10px;">
+                    <input type="button" id="ok" value="<spring:message code="OK"/>" class="btn-primary">
+                    <input type="button" value="<spring:message code="CANCEL"/>" class="btn-secondary"
+                           onclick="">
+                </td>
+            </tr>
            </tbody>
        </table>
    </form>
 </div>
+
 <script type="text/javascript">
    $('img').addEvent('click', function(event) {
        $('imgFormat').setStyle('visibility', 'visible');
@@ -85,8 +86,7 @@

    $('ok').addEvent('click', function(event) {
        $('exportForm').submit();
-        MOOdalBox.close();
-
+        MooDialog.Request.active.close();
    });

    document.exportForm.mapSvg.value = $("workspaceContainer").innerHTML;
--- a/wise-webapp/src/main/webapp/jsp/mindmapPublish.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapPublish.jsp
@@ -14,8 +14,8 @@
        <input type="hidden" name="mapId" value="${mindmap.id}"/>
        <table>
            <colgroup>
-                <col width="10%"/>
-                <col width="90%"/>
+                <col width="20%"/>
+                <col width="80%"/>
            </colgroup>
            <tbody>
                <tr>
@@ -40,25 +40,23 @@
                    </td>
                    <td>
                        <div id="disabledPanel"
-                             style="position:absolute;background-color:white;opacity:0.8;width:600px;height:180px;left:10px;visibility:hidden;">
+                             style="position:absolute;background-color:white;opacity:0.8;width:600px;height:160px;left:10px;visibility:hidden;">

                        </div>
                    </td>
                </tr>
                <tr>
                    <td class="formLabel">
-                        <spring:message code="URL"/>
-                        :
+                        <spring:message code="URL"/>:
                    </td>
-                    <td>
+                    <td style="padding-bottom: 5px;">
                        <input name="url" value="http://www.wisemapping.com/c/publicView.htm?mapId=${mindmap.id}"
                               style="width:400px" readonly="readonly"/>
                    </td>
                </tr>
                <tr>
                    <td class="formLabel">
-                        <spring:message code="DIRECT_LINK"/>
-                        :
+                        <spring:message code="DIRECT_LINK"/>:
                    </td>
                    <td>
                        <textarea style="width:400px;height:30px;overflow:hidden;" cols="55" rows="3" readonly="readonly">
@@ -75,8 +73,7 @@
                </tr>
                <tr>
                    <td class="formLabel" style="white-space:normal;">
-                        <spring:message code="BLOG_INCLUSION"/>
-                        :
+                        <spring:message code="BLOG_INCLUSION"/>:
                    </td>
                    <td>
                        <textarea style="width:400px;height:70px;overflow:hidden;" cols="55" rows="5" readonly="readonly">
@@ -92,8 +89,7 @@ src="http://www.wisemapping.com/c/embeddedView.htm?mapId=${mindmap.id}&zoom=1"&g
                <tr>
                    <td style="text-align:center;margin-top:30px;" colspan="2">
                        <input type="submit" id="ok" value="<spring:message code="OK"/>" class="btn-primary">
-                        <input type="button" value="<spring:message code="CANCEL"/>" class="btn-primary"
-                               onclick="MOOdalBox.close();">
+                        <input type="button" value="<spring:message code="CANCEL"/>" class="btn-secondary" id="cancelBtn">
                    </td>
                </tr>
            </tbody>
@@ -114,12 +110,15 @@ src="http://www.wisemapping.com/c/embeddedView.htm?mapId=${mindmap.id}&zoom=1"&g
            $('disabledPanel').setStyle("visibility", "visible");
        }
        isPublicPanelEnabled = !isPublicPanelEnabled;
-    }
+    };

    if (${mindmap.public==false})
    {
-        panelEnabler()
+        panelEnabler();
    }
    $('publicViewId').addEvent('click', panelEnabler);

+     $('cancelBtn').addEvent('click', function(event) {
+        MooDialog.Request.active.close();
+    });
 </script>
--- a/wise-webapp/src/main/webapp/jsp/mindmapTags.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapTags.jsp
@@ -21,10 +21,16 @@
                <td>&nbsp;</td>
                <td style="padding: 5px">
                    <input type="submit" value="<spring:message code="SUBMIT"/>" class="btn-primary">
-                    <input type="button" value="<spring:message code="CANCEL"/>" class="btn-secondary">
+                    <input type="button" value="<spring:message code="CANCEL"/>" class="btn-secondary" id="cancelBtn">
                </td>
            </tr>
            </tbody>
        </table>
    </form:form>
 </div>
+
+<script type="text/javascript">
+    $('cancelBtn').addEvent('click', function(event) {
+        MooDialog.Request.active.close();
+    });
+</script>
--- a/wise-webapp/src/main/webapp/nicons/discard.png
+++ b/wise-webapp/src/main/webapp/nicons/discard.png