diff options
| author | Danijel Anđelković <adanijel99@gmail.com> | 2022-05-26 22:13:00 +0200 |
|---|---|---|
| committer | Danijel Anđelković <adanijel99@gmail.com> | 2022-05-26 22:13:00 +0200 |
| commit | 71c87626ff13be56ef028e1011b75f65af9b9914 (patch) | |
| tree | e82673cd49d1dcc8825552c516c9873086b55514 /frontend/src/app/_elements/folder/folder.component.html | |
| parent | 6060950ed1d6ba890ca44ae557aaa17632b9c350 (diff) | |
| parent | d9f2acad56bc42a05ae9c0b4fd25827fb6cea374 (diff) | |
Merge branch 'redesign' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into redesign
Diffstat (limited to 'frontend/src/app/_elements/folder/folder.component.html')
| -rw-r--r-- | frontend/src/app/_elements/folder/folder.component.html | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/frontend/src/app/_elements/folder/folder.component.html b/frontend/src/app/_elements/folder/folder.component.html index 17ed02f8..34cd4693 100644 --- a/frontend/src/app/_elements/folder/folder.component.html +++ b/frontend/src/app/_elements/folder/folder.component.html @@ -77,10 +77,10 @@ </div> <div class="mx-2 hover-show" *ngIf="selectedTab !== TabType.PublicDatasets && selectedTab !== TabType.PublicModels"> <button *ngIf="selectedTab==TabType.MyDatasets" class="btn-clear file-button" (click)="downloadFile(file,$event)" style="display: inline-block;"> - <mat-icon matTooltip="Preuzmi" matTooltipPosition="before">download</mat-icon> + <mat-icon matTooltip="Preuzmi" matTooltipPosition="above">download</mat-icon> </button> <button class="btn-clear file-button" (click)="deleteFile(file, $event)" style="display: inline-block;"> - <mat-icon matTooltip="Obriši" matTooltipPosition="right">delete</mat-icon> + <mat-icon matTooltip="Obriši" matTooltipPosition="above">delete</mat-icon> </button> </div> <div class="mx-2 hover-show" *ngIf="selectedTab == TabType.PublicDatasets || selectedTab == TabType.PublicModels"> @@ -119,6 +119,21 @@ </div> </div> </div> + <div [ngSwitch]="newFileSelected" *ngIf="!listView"> + <div class="file-bottom-buttons" *ngIf="selectedTab != TabType.NewFile"> + <div class="file-bottom-buttons-helper"> + <button *ngIf="this.selectedFile && selectedTab == TabType.File && privacy != Privacy.Public" class="btn-clear file-button" (click)="deleteFile(this.selectedFile, $event)"> + <mat-icon matTooltip="Obriši" matTooltipPosition="above">delete</mat-icon> + </button> + <button *ngIf="this.selectedFile && selectedTab==TabType.File && FolderType.Dataset==this.type" class="btn-clear file-button" (click)="downloadFile(this.selectedFile,$event)" style="display: inline-block;"> + <mat-icon matTooltip="Preuzmi" matTooltipPosition="above">download</mat-icon> + </button> + </div> + <!-- <button class="btn-clear file-button"> + <mat-icon>zoom_out_map</mat-icon> + </button> --> + </div> + </div> <div id="footer" [ngSwitch]="newFileSelected" *ngIf="!listView"> <button mat-button (click)="saveNewFile()" class="bottom-button text-offwhite rounded-bottom" [disabled]="saveDisabled" *ngSwitchCase="true"> <div class="f-row"> @@ -154,20 +169,6 @@ </button> </ng-container> </div> - <div [ngSwitch]="newFileSelected" *ngIf="!listView"> - <div class="file-bottom-buttons" *ngIf="selectedTab != TabType.NewFile"> - <div class="file-bottom-buttons-helper"> - <button *ngIf="this.selectedFile && selectedTab == TabType.File && privacy != Privacy.Public" class="btn-clear file-button" (click)="deleteFile(this.selectedFile, $event)"> - <mat-icon matTooltip="Obriši" matTooltipPosition="right">delete</mat-icon> - </button> - <button *ngIf="this.selectedFile && selectedTab==TabType.File && FolderType.Dataset==this.type" class="btn-clear file-button" (click)="downloadFile(this.selectedFile,$event)" style="display: inline-block;"> - <mat-icon matTooltip="Preuzmi" matTooltipPosition="before">download</mat-icon> - </button> - </div> - <!-- <button class="btn-clear file-button"> - <mat-icon>zoom_out_map</mat-icon> - </button> --> - </div> - </div> + </div>
\ No newline at end of file |