From 729d2e98f7991cba2260a45fc5017731445069ff Mon Sep 17 00:00:00 2001
From: Ezequiel Bergamaschi <ezequielbergamaschi@gmail.com>
Date: Sun, 2 Feb 2014 01:35:19 -0300
Subject: [PATCH] palette with default value

---
 wise-webapp/src/main/webapp/js/labelActions.js  | 6 ++----
 wise-webapp/src/main/webapp/jsp/mindmapList.jsp | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/wise-webapp/src/main/webapp/js/labelActions.js b/wise-webapp/src/main/webapp/js/labelActions.js
index 0259177e..b61b4ab8 100644
--- a/wise-webapp/src/main/webapp/js/labelActions.js
+++ b/wise-webapp/src/main/webapp/js/labelActions.js
@@ -16,17 +16,15 @@ function labelTagsAsHtml(labels) {
     var result = "";
     for (var i = 0; i<labels.length; i++) {
         var label = labels[i];
-        //FIXME: remover el hack del black cuando se fixee el modal dialog
-        var labelColor = label.color || "black";
         result +=
             "<table class='tableTag'>" +
                 "<tbody><tr>" +
-                    "<td style='cursor: default; background-color:"+ labelColor +"'>" +
+                    "<td style='cursor: default; background-color:"+ label.color +"'>" +
                         "<div class='labelTag' >" +
                             label.title +
                         '</div>' +
                     "</td>" +
-                    "<td style='cursor: pointer;background-color:"+ labelColor +"'>" +
+                    "<td style='cursor: pointer;background-color:"+ label.color +"'>" +
                         "<span style='left: -2px;top: -1px;position: relative;font-size: 11px' title='remove'>x</span>"+
                     "</td>" +
                 "</tr></tbody>" +
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp
index 7f42dd60..21aec077 100644
--- a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp
@@ -326,7 +326,7 @@
                 </div>
                 <div id="colorGroup" class="input-group">
                     <label class="control-label" for="colorChooser"><spring:message code="CHOOSE_COLOR"/>:</label>
-                    <input class="form-control" name="color" id="colorChooser" type="text" style="width: 70px" required="required"/>
+                    <input class="form-control" name="color" id="colorChooser" type="text" style="width: 70px" required="required" value="#000000"/>
                     <!--hack, maybe there is a compatibility problem with bootstrap-->
                     <span class="input-group-addon" style="display: inline-block; position: relative; top: 5px"><i></i></span>
                 </div>