diff --git a/frontend-js/src/main/css/global.css b/frontend-js/src/main/css/global.css index 506b94d1cc92ac6137fd4d289f49fd9525e17d30..187ebbd45c2a5e67b2483076df4c0664439b6e8e 100644 --- a/frontend-js/src/main/css/global.css +++ b/frontend-js/src/main/css/global.css @@ -468,4 +468,9 @@ table.minerva-window-drug-table, table.minerva-window-drug-table th, margin-top: 12px; display: inline; float: left; +} + +.minerva-overlay-dialog div[style*="display: table-cell"] { + padding: 2px; + vertical-align: top; } \ No newline at end of file diff --git a/frontend-js/src/main/js/gui/Panel.js b/frontend-js/src/main/js/gui/Panel.js index 4bd37916f1119fdfd107e9a597202349cdd333cf..d4c85402ef7ad3016073ef23f540018e21145813 100644 --- a/frontend-js/src/main/js/gui/Panel.js +++ b/frontend-js/src/main/js/gui/Panel.js @@ -186,6 +186,10 @@ Panel.prototype.assignDialogOptions = function(div, params) { dialog.dialog('option', 'modal', params[key]); } else if (key === "buttons") { dialog.dialog('option', 'buttons', params[key]); + } else if (key === "className") { + dialog.dialog('option', 'dialogClass', params[key]); + } else if (key === "title") { + dialog.dialog('option', 'title', params[key]); } else { throw new Error("Unknown dialog param: " + key + " - " + params[key]); } @@ -215,7 +219,8 @@ Panel.prototype.openDialog = function(content, options) { close : function() { contentDiv.style.display = "none"; $(this).dialog('destroy'); - } + }, + dialogClass : options.className, }); this.assignDialogOptions(div, options); diff --git a/frontend-js/src/main/js/gui/leftPanel/OverlayPanel.js b/frontend-js/src/main/js/gui/leftPanel/OverlayPanel.js index 6880c24711602bbb0f30ffdfa199fcd485205cb8..750b0204fbffab3b17c7259789963e037479ce4f 100644 --- a/frontend-js/src/main/js/gui/leftPanel/OverlayPanel.js +++ b/frontend-js/src/main/js/gui/leftPanel/OverlayPanel.js @@ -208,6 +208,7 @@ OverlayPanel.prototype.createOverlayRow = function(overlay, checked) { editTd.appendChild(editButton); result.appendChild(editTd); } + result.title = overlay.getDescription(); return result; }; @@ -215,13 +216,13 @@ OverlayPanel.prototype.openEditOverlayDialog = function(overlay) { var self = this; var guiUtils = self.getGuiUtils(); var content = document.createElement("fieldset"); - content.appendChild(guiUtils.createLabel("Name")); var nameInput = guiUtils.createInputText(overlay.getName()); - content.appendChild(nameInput); + var row = guiUtils.createTableRow([ guiUtils.createLabel("Name: "), nameInput ]); + content.appendChild(row); - content.appendChild(guiUtils.createLabel("Description")); var descriptionInput = guiUtils.createTextArea(overlay.getDescription()); - content.appendChild(descriptionInput); + row = guiUtils.createTableRow([ guiUtils.createLabel("Description: "), descriptionInput ]); + content.appendChild(row); var buttons = [ { text : "SAVE", @@ -260,6 +261,8 @@ OverlayPanel.prototype.openEditOverlayDialog = function(overlay) { self.openDialog(content, { id : overlay.getId(), buttons : buttons, + title : "Data overlay: " + overlay.getName(), + className : "minerva-overlay-dialog", }); };