diff options
| author | Sonja Galovic <galovicsonja@gmail.com> | 2022-05-18 14:00:44 +0200 |
|---|---|---|
| committer | Sonja Galovic <galovicsonja@gmail.com> | 2022-05-18 14:00:44 +0200 |
| commit | f3e4093e5a29eadd61a00a3a05668e3e24b7d40d (patch) | |
| tree | 613df1a3ed2afa08f450267667732854dcd51134 /frontend/src/app/_elements/form-dataset/form-dataset.component.html | |
| parent | 9233e6f193f68a0477e2900ac7a82928ab7f4adc (diff) | |
| parent | aa71097de7e95658c0cfa3e7d212f018aa917baf (diff) | |
Merge branch 'redesign' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into redesign
# Conflicts:
# frontend/src/app/_elements/column-table/column-table.component.html
# frontend/src/app/_pages/experiment/experiment.component.ts
Diffstat (limited to 'frontend/src/app/_elements/form-dataset/form-dataset.component.html')
| -rw-r--r-- | frontend/src/app/_elements/form-dataset/form-dataset.component.html | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/frontend/src/app/_elements/form-dataset/form-dataset.component.html b/frontend/src/app/_elements/form-dataset/form-dataset.component.html index 9f8e9e6f..7be838f1 100644 --- a/frontend/src/app/_elements/form-dataset/form-dataset.component.html +++ b/frontend/src/app/_elements/form-dataset/form-dataset.component.html @@ -3,8 +3,7 @@ <div class="topBar"> <div class="kolona mb-3"> <div class="fileButton"> - <button type="button" mat-raised-button (click)="fileInput.click()">Dodaj izvor podataka</button> - + <button type="button" mat-raised-button (click)="fileInput.click()"><span *ngIf="!firstInput">Dodaj izvor podataka</span><span *ngIf="firstInput">{{filename}}</span></button> </div> </div> @@ -32,11 +31,7 @@ </mat-form-field> </div> </div> - - <div class="row" *ngIf="firstInput"> - <label class="naslov mt-2">{{filename}}</label> - - </div> + <div class="row" style="margin-right: 0;"> <div class="file-container" [ngClass]="{'dottedClass': !tableData.hasInput}"> @@ -49,7 +44,7 @@ <div class="mt-5 datatable"> <div [ngClass]="{'hidden': (!existingFlag)}" class="text-center"> <button mat-button (click)="goBack()"><mat-icon>keyboard_arrow_left</mat-icon></button> - <div style="display: inline;">{{(this.begin/10)+1}}</div> + <div style="display: inline;">{{(this.begin/10)+1}}...{{getPage()}}</div> <button mat-button (click)="goForward()"><mat-icon>keyboard_arrow_right</mat-icon></button> </div> <app-datatable [tableData]="tableData"></app-datatable> |