Fix embedded view.

mindplot/src/main/javascript/IconGroup.js

@@ -99,7 +99,7 @@ mindplot.IconGroup = new Class({
 
     removeIconByUrl : function(url) {
         var icon = this._findIconFromUrl(url);
-        $assert(icon,'icon could not be found');
+        $assert(icon, 'icon could not be found');
         this._removeIcon(icon);
     },
 

mindplot/src/main/javascript/libraries/moodialog/MooDialog.Request.js

@@ -17,11 +17,11 @@ MooDialog.Request = new Class({
         this.parent(options);
         this.requestOptions = requestOptions || {method:'get'};
         this.requestOptions.url = url;
+        this.requestOptions.update = this.content;
+        this.requestOptions.evalScripts = true;
         this.addEvent('open', function() {
-
+            var request = new Request.HTML(this.requestOptions).send();
-            var request = new Request.HTML(this.requestOptions).addEvent('success', function(text) {
+            MooDialog.Request.active = this;
-                this.setContent(text);
-            }.bind(this)).send();
         }.bind(this));
 
         if (this.options.autoOpen) this.open();

mindplot/src/main/javascript/widget/Menu.js

@@ -181,7 +181,7 @@ mindplot.widget.Menu = new Class({
 
         this.addButton('export', false, false, function() {
             var reqDialog = new MooDialog.Request('../c/export.htm?mapId=' + mapId, null,
-                {'class': 'historyModalDialog',
+                {'class': 'exportItModalDialog',
                     closeButton:true,
                     destroyOnClose:true,
                     title:'Export'
@@ -191,6 +191,7 @@ mindplot.widget.Menu = new Class({
                     reqDialog.setContent('loading...');
                 }
             });
+            MooDialog.Request.active = reqDialog;
         });
 
         this.addButton('print', false, false, function() {
@@ -251,9 +252,9 @@ mindplot.widget.Menu = new Class({
             });
         }
 
-        var discartElem = $('discart');
+        var discartElem = $('discard');
         if (discartElem) {
-            this.addButton('tagIt', false, false, function() {
+            this.addButton('discard', false, false, function() {
 
                 if (!readOnly) {
                     displayLoading();
@@ -302,8 +303,22 @@ mindplot.widget.Menu = new Class({
 
         var publishElem = $('publishIt');
         if (publishElem) {
+            this.addButton('publishIt', false, false, function() {
+                var reqDialog = new MooDialog.Request('../c/publish.htm?mapId=' + mapId, null,
+                    {'class': 'publishModalDialog',
+                        closeButton:true,
+                        destroyOnClose:true,
+                        title:'Publish'
+                    });
+                reqDialog.setRequestOptions({
+                    onRequest: function() {
+                        reqDialog.setContent('loading...');
+                    }
+                });
 
+            });
         }
+
         var historyElem = $('history');
         if (historyElem) {
 

wise-doc/src/main/webapp/c/export.htm

@@ -0,0 +1,100 @@
+<div class="modalDialog">
+    <!--  Header can be customized -->
+
+
+    <h1>
+        Export
+        'sss'</h1>
+
+    <div>
+        <form method="post" id="exportForm" name="exportForm" action="export.bin" style="height:100%;">
+            <input type="hidden" name="action" value="export">
+            <input type="hidden" name="mapId" value="3">
+            <input type="hidden" name="mapSvg" value="">
+            <table>
+                <tbody>
+                <tr>
+                    <td>
+                        <input type="radio" id="svg" name="exportFormat" value="SVG">
+                        <b>
+                            Scalable Vector Graphics (SVG)
+                        </b>
+
+                        <p>
+                            Scalable Vector Graphics (SVG) is an XML markup language for describing two-dimensional
+                            vector graphics. This format will enable you to print your maps without quality lost at any
+                            resolution.
+                        </p>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <input type="radio" name="exportFormat" value="PDF" id="pdf">
+                        <b>
+                            Portable Document Format (PDF)
+                        </b>
+
+                        <p>
+                            Get your map as Portable Document Format(PDF) to share use in your presentations.
+                        </p>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <input type="radio" id="freemind" name="exportFormat" value="FREEMIND" checked="checked">
+                        <b>
+                            Freemind (version 0.9.0)
+                        </b>
+
+                        <p>
+                            FreeMind is a nice desktop mind mapping application that has the great benefit of being
+                            free.
+                        </p>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <input type="radio" name="exportFormat" id="img" value="IMG_EXPORT_FORMAT">
+                        <b>
+                            Image File
+                        </b><select name="imgFormat" id="imgFormat" style="visibility:hidden;margin-left:5px;">
+                        <option>PNG</option>
+                        <option>JPEG</option>
+                    </select>
+
+                        <p>
+                            Get a graphic representation of your map including all colors and shapes to reuse in
+                            documents or for archiving
+                        </p>
+                    </td>
+                </tr>
+                <tr>
+                    <td style="text-align:center;margin-top:10px;">
+                        <input type="button" id="ok" value="Ok" class="btn-primary">
+                        <input type="button" value="Cancel" class="btn-secondary" onclick="MOOdalBox.close();">
+                    </td>
+                </tr>
+                </tbody>
+            </table>
+        </form>
+    </div>
+
+</div>
+<script type="text/javascript">
+    $('img').addEvent('click', function(event) {
+        $('imgFormat').setStyle('visibility', 'visible');
+    });
+    $('pdf').addEvent('click', function(event) {
+        $('imgFormat').setStyle('visibility', 'hidden');
+    });
+    $('svg').addEvent('click', function(event) {
+        $('imgFormat').setStyle('visibility', 'hidden');
+    });
+
+    $('ok').addEvent('click', function(event) {
+        $('exportForm').submit();
+        MooDialog.Request.active.close();
+    });
+   document.exportForm.mapSvg.value = $("workspaceContainer").innerHTML;
+
+</script>

wise-doc/src/main/webapp/c/publish.htm

@@ -0,0 +1,98 @@
+<div class="modalDialog">
+    <!--  Header can be customized -->
+
+
+    <h1>
+        Publish
+        'ddd'
+    </h1>
+
+    <h2>
+        By publishing the map you make it visible to everyone on the Internet. Copy the code snippets below to integrate
+        it into your website or blog.
+    </h2>
+
+    <div>
+        <form method="post" id="publishForm" name="publishForm" action="publish.htm" style="height:100%;">
+            <input type="hidden" name="actionId" value="save">
+            <input type="hidden" name="mapId" value="1">
+            <table style="margin: 10px;">
+                <colgroup>
+                    <col width="20%">
+                    <col width="80%">
+                </colgroup>
+                <tbody>
+                <tr>
+                    <td>
+                        &nbsp;
+                    </td>
+                    <td>
+                        <input type="checkbox" id="publicViewId" name="publicView" value="true">
+                        Publish map to the Internet
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        &nbsp;
+                    </td>
+                    <td>
+                        <div id="disabledPanel"
+                             style="position: absolute; background-color: white; opacity: 0.8; width: 600px; height: 155px; left: 10px; visibility: hidden; ">
+
+                        </div>
+                    </td>
+                </tr>
+                <tr>
+                    <td class="formLabel">
+                        URL:
+                    </td>
+                    <td style="padding: 5px;">
+                        <input name="url" value="http://www.wisemapping.com/c/publicView.htm?mapId=1" style="width:400px" readonly="readonly">
+                    </td>
+                </tr>
+                <tr>
+                    <td class="formLabel">
+                        Direct Link:
+                    </td>
+                    <td>
+                        <textarea style="width:400px;height:30px;overflow:hidden;" cols="55" rows="3"
+                                  readonly="readonly">                        &lt;a
+                            href="http://www.wisemapping.com/c/publicView.htm?mapId=1"&gt;ddd&lt;/a&gt;</textarea>
+                    </td>
+                </tr>
+                <tr>
+                    <td class="formLabel">
+                        &nbsp;
+                    </td>
+                    <td>
+                        &nbsp;
+                    </td>
+                </tr>
+                <tr>
+                    <td class="formLabel" style="width:200px">
+                        For inclusion in blogs and web pages
+                        :
+                    </td>
+                    <td>
+                        <textarea style="width:400px;height:70px;overflow:hidden;" cols="55" rows="5"
+                                  readonly="readonly">                        &lt;iframe
+                            style="border:0;width:600px;height:400px;border: 1px solid black"
+                            src="http://www.wisemapping.com/c/embeddedView.htm?mapId=1&amp;zoom=1"&gt;
+                            &lt;/iframe&gt;
+                        </textarea>
+
+                        <p>* Note: You can change embedded map size modifying 'height' and 'width' style properties. You
+                            can also adjust the zoom factor modifying 'zoom' parameter from the URL.</p>
+                    </td>
+                </tr>
+                <tr>
+                    <td style="text-align:center;margin-top:30px;" colspan="2">
+                        <input type="submit" id="ok" value="Ok" class="btn-secondary">
+                        <input type="button" value="Cancel" class="btn-primary" id="cancelBtn">
+                    </td>
+                </tr>
+                </tbody>
+            </table>
+        </form>
+    </div>
+</div>

wise-doc/src/main/webapp/css/editor2.css

@@ -704,7 +704,7 @@ div#small_error_icon {
 /** */
 /* Modal dialogs definitions */
 
-.tagItModalDialog, .historyModalDialog, .shareItModalDialog {
+.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 {
+.publishModalDialog {
+    width: 600px;
+}
+
+.tagItModalDialog .title, .historyModalDialog .title, .shareItModalDialog .title, .exportModalDialog .title, .publishModalDialog .title {
     position: absolute;
     top: 0;
     left: 0;
@@ -758,6 +762,14 @@ div#small_error_icon {
     height: 300px;
 }
 
+.exportItModalDialog .content {
+    height: 280px;
+}
+
+.publishModalDialog  .content {
+    height: 330px;
+}
+
 .modalDialog h1 {
     font-size: 14px;
 }
@@ -767,4 +779,9 @@ div#small_error_icon {
     margin: 5px;
 }
 
-
+td.formLabel {
+    text-align: right;
+    padding: 2px 10px;
+    font-weight: bolder;
+    vertical-align: top;
+}

wise-doc/src/main/webapp/css/embedded.css

@@ -0,0 +1,133 @@
+html {
+    overflow: hidden;
+}
+
+#waitDialog {
+    position: absolute;
+    top: 10px;
+    left: 10px;
+    height: 100px;
+}
+
+#firstHeader {
+    width: 100%;
+}
+
+#subHeader {
+    position: absolute;
+    width: 100%;
+    height: 55px;
+    top: 30px;
+}
+
+#loadingContainer {
+    position: relative;
+    top: 80px;
+    height: 120px; /*background: whitesmoke;*/
+    background: #FEFEFE;
+    opacity: .99;
+    padding: 15px;
+    width: 100%;
+    border: 1px solid;
+    border-color: #a9a9a9;
+
+}
+
+#loadingContainer .loadingText {
+    position: relative;
+    top: 50%;
+    margin-top: -35px;
+    font-size: 30px;
+    font-weight: bold;
+    vertical-align: text-bottom;
+    height: 30px;
+    float: left;
+}
+
+#loadingContainer .loadingIcon {
+    position: relative;
+    background: url(../images/ajax-loader2.gif) no-repeat;
+    top: 25px;
+    height: 100px;
+    width: 70px;
+    float: left;
+    clear: both;
+}
+
+/* ------------- Footer Styles -------------------------*/
+div#embFooter {
+    position: absolute;
+    height: 35px;
+    width: 100%;
+    bottom: 0;
+    left: 0;
+    border-top: 1px solid black;
+    background: #E5E5E5;
+}
+
+div#logo {
+    height: 65px;
+    width: 80px;
+    position: absolute;
+    background: url(../nicons/logo-small.png) no-repeat right top;
+    right: 10px;
+    top: -10px;
+}
+
+.button {
+    width: 20px;
+    height: 20px;
+    float: left;
+    cursor: pointer;
+    white-space: nowrap;
+    margin: 1px;
+}
+
+.button:hover {
+    float: left;
+    cursor: pointer;
+    border: 1px solid black;
+    border-top-color: white;
+    border-left-color: white;
+    margin: 0;
+
+}
+
+div#zoomIn {
+    background: url(../nicons/zoom-in.png) no-repeat left top;
+    margin-top: 10px;
+    margin-left: 10px;
+}
+
+#zoomOut {
+    background: url(../nicons/zoom-out.png) no-repeat left top;;
+    margin-top: 10px;
+    margin-left: 5px;
+}
+
+div#mindplot {
+    position: relative;
+    top: 0;
+    left: 0;
+    width: 100%;
+}
+
+div#mapContainer {
+    border-bottom: 1px solid black;
+    padding-bottom: 40px;
+    height: 400px;
+    width: 100%;
+}
+
+div#mapDetails {
+    float: right;
+    padding-top: 10px;
+    margin-right: 100px;
+
+}
+
+div#mapDetails .title {
+    font-weight: bold;
+    margin-left: 10px;
+    margin-right: 3px;
+}

wise-doc/src/main/webapp/html/editor.html

@@ -113,9 +113,6 @@
     });
 </script>
 
-<div id="colorPalette">
-    <div id="paletteHeader"></div>
-</div>
 
 <div id="header">
     <div id="headerInfo">

wise-doc/src/main/webapp/html/embeddde.html

@@ -1,4 +0,0 @@
-<div>
-
-    algo..
-</div>

wise-doc/src/main/webapp/html/embedded.htm

@@ -0,0 +1,111 @@
+<!DOCTYPE HTML>
+
+<%@ include file="/jsp/init.jsp" %>
+
+<html>
+<head>
+    <title>WiseMapping - Editor </title>
+    <meta http-equiv="Content-type" content="text/html; charset=UTF-8"/>
+    <!--[if lt IE 9]>
+    <meta http-equiv="X-UA-Compatible" content="chrome=1">
+    <![endif]-->
+    <!--<script type="text/javascript" src="http://docs.google.com/brix/static/api/js/jsapi.nocache.js"></script>-->
+    <script type='text/javascript' src='../js/less-1.1.3.min.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='/mindplot/src/main/javascript/libraries/mootools/mootools-more-1.3.2.1-yui.js'></script>
+    <script type='text/javascript' src='/core-js/target/classes/core.js'></script>
+
+
+    <script type="text/javascript">
+        var mapId = '${mindmap.id}';
+        var mapXml = '<map name="38298" version="pela"><topic central="true" text="test\nThis is working ?" id="1"/></map>';
+        var mindReady = false;
+        $(document).addEvent('loadcomplete', function(resource) {
+            mindReady = resource == 'mind' ? true : mindReady;
+            if (mindReady) {
+
+                collab = 'standalone';
+                //var editorProperties = {zoom:0.85,saveOnLoad:true,collab:'standalone'};
+
+                var isTryMode = false;
+                designer = buildDesigner();
+
+                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="waitingContainer">
+        <div class="loadingIcon"></div>
+        <div class="loadingText">
+            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">
+
+    var waitDialog = new core.WaitDialog();
+    waitDialog.activate(true, $("waitDialog"));
+    $(window).addEvent("error", function(event) {
+
+        // Show error dialog ...
+        waitDialog.changeContent($("errorDialog"), false);
+        return false;
+    });
+</script>
+
+
+<div id="mapContainer">
+    <div id="mindplot"></div>
+    <div id="embFooter">
+        <a href="${pageContext.request.contextPath}/c/home.htm" target="new">
+            <div id="logo"></div>
+        </a>
+
+        <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>
+        </div>
+    </div>
+</div>
+<script type="text/javascript" src="../js/editor.js"></script>
+</body>
+</html>

wise-doc/src/main/webapp/js/editor.js

@@ -29,16 +29,18 @@ function buildDesigner() {
     var editorProperties = {zoom:0.85,saveOnLoad:true,collab:collab};
     designer = new mindplot.Designer(editorProperties, container);
     designer.setViewPort({
-        height: parseInt(window.innerHeight-70), // Footer and Header
+        height: parseInt(window.innerHeight - 70), // Footer and Header
         width:  parseInt(window.innerWidth)
     });
 
-    var menu = new mindplot.widget.Menu(designer, 'toolbar',mapId);
+    if ($('toolbar')) {
+        var menu = new mindplot.widget.Menu(designer, 'toolbar', mapId);
 
-    //  If a node has focus, focus can be move to another node using the keys.
+        //  If a node has focus, focus can be move to another node using the keys.
-    designer._cleanScreen = function() {
+        designer._cleanScreen = function() {
-        menu.clear()
+            menu.clear()
-    };
+        };
+    }
     return designer;
 }
 

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 {

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;
+    height: 80px;
-    width: 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 {

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;
+}

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;
+    width: 20px;
-    height: 16px;
+    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 {
+div#zoomIn {
-    background: url(../images/zoom_in.png) no-repeat left top;;
+    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;;
+    background: url(../nicons/zoom-out.png) no-repeat left top;;
-    margin-top: 10px
+    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 {

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>

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;
 }

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() {
-    };
-}

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">
+     <!--[if lt IE 9]>
-    <link rel="stylesheet" type="text/css" href="../css/embedded.css">
+    <meta http-equiv="X-UA-Compatible" content="chrome=1">
-    <link rel="stylesheet" type="text/css" href="../css/bubble.css">
+    <![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="CREATOR"/>:</span><span>${mindmap.creator}</span>--%>
-            <span class="title"><spring:message code="DESCRIPTION"/>:</span><span>${mindmap.description}</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/editor.js"></script>
-<script type="text/javascript" src="../js/embedded.js"></script>
 </body>
 </html>

wise-webapp/src/main/webapp/jsp/mindmapCollaborator.jsp

@@ -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();"
+            <input type="button" value="<spring:message code="CANCEL"/>" class="btn-secondary" id="cancelBtn"/>
-                   class="btn-secondary"/>
         </div>
 
         <div id="currentUsers">
@@ -61,34 +61,40 @@
                 <spring:message code="CURRENT_COLLABORATORS"/> (${mindmap.countColaborators})
             </h2>
             <table>
-                <colgroup><col width="95%"/></colgroup>
+                <colgroup>
-            <c:forEach items="${mindmap.collaborators}" var="mindmapCollaborator">
+                    <col width="95%"/>
-                <tr>
+                </colgroup>
-                    <td>
+                <c:forEach items="${mindmap.collaborators}" var="mindmapCollaborator">
-                        ${mindmapCollaborator.username}
+                    <tr>
-                    </td>
+                        <td>
-                    <td>
+                                ${mindmapCollaborator.username}
-                        <a href="${removeCollaborator}&colaboratorId=${mindmapCollaborator.id}"><img src="../images/close12_1.gif" alt="<spring:message code="DELETE"/>" border="0"/></a>
+                        </td>
-                    </td>
+                        <td>
-                </tr>
+                            <a href="${removeCollaborator}&colaboratorId=${mindmapCollaborator.id}"><img
-            </c:forEach>
+                                    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>
+                <colgroup>
-            <c:forEach items="${mindmap.viewers}" var="mindmapViewer">
+                    <col width="95%"/>
-                <tr>
+                </colgroup>
-                    <td>
+                <c:forEach items="${mindmap.viewers}" var="mindmapViewer">
-                        ${mindmapViewer.username}
+                    <tr>
-                    </td>
+                        <td>
-                    <td>
+                                ${mindmapViewer.username}
-                        <a href="${removeCollaborator}&colaboratorId=${mindmapViewer.id}"><img src="../images/close12_1.gif" alt="<spring:message code="DELETE"/>" border="0"/></a>
+                        </td>
-                    </td>
+                        <td>
-                </tr>
+                            <a href="${removeCollaborator}&colaboratorId=${mindmapViewer.id}"><img
-            </c:forEach>
+                                    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>

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">
+            <div id="discard" class="buttonOn" title="Discard">
-                <img src="../nicons/discart.png"/>
+                <img src="../nicons/discard.png"/>
             </div>
             <div id="print" class="buttonOn" title="Print">
                 <img src="../nicons/print.png"/>

wise-webapp/src/main/webapp/jsp/mindmapExport.jsp

@@ -10,68 +10,69 @@
         <input type="hidden" name="mapSvg" value=""/>
         <table>
             <tbody>
-                <tr>
+            <tr>
-                    <td>
+                <td>
-                        <input type="radio" id="svg" name="exportFormat" value="SVG"/>
+                    <input type="radio" id="svg" name="exportFormat" value="SVG"/>
-                        <b>
+                    <b>
-                            <spring:message code="SVG_EXPORT_FORMAT"/>
+                        <spring:message code="SVG_EXPORT_FORMAT"/>
-                        </b>
+                    </b>
 
-                        <p>
+                    <p>
-                            <spring:message code="SVG_EXPORT_FORMAT_DETAILS"/>
+                        <spring:message code="SVG_EXPORT_FORMAT_DETAILS"/>
-                        </p>
+                    </p>
-                    </td>
+                </td>
-                </tr>
+            </tr>
-                <tr>
+            <tr>
-                    <td>
+                <td>
-                        <input type="radio" name="exportFormat" value="PDF" id="pdf"/>
+                    <input type="radio" name="exportFormat" value="PDF" id="pdf"/>
-                        <b>
+                    <b>
-                            <spring:message code="PDF_EXPORT_FORMAT"/>
+                        <spring:message code="PDF_EXPORT_FORMAT"/>
-                        </b>
+                    </b>
 
-                        <p>
+                    <p>
-                            <spring:message code="PDF_EXPORT_FORMAT_DETAILS"/>
+                        <spring:message code="PDF_EXPORT_FORMAT_DETAILS"/>
-                        </p>
+                    </p>
-                    </td>
+                </td>
-                </tr>
+            </tr>
-                 <tr>
+            <tr>
-                    <td>
+                <td>
-                        <input type="radio" id="freemind" name="exportFormat" value="FREEMIND" checked="checked"/>
+                    <input type="radio" id="freemind" name="exportFormat" value="FREEMIND" checked="checked"/>
-                        <b>
+                    <b>
-                            <spring:message code="FREEMIND_EXPORT_FORMAT"/>
+                        <spring:message code="FREEMIND_EXPORT_FORMAT"/>
-                        </b>
+                    </b>
 
-                        <p>
+                    <p>
-                            <spring:message code="FREEMIND_EXPORT_FORMAT_DETAILS"/>
+                        <spring:message code="FREEMIND_EXPORT_FORMAT_DETAILS"/>
-                        </p>
+                    </p>
-                    </td>
+                </td>
-                </tr>
+            </tr>
-                <tr>
+            <tr>
-                    <td>
+                <td>
-                        <input type="radio" name="exportFormat" id="img" value="IMG_EXPORT_FORMAT"/>
+                    <input type="radio" name="exportFormat" id="img" value="IMG_EXPORT_FORMAT"/>
-                        <b>
+                    <b>
-                            <spring:message code="IMG_EXPORT_FORMAT"/>
+                        <spring:message code="IMG_EXPORT_FORMAT"/>
-                        </b><select name="imgFormat" id="imgFormat" style="visibility:hidden;margin-left:5px;">
+                    </b><select name="imgFormat" id="imgFormat" style="visibility:hidden;margin-left:5px;">
-                        <option>PNG</option>
+                    <option>PNG</option>
-                        <option>JPEG</option>
+                    <option>JPEG</option>
-                    </select>
+                </select>
 
-                        <p>
+                    <p>
-                            <spring:message code="IMG_EXPORT_FORMAT_DETAILS"/>
+                        <spring:message code="IMG_EXPORT_FORMAT_DETAILS"/>
-                        </p>
+                    </p>
-                    </td>
+                </td>
-                </tr>
+            </tr>
-                <tr>
+            <tr>
-                    <td style="text-align:center;margin-top:10px;">
+                <td style="text-align:center;margin-top:10px;">
-                        <input type="button" id="ok" value="<spring:message code="OK"/>" class="btn-primary">
+                    <input type="button" id="ok" value="<spring:message code="OK"/>" 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"
-                               onclick="MOOdalBox.close();">
+                           onclick="">
-                    </td>
+                </td>
-                </tr>
+            </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;

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="20%"/>
-                <col width="90%"/>
+                <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"
+                        <input type="button" value="<spring:message code="CANCEL"/>" class="btn-secondary" id="cancelBtn">
-                               onclick="MOOdalBox.close();">
                     </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>

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>