Skip to content

Commit 361074f

Browse files
authored
UFAL/Edit bitstreams table UI fix (#1131)
* VSB-TUO/Edit bitstreams table - Removed last column (table cells) (#992) * display of sync status * fix: removed wrong i18n translation message and use the correct one; display of bundle controls in correct column * fix: fixed alignment of cells; overflowing the text in Name column * fix: removed unwanted bootstrap class * fix: added word-break css property solution
1 parent e83a296 commit 361074f

3 files changed

Lines changed: 33 additions & 20 deletions

File tree

src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -366,13 +366,13 @@ export class ItemBitstreamsService {
366366
getColumnSizes(): ResponsiveTableSizes {
367367
return new ResponsiveTableSizes([
368368
// Name column
369-
new ResponsiveColumnSizes(2, 2, 3, 4, 4),
369+
new ResponsiveColumnSizes(3, 3, 3, 3, 3),
370370
// Description column
371-
new ResponsiveColumnSizes(2, 3, 3, 3, 3),
371+
new ResponsiveColumnSizes(3, 3, 3, 3, 3),
372372
// Format column
373373
new ResponsiveColumnSizes(2, 2, 2, 2, 2),
374374
// Actions column
375-
new ResponsiveColumnSizes(6, 5, 4, 3, 3),
375+
new ResponsiveColumnSizes(2, 2, 2, 2, 2),
376376
// Store synchronization columns
377377
new ResponsiveColumnSizes(2, 2, 2, 2, 2)
378378
]);

src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@
2727
<th id="actions" scope="col" class="{{ columnSizes.columns[3].buildClasses() }} text-center">
2828
{{'item.edit.bitstreams.headers.actions' | translate}}
2929
</th>
30+
<th id="synchronized" scope="col" class="{{ columnSizes.columns[4].buildClasses() }} text-center">
31+
{{'item.edit.bitstreams.headers.synchronized' | translate}}
32+
</th>
3033
</tr>
3134
</thead>
3235

@@ -35,7 +38,7 @@
3538
<th id="{{ bundleName }}" class="span" colspan="3" scope="colgroup">
3639
{{'item.edit.bitstreams.bundle.name' | translate:{ name: bundleName } }}
3740
</th>
38-
<td class="text-center">
41+
<td class="{{ columnSizes.columns[3].buildClasses() }} text-center">
3942

4043
<div class="btn-group">
4144
<button [routerLink]="[itemPageRoute, 'bitstreams', 'new']"
@@ -74,6 +77,7 @@
7477
</div>
7578

7679
</td>
80+
<td class="{{ columnSizes.columns[4].buildClasses() }}"></td>
7781
</tr>
7882

7983
<ng-container *ngFor="let entry of (tableEntries$ | async)">
@@ -82,20 +86,20 @@
8286

8387
<th class="bitstream-name row-element {{ columnSizes.columns[0].buildClasses() }}"
8488
scope="row" id="{{ entry.nameStripped }}" headers="{{ bundleName }} name">
85-
<div class="drag-handle text-muted float-left p-1 mr-2" tabindex="0" cdkDragHandle
86-
(keydown.enter)="select($event, entry)" (keydown.space)="select($event, entry)" (click)="select($event, entry)">
87-
<i class="fas fa-grip-vertical fa-fw"
88-
[title]="'item.edit.bitstreams.edit.buttons.drag' | translate"></i>
89-
</div>
90-
{{ entry.name }}
89+
<div class="drag-handle text-muted float-left p-1 mr-2" tabindex="0" cdkDragHandle
90+
(keydown.enter)="select($event, entry)" (keydown.space)="select($event, entry)" (click)="select($event, entry)">
91+
<i class="fas fa-grip-vertical fa-fw"
92+
[title]="'item.edit.bitstreams.edit.buttons.drag' | translate"></i>
93+
</div>
94+
<span class="dont-break-out">{{ entry.name }}</span>
9195
</th>
9296
<td class="row-element {{ columnSizes.columns[1].buildClasses() }}"
9397
headers="{{ entry.nameStripped }} {{ bundleName }} description">
94-
{{ entry.description }}
98+
<span class="dont-break-out">{{ entry.description }}</span>
9599
</td>
96100
<td class="row-element {{ columnSizes.columns[2].buildClasses() }}"
97101
headers="{{ entry.nameStripped }} {{ bundleName }} format">
98-
{{ (entry.format | async)?.shortDescription }}
102+
<span class="dont-break-out">{{ (entry.format | async)?.shortDescription }}</span>
99103
</td>
100104
<td class="row-element {{ columnSizes.columns[3].buildClasses() }}"
101105
headers="{{ entry.nameStripped }} {{ bundleName }} actions">
@@ -128,13 +132,14 @@
128132
</div>
129133
</div>
130134
</td>
131-
<td class="{{columnSizes.columns[4].buildClasses()}} row-element d-flex align-items-center justify-content-center">
132-
<div class="float-left d-flex align-items-center overflow-hidden">
133-
<span class="text-center">
134-
<i [class]="isBitstreamSynchronized(entry) ? 'fas fa-check' : 'fas fa-times'"></i>
135-
</span>
136-
<span class="pl-1">|</span>
137-
<div class="pl-1" [ngTemplateOutlet]="checksum"></div>
135+
<td class="{{columnSizes.columns[4].buildClasses()}} row-element"
136+
headers="{{ entry.nameStripped }} {{ bundleName }} synchronized">
137+
<div class="d-flex align-items-center justify-content-center">
138+
<span class="text-center">
139+
<i [class]="isBitstreamSynchronized(entry) ? 'fas fa-check' : 'fas fa-times'"></i>
140+
</span>
141+
<span class="pl-1">|</span>
142+
<div class="pl-1" [ngTemplateOutlet]="checksum"></div>
138143
</div>
139144
</td>
140145
</tr>
@@ -149,7 +154,7 @@
149154
</ng-template>
150155

151156
<ng-template #checksum let-entry="entry">
152-
<div class="hover-container"
157+
<div class="d-flex align-items-center"
153158
(mouseenter)="showChecksumValues = true"
154159
(mouseleave)="showChecksumValues = false"
155160
*ngVar="(checkSum$ | async) as bitstreamChecksum">

src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,14 @@
1919
font-weight: normal;
2020
}
2121

22+
.dont-break-out {
23+
word-break: break-word;
24+
}
25+
2226
.table {
2327
margin-bottom: 0;
2428
}
29+
30+
.table thead th {
31+
vertical-align: middle;
32+
}

0 commit comments

Comments
 (0)