diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000000000000000000000000000000000000..65e1ec0785db20d5a27a5203bd4a1a443fe87266 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "makefile.extensionOutputFolder": "./.vscode" +} \ No newline at end of file diff --git a/Makefile b/Makefile index 808b8283bc4305e684c420fec727481b97b469fe..0c098c5d92d3ebef583f90f6d58d9014a0397917 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -UID := 1000 -GID := 1000 +UID := 9898 +GID := 4000 list: @echo "" diff --git a/client/src/app/instance/search/components/result/datatable-actions.component.html b/client/src/app/instance/search/components/result/datatable-actions.component.html index 3889169ed51cc03145b4e17198f16706b4227be2..fd173437885bbe0526e6e829caf99ec4b5fffcab 100644 --- a/client/src/app/instance/search/components/result/datatable-actions.component.html +++ b/client/src/app/instance/search/components/result/datatable-actions.component.html @@ -1,25 +1,32 @@ <div *ngIf="dataset.datatable_selectable_rows" class="btn-group mb-2" dropdown [isDisabled]="selectedData.length < 1"> - <button id="button-basic" dropdownToggle type="button" class="btn btn-primary dropdown-toggle" aria-controls="dropdown-basic"> - Actions <span class="caret"></span> + <button id="button-basic" dropdownToggle type="button" class="btn btn-primary dropdown-toggle" + aria-controls="dropdown-basic"> + <span *ngIf="!selectedData.length">Actions on selected rows (select rows first)</span> + <span *ngIf="selectedData.length">Actions on {{selectedData.length}} rows </span> + <span class="caret"></span> </button> <ul id="dropdown-basic" *dropdownMenu class="dropdown-menu" role="menu" aria-labelledby="button-basic"> <li *ngIf="dataset.download_json" role="menuitem"> - <a class="dropdown-item" [href]="getDatatableUrl('json')" (click)="download($event, getDatatableUrl('json'), 'json')"> + <a class="dropdown-item" [href]="getDatatableUrl('json')" + (click)="download($event, getDatatableUrl('json'), 'json')"> <span class="fas fa-file"></span> Download JSON </a> </li> <li *ngIf="dataset.download_csv" role="menuitem"> - <a class="dropdown-item" [href]="getDatatableUrl('csv')" (click)="download($event, getDatatableUrl('csv'), 'csv')"> + <a class="dropdown-item" [href]="getDatatableUrl('csv')" + (click)="download($event, getDatatableUrl('csv'), 'csv')"> <span class="fas fa-file-csv"></span> Download CSV </a> </li> <li *ngIf="dataset.download_ascii" role="menuitem"> - <a class="dropdown-item" [href]="getDatatableUrl('ascii')" (click)="download($event, getDatatableUrl('ascii'), 'ascii')"> + <a class="dropdown-item" [href]="getDatatableUrl('ascii')" + (click)="download($event, getDatatableUrl('ascii'), 'ascii')"> <span class="fas fa-file"></span> Download ASCII </a> </li> <li *ngIf="dataset.download_vo" role="menuitem"> - <a class="dropdown-item" [href]="getDatatableUrl('votable')" (click)="download($event, getDatatableUrl('votable'), 'votable')"> + <a class="dropdown-item" [href]="getDatatableUrl('votable')" + (click)="download($event, getDatatableUrl('votable'), 'votable')"> <span class="fas fa-file"></span> VOtable </a> </li> @@ -34,4 +41,4 @@ </a> </li> </ul> -</div> +</div> \ No newline at end of file