More more more fixes.

2024-08-20 12:30:44 +02:00 · 2011-10-15 13:23:27 -03:00 · 2011-10-15 13:23:27 -03:00 · cb6302bf50
commit cb6302bf50
parent 024585c321
55 changed files with 288 additions and 437 deletions
--- a/mindplot/src/main/javascript/Designer.js
+++ b/mindplot/src/main/javascript/Designer.js
@ -341,10 +341,8 @@ mindplot.Designer = new Class({
        },

        needsSave : function() {
-
            //@Todo: Review all this ...
-//            return this._actionDispatcher.hasBeenChanged();
-            return true;
+            return this._actionDispatcher._actionRunner.hasBeenChanged();
        },

        save : function(onSavedHandler, saveHistory) {
@ -391,11 +389,12 @@ mindplot.Designer = new Class({
        },

        undo : function() {
-            this._actionRunner.undo();
+            // @Todo: This is a hack...
+            this._actionDispatcher._actionRunner.undo();
        },

        redo : function() {
-            this._actionRunner.redo();
+            this._actionDispatcher._actionRunner.redo();
        },

        _nodeModelToNodeGraph : function(nodeModel, isVisible) {
--- a/mindplot/src/main/javascript/widget/Menu.js
+++ b/mindplot/src/main/javascript/widget/Menu.js
@ -179,6 +179,24 @@ mindplot.widget.Menu = new Class({
        };
        this._toolbarElems.push(new mindplot.widget.ColorPalettePanel('fontColor', fontColorModel, baseUrl));

+        this.addButton('export', false, false, function() {
+            var reqDialog = new MooDialog.Request('../c/export.htm?mapId=' + mapId, null,
+                {'class': 'historyModalDialog',
+                    closeButton:true,
+                    destroyOnClose:true,
+                    title:'Export'
+                });
+            reqDialog.setRequestOptions({
+                onRequest: function() {
+                    reqDialog.setContent('loading...');
+                }
+            });
+        });
+
+        this.addButton('print', false, false, function() {
+            printMap();
+        });
+
        this.addButton('zoomIn', false, false, function() {
            designer.zoomIn();
        });
@ -225,29 +243,17 @@ mindplot.widget.Menu = new Class({

        var saveElem = $('save');
        if (saveElem) {
-            saveElem.addEvent('click', function() {
-
-                if (!readOnly) {
-                    saveElem.setStyle('cursor', 'wait');
-                    (function() {
-                        designer.save(function() {
-                            saveElem.setStyle('cursor', 'pointer');
-                        }, true);
-                    }).delay(1);
-                } else {
-                    new Windoo.Confirm('This option is not enabled in try mode. You must by signed in order to execute this action.<br/> to create an account click <a href="userRegistration.htm">here</a>',
-                        {
-                            'window': {theme:Windoo.Themes.wise,
-                                title:''
-                            }
-                        });
-                }
+            this.addButton('save', false, false, function() {
+                saveElem.setStyle('cursor', 'wait');
+                designer.save(function() {
+                    saveElem.setStyle('cursor', 'pointer');
+                }, true);
            });
        }

        var discartElem = $('discart');
        if (discartElem) {
-            discartElem.addEvent('click', function() {
+            this.addButton('tagIt', false, false, function() {

                if (!readOnly) {
                    displayLoading();
@ -261,49 +267,58 @@ mindplot.widget.Menu = new Class({

        var tagElem = $('tagIt');
        if (tagElem) {
-            tagElem.addEvent('click', function(event) {
-                var reqDialog = new MooDialog.Request('../c/tags.htm?mapId=' + mapId, null, {'class': 'MooDialogBig'});
-//                  var reqDialog = new MooDialog.Request("embeddde.html",null,{'class': 'MooDialogBig'});
+            this.addButton('tagIt', false, false, function() {
+                var reqDialog = new MooDialog.Request('../c/tags.htm?mapId=' + mapId, null,
+                    {'class': 'tagItModalDialog',
+                        closeButton:true,
+                        destroyOnClose:true,
+                        title:'Tags'
+                    });
+                reqDialog.setRequestOptions({
+                    onRequest: function() {
+                        reqDialog.setContent('loading...');
+                    }
+                });
+            });
+        }
+
+        var shareElem = $('shareIt');
+        if (shareElem) {
+            this.addButton('shareIt', false, false, function() {
+                var reqDialog = new MooDialog.Request('../c/mymaps.htm?action=collaborator&userEmail=paulo%40pveiga.com.ar&mapId=' + mapId, null,
+                    {'class': 'shareItModalDialog',
+                        closeButton:true,
+                        destroyOnClose:true,
+                        title:'Share It'
+                    });
                reqDialog.setRequestOptions({
                    onRequest: function() {
                        reqDialog.setContent('loading...');
                    }
                });

-
-            });
-        }
-
-        var shareElem = $('shareIt');
-        if (shareElem) {
-            shareElem.addEvent('click', function() {
-
-
            });
        }

        var publishElem = $('publishIt');
        if (publishElem) {
-            $('publishIt').addEvent('click', function(event) {
-                new Windoo.Confirm('This option is not enabled in try mode. You must by signed in order to execute this action.',
-                    {
-                        'window': {theme:Windoo.Themes.wise,
-                            title:''
-                        }
-                    });

-            });
        }
        var historyElem = $('history');
        if (historyElem) {
-            historyElem.addEvent('click', function(event) {
-                new Windoo.Confirm('This option is not enabled in try mode. You must by signed in order to execute this action.',
-                    {
-                        'window': {theme:Windoo.Themes.wise,
-                            title:''
-                        }
-                    });

+            this.addButton('history', false, false, function() {
+                var reqDialog = new MooDialog.Request('../c/history.htm?action=list&goToMindmapList&mapId=' + mapId, null,
+                    {'class': 'historyModalDialog',
+                        closeButton:true,
+                        destroyOnClose:true,
+                        title:'History'
+                    });
+                reqDialog.setRequestOptions({
+                    onRequest: function() {
+                        reqDialog.setContent('loading...');
+                    }
+                });
            });
        }

--- a/wise-doc/src/main/webapp/css/editor2.css
+++ b/wise-doc/src/main/webapp/css/editor2.css
@ -283,6 +283,11 @@ div#headerActions span {
    border-bottom: 3px solid rgb(247, 201, 49);
 }

+div#headerActions a {
+    color: white;
+    text-decoration: none;
+}
+
 div#headerMapTitle {
    width: 200px;
    height:(@header-info-height ) - 13;
@ -295,7 +300,7 @@ div#headerMapTitle {
 }

 div#headerMapTitle span {
-    padding: 4px 50px ;
+    padding: 4px 50px;
    border: 1px solid rgb(90, 90, 90);
    background-color: rgb(45, 45, 45);
    -moz-border-radius: 3px;
@ -312,6 +317,7 @@ div#toolbar {
    background-image: -moz-linear-gradient(bottom, rgb(229, 227, 209) 47%, rgb(252, 250, 237) 87%);
    background-image: -webkit-linear-gradient(bottom, rgb(229, 227, 209) 47%, rgb(252, 250, 237) 87%);
    background-image: -ms-linear-gradient(bottom, rgb(229, 227, 209) 47%, rgb(252, 250, 237) 87%);
+
    background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0.47, rgb(229, 227, 209)), color-stop(0.87, rgb(252, 250, 237)));
    border-bottom: 3px double rgb(190, 190, 190);
    border-top: 1px solid rgb(190, 190, 190);
@ -320,8 +326,6 @@ div#toolbar {
 div#toolbar .buttonContainer {
    height: @header-toolbar-height;
    float: left;
-    /*color: black;*/
-    /*border: 1px solid #BBB4D6;*/
    margin-left: 5px;
 }

@ -542,9 +546,6 @@ div.toolbarPanelLink, div.toolbarPanelLinkSelectedLink {
    font-size: 12px;
    padding: 5px 10px;
    font-weight: bold;
-    -moz-border-radius: 3px;
-    -webkit-border-radius: 3px;
-    border-radius: 3px;
 }

 div.toolbarPanelLink:hover, div.toolbarPanelLinkSelectedLink {
@ -654,6 +655,7 @@ div#small_error_icon {
    text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
    border-color: #0064cd #0064cd #003f81;
    border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+    margin-top: 7px;
 }

 .btn-primary:hover {
@ -691,6 +693,7 @@ div#small_error_icon {
    -o-transition: 0.1s linear all;
    transition: 0.1s linear all;
    text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+    margin-top: 7px;
 }

 .btn-secondary:hover {
@ -699,8 +702,9 @@ div#small_error_icon {
 }

 /** */
+/* Modal dialogs definitions */

-.MooDialogBig {
+.tagItModalDialog, .historyModalDialog, .shareItModalDialog {
    position: fixed;
    top: 50%;
    left: 50%;
@ -710,7 +714,7 @@ div#small_error_icon {
    background-color: #ffffff;
    border: 1px solid #999;
    border: 1px solid rgba(0, 0, 0, 0.3);
-    *border: 1px solid #999;
+    border: 1px solid #999;
    /* IE6-7 */

    -webkit-border-radius: 6px;
@ -725,7 +729,42 @@ div#small_error_icon {
    padding: 30px;
 }

+.shareItModalDialog {
+    width: 500px;
+}

-.MooDialogBig .content {
+.tagItModalDialog .title, .historyModalDialog .title, .shareItModalDialog .title {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    border-bottom: 1px solid #a1aec5;
+    font-weight: bold;
+    text-shadow: 1px 1px 0 #fff;
+    border-bottom: 1px solid #eee;
+    padding: 5px 30px;
+    font-size: 18px
+}
+
+.tagItModalDialog .content {
+    height: 130px;
+}
+
+.historyModalDialog .content {
    height: 300px;
-}
+}
+
+.shareItModalDialog .content {
+    height: 300px;
+}
+
+.modalDialog h1 {
+    font-size: 14px;
+}
+
+.modalDialog h2 {
+    font-size: 14px;
+    margin: 5px;
+}
+
+
--- a/wise-doc/src/main/webapp/html/editor.html
+++ b/wise-doc/src/main/webapp/html/editor.html
@ -127,7 +127,21 @@
    </div>
    <div id="toolbar">
        <div id="editTab" class="tabContent">
-            <div id="file" class="buttonContainer">
+            <div id="persist" class="buttonContainer">
+                <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>
+                <div id="print" class="buttonOn" title="Print">
+                    <img src="../nicons/print.png"/>
+                </div>
+                <div id="export" class="buttonOn" title="Export">
+                    <img src="../nicons/export.png"/>
+                </div>
+            </div>
+            <div id="edit" class="buttonContainer">
                <div id="undoEdition" class="buttonOn" title="Undo Edition">
                    <img src="../nicons/undo.png"/>
                </div>
--- a/wise-webapp/src/main/webapp/WEB-INF/defs/definitions.xml
+++ b/wise-webapp/src/main/webapp/WEB-INF/defs/definitions.xml
@ -115,6 +115,12 @@
        <put name="body" value="/jsp/newMap.jsp"/>
    </definition>

+        <definition name="newMap" extends="pageTemplate">
+        <put name="title" value="NEW_MINDMAP"/>
+        <put name="details" value="FIELD_REQUIRED_MSG"/>
+        <put name="body" value="/jsp/newMap.jsp"/>
+    </definition>
+
    <definition name="newMapError" extends="pageTemplate">
        <put name="title" value="NEW_MINDMAP"/>
        <put name="details" value="FIELD_REQUIRED_MSG"/>
--- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-acegi-security.xml
+++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-acegi-security.xml
@ -109,6 +109,7 @@
                /js/**=IS_AUTHENTICATED_ANONYMOUSLY
                /ws/**=IS_AUTHENTICATED_ANONYMOUSLY
                /images/*=IS_AUTHENTICATED_ANONYMOUSLY
+                /nicons/*=IS_AUTHENTICATED_ANONYMOUSLY
                /c/embeddedview.htm=IS_AUTHENTICATED_ANONYMOUSLY
                /c/export.htm=IS_AUTHENTICATED_ANONYMOUSLY
                /c/publicview.htm=IS_AUTHENTICATED_ANONYMOUSLY
--- a/wise-webapp/src/main/webapp/css/common.css
+++ b/wise-webapp/src/main/webapp/css/common.css
@ -345,21 +345,6 @@ div#printLogo {
    background: url(../images/logo-vsmall.png) no-repeat right top;
 }

-.btn-primary {
-    background: #3399CC;
-    border: 1px solid #006699;
-    color: #FFFFFF;
-    font-family: arial, helvetica, sans-serif;
-    font-size: 92%;
-    font-style: normal;
-    font-variant: normal;
-    font-weight: bold;
-    line-height: normal;
-    overflow: visible;
-    padding: 2px 8px 1px;
-    vertical-align: middle;
-}
-
 div#paypal {
    float: left;
    margin: -29px;
@ -594,14 +579,83 @@ div.installCFG h2 {
    margin: 0;
 }

-.floating-tip {
-    background-color: #dfcf3c;
-    padding: 5px 15px;
-    color: #666666;
-    /*font-weight: bold;*/
-    /*width: 100px;*/
+/* */
+.btn-primary {
+    cursor: pointer;
+    display: inline-block;
+    padding: 5px 14px 6px;
+    text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+    color: #333;
    font-size: 13px;
-    -moz-border-radius: 3px;
-    -webkit-border-radius: 3px;
-    border-radius: 3px;
-    box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.2);
+    line-height: normal;
+    border: 1px solid #ccc;
+    border-bottom-color: #bbb;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+    -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+    -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+    box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+    -webkit-transition: 0.1s linear all;
+    -moz-transition: 0.1s linear all;
+    -ms-transition: 0.1s linear all;
+    -o-transition: 0.1s linear all;
+    transition: 0.1s linear all;
+    color: #ffffff;
+    background-color: #0064cd;
+    background-repeat: repeat-x;
+    background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));
+    background-image: -moz-linear-gradient(top, #049cdb, #0064cd);
+    background-image: -ms-linear-gradient(top, #049cdb, #0064cd);
+    background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));
+    background-image: -webkit-linear-gradient(top, #049cdb, #0064cd);
+    background-image: -o-linear-gradient(top, #049cdb, #0064cd);
+    background-image: linear-gradient(top, #049cdb, #0064cd);
+    text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+    border-color: #0064cd #0064cd #003f81;
+    border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+    margin-top: 7px;
+}
+
+.btn-primary:hover {
+    background-position: 0 -15px;
+    text-decoration: none;
+}
+
+.btn-secondary {
+    cursor: pointer;
+    display: inline-block;
+    background-color: #e6e6e6;
+    background-repeat: no-repeat;
+    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));
+    background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+    background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);
+    background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+    background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+    background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+    padding: 5px 14px 6px;
+    text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+    color: #333;
+    font-size: 13px;
+    line-height: normal;
+    border: 1px solid #ccc;
+    border-bottom-color: #bbb;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+    -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+    -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+    box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+    -webkit-transition: 0.1s linear all;
+    -moz-transition: 0.1s linear all;
+    -ms-transition: 0.1s linear all;
+    -o-transition: 0.1s linear all;
+    transition: 0.1s linear all;
+    text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+    margin-top: 7px;
+}
+
+.btn-secondary:hover {
+    background-position: 0 -15px;
+    text-decoration: none;
+}
--- a/wise-webapp/src/main/webapp/css/editor2.css
+++ b/wise-webapp/src/main/webapp/css/editor2.css
@ -300,7 +300,7 @@ div#headerMapTitle {
 }

 div#headerMapTitle span {
-    padding: 4px 50px ;
+    padding: 4px 50px;
    border: 1px solid rgb(90, 90, 90);
    background-color: rgb(45, 45, 45);
    -moz-border-radius: 3px;
@ -326,8 +326,6 @@ div#toolbar {
 div#toolbar .buttonContainer {
    height: @header-toolbar-height;
    float: left;
-    /*color: black;*/
-    /*border: 1px solid #BBB4D6;*/
    margin-left: 5px;
 }

@ -657,6 +655,7 @@ div#small_error_icon {
    text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
    border-color: #0064cd #0064cd #003f81;
    border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+    margin-top: 7px;
 }

 .btn-primary:hover {
@ -694,6 +693,7 @@ div#small_error_icon {
    -o-transition: 0.1s linear all;
    transition: 0.1s linear all;
    text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+    margin-top: 7px;
 }

 .btn-secondary:hover {
@ -702,8 +702,9 @@ div#small_error_icon {
 }

 /** */
+/* Modal dialogs definitions */

-.MooDialogBig {
+.tagItModalDialog, .historyModalDialog, .shareItModalDialog, .exportModalDialog {
    position: fixed;
    top: 50%;
    left: 50%;
@ -713,7 +714,7 @@ div#small_error_icon {
    background-color: #ffffff;
    border: 1px solid #999;
    border: 1px solid rgba(0, 0, 0, 0.3);
-    *border: 1px solid #999;
+    border: 1px solid #999;
    /* IE6-7 */

    -webkit-border-radius: 6px;
@ -728,17 +729,46 @@ div#small_error_icon {
    padding: 30px;
 }

-
-.MooDialogBig .content {
-    height: 200px;
+.shareItModalDialog {
+    width: 500px;
 }

-.MooDialogBig h1
-{
+.tagItModalDialog .title, .historyModalDialog .title, .shareItModalDialog .title, .exportModalDialog .title {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    border-bottom: 1px solid #a1aec5;
+    font-weight: bold;
+    text-shadow: 1px 1px 0 #fff;
+    border-bottom: 1px solid #eee;
+    padding: 5px 30px;
+    font-size: 18px
+}
+
+.tagItModalDialog .content {
+    height: 130px;
+}
+
+.historyModalDialog .content {
+    height: 300px;
+}
+
+.shareItModalDialog .content {
+    height: 300px;
+}
+
+.exportItModalDialog .content {
+    height: 280px;
+}
+
+.modalDialog h1 {
    font-size: 14px;
 }
-.MooDialogBig h2
-{
+
+.modalDialog h2 {
    font-size: 14px;
    margin: 5px;
-}
+}
+
+
--- a/wise-webapp/src/main/webapp/css/mymaps.css
+++ b/wise-webapp/src/main/webapp/css/mymaps.css
@ -224,25 +224,29 @@

 #recentFiles.sb {
    background: #EEEEEE;
-    border:1px solid #E5E5E5;
+    border: 1px solid #E5E5E5;
    -moz-border-radius: 16px;
    -khtml-border-radius: 16px;
    -webkit-border-radius: 16px;
-    border-radius:16px;
+    border-radius: 16px;
 }

 #recentItems.sb {
    background: white;
-    border:1px solid #E5E5E5;
+    border: 1px solid #E5E5E5;
    -moz-border-radius: 16px;
    -khtml-border-radius: 16px;
    -webkit-border-radius: 16px;
-    border-radius:16px;
+    border-radius: 16px;
 }

 #mydocs {
    -moz-border-radius: 16px;
    -khtml-border-radius: 16px;
    -webkit-border-radius: 16px;
-    border-radius:16px;
+    border-radius: 16px;
+}
+
+.subMenu2 {
+   display: none;
 }
--- a/wise-webapp/src/main/webapp/images/aboutColors.png
+++ b/wise-webapp/src/main/webapp/images/aboutColors.png
--- a/wise-webapp/src/main/webapp/images/bubbleTip_bottom.png
+++ b/wise-webapp/src/main/webapp/images/bubbleTip_bottom.png
--- a/wise-webapp/src/main/webapp/images/bubbleTip_bottom_blue.gif
+++ b/wise-webapp/src/main/webapp/images/bubbleTip_bottom_blue.gif
--- a/wise-webapp/src/main/webapp/images/bubbleTip_bottom_pico.png
+++ b/wise-webapp/src/main/webapp/images/bubbleTip_bottom_pico.png
--- a/wise-webapp/src/main/webapp/images/bubbleTip_bottom_pico_blue.gif
+++ b/wise-webapp/src/main/webapp/images/bubbleTip_bottom_pico_blue.gif
--- a/wise-webapp/src/main/webapp/images/bubbleTip_bottom_pico_blue.png
+++ b/wise-webapp/src/main/webapp/images/bubbleTip_bottom_pico_blue.png
--- a/wise-webapp/src/main/webapp/images/bubbleTip_corner_bottom_left.png
+++ b/wise-webapp/src/main/webapp/images/bubbleTip_corner_bottom_left.png
--- a/wise-webapp/src/main/webapp/images/bubbleTip_corner_bottom_left_blue.gif
+++ b/wise-webapp/src/main/webapp/images/bubbleTip_corner_bottom_left_blue.gif
--- a/wise-webapp/src/main/webapp/images/bubbleTip_corner_bottom_right.png
+++ b/wise-webapp/src/main/webapp/images/bubbleTip_corner_bottom_right.png
--- a/wise-webapp/src/main/webapp/images/bubbleTip_corner_bottom_right_blue.gif
+++ b/wise-webapp/src/main/webapp/images/bubbleTip_corner_bottom_right_blue.gif
--- a/wise-webapp/src/main/webapp/images/bubbleTip_corner_top_left.png
+++ b/wise-webapp/src/main/webapp/images/bubbleTip_corner_top_left.png
--- a/wise-webapp/src/main/webapp/images/bubbleTip_corner_top_left_blue.gif
+++ b/wise-webapp/src/main/webapp/images/bubbleTip_corner_top_left_blue.gif
--- a/wise-webapp/src/main/webapp/images/bubbleTip_corner_top_right.png
+++ b/wise-webapp/src/main/webapp/images/bubbleTip_corner_top_right.png
--- a/wise-webapp/src/main/webapp/images/bubbleTip_corner_top_right_blue.gif
+++ b/wise-webapp/src/main/webapp/images/bubbleTip_corner_top_right_blue.gif
--- a/wise-webapp/src/main/webapp/images/bubbleTip_left.png
+++ b/wise-webapp/src/main/webapp/images/bubbleTip_left.png
--- a/wise-webapp/src/main/webapp/images/bubbleTip_left_blue.gif
+++ b/wise-webapp/src/main/webapp/images/bubbleTip_left_blue.gif
--- a/wise-webapp/src/main/webapp/images/bubbleTip_pico_bottom.png
+++ b/wise-webapp/src/main/webapp/images/bubbleTip_pico_bottom.png
--- a/wise-webapp/src/main/webapp/images/bubbleTip_pico_bottom_blue.gif
+++ b/wise-webapp/src/main/webapp/images/bubbleTip_pico_bottom_blue.gif
--- a/wise-webapp/src/main/webapp/images/bubbleTip_pico_corner_bottom_left.png
+++ b/wise-webapp/src/main/webapp/images/bubbleTip_pico_corner_bottom_left.png
--- a/wise-webapp/src/main/webapp/images/bubbleTip_pico_corner_bottom_left_blue.gif
+++ b/wise-webapp/src/main/webapp/images/bubbleTip_pico_corner_bottom_left_blue.gif
--- a/wise-webapp/src/main/webapp/images/bubbleTip_pico_corner_bottom_right.png
+++ b/wise-webapp/src/main/webapp/images/bubbleTip_pico_corner_bottom_right.png
--- a/wise-webapp/src/main/webapp/images/bubbleTip_pico_corner_bottom_right_blue.gif
+++ b/wise-webapp/src/main/webapp/images/bubbleTip_pico_corner_bottom_right_blue.gif
--- a/wise-webapp/src/main/webapp/images/bubbleTip_pico_corner_top_left.png
+++ b/wise-webapp/src/main/webapp/images/bubbleTip_pico_corner_top_left.png
--- a/wise-webapp/src/main/webapp/images/bubbleTip_pico_corner_top_left_blue.gif
+++ b/wise-webapp/src/main/webapp/images/bubbleTip_pico_corner_top_left_blue.gif
--- a/wise-webapp/src/main/webapp/images/bubbleTip_pico_corner_top_right.png
+++ b/wise-webapp/src/main/webapp/images/bubbleTip_pico_corner_top_right.png
--- a/wise-webapp/src/main/webapp/images/bubbleTip_pico_corner_top_right_blue.gif
+++ b/wise-webapp/src/main/webapp/images/bubbleTip_pico_corner_top_right_blue.gif
--- a/wise-webapp/src/main/webapp/images/bubbleTip_pico_top.png
+++ b/wise-webapp/src/main/webapp/images/bubbleTip_pico_top.png
--- a/wise-webapp/src/main/webapp/images/bubbleTip_pico_top_blue.gif
+++ b/wise-webapp/src/main/webapp/images/bubbleTip_pico_top_blue.gif
--- a/wise-webapp/src/main/webapp/images/bubbleTip_right.png
+++ b/wise-webapp/src/main/webapp/images/bubbleTip_right.png
--- a/wise-webapp/src/main/webapp/images/bubbleTip_right_blue.gif
+++ b/wise-webapp/src/main/webapp/images/bubbleTip_right_blue.gif
--- a/wise-webapp/src/main/webapp/images/bubbleTip_top.png
+++ b/wise-webapp/src/main/webapp/images/bubbleTip_top.png
--- a/wise-webapp/src/main/webapp/images/bubbleTip_top_blue.gif
+++ b/wise-webapp/src/main/webapp/images/bubbleTip_top_blue.gif
--- a/wise-webapp/src/main/webapp/images/bubbleTip_top_pico.png
+++ b/wise-webapp/src/main/webapp/images/bubbleTip_top_pico.png
--- a/wise-webapp/src/main/webapp/images/bubbleTip_top_pico_blue.gif
+++ b/wise-webapp/src/main/webapp/images/bubbleTip_top_pico_blue.gif
--- a/wise-webapp/src/main/webapp/images/bubbleTip_top_pico_blue.png
+++ b/wise-webapp/src/main/webapp/images/bubbleTip_top_pico_blue.png
--- a/wise-webapp/src/main/webapp/images/freeMind-import-export.png
+++ b/wise-webapp/src/main/webapp/images/freeMind-import-export.png
--- a/wise-webapp/src/main/webapp/js/shadedborder.js
+++ b/wise-webapp/src/main/webapp/js/shadedborder.js
@ -1,297 +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.
-*/
-
-/**
- * RUZEE.ShadedBorder 0.2
- * (c) 2006 Steffen Rusitschka
- *
- * RUZEE.ShadedBorder is freely distributable under the terms of an MIT-style license.
- * For details, see http://www.ruzee.com/
- */
-
-var RUZEE = window.RUZEE || {};
-
-RUZEE.ShadedBorder = {
-
-    create: function(opts) {
-        var isie = /msie/i.test(navigator.userAgent) && !window.opera;
-        function sty(el, h) {
-            for (k in h) {
-                if (/ie_/.test(k)) {
-                    if (isie) el.style[k.substr(3)] = h[k];
-                } else el.style[k] = h[k];
-            }
-        }
-        function crdiv(h) {
-            var el = document.createElement("div");
-            el.className = "sb-gen";
-            sty(el, h);
-            return el;
-        }
-        function op(v) {
-            v = v < 0 ? 0 : v;
-            v = v > 0.99999 ? 0.99999 : v;
-            if (isie) {
-                return " filter:alpha(opacity=" + (v * 100) + ");";
-            } else {
-                return " opacity:" + v + ';';
-            }
-        }
-
-        var sr = opts.shadow || 0;
-        var r = opts.corner || 0;
-        var bor = 0;
-        var bow = opts.border || 0;
-        var shadow = sr != 0;
-        var lw = r > sr ? r : sr;
-        var rw = lw;
-        var th = lw;
-        var bh = lw;
-        if (bow > 0) {
-            bor = r;
-            r = r - bow;
-        }
-        var cx = r != 0 && shadow ? Math.round(lw / 3) : 0;
-        var cy = cx;
-        var cs = Math.round(cx / 2);
-        var iclass = r > 0 ? "sb-inner" : "sb-shadow";
-        var sclass = "sb-shadow";
-        var bclass = "sb-border";
-        var edges = opts.edges || "trlb";
-        if (!/t/i.test(edges)) th = 0;
-        if (!/b/i.test(edges)) bh = 0;
-        if (!/l/i.test(edges)) lw = 0;
-        if (!/r/i.test(edges)) rw = 0;
-
-        var p = { position:"absolute", left:"0", top:"0", width:lw + "px", height:th + "px",
-            ie_fontSize:"1px", overflow:"hidden" };
-        var tl = crdiv(p);
-        delete p.left;
-        p.right = "0";
-        p.width = rw + "px";
-        var tr = crdiv(p);
-        delete p.top;
-        p.bottom = "0";
-        p.height = bh + "px";
-        var br = crdiv(p);
-        delete p.right;
-        p.left = "0";
-        p.width = lw + "px";
-        var bl = crdiv(p);
-
-        var tw = crdiv({ position:"absolute", width:"100%", height:th + "px", ie_fontSize:"1px",
-            top:"0", left:"0", overflow:"hidden" });
-        var t = crdiv({ position:"relative", height:th + "px", ie_fontSize:"1px", marginLeft:lw + "px",
-            marginRight:rw + "px", overflow:"hidden" });
-        tw.appendChild(t);
-
-        var bw = crdiv({ position:"absolute", left:"0", bottom:"0", width:"100%", height:bh + "px",
-            ie_fontSize:"1px", overflow:"hidden" });
-
-        var b = crdiv({ position:"relative", height:bh + "px", ie_fontSize:"1px", marginLeft:lw + "px",
-            marginRight:rw + "px", overflow:"hidden" });
-
-        bw.appendChild(b);
-
-        var mw = crdiv({ position:"absolute", top:(-bh) + "px", left:"0", width:"100%", height:"100%",
-            overflow:"hidden", ie_fontSize:"1px" });
-
-        function corner(el, t, l) {
-            var w = l ? lw : rw;
-            var h = t ? th : bh;
-            var s = t ? cs : -cs;
-            var dsb = [];
-            var dsi = [];
-            var dss = [];
-
-            var xp = 0;
-            var xd = 1;
-            if (l) {
-                xp = w - 1;
-                xd = -1;
-            }
-            for (var x = 0; x < w; ++x) {
-                var yp = 0;
-                var yd = 1;
-                if (t) {
-                    yp = h - 1;
-                    yd = -1;
-                }
-                for (var y = 0; y < h; ++y) {
-                    var div = '<div style="position:absolute; top:' + yp + 'px; left:' + xp + 'px; ' +
-                              'width:1px; height:1px; overflow:hidden;';
-
-                    var xc = x - cx;
-                    var yc = y - cy - s;
-                    var d = Math.sqrt(xc * xc + yc * yc);
-                    var doShadow = false;
-
-                    if (r > 0) {
-                        // draw border
-                        if (xc < 0 && yc < bor && yc >= r || yc < 0 && xc < bor && xc >= r) {
-                            dsb.push(div + '" class="' + bclass + '"></div>');
-                        } else
-                            if (d < bor && d >= r - 1 && xc >= 0 && yc >= 0) {
-                                var dd = div;
-                                if (d >= bor - 1) {
-                                    dd += op(bor - d);
-                                    doShadow = true;
-                                }
-                                dsb.push(dd + '" class="' + bclass + '"></div>');
-                            }
-
-                            // draw inner
-                        var dd = div + ' z-index:2;';
-                        if (xc < 0 && yc < r || yc < 0 && xc < r) {
-                            dsi.push(dd + '" class="' + iclass + '"></div>');
-                        } else
-                            if (d < r && xc >= 0 && yc >= 0) {
-                                if (d >= r - 1) {
-                                    dd += op(r - d);
-                                    doShadow = true;
-                                }
-                                dsi.push(dd + '" class="' + iclass + '"></div>');
-                            } else doShadow = true;
-                    } else doShadow = true;
-
-                    // draw shadow
-                    if (sr > 0 && doShadow) {
-                        d = Math.sqrt(x * x + y * y);
-                        if (d < sr) {
-                            dss.push(div + ' z-index:0; ' + op(1 - (d / sr)) + '" class="' + sclass + '"></div>');
-                        }
-                    }
-                    yp += yd;
-                }
-                xp += xd;
-            }
-            el.innerHTML = dss.concat(dsb.concat(dsi)).join('');
-        }
-
-        function mid(mw) {
-            var ds = [];
-
-            ds.push('<div style="position:relative; top:' + (th + bh) + 'px;' +
-                    ' height:10000px; margin-left:' + (lw - r - cx) + 'px;' +
-                    ' margin-right:' + (rw - r - cx) + 'px; overflow:hidden;"' +
-                    ' class="' + iclass + '"></div>');
-
-            var dd = '<div style="position:absolute; width:1px;' +
-                     ' top:' + (th + bh) + 'px; height:10000px;';
-            for (var x = 0; x < lw - r - cx; ++x) {
-                ds.push(dd + ' left:' + x + 'px;' + op((x + 1.0) / lw) +
-                        '" class="' + sclass + '"></div>');
-            }
-
-            for (var x = 0; x < rw - r - cx; ++x) {
-                ds.push(dd + ' right:' + x + 'px;' + op((x + 1.0) / rw) +
-                        '" class="' + sclass + '"></div>');
-            }
-
-            if (bow > 0) {
-                var su = ' width:' + bow + 'px;' + '" class="' + bclass + '"></div>';
-                ds.push(dd + ' left:' + (lw - bor - cx) + 'px;' + su);
-                ds.push(dd + ' right:' + (rw - bor - cx) + 'px;' + su);
-            }
-
-            mw.innerHTML = ds.join('');
-        }
-
-        function tb(el, t) {
-            var ds = [];
-            var h = t ? th : bh;
-            var dd = '<div style="height:1px; overflow:hidden; position:absolute;' +
-                     ' width:100%; left:0px; ';
-            var s = t ? cs : -cs;
-            for (var y = 0; y < h - s - cy - r; ++y) {
-                ds.push(dd + (t ? 'top:' : 'bottom:') + y + 'px;' + op((y + 1) * 1.0 / h) +
-                        '" class="' + sclass + '"></div>');
-            }
-            if (y >= bow) {
-                ds.push(dd + (t ? 'top:' : 'bottom:') + (y - bow) + 'px;' +
-                        ' height:' + bow + 'px;" class="' + bclass + '"></div>');
-            }
-
-            ds.push(dd + (t ? 'top:' : 'bottom:') + y + 'px;' +
-                    ' height:' + (r + cy + s) + 'px;" class="' + iclass + '"></div>');
-
-            el.innerHTML = ds.join('');
-        }
-
-        corner(tl, true, true);
-        corner(tr, true, false);
-        corner(bl, false, true);
-        corner(br, false, false);
-        mid(mw);
-        tb(t, true);
-        tb(b, false);
-
-        return {
-            render: function(el) {
-                if (typeof el == 'string') el = document.getElementById(el);
-                if (el.length != undefined) {
-                    for (var i = 0; i < el.length; ++i) this.render(el[i]);
-                    return;
-                }
-                // remove generated children
-                var node = el.firstChild;
-                while (node) {
-                    var nextNode = node.nextSibling;
-                    if (node.nodeType == 1 && node.className == 'sb-gen')
-                        el.removeChild(node);
-                    node = nextNode;
-                }
-
-                var iel = el.firstChild;
-
-                var twc = tw.cloneNode(true);
-                var mwc = mw.cloneNode(true);
-                var bwc = bw.cloneNode(true);
-
-                el.insertBefore(tl.cloneNode(true), iel);
-                el.insertBefore(tr.cloneNode(true), iel);
-                el.insertBefore(bl.cloneNode(true), iel);
-                el.insertBefore(br.cloneNode(true), iel);
-                el.insertBefore(twc, iel);
-                el.insertBefore(mwc, iel);
-                el.insertBefore(bwc, iel);
-
-                if (isie) {
-                    function resize() {
-                        twc.style.width = bwc.style.width = mwc.style.width = el.offsetWidth + "px";
-                        mwc.firstChild.style.height = el.offsetHeight + "px";
-                    }
-                    el.onresize = resize;
-                    resize();
-                }
-            }
-        };
-    }
-};
-
-// add our styles to the document
-document.write(
-        '<style type="text/css">' +
-        '.sb, .sbi, .sb *, .sbi * { position:relative;}' +
-        '* html .sb, * html .sbi { height:1%; }' +
-        '.sbi { display:inline-block; }' +
-        '.sb-inner { background:#ddd; }' +
-        '.sb-shadow { background:#000; }' +
-        '.sb-border { background:#bbb; }' +
-        '</style>'
-        );
--- a/wise-webapp/src/main/webapp/jsp/formDialogTemplate.jsp
+++ b/wise-webapp/src/main/webapp/jsp/formDialogTemplate.jsp
@ -6,20 +6,6 @@
 <tiles:importAttribute name="details" scope="page"/>

 <div class="modalDialog">
-
    <!--  Header can be customized -->
-
-    <c:if test="${(not empty pageScope.title)}">
-        <h1>
-            <spring:message code="${pageScope.title}"/>
-        </h1>
-
-        <c:if test="${(not empty pageScope.details)}">
-            <h2>
-                <spring:message code="${pageScope.details}"/>
-            </h2>
-        </c:if>
-    </c:if>
-
    <tiles:insert name="body"/>
 </div>
--- a/wise-webapp/src/main/webapp/jsp/mindmapCollaborator.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapCollaborator.jsp
@ -53,7 +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-primary"/>
+                   class="btn-secondary"/>
        </div>

        <div id="currentUsers">
--- a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp
@ -25,7 +25,9 @@
    <script type='text/javascript' src='../js/libraries/mootools/mootools-more-1.3.2.1-yui.js'></script>

    <script type="text/javascript" src="../dwr/engine.js"></script>
+    <script type="text/javascript" src="../dwr/interface/MapEditorService.js"></script>
    <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>
@ -141,9 +143,15 @@
            <div id="save" class="buttonOn" title="Save">
                <img src="../nicons/save.png"/>
            </div>
-            <div id="discart" class="buttonOn" title="Discart">
+            <div id="discart" class="buttonOn" title="Discard">
                <img src="../nicons/discart.png"/>
            </div>
+            <div id="print" class="buttonOn" title="Print">
+                <img src="../nicons/print.png"/>
+            </div>
+            <div id="export" class="buttonOn" title="Export">
+                <img src="../nicons/export.png"/>
+            </div>
        </div>
        <div id="edit" class="buttonContainer">
            <div id="undoEdition" class="buttonOn" title="Undo Edition">
--- a/wise-webapp/src/main/webapp/jsp/mindmapExport.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapExport.jsp
@ -64,7 +64,7 @@
                <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-primary"
+                        <input type="button" value="<spring:message code="CANCEL"/>" class="btn-secondary"
                               onclick="MOOdalBox.close();">
                    </td>
                </tr>
--- a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp
@ -18,8 +18,8 @@
    <script type="text/javascript" src="${pageContext.request.contextPath}/js/wiseListLibrary.js"></script>
    <!--[if lt IE 9]>
    <link rel="stylesheet" type="text/css" href="../css/mymapsOldIE.css"/>
-    <script type="text/javascript" src="${pageContext.request.contextPath}/js/shadedborder.js"></script>    
-    <script type="text/javascript" src="${pageContext.request.contextPath}/js/transcorners.js"></script>    
+    <script type="text/javascript" src="${pageContext.request.contextPath}/js/shadedborder.js"></script>
+    <script type="text/javascript" src="${pageContext.request.contextPath}/js/transcorners.js"></script>
    <script type="text/javascript">
        window.onload = function() {
            var boxGenerator = RUZEE.ShadedBorder.create({ corner:16,  border:1 });
@ -363,7 +363,7 @@
    function openWizard(href, title, rel)
    {
        href = href + $('selectedMapIds').value;
-        MOOdalBox.open(href, title, rel);
+//        MOOdalBox.open(href, title, rel);
    }

    function addToSelectedMapList(el)
@ -450,8 +450,6 @@
 </script>
 <script type="text/javascript">

-    MOOdalBox.reloadRequered = true;
-
    function removeCollaborator(collaboratorEmail)
    {
        document.removeCollaboratorForm.colaboratorId.value = collaboratorEmail;
--- a/wise-webapp/src/main/webapp/jsp/mindmapTags.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapTags.jsp
@ -11,10 +11,7 @@
        <table>
            <tbody>
            <tr>
-                <td class="formLabel">
-                    <spring:message code="TAGS"/>
-                    :
-                </td>
+                <td class="formLabel"> &nbsp;</td>
                <td>
                    <form:input path="mindmapTags" id="mindmapTags" tabindex="0"/>
                    <form:errors path="mindmapTags" cssClass="errorMsg"/>
--- a/wise-webapp/src/main/webapp/jsp/newMap.jsp
+++ b/wise-webapp/src/main/webapp/jsp/newMap.jsp
@ -34,11 +34,11 @@
                    <input type="submit" value="<spring:message code="SUBMIT"/>" class="btn-primary">
                    <c:choose>
                    <c:when test="${!errorView}">
-                    <input type="button" value="<spring:message code="CANCEL"/>" class="btn-primary"
+                    <input type="button" value="<spring:message code="CANCEL"/>" class="btn-secondary"
                           onclick="MOOdalBox.close();">
                    </c:when>
                     <c:otherwise>
-                    <input type="button" value="<spring:message code="BACK"/>" class="btn-primary"
+                    <input type="button" value="<spring:message code="BACK"/>" class="btn-secondary"
                           onclick="window.location='mymaps.htm'">
                    </c:otherwise>
                    </c:choose>
--- a/wise-webapp/src/main/webapp/jsp/template.jsp
+++ b/wise-webapp/src/main/webapp/jsp/template.jsp
@ -1,5 +1,5 @@
 <!DOCTYPE HTML>
-<%@page pageEncoding="UTF-8"%>
+<%@page pageEncoding="UTF-8" %>
 <%@ taglib prefix="tiles" uri="http://struts.apache.org/tags-tiles" %>
 <%@ include file="/jsp/init.jsp" %>

@ -24,13 +24,10 @@
    <link rel="icon" href="${pageContext.request.contextPath}/images/favicon.ico" type="image/x-icon"/>
    <link rel="shortcut icon" href="${pageContext.request.contextPath}/images/favicon.ico" type="image/x-icon"/>
    <script type="text/javascript" src="${pageContext.request.contextPath}/js/wiseLibrary.js"></script>
-    <!--[if lt IE 9]>
-    <link rel="stylesheet" type="text/css" href="../css/wisehomeOldIE.css"/>
-    <script type="text/javascript" src="${pageContext.request.contextPath}/js/shadedborder.js"></script>
-    <script type="text/javascript">
-        var isOldIE = true;
-    </script>
-    <![endif]-->
+    <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>
+
 </head>
 <body>

--- a/wise-webapp/src/main/webapp/nicons/shape-line.png
+++ b/wise-webapp/src/main/webapp/nicons/shape-line.png