mirror of
https://bitbucket.org/wisemapping/wisemapping-open-source.git
synced 2024-08-20 20:40:44 +02:00
palette with default value
This commit is contained in:
parent
baa8adacda
commit
729d2e98f7
@ -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>" +
|
||||
|
@ -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>
|
||||
|
Loading…
Reference in New Issue
Block a user