diff --git a/frontend-js/package-lock.json b/frontend-js/package-lock.json index 501b5abfd90c332f4ef4b3cc3f73533a8be66183..4d93672cb59c6cb0cfc9266e6438584aa455f14a 100644 --- a/frontend-js/package-lock.json +++ b/frontend-js/package-lock.json @@ -2715,11 +2715,6 @@ "integrity": "sha1-XAgV08xvkP9fqvWyaKbiO0ypBPo=", "dev": true }, - "js-cookie": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-2.2.0.tgz", - "integrity": "sha1-Gywnmm7s44ChIWi5JIUmWzWx7/s=" - }, "js-tokens": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", diff --git a/frontend-js/src/main/js/GuiConnector.js b/frontend-js/src/main/js/GuiConnector.js index 8681ba981c91018e37b13498b62495fd227db782..608ce9cf5681d04d2bd769e7de31cc612335aa9d 100644 --- a/frontend-js/src/main/js/GuiConnector.js +++ b/frontend-js/src/main/js/GuiConnector.js @@ -272,6 +272,7 @@ GuiConnector.prototype.showErrorDialog = function (title, content) { dialog.appendChild(dialogBody); $(dialog).dialog({ modal: true, + dialogClass: 'minerva-error-dialog', classes: { "ui-dialog": "ui-state-error" }, @@ -288,6 +289,7 @@ GuiConnector.prototype.showSuccessDialog = function (title, content) { dialogBody.innerHTML = content; dialog.appendChild(dialogBody); $(dialog).dialog({ + dialogClass: 'minerva-success-dialog', modal: true, close: function () { $(this).dialog('destroy').remove(); @@ -466,6 +468,7 @@ GuiConnector.prototype.info = function (message) { self._infoDialog.appendChild(self._infoDialogContent); document.body.appendChild(self._infoDialog); $(self._infoDialog).dialog({ + dialogClass: 'minerva-info-dialog', classes: { "ui-dialog": "ui-state-info" }, @@ -492,6 +495,7 @@ GuiConnector.prototype.showConfirmationDialog = function (params) { $('<div></div>').appendTo('body') .html('<div><h6>' + message + '</h6></div>') .dialog({ + dialogClass: 'minerva-confirmation-dialog', modal: true, title: title, zIndex: 10000, autoOpen: true, width: 'auto', resizable: false, buttons: { @@ -551,6 +555,7 @@ GuiConnector.prototype.warn = function (message) { self._warnDialog.appendChild(self._warnDialogContent); document.body.appendChild(self._warnDialog); $(self._warnDialog).dialog({ + dialogClass: 'minerva-warn-dialog', classes: { "ui-dialog": "ui-state-highlight" }, diff --git a/frontend-js/src/main/js/gui/AddOverlayDialog.js b/frontend-js/src/main/js/gui/AddOverlayDialog.js index 73332312249c04797f0e69c1bb928a3304293c88..5fff0a74a24f93d0e8dedc1227d98d7af8aa1459 100644 --- a/frontend-js/src/main/js/gui/AddOverlayDialog.js +++ b/frontend-js/src/main/js/gui/AddOverlayDialog.js @@ -312,6 +312,7 @@ AddOverlayDialog.prototype.open = function () { }]; $(div).dialog({ + dialogClass: 'minerva-add-overlay-dialog', title: "Add overlay", buttons: buttons, modal: true diff --git a/frontend-js/src/main/js/gui/CommentDialog.js b/frontend-js/src/main/js/gui/CommentDialog.js index de7ad0e8ec1e81b47ee84bef28bc65e6b62dbb85..454df0cd09c4badd989b083c37fbc18148c34f15 100644 --- a/frontend-js/src/main/js/gui/CommentDialog.js +++ b/frontend-js/src/main/js/gui/CommentDialog.js @@ -29,6 +29,7 @@ function CommentDialog(params) { var self = this; self._createGui(); $(self.getElement()).dialog({ + dialogClass: 'minerva-comment-dialog', title: "Add comment", autoOpen: false, resizable: false, diff --git a/frontend-js/src/main/js/gui/LoginDialog.js b/frontend-js/src/main/js/gui/LoginDialog.js index ab627c505d2de1dbcd32b86cc6932614ca040633..09d5d8621a6ef085950ace3081745858c8b0a389 100644 --- a/frontend-js/src/main/js/gui/LoginDialog.js +++ b/frontend-js/src/main/js/gui/LoginDialog.js @@ -155,6 +155,7 @@ LoginDialog.prototype.open = function () { var div = self.getElement(); if (!$(div).hasClass("ui-dialog-content")) { $(div).dialog({ + dialogClass: 'minerva-login-dialog', autoOpen: false, resizable: false }); diff --git a/frontend-js/src/main/js/gui/OverviewDialog.js b/frontend-js/src/main/js/gui/OverviewDialog.js index 40d2761929c3bf75b728a3c54add46637ec453c4..fffeb632ca151c17d323dc7b6eb9dcb3fd88e425 100644 --- a/frontend-js/src/main/js/gui/OverviewDialog.js +++ b/frontend-js/src/main/js/gui/OverviewDialog.js @@ -26,6 +26,7 @@ function OverviewDialog(params) { AbstractGuiElement.call(this, params); var self = this; $(self.getElement()).dialog({ + dialogClass: 'minerva-overview-dialog', autoOpen: false, resizable: false }); diff --git a/frontend-js/src/main/js/gui/Panel.js b/frontend-js/src/main/js/gui/Panel.js index 8f21f244472e35c939fc871f140d85d0d38628e6..17c65b590bb6ee31015a4cebeab270a120b369e7 100644 --- a/frontend-js/src/main/js/gui/Panel.js +++ b/frontend-js/src/main/js/gui/Panel.js @@ -236,7 +236,7 @@ Panel.prototype.assignDialogOptions = function (div, params) { /** * - * @param {string} content + * @param {HTMLElement} content * @param options */ Panel.prototype.openDialog = function (content, options) { diff --git a/frontend-js/src/main/js/gui/admin/AddPluginDialog.js b/frontend-js/src/main/js/gui/admin/AddPluginDialog.js index f62954c105810d1525404902ec88abffc837696d..4c122b6a8e07989bae44bbad36295de13d86c3c6 100644 --- a/frontend-js/src/main/js/gui/admin/AddPluginDialog.js +++ b/frontend-js/src/main/js/gui/admin/AddPluginDialog.js @@ -231,6 +231,7 @@ AddPluginDialog.prototype.open = function () { var div = self.getElement(); if (!$(div).hasClass("ui-dialog-content")) { $(div).dialog({ + dialogClass: 'minerva-add-plugin-dialog', title: "Add plugin", width: window.innerWidth / 2, height: window.innerHeight / 2 diff --git a/frontend-js/src/main/js/gui/admin/AddProjectDialog.js b/frontend-js/src/main/js/gui/admin/AddProjectDialog.js index 59180fe3b4fd93ae4a432af6117fea4eb4a7fc3d..f03531052d94cd67528df7d117978f1eb526f007 100644 --- a/frontend-js/src/main/js/gui/admin/AddProjectDialog.js +++ b/frontend-js/src/main/js/gui/admin/AddProjectDialog.js @@ -843,6 +843,7 @@ AddProjectDialog.prototype.open = function () { var div = self.getElement(); if (!$(div).hasClass("ui-dialog-content")) { $(div).dialog({ + dialogClass: 'minerva-add-project-dialog', title: "ADD PROJECT", width: window.innerWidth / 2, height: window.innerHeight / 2 diff --git a/frontend-js/src/main/js/gui/admin/ChooseAnnotatorsDialog.js b/frontend-js/src/main/js/gui/admin/ChooseAnnotatorsDialog.js index a43363dbea53769c08f17da97e73e7610f1071d3..a4555c1e41a679a30c51f777531609d4d968557a 100644 --- a/frontend-js/src/main/js/gui/admin/ChooseAnnotatorsDialog.js +++ b/frontend-js/src/main/js/gui/admin/ChooseAnnotatorsDialog.js @@ -385,6 +385,7 @@ ChooseAnnotatorsDialog.prototype.open = function () { var div = self.getElement(); if (!$(div).hasClass("ui-dialog-content")) { $(div).dialog({ + dialogClass: 'minerva-select-annotator-dialog', title: "Select annotators", modal: true, width: window.innerWidth / 2, diff --git a/frontend-js/src/main/js/gui/admin/ChooseValidatorsDialog.js b/frontend-js/src/main/js/gui/admin/ChooseValidatorsDialog.js index 10f77ba75aa204312d8f2b37d2e0d721a209f778..b279827a47eed8b8775c005aae8c5c68c73cc725 100644 --- a/frontend-js/src/main/js/gui/admin/ChooseValidatorsDialog.js +++ b/frontend-js/src/main/js/gui/admin/ChooseValidatorsDialog.js @@ -395,6 +395,7 @@ ChooseValidatorsDialog.prototype.open = function () { var div = self.getElement(); if (!$(div).hasClass("ui-dialog-content")) { $(div).dialog({ + dialogClass: 'minerva-select-annotations-dialog', title: "Select valid annotations", modal: true, width: window.innerWidth / 2, diff --git a/frontend-js/src/main/js/gui/admin/EditProjectDialog.js b/frontend-js/src/main/js/gui/admin/EditProjectDialog.js index 4d46be2614a1b88117bf0238cea5afd0db97ecd6..2ac3500166e2c427d702a3ee70a1c44c9f5dbac4 100644 --- a/frontend-js/src/main/js/gui/admin/EditProjectDialog.js +++ b/frontend-js/src/main/js/gui/admin/EditProjectDialog.js @@ -883,6 +883,7 @@ EditProjectDialog.prototype.open = function () { var div = self.getElement(); if (!$(div).hasClass("ui-dialog-content")) { $(div).dialog({ + dialogClass: 'minerva-edit-project-dialog', title: self.getProject().getProjectId(), width: window.innerWidth / 2, height: window.innerHeight / 2 diff --git a/frontend-js/src/main/js/gui/admin/EditUserDialog.js b/frontend-js/src/main/js/gui/admin/EditUserDialog.js index 03873236a57aefa0ee15d03d70c9d3a49f2804dc..a354a41f5ded48ab46bb382042f153e56a4b34a8 100644 --- a/frontend-js/src/main/js/gui/admin/EditUserDialog.js +++ b/frontend-js/src/main/js/gui/admin/EditUserDialog.js @@ -569,6 +569,7 @@ EditUserDialog.prototype.open = function () { } if (!$(div).hasClass("ui-dialog-content")) { $(div).dialog({ + dialogClass: 'minerva-edit-user-dialog', title: title, width: window.innerWidth / 2, height: window.innerHeight / 2 diff --git a/frontend-js/src/main/js/gui/admin/LogListDialog.js b/frontend-js/src/main/js/gui/admin/LogListDialog.js index 3c4bb3e6078c68c5d82aaa1d9524300905863c20..f8f09a7c86237bd3d6291971533852e93fce4c21 100644 --- a/frontend-js/src/main/js/gui/admin/LogListDialog.js +++ b/frontend-js/src/main/js/gui/admin/LogListDialog.js @@ -152,6 +152,7 @@ LogListDialog.prototype.open = function () { var self = this; if (!$(self.getElement()).hasClass("ui-dialog-content")) { $(self.getElement()).dialog({ + dialogClass: 'minerva-logs-dialog', title: "Log list", autoOpen: false, resizable: false, diff --git a/frontend-js/src/main/js/gui/leftPanel/GuiUtils.js b/frontend-js/src/main/js/gui/leftPanel/GuiUtils.js index 5db672827e1419c545e67cd9a1269d01fbf6722c..ea3b891c2d1c8323054efa58cb00eb889ec9b33c 100644 --- a/frontend-js/src/main/js/gui/leftPanel/GuiUtils.js +++ b/frontend-js/src/main/js/gui/leftPanel/GuiUtils.js @@ -1000,6 +1000,7 @@ GuiUtils.prototype.createHelpButton = function (toolTip, useXss) { xss: false }); $(helpDialogDiv).dialog({ + dialogClass: 'minerva-help-dialog', close: function () { $(this).dialog('destroy').remove(); helpDialogDiv = undefined; diff --git a/frontend-js/src/main/js/gui/leftPanel/LeftPanel.js b/frontend-js/src/main/js/gui/leftPanel/LeftPanel.js index 2f1266695f14b3a9a7f32dd625394eb43d8bc345..122bab37ee1d7fe19228aa86e7af5187b2e40ca0 100644 --- a/frontend-js/src/main/js/gui/leftPanel/LeftPanel.js +++ b/frontend-js/src/main/js/gui/leftPanel/LeftPanel.js @@ -162,6 +162,7 @@ LeftPanel.prototype.showElementDetails = function (element) { var div = self.elementInfoDiv; if (!$(div).hasClass("ui-dialog-content")) { $(div).dialog({ + dialogClass: 'minerva-element-info-dialog', resizable: false, width: $(self.getElement()).width(), height: 200, diff --git a/frontend-js/src/main/js/gui/leftPanel/PublicationListDialog.js b/frontend-js/src/main/js/gui/leftPanel/PublicationListDialog.js index 3535cb44bd3ba83fbf998b3b77aef322f9506523..d48760dcd8448eef3f0fa74bb83e6fdc264ab389 100644 --- a/frontend-js/src/main/js/gui/leftPanel/PublicationListDialog.js +++ b/frontend-js/src/main/js/gui/leftPanel/PublicationListDialog.js @@ -166,6 +166,7 @@ PublicationListDialog.prototype.show = function () { var self = this; if (!$(self.getElement()).hasClass("ui-dialog-content")) { $(self.getElement()).dialog({ + dialogClass: 'minerva-publication-list-dialog', title: "Publication list", autoOpen: false, resizable: false, diff --git a/frontend-js/src/main/js/map/CustomMap.js b/frontend-js/src/main/js/map/CustomMap.js index bfc79ed439828157436e634882804b352972d56c..62c307c332cb806abb5ea24da72ea0d6a8b598e8 100644 --- a/frontend-js/src/main/js/map/CustomMap.js +++ b/frontend-js/src/main/js/map/CustomMap.js @@ -442,6 +442,7 @@ CustomMap.prototype.getSubmapDialogDiv = function (id) { this._dialogs[id] = dialogDiv; $(dialogDiv).dialog({ + dialogClass: 'minerva-submap', autoOpen: false }); } diff --git a/frontend-js/src/main/js/minerva.js b/frontend-js/src/main/js/minerva.js index 2ba660e9114bd5fb53909657ae3edaf424edba20..9337a2484105b494ed89eb880d46256fedf52eda 100644 --- a/frontend-js/src/main/js/minerva.js +++ b/frontend-js/src/main/js/minerva.js @@ -150,6 +150,7 @@ function requestConsent(user, termsOfUseUrl) { dialog.appendChild(dialogContent); document.body.appendChild(dialog); $(dialog).dialog({ + dialogClass: 'minerva-terms-of-use-dialog', classes: { "ui-dialog": "ui-state-error" },