From 4a70f8fdb114a30874adb9c7046c2ff73c1be3c4 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Tue, 5 Feb 2019 16:57:28 +0100
Subject: [PATCH] class names added to all dialogs in the application
---
frontend-js/package-lock.json | 5 -----
frontend-js/src/main/js/GuiConnector.js | 5 +++++
frontend-js/src/main/js/gui/AddOverlayDialog.js | 1 +
frontend-js/src/main/js/gui/CommentDialog.js | 1 +
frontend-js/src/main/js/gui/LoginDialog.js | 1 +
frontend-js/src/main/js/gui/OverviewDialog.js | 1 +
frontend-js/src/main/js/gui/Panel.js | 2 +-
frontend-js/src/main/js/gui/admin/AddPluginDialog.js | 1 +
frontend-js/src/main/js/gui/admin/AddProjectDialog.js | 1 +
frontend-js/src/main/js/gui/admin/ChooseAnnotatorsDialog.js | 1 +
frontend-js/src/main/js/gui/admin/ChooseValidatorsDialog.js | 1 +
frontend-js/src/main/js/gui/admin/EditProjectDialog.js | 1 +
frontend-js/src/main/js/gui/admin/EditUserDialog.js | 1 +
frontend-js/src/main/js/gui/admin/LogListDialog.js | 1 +
frontend-js/src/main/js/gui/leftPanel/GuiUtils.js | 1 +
frontend-js/src/main/js/gui/leftPanel/LeftPanel.js | 1 +
.../src/main/js/gui/leftPanel/PublicationListDialog.js | 1 +
frontend-js/src/main/js/map/CustomMap.js | 1 +
frontend-js/src/main/js/minerva.js | 1 +
19 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/frontend-js/package-lock.json b/frontend-js/package-lock.json
index 501b5abfd9..4d93672cb5 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 8681ba981c..608ce9cf56 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 7333231224..5fff0a74a2 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 de7ad0e8ec..454df0cd09 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 ab627c505d..09d5d8621a 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 40d2761929..fffeb632ca 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 8f21f24447..17c65b590b 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 f62954c105..4c122b6a8e 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 59180fe3b4..f03531052d 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 a43363dbea..a4555c1e41 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 10f77ba75a..b279827a47 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 4d46be2614..2ac3500166 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 03873236a5..a354a41f5d 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 3c4bb3e607..f8f09a7c86 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 5db672827e..ea3b891c2d 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 2f1266695f..122bab37ee 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 3535cb44bd..d48760dcd8 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 bfc79ed439..62c307c332 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 2ba660e911..9337a24841 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"
},
--
GitLab