Default editor colors appear in the pallete.

Remove discard changes button.

mindplot/src/main/javascript/MainTopic.js

@@ -198,7 +198,8 @@ mindplot.MainTopic = new Class({
                 result = $msg('SUB_TOPIC');
             }
         } else {
-            result = $msg('ISOLATED_TOPIC');;
+            result = $msg('ISOLATED_TOPIC');
+            ;
         }
         return result;
     },
@@ -213,7 +214,7 @@ mindplot.MainTopic = new Class({
                     size:8,
                     style:"normal",
                     weight:"normal",
-                    color:"#525c61"
+                    color:"rgb(82,92,97)"
                 };
             } else {
                 result = {
@@ -221,7 +222,7 @@ mindplot.MainTopic = new Class({
                     size:6,
                     style:"normal",
                     weight:"normal",
-                    color:"#525c61"
+                    color:"rgb(82,92,97)"
                 };
             }
         } else {
@@ -230,18 +231,18 @@ mindplot.MainTopic = new Class({
                 size:8,
                 style:"normal",
                 weight:"normal",
-                color:"#525c61"
+                color:"rgb(82,92,97)"
             };
         }
         return result;
     },
 
     _defaultBackgroundColor:function () {
-        return "#E0E5EF";
+        return "rgb(224,229,239)";
     },
 
     _defaultBorderColor:function () {
-        return '#023BB9';
+        return 'rgb(2,59,185)';
     }
 
 });

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

@@ -89,7 +89,13 @@ mindplot.widget.ColorPalettePanel = new Class({
         var modelValue = model.getValue();
         colorCells.each(function (elem) {
             var color = elem.getStyle("background-color");
-            if (modelValue == color) {
+            if (modelValue != null && modelValue[0] == 'r') {
+                modelValue = modelValue.rgbToHex();
+            }
+            console.log("modelValue:" + modelValue);
+            console.log("color:" + color);
+
+            if (modelValue != null && modelValue.toUpperCase() == color.toUpperCase()) {
                 elem.parentNode.className = 'palette-cell palette-cell-selected';
             }
         });

mindplot/src/main/javascript/widget/colorPalette.html

@@ -1,6 +1,7 @@
 <div id="color-palette" class="palette-panel palette-panel-vertical palette-panel-noaccel"
      style="-webkit-user-select: none; left: 451px; top: 128px; visibility: visible; " role="menu" aria-haspopup="true"
      aria-activedescendant="">
+
 <div class="palette" id=":3p">
     <table class="palette-table" cellspacing="0" cellpadding="0" role="grid"
            aria-activedescendent="palette-cell-244">
@@ -46,8 +47,8 @@
             </td>
             <td class="palette-cell">
                 <div class="palette-colorswatch"
-                     style="background-color: rgb(255, 255, 255);"
+                     style="background-color: rgb(254, 255, 255);"
-                     title="RGB (255, 255, 255)"></div>
+                     title="RGB (254, 255, 255)"></div>
             </td>
         </tr>
         </tbody>
@@ -395,4 +396,55 @@
 </tbody>
 </table>
 </div>
+
+<div class="palette" id=":2p">
+    <table class="palette-table" cellspacing="0" cellpadding="0" role="grid"
+           aria-activedescendent="palette-cell-244">
+        <tbody class="palette-body">
+        <tr class="palette-row">
+            <td class="palette-cell">
+                <div class="palette-colorswatch"
+                     style="background-color: rgb(255, 255, 255);"
+                     title="RGB (255, 255, 255)"></div>
+            </td>
+            <td class="palette-cell">
+                <div class="palette-colorswatch"
+                     style="background-color: rgb(224, 229, 239);"
+                     title="RGB (224, 229, 239)"></div>
+            </td>
+            <td class="palette-cell">
+                <div class="palette-colorswatch"
+                     style="background-color:rgb(80, 157, 192);"
+                     title="RGB (80, 157, 192)"></div>
+            </td>
+            <td class="palette-cell">
+                <div class="palette-colorswatch"
+                     style="background-color:rgb(57, 113, 177);"
+                     title="RGB (57, 113, 177)"></div>
+            </td>
+            <td class="palette-cell">
+                <div class="palette-colorswatch"
+                     style="background-color: rgb(2, 59, 185);"
+                     title="RGB (2, 59, 185)"></div>
+            </td>
+            <td class="palette-cell">
+                <div class="palette-colorswatch"
+                     style="background-color: rgb(244, 184, 45);"
+                     title="RGB (244, 184, 45)"></div>
+            </td>
+            <td class="palette-cell palette-cell-selected">
+                <div class="palette-colorswatch"
+                     style="background-color: rgb(241, 163, 39);"
+                     title="RGB (241, 163, 39)"></div>
+            </td>
+            <td class="palette-cell">
+                <div class="palette-colorswatch"
+                     style="background-color: rgb(82, 92, 97);"
+                     title="RGB (82, 92, 97)"></div>
+            </td>
+        </tr>
+        </tbody>
+    </table>
+</div>
+
 </div>

wise-webapp/src/main/webapp/jsp/mindmapEditorToolbar.jsf

@@ -6,9 +6,9 @@
             <div id="save" class="buttonOn">
                 <img src="images/save.png"/>
             </div>
-            <div id="discard" class="buttonOn">
+            <%--<div id="discard" class="buttonOn">--%>
-                <img src="images/discard.png"/>
+                <%--<img src="images/discard.png"/>--%>
-            </div>
+            <%--</div>--%>
         </c:if>
         <div id="print" class="buttonOn">
             <img src="images/print.png"/>