Skip to content

Commit a0a7dbd

Browse files
committed
[CST-7654] Fix page layout and add title
1 parent 625039d commit a0a7dbd

File tree

3 files changed

+41
-37
lines changed

3 files changed

+41
-37
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,43 @@
11
<div class="container">
22

3-
<!-- <div class="row">
4-
<div class="col-md-12 mb-4 pl-4">
5-
<button class="btn btn-primary" id="backButton"
6-
(click)="onReturn()">{{'admin.metadata-import.page.button.return' | translate}}</button>
7-
</div>
8-
</div> -->
3+
<!-- <div class="row">
4+
<div class="col-md-12 mb-4 pl-4">
5+
<button class="btn btn-primary" id="backButton"
6+
(click)="onReturn()">{{'admin.metadata-import.page.button.return' | translate}}</button>
7+
</div>
8+
</div> -->
99

10-
<div class="row">
11-
<div class="col-md-{{ (isSideBarHidden() | async) ? '12' : '8' }}">
12-
<ds-loading *ngIf="!isActive"></ds-loading>
13-
<ds-configuration-search-page *ngIf="isActive"
14-
[configuration]="relationshipConfig"
15-
[context]="context"
16-
[fixedFilterQuery]="searchFilter"
17-
[collapseFilters]="true"
18-
[showFilterToggle]="true"
19-
[showExport]="false"
20-
[customData]="{relationships$ : relationshipResults$, entityType: relationshipType, updateStatusByItemId$: updateStatusByItemId$}"
21-
[showScopeSelector]="false"
22-
(customEvent)="manageRelationship($event)"></ds-configuration-search-page>
10+
<div class="row">
11+
<div class="col-md-{{ (isSideBarHidden() | async) ? '12' : '8' }} pl-0">
12+
<ds-loading *ngIf="!isActive"></ds-loading>
13+
<div class="container"><h2>{{ 'manage.relationships.search-list.title' | translate }}</h2></div>
14+
<ds-configuration-search-page *ngIf="isActive"
15+
[configuration]="relationshipConfig"
16+
[context]="context"
17+
[fixedFilterQuery]="searchFilter"
18+
[collapseFilters]="true"
19+
[showFilterToggle]="true"
20+
[showExport]="false"
21+
[customData]="{relationships$ : relationshipResults$, entityType: relationshipType, updateStatusByItemId$: updateStatusByItemId$}"
22+
[showScopeSelector]="false"
23+
(customEvent)="manageRelationship($event)"></ds-configuration-search-page>
2324

24-
<div *ngIf="!(isXsOrSm$ | async)">
25-
<button type="button" class="btn btn-link menu-toggle" (click)="toggleSidebar()">
26-
<i class="fa fa-chevron-circle-{{(isSideBarHidden() | async) ? 'left' : 'right'}} fa-2x" aria-hidden="true"></i>
27-
</button>
28-
</div>
29-
</div>
30-
<div class="col-md-4" *ngIf="!(isSideBarHidden() | async) && isActive && isInit">
31-
<ng-container *ngVar="(relationshipResults$ | async) as relationships">
32-
<ds-relationships-sort-list [item]="item"
33-
[relationships]="relationships"
34-
[pendingChanges]="(pendingChanges$ | async)"
35-
(deleteRelationship)="manageRelationship($event)"
36-
(itemDrop)="itemDropped($event)"></ds-relationships-sort-list>
37-
</ng-container>
38-
</div>
39-
</div>
25+
<div *ngIf="!(isXsOrSm$ | async)">
26+
<button type="button" class="btn btn-link menu-toggle" (click)="toggleSidebar()">
27+
<i class="fa fa-chevron-circle-{{(isSideBarHidden() | async) ? 'left' : 'right'}} fa-2x"
28+
aria-hidden="true"></i>
29+
</button>
30+
</div>
31+
</div>
32+
<div class="col-md-4" *ngIf="!(isSideBarHidden() | async) && isActive && isInit">
33+
<ng-container *ngVar="(relationshipResults$ | async) as relationships">
34+
<ds-relationships-sort-list [item]="item"
35+
[relationships]="relationships"
36+
[pendingChanges]="(pendingChanges$ | async)"
37+
(deleteRelationship)="manageRelationship($event)"
38+
(itemDrop)="itemDropped($event)"></ds-relationships-sort-list>
39+
</ng-container>
40+
</div>
41+
</div>
4042

4143
</div>

src/app/edit-item-relationships/relationships-sort-list/relationships-sort-list.component.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div cdkDropListGroup>
22
<div class="relationships-container">
3-
<h2>{{ 'manage.relationships.title' | translate }}</h2>
3+
<h2>{{ 'manage.relationships.selected-list.title' | translate }}</h2>
44
<ds-loading *ngIf="(isLoading | async)"></ds-loading>
55
<ng-container *ngIf="!(this.isLoading | async)">
66
<div *ngIf="(filteredRelationships && filteredRelationships.length > 0) ; else noData"

src/assets/i18n/en.json5

+3-1
Original file line numberDiff line numberDiff line change
@@ -3372,7 +3372,9 @@
33723372

33733373
"manage.relationships.unhide": "Unhide",
33743374

3375-
"manage.relationships.title" : "Selected items",
3375+
"manage.relationships.search-list.title" : "All your items",
3376+
3377+
"manage.relationships.selected-list.title" : "Selected items",
33763378

33773379
"manage.relationships.no.relationships.found" : "Empty selection",
33783380

0 commit comments

Comments
 (0)