Skip to content

Commit 8873b2a

Browse files
committed
aesthetics
1 parent a228de6 commit 8873b2a

File tree

3 files changed

+27
-12
lines changed

3 files changed

+27
-12
lines changed

services/static-webserver/client/source/class/osparc/data/Roles.js

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ qx.Class.define("osparc.data.Roles", {
165165
}
166166
},
167167

168-
__createIntoFromRoles: function(roles, showWording = true) {
168+
__createRolesLayout: function(roles, showWording = true) {
169169
const rolesLayout = new qx.ui.container.Composite(new qx.ui.layout.HBox(5)).set({
170170
alignY: "middle",
171171
paddingRight: 10
@@ -202,23 +202,34 @@ qx.Class.define("osparc.data.Roles", {
202202
},
203203

204204
createRolesOrgInfo: function() {
205-
return this.__createIntoFromRoles(osparc.data.Roles.ORG);
205+
return this.__createRolesLayout(osparc.data.Roles.ORG);
206206
},
207207

208208
createRolesWalletInfo: function() {
209-
return this.__createIntoFromRoles(osparc.data.Roles.WALLET);
209+
return this.__createRolesLayout(osparc.data.Roles.WALLET);
210210
},
211211

212212
createRolesStudyInfo: function() {
213-
return this.__createIntoFromRoles(osparc.data.Roles.STUDY);
213+
return this.__createRolesLayout(osparc.data.Roles.STUDY);
214214
},
215215

216216
createRolesServicesInfo: function() {
217-
return this.__createIntoFromRoles(osparc.data.Roles.SERVICES);
217+
return this.__createRolesLayout(osparc.data.Roles.SERVICES);
218218
},
219219

220220
createRolesWorkspaceInfo: function(showWording = true) {
221-
return this.__createIntoFromRoles(osparc.data.Roles.WORKSPACE, showWording);
222-
}
221+
return this.__createRolesLayout(osparc.data.Roles.WORKSPACE, showWording);
222+
},
223+
224+
replaceSpacerWithWidget: function(rolesLayout, widget) {
225+
if (rolesLayout && rolesLayout.getChildren()) {
226+
// remove spacer
227+
rolesLayout.remove(rolesLayout.getChildren()[0]);
228+
// add widget
229+
rolesLayout.addAt(widget, 0, {
230+
flex: 1
231+
});
232+
}
233+
},
223234
}
224235
});

services/static-webserver/client/source/class/osparc/desktop/organizations/MembersList.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@ qx.Class.define("osparc.desktop.organizations.MembersList", {
9696
__createMembersList: function() {
9797
const vBox = new qx.ui.container.Composite(new qx.ui.layout.VBox(5));
9898
const rolesLayout = this.__getRolesToolbar();
99-
rolesLayout.addAt(this.__getMembersFilter(), 0, {
100-
flex: 3
101-
});
99+
const membersFilter = this.__getMembersFilter();
100+
membersFilter.setPaddingRight(10);
101+
osparc.data.Roles.replaceSpacerWithWidget(rolesLayout, membersFilter);
102102
vBox.add(rolesLayout);
103103
vBox.add(this.__getMembersList(), {
104104
flex: 1

services/static-webserver/client/source/class/osparc/desktop/organizations/OrganizationsList.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,12 @@ qx.Class.define("osparc.desktop.organizations.OrganizationsList", {
3737
});
3838
this._add(intro);
3939

40-
this._add(this.__getOrganizationsFilter());
41-
this._add(osparc.data.Roles.createRolesOrgInfo());
40+
const rolesLayout = osparc.data.Roles.createRolesOrgInfo();
41+
const orgsFilter = this.__getOrganizationsFilter();
42+
orgsFilter.setPaddingRight(10);
43+
osparc.data.Roles.replaceSpacerWithWidget(rolesLayout, orgsFilter);
44+
this._add(rolesLayout);
45+
4246
this._add(this.__getOrganizationsList(), {
4347
flex: 1
4448
});

0 commit comments

Comments
 (0)