Skip to content

Commit 27d7693

Browse files
hplaharhplahar
committed
code cleanup and ui improvements
1 parent 80eec50 commit 27d7693

File tree

8 files changed

+46
-39
lines changed

8 files changed

+46
-39
lines changed

‎src/main/ngapp/src/app/components/collection/folder/folder.component.html

+31-30
Original file line numberDiff line numberDiff line change
@@ -3,54 +3,55 @@
33
<div class="row">
44
<div class="col px-0 pt-5 pb-3">
55

6-
<div class="d-flex justify-content-between">
7-
<h2 class="text-secondary">
6+
<div class="d-flex">
7+
<div class="w-75">
8+
<!-- <div class="text-nowrap bp3-text-overflow-ellipsis" style="max-width: 250px">-->
9+
<h2 class="text-secondary">
810
<span class="cursor-pointer"
911
(click)="goToCollection(collectionName)">{{collectionName | titlecase}}</span>
10-
<i class="bi bi-chevron-right font-80em ps-2"></i> {{folderDetails.folderName}}
11-
<div ngbDropdown class="d-inline-block" #myDrop="ngbDropdown">
12-
<button class="btn p-0" ngbDropdownAnchor (focus)="myDrop.open()"></button>
13-
<div ngbDropdownMenu aria-labelledby="dropdownManual">
14-
<button ngbDropdownItem class="small" (click)="navigateToFolder(folder)"
15-
*ngFor="let folder of userFolders">{{folder.folderName}}</button>
12+
<i class="bi bi-chevron-right font-80em ps-2"></i> {{folderDetails.folderName}}
13+
<div ngbDropdown class="d-inline-block" #myDrop="ngbDropdown">
14+
<button class="btn p-0" ngbDropdownAnchor (focus)="myDrop.open()"></button>
15+
<div ngbDropdownMenu aria-labelledby="dropdownManual">
16+
<button ngbDropdownItem class="small" (click)="navigateToFolder(folder)"
17+
*ngFor="let folder of userFolders">{{folder.folderName}}</button>
18+
</div>
1619
</div>
17-
</div>
18-
</h2>
20+
</h2>
21+
</div>
1922

20-
<div class="d-flex justify-content-end">
23+
<div class="d-flex justify-content-end w-25">
2124
<div *ngIf="folderDetails.canEdit">
2225
<button type="button" class="btn btn-white border font-95em" [ngClass]="{'text-muted': false}"
2326
(click)="shareFolder()">
2427
<!-- [disabled]="!selectedFolderId"-->
2528
<i class="bi bi-people-fill"></i> Share
2629
</button>
27-
28-
<button class="btn btn-primary ms-2 font-95em" (click)="showUploadModal()">
29-
<i class="bi bi-upload"></i> Upload
30-
</button>
31-
32-
33-
<button type="button" class="btn btn-white ms-2 border font-95em" (click)="showExportModal()">
34-
<i class="bi bi-download"></i> Export
35-
</button>
36-
3730
</div>
3831

39-
<div ngbDropdown class="ms-3 d-inline-block">
40-
<button type="button" class="btn btn-white border font-95em" ngbDropdownToggle>Actions</button>
32+
<div ngbDropdown class="ms-1 d-inline-block">
33+
<button type="button" class="btn btn-white border font-95em" ngbDropdownToggle>
34+
<i class="bi bi-three-dots-vertical"></i> Folder Actions
35+
</button>
4136

4237
<div ngbDropdownMenu aria-labelledby="folderActionDropDownOptions">
43-
<div ngbDropdownItem class="small" (click)="showCreateSamplesModal()">Create Samples</div>
44-
<div ngbDropdownItem class="small">Export</div>
45-
<div ngbDropdownItem class="small">Bulk Edit</div>
46-
<div ngbDropdownItem class="small">Upload</div>
38+
<div ngbDropdownItem class="small cursor-pointer" (click)="showCreateSamplesModal()">Create
39+
Samples
40+
</div>
41+
<div ngbDropdownItem class="small cursor-pointer">Export</div>
42+
<!-- <div ngbDropdownItem class="small cursor-pointer">Bulk Edit</div>-->
43+
<div ngbDropdownItem class="small cursor-pointer">Upload</div>
4744

45+
<ng-container *ngIf="isAdmin()">
4846
<div class="dropdown-divider"></div>
4947

50-
<div ngbDropdownItem class="small cursor-pointer" (click)="showTransferModal()">Transfer
48+
<div ngbDropdownItem class="small cursor-pointer" (click)="showTransferModal()">Transfer
49+
Folder
5150
</div>
52-
<div ngbDropdownItem class="small">Promote</div>
53-
<div ngbDropdownItem class="small">Accept</div>
51+
<div ngbDropdownItem class="small cursor-pointer">Accept Transfer</div>
52+
53+
<div ngbDropdownItem class="small cursor-pointer">Add To Featured Collection</div>
54+
</ng-container>
5455
</div>
5556
</div>
5657
</div>

‎src/main/ngapp/src/app/components/collection/folder/folder.component.ts

+6-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import {Folder} from "../../../models/folder";
99
import {FolderService} from "../../../services/folder.service";
1010
import {ExportEntriesComponent} from "../../entry/modal/export-entries/export-entries.component";
1111
import {CreateSamplesComponent} from "../../entry/modal/create-samples/create-samples.component";
12+
import {UserService} from "../../../services/user.service";
1213

1314
@Component({
1415
selector: 'app-folder',
@@ -23,7 +24,7 @@ export class FolderComponent implements OnInit {
2324
userFolders: Folder[];
2425

2526
constructor(private http: HttpService, private activatedRoute: ActivatedRoute, private modalService: NgbModal,
26-
private folders: FolderService, private router: Router) {
27+
private folders: FolderService, private router: Router, private userService: UserService) {
2728
}
2829

2930
ngOnInit(): void {
@@ -43,6 +44,10 @@ export class FolderComponent implements OnInit {
4344
});
4445
}
4546

47+
isAdmin(): boolean {
48+
return this.userService.getUser().isAdmin;
49+
}
50+
4651
getFolderEntries(folderId: number): void {
4752
this.paging.processing = true;
4853
this.http.get('folders/' + folderId + '/entries', this.paging).subscribe((result: Folder) => {

‎src/main/ngapp/src/app/components/entry/create-new-entry/create-new-entry.component.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</div>
88

99
<div class="flex-grow-1">
10-
<div class="bg-white border-bottom p-3">
10+
<div class="bg-white p-3">
1111
<app-header></app-header>
1212
</div>
1313

‎src/main/ngapp/src/app/components/entry/entry-detail/entry-detail.component.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</div>
88

99
<div class="flex-grow-1">
10-
<div class="bg-white border-bottom p-3">
10+
<div class="bg-white p-3">
1111
<app-header></app-header>
1212
</div>
1313

‎src/main/ngapp/src/app/components/entry/upload/upload.component.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</div>
88

99
<div class="flex-grow-1">
10-
<div class="bg-white border-bottom p-3">
10+
<div class="bg-white p-3">
1111
<app-header></app-header>
1212
</div>
1313

‎src/main/ngapp/src/app/components/main/collection.component.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
<div class="row">
33
<div class="px-0 col d-flex">
44

5-
<div class="bg-white" style="flex:0 0 250px">
5+
<div class="bg-white border-end" style="flex:0 0 250px">
66
<app-main-sidebar-menu (selectedCollectionChange)="collectionSelected($event)"></app-main-sidebar-menu>
77
</div>
88

99
<div class="flex-grow-1">
10-
<div class="bg-white border-bottom p-3">
10+
<div class="bg-white p-3">
1111
<app-header></app-header>
1212
</div>
1313

‎src/main/ngapp/src/app/components/modal/share-folder-modal/share-folder-modal.component.html

+3-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ <h3 class="modal-title">Share "{{folder.folderName}}"</h3>
1111
<span class="fw-bold fst-italic text-muted cursor-pointer"
1212
(click)="folderPermissionsOnly = !folderPermissionsOnly">
1313
<i class="bi"
14-
[ngClass]="{'bi-check-square': folderPermissionsOnly, 'bi-square': !folderPermissionsOnly}"></i> &nbsp;Folder permissions only
14+
[ngClass]="{'bi-check-square': folderPermissionsOnly, 'bi-square': !folderPermissionsOnly}"></i>
15+
&nbsp;Folder permissions only
1516
</span>
1617

1718
<div style="overflow: auto; max-height: 200px">
@@ -34,7 +35,7 @@ <h3 class="modal-title">Share "{{folder.folderName}}"</h3>
3435

3536

3637
<ng-container *ngIf="!permissions">
37-
<img src="assets/img/loader-mini.gif"> Loading permissions...
38+
<img ngSrc="assets/img/loader-mini.gif" height="16" width="16" alt=""> Loading permissions...
3839
</ng-container>
3940
</div>
4041

‎src/main/ngapp/src/app/components/profile/profile/profile.component.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</div>
88

99
<div class="flex-grow-1">
10-
<div class="bg-white border-bottom p-3">
10+
<div class="bg-white p-3">
1111
<app-header></app-header>
1212
</div>
1313

0 commit comments

Comments
 (0)