Skip to content

Commit eea0b8b

Browse files
authored
🐛 Various issue in the study cards (ITISFoundation#5613)
1 parent f20260a commit eea0b8b

File tree

5 files changed

+37
-31
lines changed

5 files changed

+37
-31
lines changed

services/static-webserver/client/source/class/osparc/auth/LoginPage.js

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -145,12 +145,21 @@ qx.Class.define("osparc.auth.LoginPage", {
145145
},
146146

147147
_setBackgroundImage: function(backgroundImage) {
148-
this.getContentElement().setStyles({
149-
"background-image": backgroundImage,
150-
"background-repeat": "no-repeat",
151-
"background-size": "65% auto, 80% auto", // auto width, 85% height
152-
"background-position": "left bottom, left -440px bottom -230px" // left bottom
153-
});
148+
if (osparc.product.Utils.getProductName().includes("s4l")) {
149+
this.getContentElement().setStyles({
150+
"background-image": backgroundImage,
151+
"background-repeat": "no-repeat",
152+
"background-size": "65% auto, 80% auto", // auto width, 85% height
153+
"background-position": "left bottom, left -440px bottom -230px" // left bottom
154+
});
155+
} else {
156+
this.getContentElement().setStyles({
157+
"background-image": backgroundImage,
158+
"background-repeat": "no-repeat",
159+
"background-size": "50% auto", // 50% of the view width
160+
"background-position": "left 10% center" // left bottom
161+
});
162+
}
154163
},
155164

156165
_resetBackgroundImage: function() {

services/static-webserver/client/source/class/osparc/dashboard/CardBase.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -419,8 +419,7 @@ qx.Class.define("osparc.dashboard.CardBase", {
419419
uiModeIcon.set({
420420
source,
421421
toolTipText,
422-
alignY: "bottom",
423-
marginBottom: 10
422+
alignY: "bottom"
424423
});
425424
}
426425
},

services/static-webserver/client/source/class/osparc/dashboard/GridButtonBase.js

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,6 @@ qx.Class.define("osparc.dashboard.GridButtonBase", {
6565
row: 3,
6666
column: 0
6767
},
68-
VIEWER_MODE: {
69-
row: 3,
70-
column: 1,
71-
rowSpan: 2,
72-
colSpan: 1
73-
},
7468
FOOTER: {
7569
row: 4,
7670
column: 0,
@@ -79,30 +73,29 @@ qx.Class.define("osparc.dashboard.GridButtonBase", {
7973
}
8074
},
8175
FPOS: {
82-
STATUS: {
76+
MODIFIED: {
8377
row: 0,
8478
column: 0,
8579
rowSpan: 1,
86-
colSpan: 4
80+
colSpan: 2
8781
},
88-
MODIFIED: {
89-
row: 1,
90-
column: 0,
91-
rowSpan: 1,
92-
colSpan: 3
82+
VIEWER_MODE: {
83+
row: 0,
84+
column: 3,
85+
colSpan: 1
9386
},
9487
UPDATES: {
95-
row: 1,
88+
row: 0,
9689
column: 4,
9790
colSpan: 1
9891
},
9992
TSR: {
100-
row: 3,
93+
row: 1,
10194
column: 0,
10295
colSpan: 2
10396
},
10497
HITS: {
105-
row: 3,
98+
row: 1,
10699
column: 2,
107100
colSpan: 1
108101
}
@@ -282,8 +275,9 @@ qx.Class.define("osparc.dashboard.GridButtonBase", {
282275
control = new qx.ui.basic.Image().set({
283276
alignY: "middle",
284277
textColor: "status_icon",
285-
height: 12,
286-
width: 12,
278+
height: 13,
279+
width: 13,
280+
margin: [0, 1]
287281
});
288282
layout = this.getChildControl("subtitle");
289283
layout.set({

services/static-webserver/client/source/class/osparc/dashboard/GridButtonItem.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,11 @@ qx.Class.define("osparc.dashboard.GridButtonItem", {
5252
break;
5353
case "workbench-mode":
5454
control = new qx.ui.basic.Image().set({
55-
alignY: "middle"
55+
alignY: "middle",
56+
padding: [0, 5]
5657
});
57-
layout = this.getChildControl("main-layout");
58-
layout.add(control, osparc.dashboard.GridButtonBase.POS.VIEWER_MODE);
58+
layout = this.getChildControl("footer");
59+
layout.add(control, osparc.dashboard.GridButtonBase.FPOS.VIEWER_MODE);
5960
break;
6061
case "empty-workbench": {
6162
control = this._getEmptyWorkbenchIcon();
@@ -68,7 +69,7 @@ qx.Class.define("osparc.dashboard.GridButtonItem", {
6869
source: "@MaterialIcons/update/16",
6970
visibility: "excluded",
7071
alignY: "middle",
71-
alignX: "center"
72+
padding: [0, 5]
7273
});
7374
osparc.utils.Utils.setIdToWidget(control, "updateStudyBtn");
7475
layout = this.getChildControl("footer");

services/static-webserver/client/source/class/osparc/dashboard/GridButtonNew.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,10 @@ qx.Class.define("osparc.dashboard.GridButtonNew", {
4040

4141
if (title) {
4242
const titleLabel = this.getChildControl("title");
43-
titleLabel.setValue(title);
43+
titleLabel.set({
44+
value: title,
45+
rich: true
46+
});
4447
}
4548

4649
if (description) {

0 commit comments

Comments
 (0)