diff --git a/config/database/hsql/apopulate-schemas.sql b/config/database/hsql/apopulate-schemas.sql index d1cd5912..0d4e071f 100644 --- a/config/database/hsql/apopulate-schemas.sql +++ b/config/database/hsql/apopulate-schemas.sql @@ -30,7 +30,7 @@ INSERT INTO COLLABORATION (id, colaborator_id, properties_id, mindmap_id, role_i INSERT INTO COLLABORATION_PROPERTIES (id, starred, mindmap_properties) VALUES (2, 1, '{zoom:0.8}'); INSERT INTO COLLABORATION (id, colaborator_id, properties_id, mindmap_id, role_id) VALUES (2, 2, 2, 1, 1); -INSERT INTO LABEL (id, title, creator_id, parent_label_id, color) VALUES (1, 'test label', 1, NULL, '#ff0000'); +INSERT INTO LABEL (id, title, creator_id, parent_label_id, color, iconName) VALUES (1, 'test label', 1, NULL, '#ff0000', 'glyphicon glyphicon-tag'); INSERT INTO R_LABEL_MINDMAP (label_id, mindmap_id) VALUES (1,1); INSERT INTO MINDMAP (id, title, xml, description, public, creation_date, edition_date, creator_id, tags, last_editor_id) @@ -38,9 +38,9 @@ INSERT INTO MINDMAP (id, title, xml, description, public, creation_date, edition INSERT INTO COLLABORATION_PROPERTIES (id, starred, mindmap_properties) VALUES (3, 1, '{zoom:0.8}'); INSERT INTO COLLABORATION (id, colaborator_id, properties_id, mindmap_id, role_id) VALUES (3, 2, 3, 2, 0); -INSERT INTO LABEL (id, title, creator_id, parent_label_id, color) VALUES (2, 'admin label', 2, NULL, '#0000ff'); +INSERT INTO LABEL (id, title, creator_id, parent_label_id, color, iconName) VALUES (2, 'admin label', 2, NULL, '#0000ff', 'glyphicon glyphicon-star'); INSERT INTO R_LABEL_MINDMAP (label_id, mindmap_id) VALUES (2,2); -INSERT INTO LABEL (id, title, creator_id, parent_label_id, color) VALUES (3, 'mindmap shared', 2, NULL, '#00ff00'); +INSERT INTO LABEL (id, title, creator_id, parent_label_id, color, iconName) VALUES (3, 'mindmap shared', 2, NULL, '#00ff00', 'glyphicon glyphicon-share'); INSERT INTO R_LABEL_MINDMAP (label_id, mindmap_id) VALUES (3,1); COMMIT; diff --git a/config/database/hsql/create-schemas.sql b/config/database/hsql/create-schemas.sql index ca5ec213..30a919bb 100644 --- a/config/database/hsql/create-schemas.sql +++ b/config/database/hsql/create-schemas.sql @@ -37,7 +37,8 @@ CREATE TABLE LABEL ( title VARCHAR(30), creator_id INTEGER NOT NULL, parent_label_id INTEGER, - color VARCHAR(7) NOT NULL + color VARCHAR(7) NOT NULL, + iconName VARCHAR(50) NOT NULL --FOREIGN KEY (creator_id) REFERENCES USER (colaborator_id) ); diff --git a/config/database/mysql/apopulate-schemas.sql b/config/database/mysql/apopulate-schemas.sql index aee90b96..8db7865a 100644 --- a/config/database/mysql/apopulate-schemas.sql +++ b/config/database/mysql/apopulate-schemas.sql @@ -34,7 +34,7 @@ INSERT INTO COLLABORATION (id, colaborator_id, properties_id, mindmap_id, role_i INSERT INTO COLLABORATION_PROPERTIES (id, starred, mindmap_properties) VALUES (2, 1, '{zoom:0.8}'); INSERT INTO COLLABORATION (id, colaborator_id, properties_id, mindmap_id, role_id) VALUES (2, 2, 2, 1, 1); -INSERT INTO LABEL (id, title, creator_id, parent_label_id, color) VALUES (1, 'test label', 1, NULL, '#ff0000'); +INSERT INTO LABEL (id, title, creator_id, parent_label_id, color, iconName) VALUES (1, 'test label', 1, NULL, '#ff0000', 'glyphicon glyphicon-tag'); INSERT INTO R_LABEL_MINDMAP (label_id, mindmap_id) VALUES (1,1); INSERT INTO MINDMAP (id, title, xml, description, public, creation_date, edition_date, creator_id, tags, last_editor_id) @@ -42,9 +42,9 @@ INSERT INTO MINDMAP (id, title, xml, description, public, creation_date, edition INSERT INTO COLLABORATION_PROPERTIES (id, starred, mindmap_properties) VALUES (3, 1, '{zoom:0.8}'); INSERT INTO COLLABORATION (id, colaborator_id, properties_id, mindmap_id, role_id) VALUES (3, 2, 3, 2, 0); -INSERT INTO LABEL (id, title, creator_id, parent_label_id, color) VALUES (2, 'admin label', 2, NULL, '#0000ff'); +INSERT INTO LABEL (id, title, creator_id, parent_label_id, color, iconName) VALUES (2, 'admin label', 2, NULL, '#0000ff', 'glyphicon glyphicon-star'); INSERT INTO R_LABEL_MINDMAP (label_id, mindmap_id) VALUES (2,2); -INSERT INTO LABEL (id, title, creator_id, parent_label_id, color) VALUES (3, 'mindmap shared', 2, NULL, '#00ff00'); +INSERT INTO LABEL (id, title, creator_id, parent_label_id, color, iconName) VALUES (3, 'mindmap shared', 2, NULL, '#00ff00', 'glyphicon glyphicon-share'); INSERT INTO R_LABEL_MINDMAP (label_id, mindmap_id) VALUES (3,1); COMMIT; diff --git a/config/database/mysql/create-schemas.sql b/config/database/mysql/create-schemas.sql index bf12dbf1..eba00226 100644 --- a/config/database/mysql/create-schemas.sql +++ b/config/database/mysql/create-schemas.sql @@ -58,6 +58,7 @@ CREATE TABLE LABEL ( creator_id INTEGER NOT NULL, parent_label_id INTEGER, color VARCHAR(7) NOT NULL, + iconName VARCHAR(50) NOT NULL, FOREIGN KEY (creator_id) REFERENCES USER (colaborator_id), FOREIGN KEY (parent_label_id) REFERENCES LABEL (id) ON DELETE CASCADE diff --git a/wise-webapp/src/main/java/com/wisemapping/model/Label.java b/wise-webapp/src/main/java/com/wisemapping/model/Label.java index ca8dad6b..a2319771 100644 --- a/wise-webapp/src/main/java/com/wisemapping/model/Label.java +++ b/wise-webapp/src/main/java/com/wisemapping/model/Label.java @@ -12,6 +12,7 @@ public class Label { @NotNull private User creator; @Nullable private Label parent; @NotNull private String color; + @NotNull private String iconName; public void setParent(@Nullable Label parent) { this.parent = parent; @@ -57,6 +58,15 @@ public class Label { this.color = color; } + @NotNull + public String getIconName() { + return iconName; + } + + public void setIconName(@NotNull String iconName) { + this.iconName = iconName; + } + @Override public boolean equals(Object o) { if (this == o) return true; @@ -76,4 +86,5 @@ public class Label { result = 31 * result + (parent != null ? parent.hashCode() : 0); return result; } + } diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestLabel.java b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestLabel.java index 65bc29bb..14fc8512 100644 --- a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestLabel.java +++ b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestLabel.java @@ -65,10 +65,18 @@ public class RestLabel { label.setColor(color); } + public void setIconName(@NotNull final String iconName) { + label.setIconName(iconName); + } + @Nullable public String getColor() { return label.getColor(); } + @Nullable public String getIconName() { + return label.getIconName(); + } + @JsonIgnore public Label getDelegated() { return label; diff --git a/wise-webapp/src/main/java/com/wisemapping/validator/LabelValidator.java b/wise-webapp/src/main/java/com/wisemapping/validator/LabelValidator.java index f7f0083f..bd5e2035 100644 --- a/wise-webapp/src/main/java/com/wisemapping/validator/LabelValidator.java +++ b/wise-webapp/src/main/java/com/wisemapping/validator/LabelValidator.java @@ -37,6 +37,7 @@ public class LabelValidator implements Validator { private void validateLabel(@NotNull final Label label, @NotNull final Errors errors) { ValidationUtils.rejectIfEmptyOrWhitespace(errors, "title", Messages.FIELD_REQUIRED); ValidationUtils.rejectIfEmptyOrWhitespace(errors, "color", Messages.FIELD_REQUIRED); + ValidationUtils.rejectIfEmptyOrWhitespace(errors, "iconName", Messages.FIELD_REQUIRED); final String title = label.getTitle(); ValidatorUtils.rejectIfExceeded( errors, diff --git a/wise-webapp/src/main/resources/com/wisemapping/model/Label.hbm.xml b/wise-webapp/src/main/resources/com/wisemapping/model/Label.hbm.xml index 11602ec6..046bf515 100644 --- a/wise-webapp/src/main/resources/com/wisemapping/model/Label.hbm.xml +++ b/wise-webapp/src/main/resources/com/wisemapping/model/Label.hbm.xml @@ -11,6 +11,7 @@ + diff --git a/wise-webapp/src/main/resources/messages_en.properties b/wise-webapp/src/main/resources/messages_en.properties index 91d96563..0ce64939 100644 --- a/wise-webapp/src/main/resources/messages_en.properties +++ b/wise-webapp/src/main/resources/messages_en.properties @@ -145,6 +145,7 @@ NEW=New MIND_FILE=File PARENT_LABEL=Nest label under COLOR=Color +ICON=Icon CHOOSE_LABEL=Choose a label SELECT_LABEL=Please select a label NO_SEARCH_RESULT=No mindmap available for the selected filter criteria @@ -281,6 +282,132 @@ OPEN_OFFICE_EXPORT_FORMAT_DETAILS=Get your map as OpenOffice Write Document MINDJET_EXPORT_FORMAT=(BETA) MindJet 8.x MINDJET_EXPORT_FORMAT_DETAILS=Export your maps in MindJet 8.x format MINDMAP_IS_LOCKED=Mindmap is locked for edition. +# icons.. +ASTERISK=Asterisk +PLUS=Plus +EURO=Euro +MINUS=Minus +CLOUD=Cloud +ENVELOPE=Envelope +PENCIL=Pencil +CLASS=Glass +MUSIC=Music +HEART=Heart +STAR=Star +STAR-EMPTY=Empty Star +USER=User +FILM=Film +OK=Ok +REMOVE=Remove +SIGNAL=Signal +COG=Cog +TRASH=Trash +FILE=File +TIME=Time +DOWNLOAD-ALT=Download +DOWNLOAD=Download +UPLOAD=Upload +INBOX=Inbox +REPEAT=Repeat +REFRESH=Refresh +LIST-ALT=List +LOCK=Lock +FLAG=Flag +HEADPHONES=Headphones +GRCODE=GR Code +BARCODE=Barcode +TAG=Tag +TAGS=Tags +BOOK=Book +BOOKMARK=Bookmark +PRING=Print +CAMERA=Camera +LIST=List +FACETIME-VIDEO=Facetime Video +PICTURE=Picture +MAP-MARKER=Map Maker +ADJUST=Adjust +TINT=Tint +EDIT=Edit +CHECK=Check +CHEVRON-LEFT=Chevron Left +CHEVRON-RIGHT=Chevron Right +PLUS-SIGN=Plus Sign +MINUS-SIGN=Minus Sign +REMOVE-SIGN=Remove Sign +OK-SIGN=Ok Sign +QUESTION-SIGN=Question Sign +INFO-SIGN=Info Sign +SCREENSHOT=Screenshot +REMOVE-CIRCLE=Remove Circle +OK-CIRCLE=Ok Circle +BAN-CIRCLE=Ban Circle +ARROW-LEFT=Arrow Left +ARROW-RIGHT=Arrow Right +ARROW-UP=Arrow Up +ARROW-DOWN=Arrow Down +SHARE-ALT=Share +EXCLAMATION-SIGN=Exclamation +GIFT=Gift +LEAF=Leaf +FIRE=Fire +EYE-OPEN=Open eye +EYE-CLOSE=Closed eye +WARNING-SIGN=Warning +PLANE=Plane +CALENDAR=Calendar +RANDOM=Random +COMMENT=Comment +MAGNET=Magnet +CHEVRON-UP=Chevrop Up +CHEVRON-DOWN=Chevron Down +SHOPPING-CART=Shopping +FOLDER-CLOSE=Closed Folder +FOLDER-OPEN=Open Folder +HDD=HDD +BULLHORN=Bullhorn +BELL=Bell +CERTIFICATE=Certificate +THUMBS-UP=Thumbs up +THUMBS-DOWN=Thumbs down +HAND-RIGHT=Hand right +HAND-LEFT=Hand left +HAND-UP=Hang up +HAND-DOWN=Hang down +CIRCLE-ARROW-RIGHT=Circle right +CIRCLE-ARROW-LEFT=Circle left +CIRCLE-ARROW-UP=Circle up +CIRCLE-ARROW-DOWN=Circle down +GLOBE=Globe +WRENCH=Wrench +TASKS=Tasks +FILTER=Filter +BRIEFCASE=Briefcase +PAPERCLIP=Paperclip +HEART-EMPTY=Empty Heart +LINK=Link +PHONE=Phone +PUSHPIN=Pushpin +USD=USD +GBP=GBP +UNCHECKED=Unchecked +FLASH=Flash +RECORD=Record +SAVED=Saved +SEND=Send +FLOPPY-DISK=Floppy Disk +TRANSFER +CUTLERY=Cutlery +HEADER=Header +COMPRESSED=Compressed +EARPHONE=Earphone +PHONE-ALT=Phone +TOWER=Tower +STATS=Stats +COPYRIGTH-MARK=Copyright +REGISTRATION-MARK=Registration Mark +CLOUD-DOWNLOAD=Cloud Download +CLOUD-UPLOAD=Cloud Updload diff --git a/wise-webapp/src/main/webapp/css/mindmapList.less b/wise-webapp/src/main/webapp/css/mindmapList.less index 51678c8b..02d4c859 100644 --- a/wise-webapp/src/main/webapp/css/mindmapList.less +++ b/wise-webapp/src/main/webapp/css/mindmapList.less @@ -352,8 +352,50 @@ abbr[title] { padding:0px; margin:0px; } + #footerContainer > li.active { padding:0px; margin:0px; } +#foldersContainer > ul > li > a { + padding: 8px 15px; + white-space: nowrap; +} + +/* ----------------------------- Icons ----------------------------------- */ + +#defaultIcon { + background: #eee; + border: 1px solid #ccc !important; +} + +#defaultIcon:hover { + background-color: #C8C8C8; +} + +.colorInput:hover { + background-color: #C8C8C8; +} + +.bs-glyphicons > ul { + padding-left: 10px; + overflow-x: hidden; +} + +.bs-glyphicons > ul > li { + float: left; + width: 12%; + height: 20%; + padding: 10px; + font-size: 10px; + line-height: 1.4; + text-align: center; + border: 1px solid #fff; + background-color: #f9f9f9; + cursor: pointer; +} + +.bs-glyphicons > ul > li:hover { + background-color: #C8C8C8; +} \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/js/mindmapList.js b/wise-webapp/src/main/webapp/js/mindmapList.js index 4404e1d7..fc2fa0f3 100644 --- a/wise-webapp/src/main/webapp/js/mindmapList.js +++ b/wise-webapp/src/main/webapp/js/mindmapList.js @@ -66,7 +66,6 @@ jQuery.fn.dataTableExt.removeSelectedRows = function () { updateStatusToolbar(); }; - jQuery.fn.dialogForm = function (options) { var containerId = this[0].id; @@ -78,7 +77,8 @@ jQuery.fn.dialogForm = function (options) { // Clear form values ... if (options.clearForm == undefined || options.clearForm) { - $("#" + containerId).find('input[name!="color"]').val(''); + //FIXME: icon and color should be handled as exceptions.. + $("#" + containerId).find('input[name!="color"]input[name!="iconName"]').val(''); } // Clear button "Saving..." state ... @@ -177,7 +177,6 @@ jQuery.fn.dialogForm = function (options) { }; - // Update toolbar events ... function updateStatusToolbar() { @@ -301,10 +300,15 @@ $(function () { postUpdate: function(data, id) { createLabelItem(data, id); if (mapIds.length > 0) { - linkLabelToMindmap(mapIds, {id: id, title: data.title, color: data.color}); + linkLabelToMindmap(mapIds, {id: id, title: data.title, color: data.color, icon: data.icon}); } } }); + // Setting sizes to label icon list + var dropDownHeight = $(window).height()/3; + $("#labelIconItems ul").height(dropDownHeight); + var dropDownWidth = $(window).width()/3; + $("#labelIconItems ul").width(dropDownWidth); } ); @@ -531,7 +535,28 @@ $(function () { $("#foldersContainer ul").css('overflow-x', 'hidden'); $("#foldersContainer ul").height(maxHeight); - }) + }); + + //init popovers... + var icons = $(".bs-glyphicons-list li"); + icons.each(function() { + $(this).popover({ + animation: true, + placement: "auto", + trigger: 'hover', + //FIXME: Which is the best way to use messages.properties here? + content: ($(this).attr('class').replace('glyphicon glyphicon-','')) + }) + }); + + icons.on("click", function(){ + var defaultIcon = $("#defaultIcon"); + //remove current icon + defaultIcon.find("i").remove(); + var myClass = $(this).attr("class"); + defaultIcon.prepend(""); + defaultIcon.closest("#iconGroup").find('input').val(myClass); + }); }); /*--------------------------------------------- Label actions --------------------------------------------------**/ @@ -540,7 +565,7 @@ function createLabelItem(data, id) { var labelItem = $("
  • "); labelItem.append( " " + - "" + + "" + "
    " + "
    " + data.title + "
    " + "" + @@ -611,9 +636,10 @@ function prepareLabelList(labels) { //append items to dropdown $.each(labels, function(index, value) { labelList.append( - $('
  • ').attr('value', value.id).attr('color', value.color) + $('
  • ').attr('value', value.id).attr('color', value.color).attr('icon', value.icon) .append( '
    ' + + "
    " + "
    " + "
    " + value.title + "
    " + '
    ') diff --git a/wise-webapp/src/main/webapp/jsp/labelIconList.jsp b/wise-webapp/src/main/webapp/jsp/labelIconList.jsp new file mode 100644 index 00000000..83a3f789 --- /dev/null +++ b/wise-webapp/src/main/webapp/jsp/labelIconList.jsp @@ -0,0 +1,132 @@ +<%@page pageEncoding="UTF-8" %> + +
      +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • + +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • + +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • + +
    • +
    • +
    • +
    \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp index bceaafa0..bba4cbaf 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp @@ -122,6 +122,12 @@ }); }); + + @@ -338,10 +344,23 @@
    - +
    +
    + + +
    + + + +
    +
    diff --git a/wise-webapp/src/test/java/com/wisemapping/test/rest/RestLabelITCase.java b/wise-webapp/src/test/java/com/wisemapping/test/rest/RestLabelITCase.java index 00d7ffcc..8e38f746 100644 --- a/wise-webapp/src/test/java/com/wisemapping/test/rest/RestLabelITCase.java +++ b/wise-webapp/src/test/java/com/wisemapping/test/rest/RestLabelITCase.java @@ -30,6 +30,7 @@ public class RestLabelITCase { private String userEmail; private static final String COLOR = "#000000"; + private static final String ICON = "glyphicon glyphicon-tag"; @BeforeClass void createUser() { @@ -45,11 +46,11 @@ public class RestLabelITCase { // Create a new label final String title1 = "Label 1 - " + mediaType.toString(); - addNewLabel(requestHeaders, template, title1, COLOR); + addNewLabel(requestHeaders, template, title1, COLOR, ICON); // Create a new label final String title2 = "Label 2 - " + mediaType.toString(); - addNewLabel(requestHeaders, template, title2, COLOR); + addNewLabel(requestHeaders, template, title2, COLOR, ICON); // Check that the label has been created ... final RestLabelList restLabelList = getLabels(requestHeaders, template); @@ -83,7 +84,7 @@ public class RestLabelITCase { final RestTemplate template = RestHelper.createTemplate( userEmail + ":" + "admin"); try { - addNewLabel(requestHeaders, template, null, COLOR); + addNewLabel(requestHeaders, template, null, COLOR, ICON); fail("Wrong response"); } catch (HttpClientErrorException e) { final String responseBodyAsString = e.getResponseBodyAsString(); @@ -91,12 +92,21 @@ public class RestLabelITCase { } try { - addNewLabel(requestHeaders, template, "title12345", null); + addNewLabel(requestHeaders, template, "title12345", null, ICON); fail("Wrong response"); } catch (HttpClientErrorException e) { final String responseBodyAsString = e.getResponseBodyAsString(); assert (responseBodyAsString.contains("Required field cannot be left blank")); } + + try { + addNewLabel(requestHeaders, template, "title12345", COLOR, null); + fail("Wrong response"); + } catch (HttpClientErrorException e) { + final String responseBodyAsString = e.getResponseBodyAsString(); + assert (responseBodyAsString.contains("Required field cannot be left blank")); + } + } @Test(dataProviderClass = RestHelper.class, dataProvider="ContentType-Provider-Function") @@ -105,7 +115,7 @@ public class RestLabelITCase { final RestTemplate template = RestHelper.createTemplate( userEmail + ":" + "admin"); final String title = "title to delete"; - final URI resourceUri = addNewLabel(requestHeaders, template, title, COLOR); + final URI resourceUri = addNewLabel(requestHeaders, template, title, COLOR, ICON); // Now remove it ... template.delete(RestHelper.HOST_PORT + resourceUri.toString()); @@ -119,7 +129,7 @@ public class RestLabelITCase { } - static URI addNewLabel(@NotNull HttpHeaders requestHeaders, @NotNull RestTemplate template, @Nullable String title, @Nullable String color ) throws IOException, WiseMappingException { + static URI addNewLabel(@NotNull HttpHeaders requestHeaders, @NotNull RestTemplate template, @Nullable String title, @Nullable String color, @Nullable String icon) throws IOException, WiseMappingException { final RestLabel restLabel = new RestLabel(); if (title != null) { restLabel.setTitle(title); @@ -127,6 +137,9 @@ public class RestLabelITCase { if (color != null) { restLabel.setColor(color); } + if (icon != null) { + restLabel.setIconName(icon); + } // Create a new label ... HttpEntity createUserEntity = new HttpEntity(restLabel, requestHeaders); diff --git a/wise-webapp/src/test/java/com/wisemapping/test/rest/RestMindmapITCase.java b/wise-webapp/src/test/java/com/wisemapping/test/rest/RestMindmapITCase.java index b083feb2..7316dfff 100644 --- a/wise-webapp/src/test/java/com/wisemapping/test/rest/RestMindmapITCase.java +++ b/wise-webapp/src/test/java/com/wisemapping/test/rest/RestMindmapITCase.java @@ -40,6 +40,7 @@ import static org.testng.Assert.fail; public class RestMindmapITCase { private String userEmail = "admin@wisemapping.com"; + private static final String ICON = "glyphicon glyphicon-tag"; @BeforeClass void createUser() { @@ -251,7 +252,7 @@ public class RestMindmapITCase { // Create a new label final String titleLabel = "Label 1 - " + mediaType.toString(); - final URI labelUri = RestLabelITCase.addNewLabel(requestHeaders, template, titleLabel, COLOR); + final URI labelUri = RestLabelITCase.addNewLabel(requestHeaders, template, titleLabel, COLOR, ICON); // Create a sample map ... final String mapTitle = "Maps 1 - " + mediaType.toString();