vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-11-22 14:17:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

palette with default value

Browse Source
This commit is contained in:
Ezequiel Bergamaschi 2014-02-02 01:35:19 -03:00 committed by Ezequiel Bergamaschi
parent baa8adacda
commit 729d2e98f7
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wise-webapp/src/main/webapp/js/labelActions.js
View File

@ -16,17 +16,15 @@ function labelTagsAsHtml(labels) {
var result = ""; var result = "";
for (var i = 0; i<labels.length; i++) { for (var i = 0; i<labels.length; i++) {
var label = labels[i]; var label = labels[i];
//FIXME: remover el hack del black cuando se fixee el modal dialog
var labelColor = label.color || "black";
result += result +=
"<table class='tableTag'>" + "<table class='tableTag'>" +
"<tbody><tr>" + "<tbody><tr>" +
"<td style='cursor: default; background-color:"+ labelColor +"'>" + "<td style='cursor: default; background-color:"+ label.color +"'>" +
"<div class='labelTag' >" + "<div class='labelTag' >" +
label.title + label.title +
'</div>' + '</div>' +
"</td>" + "</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>"+ "<span style='left: -2px;top: -1px;position: relative;font-size: 11px' title='remove'>x</span>"+
"</td>" + "</td>" +
"</tr></tbody>" + "</tr></tbody>" +

2
wise-webapp/src/main/webapp/jsp/mindmapList.jsp
View File

@ -326,7 +326,7 @@
</div> </div>
<div id="colorGroup" class="input-group"> <div id="colorGroup" class="input-group">
<label class="control-label" for="colorChooser"><spring:message code="CHOOSE_COLOR"/>:</label> <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--> <!--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> <span class="input-group-addon" style="display: inline-block; position: relative; top: 5px"><i></i></span>
</div> </div>