Skip to content

Commit cebe77d

Browse files
alisaismailatiFrancescoMolinaro
authored andcommitted
Merged in task/dspace-cris-2023_02_x/DSC-1513 (pull request DSpace#1703)
[DSC-1513] Improve buttons appearance Approved-by: Francesco Molinaro
2 parents e3ee893 + 8bee484 commit cebe77d

9 files changed

Lines changed: 45 additions & 18 deletions

File tree

src/app/access-control/bulk-access/bulk-access.component.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@
77

88
<div class="d-flex justify-content-end">
99
<button class="btn btn-outline-primary mr-3" (click)="reset()">
10+
<i class="fas fa-times mr-1"></i>
1011
{{ 'access-control-cancel' | translate }}
1112
</button>
1213
<button class="btn btn-primary" [disabled]="!canExport()" (click)="submit()">
14+
<i class="fas fa-cogs mr-1"></i>
1315
{{ 'access-control-execute' | translate }}
1416
</button>
1517
</div>

src/app/admin/admin-edit-user-agreement/admin-edit-user-agreement.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ <h2>{{'admin.edit-user-agreement.header' | translate}}</h2>
88
<div class="col-md">
99
<button class="btn btn-primary float-right m-2" (click)="$event.preventDefault();confirmEdit(content)" >
1010
<span>
11-
<i class="fas fa-edit"></i>
12-
&nbsp;{{ 'admin.edit-user-agreement.save-button' | translate }}
11+
<i class="fas fa-save mr-1"></i>
12+
{{ 'admin.edit-user-agreement.save-button' | translate }}
1313
</span>
1414
</button>
1515
</div>

src/app/admin/admin-import-batch-page/batch-import-page.component.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ <h2 id="header">{{'admin.batch-import.page.header' | translate}}</h2>
2828
<small class="form-text text-muted">
2929
{{'admin.batch-import.page.toggle.help' | translate}}
3030
</small>
31-
31+
3232

3333
<ds-file-dropzone-no-uploader
3434
*ngIf="isUpload"
@@ -47,6 +47,8 @@ <h2 id="header">{{'admin.batch-import.page.header' | translate}}</h2>
4747
<button class="btn btn-secondary" id="backButton"
4848
(click)="this.onReturn();">{{'admin.metadata-import.page.button.return' | translate}}</button>
4949
<button class="btn btn-primary" id="proceedButton"
50-
(click)="this.importMetadata();">{{'admin.metadata-import.page.button.proceed' | translate}}</button>
50+
(click)="this.importMetadata();">
51+
<i class="fas fa-arrow-right mr-1"></i>
52+
{{'admin.metadata-import.page.button.proceed' | translate}}</button>
5153
</div>
5254
</div>

src/app/admin/admin-import-metadata-page/metadata-import-page.component.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ <h2 id="header">{{'admin.metadata-import.page.header' | translate}}</h2>
2323
<button class="btn btn-secondary" id="backButton"
2424
(click)="this.onReturn();">{{'admin.metadata-import.page.button.return' | translate}}</button>
2525
<button class="btn btn-primary" id="proceedButton"
26-
(click)="this.importMetadata();">{{'admin.metadata-import.page.button.proceed' | translate}}</button>
26+
(click)="this.importMetadata();">
27+
<i class="fas fa-arrow-right mr-1"></i>
28+
{{'admin.metadata-import.page.button.proceed' | translate}}
29+
</button>
2730
</div>
2831
</div>

src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
<h2 id="header" class="border-bottom pb-2 ">{{'admin.registries.bitstream-formats.head' | translate}}</h2>
66

77
<p id="description">{{'admin.registries.bitstream-formats.description' | translate}}</p>
8-
<p id="create-new" class="mb-2"><a [routerLink]="'add'" class="btn btn-success">{{'admin.registries.bitstream-formats.create.new' | translate}}</a></p>
8+
<p id="create-new" class="mb-2"><a [routerLink]="'add'" class="btn btn-success">
9+
<i class="fas fa-plus mr-1"></i>
10+
{{'admin.registries.bitstream-formats.create.new' | translate}}</a>
11+
</p>
912

1013

1114
<ds-pagination
@@ -50,8 +53,14 @@ <h2 id="header" class="border-bottom pb-2 ">{{'admin.registries.bitstream-format
5053
</div>
5154

5255
<div>
53-
<button *ngIf="(bitstreamFormats | async)?.payload?.page?.length > 0" class="btn btn-primary deselect" (click)="deselectAll()">{{'admin.registries.bitstream-formats.table.deselect-all' | translate}}</button>
54-
<button *ngIf="(bitstreamFormats | async)?.payload?.page?.length > 0" type="submit" class="btn btn-danger float-right" (click)="deleteFormats()">{{'admin.registries.bitstream-formats.table.delete' | translate}}</button>
56+
<button *ngIf="(bitstreamFormats | async)?.payload?.page?.length > 0" class="btn btn-primary deselect" (click)="deselectAll()">
57+
<i class="far fa-minus-square mr-1"></i>
58+
{{'admin.registries.bitstream-formats.table.deselect-all' | translate}}
59+
</button>
60+
<button *ngIf="(bitstreamFormats | async)?.payload?.page?.length > 0" type="submit" class="btn btn-danger float-right" (click)="deleteFormats()">
61+
<i class="fas fa-trash mr-1"></i>
62+
{{'admin.registries.bitstream-formats.table.delete' | translate}}
63+
</button>
5564
</div>
5665
</div>
5766
</div>

src/app/admin/edit-cms-metadata/edit-cms-metadata.component.html

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ <h3 class="mb-4">{{'menu.section.cms.edit.metadata.head' | translate}}</h3>
1010
</select>
1111
<span class="input-group-btn">
1212
<button id="edit-metadata-btn" class="btn btn-primary" (click)="editSelectedMetadata()" [disabled]="!selectedMetadata">
13+
<i class="fas fa-edit mr-1"></i>
1314
{{'admin.edit-cms-metadata.edit-button' | translate}}
1415
</button>
1516
</span>
@@ -39,14 +40,14 @@ <h2 class=" mb-5">{{'admin.edit-cms-metadata.title' | translate}} '{{selectedMet
3940
<div class="col-md">
4041
<button id="save-metadata-btn" class="btn btn-primary float-right m-2" (click)="saveMetadata()">
4142
<span>
42-
<i class="fas fa-edit"></i>
43-
&nbsp;{{ 'admin.edit-cms-metadata.save-button' | translate }}
43+
<i class="fas fa-save mr-1"></i>
44+
{{ 'admin.edit-cms-metadata.save-button' | translate }}
4445
</span>
4546
</button>
4647
<button id="back-metadata-btn" class="btn btn-outline-secondary float-right m-2" (click)="back()">
4748
<span>
48-
<i class="fas fa-arrow-left"></i>
49-
&nbsp;{{ 'admin.edit-cms-metadata.back-button' | translate }}
49+
<i class="fas fa-arrow-left mr-1"></i>
50+
{{ 'admin.edit-cms-metadata.back-button' | translate }}
5051
</span>
5152
</button>
5253
</div>

src/app/curation-form/curation-form.component.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
<small class="text-muted">{{'curation.form.handle.hint' |translate }}</small>
1616
</div>
1717
</div>
18-
<button class="btn btn-default btn-primary" type="submit">{{'curation.form.submit' |translate }}</button>
18+
<button class="btn btn-default btn-primary" type="submit">
19+
<i class="fas fa-play mr-1"></i>
20+
{{'curation.form.submit' |translate }}
21+
</button>
1922
</div>
2023
</form>

src/app/shared/explore/section-component/search-section/search-section.component.html

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,14 @@ <h2 *ngIf="searchSection.displayTitle">{{ 'explore.search-section.' + sectionId
2020
</div>
2121
</div>
2222
<div class="d-flex justify-content-end" style="gap: 20px;">
23-
<button type="button" id="resetButton" class="btn btn-outline-primary float-right" (click)="onReset()">{{'explore.search-section.reset-button' | translate}}</button>
24-
<button type="submit" id="searchButton" class="btn btn-primary float-right">{{'explore.search-section.search-button' | translate}}</button>
23+
<button type="button" id="resetButton" class="btn btn-outline-primary float-right" (click)="onReset()">
24+
<i class="fas fa-redo mr-1"></i>
25+
{{'explore.search-section.reset-button' | translate}}
26+
</button>
27+
<button type="submit" id="searchButton" class="btn btn-primary float-right">
28+
<i class="fas fa-search mr-1"></i>
29+
{{'explore.search-section.search-button' | translate}}
30+
</button>
2531
</div>
2632
</form>
2733

src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,12 @@ <h2 id="header">{{'system-wide-alert.form.header' | translate}}</h2>
103103

104104
<div class="btn-row float-right space-children-mr mt-2">
105105
<button (click)="back()"
106-
class="btn btn-outline-secondary"><i
107-
class="fas fa-arrow-left"></i> {{'system-wide-alert.form.cancel' | translate}}</button>
106+
class="btn btn-outline-secondary">
107+
<i class="fas fa-times mr-1"></i>
108+
{{'system-wide-alert.form.cancel' | translate}}</button>
108109
<button class="btn btn-primary" [disabled]="alertForm.invalid"
109110
(click)="save()">
110-
<i class="fa fa-save"></i> {{ 'system-wide-alert.form.save' | translate}}
111+
<i class="fa fa-save mr-1"></i> {{ 'system-wide-alert.form.save' | translate}}
111112
</button>
112113
</div>
113114

0 commit comments

Comments
 (0)