Skip to content
Snippets Groups Projects
Commit e3760866 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

Merge branch '195-overlay-description' into 'master'

Resolve "overlay description"

Closes #195

See merge request !102
parents bd603d43 5d0c2376
No related branches found
No related tags found
1 merge request!102Resolve "overlay description"
......@@ -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
......@@ -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);
......
......@@ -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",
});
};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment