diff --git a/services/static-webserver/client/source/class/osparc/data/model/IframeHandler.js b/services/static-webserver/client/source/class/osparc/data/model/IframeHandler.js index 1aa8dee04217..2b085ece0ff4 100644 --- a/services/static-webserver/client/source/class/osparc/data/model/IframeHandler.js +++ b/services/static-webserver/client/source/class/osparc/data/model/IframeHandler.js @@ -116,6 +116,9 @@ qx.Class.define("osparc.data.model.IframeHandler", { __initIFrame: function() { const iframe = new osparc.widget.PersistentIframe(); + if (this.getNode().getKey().includes("s4l-ui")) { + iframe.getIframe().setAppearance("iframe-no-border"); + } osparc.utils.Utils.setIdToWidget(iframe.getIframe(), "iframe_"+this.getNode().getNodeId()); this.self().evalShowToolbar(iframe, this.getStudy()); iframe.addListener("restart", () => this.restartIFrame(), this); diff --git a/services/static-webserver/client/source/class/osparc/desktop/credits/BuyCreditsStepper.js b/services/static-webserver/client/source/class/osparc/desktop/credits/BuyCreditsStepper.js index 9789fd0fbc64..557e862df0b3 100644 --- a/services/static-webserver/client/source/class/osparc/desktop/credits/BuyCreditsStepper.js +++ b/services/static-webserver/client/source/class/osparc/desktop/credits/BuyCreditsStepper.js @@ -68,7 +68,7 @@ qx.Class.define("osparc.desktop.credits.BuyCreditsStepper", { const { paymentId, paymentFormUrl } = data; this.setPaymentId(paymentId) this.__iframe = new qx.ui.embed.Iframe(paymentFormUrl).set({ - decorator: "no-border-2" + decorator: "no-border-0" }); this.add(this.__iframe); this.setSelection([this.__iframe]) diff --git a/services/static-webserver/client/source/class/osparc/desktop/credits/PaymentGatewayWindow.js b/services/static-webserver/client/source/class/osparc/desktop/credits/PaymentGatewayWindow.js index b50a0ec75c81..4189c99410cb 100644 --- a/services/static-webserver/client/source/class/osparc/desktop/credits/PaymentGatewayWindow.js +++ b/services/static-webserver/client/source/class/osparc/desktop/credits/PaymentGatewayWindow.js @@ -21,7 +21,7 @@ qx.Class.define("osparc.desktop.credits.PaymentGatewayWindow", { statics: { popUp: function(url, title, options) { const iframe = new qx.ui.embed.Iframe(url).set({ - decorator: "no-border-2" + decorator: "no-border-0" }) return osparc.ui.window.Window.popUpInWindow(iframe, title, options.width, options.height).set({ clickAwayClose: false diff --git a/services/static-webserver/client/source/class/osparc/po/UsersPending.js b/services/static-webserver/client/source/class/osparc/po/UsersPending.js index d823841d3f25..f4f0c8f5accf 100644 --- a/services/static-webserver/client/source/class/osparc/po/UsersPending.js +++ b/services/static-webserver/client/source/class/osparc/po/UsersPending.js @@ -105,6 +105,7 @@ qx.Class.define("osparc.po.UsersPending", { break; case "pending-users-layout": { const grid = new qx.ui.layout.Grid(15, 5); + grid.setColumnMaxWidth(2, 100); // date control = new qx.ui.container.Composite(grid); this.getChildControl("pending-users-container").add(control); break; @@ -160,12 +161,18 @@ qx.Class.define("osparc.po.UsersPending", { pendingUsers.forEach(pendingUser => { grid.setRowAlign(row, "left", "middle"); - pendingUsersLayout.add(new qx.ui.basic.Label(pendingUser.firstName + " " + pendingUser.lastName), { + const fullNameLabel = new qx.ui.basic.Label(pendingUser.firstName + " " + pendingUser.lastName).set({ + selectable: true, + }); + pendingUsersLayout.add(fullNameLabel, { row, column: 0, }); - pendingUsersLayout.add(new qx.ui.basic.Label(pendingUser.email), { + const emailLabel = new qx.ui.basic.Label(pendingUser.email).set({ + selectable: true, + }); + pendingUsersLayout.add(emailLabel, { row, column: 1, }); @@ -173,7 +180,7 @@ qx.Class.define("osparc.po.UsersPending", { let date = null; switch (pendingUser.accountRequestStatus) { case "PENDING": - date = pendingUser.preRegistrationRequestedAt ? osparc.utils.Utils.formatDateAndTime(new Date(pendingUser.preRegistrationRequestedAt)) : "-"; + date = pendingUser.preRegistrationCreated ? osparc.utils.Utils.formatDateAndTime(new Date(pendingUser.preRegistrationCreated)) : "-"; break; default: date = pendingUser.accountRequestReviewedAt ? osparc.utils.Utils.formatDateAndTime(new Date(pendingUser.accountRequestReviewedAt)) : "-"; diff --git a/services/static-webserver/client/source/class/osparc/support/SupportCenter.js b/services/static-webserver/client/source/class/osparc/support/SupportCenter.js index 0070a2fbc1df..3ea13e6d2524 100644 --- a/services/static-webserver/client/source/class/osparc/support/SupportCenter.js +++ b/services/static-webserver/client/source/class/osparc/support/SupportCenter.js @@ -40,10 +40,12 @@ qx.Class.define("osparc.support.SupportCenter", { }); this.getChildControl("home-page"); - this.getChildControl("conversations-page"); - this.getChildControl("conversation-page"); - this.getChildControl("home-button"); - this.getChildControl("conversations-button"); + if (osparc.store.Groups.getInstance().isSupportEnabled()) { + this.getChildControl("conversations-page"); + this.getChildControl("conversation-page"); + this.getChildControl("home-button"); + this.getChildControl("conversations-button"); + } this.__showHome(); }, diff --git a/services/static-webserver/client/source/class/osparc/theme/Appearance.js b/services/static-webserver/client/source/class/osparc/theme/Appearance.js index 5544cd43fe53..39b9ff80aed6 100644 --- a/services/static-webserver/client/source/class/osparc/theme/Appearance.js +++ b/services/static-webserver/client/source/class/osparc/theme/Appearance.js @@ -19,6 +19,15 @@ qx.Theme.define("osparc.theme.Appearance", { extend: osparc.theme.common.Appearance, appearances: { + "iframe-no-border": { + style: () => { + return { + backgroundColor: "transparent", + decorator: "no-border-0" + }; + } + }, + "strong-ui": { style: () => { return { diff --git a/services/static-webserver/client/source/class/osparc/theme/Decoration.js b/services/static-webserver/client/source/class/osparc/theme/Decoration.js index e564f1ea29f9..882519058902 100644 --- a/services/static-webserver/client/source/class/osparc/theme/Decoration.js +++ b/services/static-webserver/client/source/class/osparc/theme/Decoration.js @@ -265,9 +265,10 @@ qx.Theme.define("osparc.theme.Decoration", { } }, - "no-border-2": { + "no-border-0": { style: { - width: 0 + width: 0, + color: "transparent" } }, diff --git a/services/static-webserver/client/source/class/osparc/widget/PersistentIframe.js b/services/static-webserver/client/source/class/osparc/widget/PersistentIframe.js index 3cbe54a025c0..1fe96d2670e6 100644 --- a/services/static-webserver/client/source/class/osparc/widget/PersistentIframe.js +++ b/services/static-webserver/client/source/class/osparc/widget/PersistentIframe.js @@ -359,9 +359,7 @@ qx.Class.define("osparc.widget.PersistentIframe", { break; } case "openSupport": { - if (osparc.store.Groups.getInstance().isSupportEnabled()) { - osparc.support.SupportCenter.openWindow(); - } + osparc.support.SupportCenter.openWindow(); break; } }