Minor fixes.

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

@@ -177,6 +177,27 @@ div#toolbar .button:hover {
     border: 1px solid black;
     border-top-color: white;
     border-left-color: white;
+    -webkit-user-select: none;
+    -khtml-user-select: none;
+    -moz-user-select: none;
+    -o-user-select: none;
+    user-select: none;
+}
+
+div#toolbar .buttonActive {
+    width: 32px;
+    height: 36px;
+    float: left;
+    margin: 0 1px;
+    cursor: pointer;
+    border: 1px solid black;
+    border-top-color: white;
+    border-left-color: white;
+    -webkit-user-select: none;
+    -khtml-user-select: none;
+    -moz-user-select: none;
+    -o-user-select: none;
+    user-select: none;
 }
 
 div#toolbar .comboButton:hover {
@@ -395,19 +416,13 @@ div#fontColor {
 
 div.toolbarPanelLink {
     cursor: pointer;
-    font-size: 14px;
     color: black;
     font-weight: bold;
     padding: 0 3px 0 4px;
     margin: 1px;
-}
-
-div.toolbarPanelLink {
     cursor: pointer;
     font-size: 12px;
     font-weight: bold;
-    padding: 0 3px 0 4px;
-    margin: 1px;
 }
 
 div.toolbarPanelLink:hover {

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

@@ -14,7 +14,6 @@
 
     <!--<script type='text/javascript' src='../js/wiseLibrary.js'></script>-->
 
-    <!--<script type='text/javascript' src='http://docs.google.com/brix/static/api/js/jsapi.nocache.js'></script>-->
     <script type='text/javascript' src='../js/mootools-core-1.3.2-full-compat.js'></script>
     <script type='text/javascript' src='../js/mootools-more-1.3.2.1-yui.js'></script>
 

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

@@ -181,68 +181,6 @@ function afterMindpotLibraryLoading() {
     $(document).addEvent('keydown', designer.keyEventHandler.bind(designer));
     $("ffoxWorkarroundInput").addEvent('keydown', designer.keyEventHandler.bind(designer));
 
-    // Register toolbar events ...
-    $('zoomIn').addEvent('click', function(event) {
-        designer.zoomIn();
-    });
-
-    $('zoomOut').addEvent('click', function(event) {
-        designer.zoomOut();
-    });
-
-    $('undoEdition').addEvent('click', function(event) {
-        designer.undo();
-    });
-
-    $('redoEdition').addEvent('click', function(event) {
-        designer.redo();
-    });
-
-    designer.addEventListener("modelUpdate", function(event) {
-        if (event.undoSteps > 0) {
-            $("undoEdition").setStyle("background-image", "url(../images/file_undo.png)");
-        } else {
-            $("undoEdition").setStyle("background-image", "url(../images/file_undo_dis.png)");
-        }
-
-        if (event.redoSteps > 0) {
-            $("redoEdition").setStyle("background-image", "url(../images/file_redo.png)");
-        } else {
-            $("redoEdition").setStyle("background-image", "url(../images/file_redo_dis.png)");
-        }
-
-    });
-
-    $('addTopic').addEvent('click', function(event) {
-        designer.createSiblingForSelectedNode();
-    });
-
-    $('deleteTopic').addEvent('click', function(event) {
-        designer.deleteCurrentNode();
-    });
-
-    $('topicLink').addEvent('click', function() {
-        designer.addLink2SelectedNode();
-
-    });
-
-    $('topicRelation').addEvent('click', function(event) {
-        designer.addRelationShip2SelectedNode(event);
-    });
-
-    $('topicNote').addEvent('click', function() {
-        designer.addNote2SelectedNode();
-
-    });
-
-    $('fontBold').addEvent('click', function() {
-        designer.setWeight2SelectedNode();
-    });
-
-    $('fontItalic').addEvent('click', function() {
-        designer.setStyle2SelectedNode();
-    });
-
     // To prevent the user from leaving the page with changes ...
     window.onbeforeunload = function () {
         if (designer.needsSave()) {
@@ -252,10 +190,12 @@ function afterMindpotLibraryLoading() {
     var menu = new mindplot.widget.Menu(designer);
 
     //  If a node has focus, focus can be move to another node using the keys.
-    designer._cleanScreen = function(){menu.clear()};
+    designer._cleanScreen = function() {
+        menu.clear()
+    };
 
 
-  // If not problem has arisen, close the dialog ...
+    // If not problem has arisen, close the dialog ...
     var closeDialog = function() {
 
         if (!window.hasUnexpectedErrors) {
@@ -283,7 +223,7 @@ function buildMindmapDesigner() {
     editorProperties.height = screenHeight;
     designer = new mindplot.MindmapDesigner(editorProperties, container);
 
-    if($wise_collaborationManager.isCollaborationFrameworkAvailable()){
+    if(mindplot.collaboration.CollaborationManager.getInstance().isCollaborationFrameworkAvailable()){
         buildCollaborativeMindmapDesigner();
     }else{
         buildStandaloneMindmapDesigner();
@@ -295,10 +235,11 @@ function buildStandaloneMindmapDesigner(){
 }
 
 function buildCollaborativeMindmapDesigner(){
-    if($wise_collaborationManager.isCollaborativeFrameworkReady()){
-        designer.loadFromCollaborativeModel($wise_collaborationManager);
+    var collaborationManager = mindplot.collaboration.CollaborationManager.getInstance();
+    if(collaborationManager.isCollaborativeFrameworkReady()){
+        designer.loadFromCollaborativeModel(collaborationManager);
     }else{
-        $wise_collaborationManager.setWiseReady(true);
+        collaborationManager.setWiseReady(true);
     }
 }