Skip to content

Commit afa7617

Browse files
committed
aesthetics
1 parent 120387d commit afa7617

File tree

2 files changed

+12
-14
lines changed

2 files changed

+12
-14
lines changed

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

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -65,21 +65,19 @@ qx.Class.define("osparc.dashboard.MoveResourceTo", {
6565
let control;
6666
switch (id) {
6767
case "current-location": {
68+
control = new qx.ui.container.Composite(new qx.ui.layout.VBox(5));
69+
const intro = new qx.ui.basic.Label(this.tr("Current location"));
70+
control.add(intro);
6871
const workspace = osparc.store.Workspaces.getInstance().getWorkspace(this.__currentWorkspaceId);
69-
let currentLocation = workspace ? workspace.getName() : "My Workspace";
72+
const workspaceText = workspace ? workspace.getName() : "My Workspace";
73+
const workspaceLabel = new qx.ui.basic.Label(this.tr("- Workspace: ") + workspaceText);
74+
control.add(workspaceLabel);
7075
const folder = osparc.store.Folders.getInstance().getFolder(this.__currentFolderId);
7176
if (folder) {
72-
// OM intermediate folders missing
73-
const path = [];
74-
this.__getUpstreamFolders(folder, path);
75-
path.forEach(folderId => {
76-
const fldr = osparc.store.Folders.getInstance().getFolder(folderId);
77-
if (fldr) {
78-
currentLocation += " / " + fldr.getName();
79-
}
80-
});
77+
const folderText = folder.getName();
78+
const folderLabel = new qx.ui.basic.Label(this.tr("- Folder: ") + folderText);
79+
control.add(folderLabel);
8180
}
82-
control = new qx.ui.basic.Label(this.tr("Current location: ") + currentLocation);
8381
this._add(control);
8482
break;
8583
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
525525
_moveFolderToRequested: function(workspaceId, folderId) {
526526
const moveFolderTo = new osparc.dashboard.MoveResourceTo(this.getCurrentWorkspaceId(), this.getCurrentFolderId());
527527
const title = this.tr("Move to...");
528-
const win = osparc.ui.window.Window.popUpInWindow(moveFolderTo, title, 350, 280);
528+
const win = osparc.ui.window.Window.popUpInWindow(moveFolderTo, title, 400, 400);
529529
moveFolderTo.addListener("moveTo", e => {
530530
win.close();
531531
const data = e.getData();
@@ -1048,7 +1048,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
10481048
const selection = this._resourcesContainer.getSelection();
10491049
const title = this.tr("Move to...");
10501050
const moveStudyTo = new osparc.dashboard.MoveResourceTo(this.getCurrentWorkspaceId(), this.getCurrentFolderId());
1051-
const win = osparc.ui.window.Window.popUpInWindow(moveStudyTo, title, 350, 280);
1051+
const win = osparc.ui.window.Window.popUpInWindow(moveStudyTo, title, 400, 400);
10521052
moveStudyTo.addListener("moveTo", e => {
10531053
win.close();
10541054
const data = e.getData();
@@ -1389,7 +1389,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
13891389
moveToButton.addListener("tap", () => {
13901390
const title = this.tr("Move to...");
13911391
const moveStudyTo = new osparc.dashboard.MoveResourceTo(this.getCurrentWorkspaceId(), this.getCurrentFolderId());
1392-
const win = osparc.ui.window.Window.popUpInWindow(moveStudyTo, title, 350, 280);
1392+
const win = osparc.ui.window.Window.popUpInWindow(moveStudyTo, title, 400, 400);
13931393
moveStudyTo.addListener("moveTo", e => {
13941394
win.close();
13951395
const data = e.getData();

0 commit comments

Comments
 (0)