Skip to content

Commit f4074a3

Browse files
authored
🎨 Study home page redesign II (#5430)
1 parent f0ead1b commit f4074a3

File tree

5 files changed

+28
-8
lines changed

5 files changed

+28
-8
lines changed

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

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ qx.Class.define("osparc.dashboard.ResourceMoreOptions", {
4242
},
4343

4444
statics: {
45-
WIDTH: 900,
46-
HEIGHT: 720,
45+
WIDTH: 830,
46+
HEIGHT: 700,
4747

4848
popUpInWindow: function(moreOpts) {
4949
const prjAlias = osparc.product.Utils.getStudyAlias({firstUpperCase: true});
@@ -396,6 +396,8 @@ qx.Class.define("osparc.dashboard.ResourceMoreOptions", {
396396
const page = this.__billingSettings = new osparc.dashboard.resources.pages.BasePage(title, iconSrc, id);
397397
page.showLabelOnTab();
398398
const billingScroll = new qx.ui.container.Scroll(billingSettings);
399+
const toolBar = this.__addToolbar();
400+
page.add(toolBar);
399401
page.add(billingScroll, {
400402
flex: 1
401403
});
@@ -414,6 +416,8 @@ qx.Class.define("osparc.dashboard.ResourceMoreOptions", {
414416
const preview = new osparc.study.StudyPreview(resourceData);
415417
const page = new osparc.dashboard.resources.pages.BasePage(title, iconSrc, id);
416418
page.showLabelOnTab();
419+
const toolBar = this.__addToolbar();
420+
page.add(toolBar);
417421
page.add(preview, {
418422
flex: 1
419423
});
@@ -442,6 +446,8 @@ qx.Class.define("osparc.dashboard.ResourceMoreOptions", {
442446
}
443447
const page = new osparc.dashboard.resources.pages.BasePage(title, iconSrc, id);
444448
page.showLabelOnTab();
449+
const toolBar = this.__addToolbar();
450+
page.add(toolBar);
445451
const commentsScroll = new qx.ui.container.Scroll(commentsLayout);
446452
page.add(commentsScroll, {
447453
flex: 1
@@ -462,6 +468,8 @@ qx.Class.define("osparc.dashboard.ResourceMoreOptions", {
462468

463469
const page = this.__dataPage = new osparc.dashboard.resources.pages.BasePage(title, iconSrc, id);
464470
page.showLabelOnTab();
471+
const toolBar = this.__addToolbar();
472+
page.add(toolBar);
465473
page.add(studyDataManager, {
466474
flex: 1
467475
});
@@ -502,6 +510,8 @@ qx.Class.define("osparc.dashboard.ResourceMoreOptions", {
502510
}
503511
const page = this.__permissionsPage = new osparc.dashboard.resources.pages.BasePage(title, iconSrc, id);
504512
page.showLabelOnTab();
513+
const toolBar = this.__addToolbar();
514+
page.add(toolBar);
505515
page.add(permissionsView, {
506516
flex: 1
507517
});
@@ -542,6 +552,8 @@ qx.Class.define("osparc.dashboard.ResourceMoreOptions", {
542552

543553
const page = this.__permissionsPage = new osparc.dashboard.resources.pages.BasePage(title, iconSrc, id);
544554
page.showLabelOnTab();
555+
const toolBar = this.__addToolbar();
556+
page.add(toolBar);
545557
page.add(classifiers, {
546558
flex: 1
547559
});
@@ -573,6 +585,8 @@ qx.Class.define("osparc.dashboard.ResourceMoreOptions", {
573585

574586
const page = this.__qualityPage = new osparc.dashboard.resources.pages.BasePage(title, iconSrc, id);
575587
page.showLabelOnTab();
588+
const toolBar = this.__addToolbar();
589+
page.add(toolBar);
576590
page.add(qualityEditor, {
577591
flex: 1
578592
});
@@ -602,6 +616,8 @@ qx.Class.define("osparc.dashboard.ResourceMoreOptions", {
602616
}, this);
603617
const page = this.__tagsPage = new osparc.dashboard.resources.pages.BasePage(title, iconSrc, id);
604618
page.showLabelOnTab();
619+
const toolBar = this.__addToolbar();
620+
page.add(toolBar);
605621
page.add(tagManager, {
606622
flex: 1
607623
});
@@ -630,6 +646,8 @@ qx.Class.define("osparc.dashboard.ResourceMoreOptions", {
630646

631647
const page = this.__servicesUpdatePage = new osparc.dashboard.resources.pages.BasePage(title, iconSrc, id);
632648
page.showLabelOnTab();
649+
const toolBar = this.__addToolbar();
650+
page.add(toolBar);
633651
page.add(servicesUpdate, {
634652
flex: 1
635653
});
@@ -657,6 +675,8 @@ qx.Class.define("osparc.dashboard.ResourceMoreOptions", {
657675

658676
const page = new osparc.dashboard.resources.pages.BasePage(title, iconSrc, id);
659677
page.showLabelOnTab();
678+
const toolBar = this.__addToolbar();
679+
page.add(toolBar);
660680
page.add(servicesBootOpts, {
661681
flex: 1
662682
});

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -978,7 +978,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
978978
},
979979

980980
__getThumbnailStudyMenuButton: function(studyData) {
981-
const thumbButton = new qx.ui.menu.Button(this.tr("Edit Thumbnail..."));
981+
const thumbButton = new qx.ui.menu.Button(this.tr("Thumbnail..."));
982982
thumbButton.addListener("execute", () => {
983983
const title = this.tr("Edit Thumbnail");
984984
const oldThumbnail = studyData.thumbnail;

services/static-webserver/client/source/class/osparc/info/StudyLarge.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ qx.Class.define("osparc.info.StudyLarge", {
142142
},
143143
"DESCRIPTION": {
144144
label: this.tr("Description:"),
145-
view: osparc.info.StudyUtils.createDescriptionMD(this.getStudy()),
145+
view: osparc.info.StudyUtils.createDescriptionMD(this.getStudy(), 110),
146146
action: {
147147
button: osparc.utils.Utils.getEditButton(this.__canIWrite()),
148148
callback: this.__canIWrite() ? this.__openDescriptionEditor : null,

services/static-webserver/client/source/class/osparc/info/StudyUtils.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,13 +169,13 @@ qx.Class.define("osparc.info.StudyUtils", {
169169
const description = new osparc.ui.markdown.Markdown().set({
170170
noMargin: true
171171
});
172-
if (maxHeight) {
173-
description.setMaxHeight(maxHeight);
174-
}
175172
study.bind("description", description, "value", {
176173
converter: desc => desc ? desc : "Add description"
177174
});
178175
const scrollContainer = new qx.ui.container.Scroll();
176+
if (maxHeight) {
177+
scrollContainer.setMaxHeight(maxHeight);
178+
}
179179
scrollContainer.add(description);
180180
return scrollContainer;
181181
},

services/static-webserver/client/source/class/osparc/study/StudyPreview.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ qx.Class.define("osparc.study.StudyPreview", {
4444
const workbenchUIPreview = new osparc.workbench.WorkbenchUIPreview();
4545
workbenchUIPreview.setStudy(study);
4646
workbenchUIPreview.loadModel(study.getWorkbench());
47-
workbenchUIPreview.setMaxHeight(600);
47+
workbenchUIPreview.setMaxHeight(550);
4848
this._add(workbenchUIPreview);
4949
}
5050
}

0 commit comments

Comments
 (0)