Skip to content

Commit bded37b

Browse files
committed
Moved actions back to right-hand side
1 parent 0b4a89b commit bded37b

File tree

3 files changed

+35
-35
lines changed

3 files changed

+35
-35
lines changed

angular/src/app/roles/roles.component.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ <h2>{{ "Roles" | localize }}</h2>
2525
<table class="table table-hover table-striped" [busy]="isTableLoading">
2626
<thead>
2727
<tr>
28-
<th>{{ "Actions" | localize }}</th>
2928
<th>{{ "RoleName" | localize }}</th>
3029
<th>{{ "DisplayName" | localize }}</th>
30+
<th>{{ "Actions" | localize }}</th>
3131
</tr>
3232
</thead>
3333
<tbody>
@@ -43,6 +43,8 @@ <h2>{{ "Roles" | localize }}</h2>
4343
})
4444
"
4545
>
46+
<td>{{ role.name }}</td>
47+
<td>{{ role.displayName }}</td>
4648
<td>
4749
<button mat-icon-button [matMenuTriggerFor]="actionsMenu">
4850
<mat-icon>menu</mat-icon>
@@ -58,8 +60,6 @@ <h2>{{ "Roles" | localize }}</h2>
5860
</button>
5961
</mat-menu>
6062
</td>
61-
<td>{{ role.name }}</td>
62-
<td>{{ role.displayName }}</td>
6363
</tr>
6464
</tbody>
6565
</table>

angular/src/app/tenants/tenants.component.html

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ <h2>{{ "Tenants" | localize }}</h2>
2525
<table class="table table-hover table-striped" [busy]="isTableLoading">
2626
<thead>
2727
<tr>
28-
<th>{{ "Actions" | localize }}</th>
2928
<th>{{ "TenancyName" | localize }}</th>
3029
<th>{{ "Name" | localize }}</th>
3130
<th>
3231
<div style="text-align:center">{{ "IsActive" | localize }}</div>
3332
</th>
33+
<th>{{ "Actions" | localize }}</th>
3434
</tr>
3535
</thead>
3636
<tbody>
@@ -46,21 +46,6 @@ <h2>{{ "Tenants" | localize }}</h2>
4646
})
4747
"
4848
>
49-
<td>
50-
<button mat-icon-button [matMenuTriggerFor]="actionsMenu">
51-
<mat-icon>menu</mat-icon>
52-
</button>
53-
<mat-menu #actionsMenu="matMenu">
54-
<button mat-menu-item (click)="editTenant(tenant)">
55-
<mat-icon>edit</mat-icon>
56-
<span>{{ "Edit" | localize }}</span>
57-
</button>
58-
<button mat-menu-item (click)="delete(tenant)">
59-
<mat-icon>delete</mat-icon>
60-
<span>{{ "Delete" | localize }}</span>
61-
</button>
62-
</mat-menu>
63-
</td>
6449
<td>{{ tenant.tenancyName }}</td>
6550
<td>{{ tenant.name }}</td>
6651
<td align="center">
@@ -79,6 +64,21 @@ <h2>{{ "Tenants" | localize }}</h2>
7964
indeterminate_check_box
8065
</i>
8166
</td>
67+
<td>
68+
<button mat-icon-button [matMenuTriggerFor]="actionsMenu">
69+
<mat-icon>menu</mat-icon>
70+
</button>
71+
<mat-menu #actionsMenu="matMenu">
72+
<button mat-menu-item (click)="editTenant(tenant)">
73+
<mat-icon>edit</mat-icon>
74+
<span>{{ "Edit" | localize }}</span>
75+
</button>
76+
<button mat-menu-item (click)="delete(tenant)">
77+
<mat-icon>delete</mat-icon>
78+
<span>{{ "Delete" | localize }}</span>
79+
</button>
80+
</mat-menu>
81+
</td>
8282
</tr>
8383
</tbody>
8484
</table>

angular/src/app/users/users.component.html

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ <h2>{{ "Users" | localize }}</h2>
2525
<table class="table table-hover table-striped" [busy]="isTableLoading">
2626
<thead>
2727
<tr>
28-
<th>{{ "Actions" | localize }}</th>
2928
<th>{{ "UserName" | localize }}</th>
3029
<th>{{ "FullName" | localize }}</th>
3130
<th>{{ "EmailAddress" | localize }}</th>
3231
<th>
3332
<div style="text-align:center">{{ "IsActive" | localize }}</div>
3433
</th>
34+
<th>{{ "Actions" | localize }}</th>
3535
</tr>
3636
</thead>
3737
<tbody>
@@ -47,21 +47,6 @@ <h2>{{ "Users" | localize }}</h2>
4747
})
4848
"
4949
>
50-
<td>
51-
<button mat-icon-button [matMenuTriggerFor]="actionsMenu">
52-
<mat-icon>menu</mat-icon>
53-
</button>
54-
<mat-menu #actionsMenu="matMenu">
55-
<button mat-menu-item (click)="editUser(user)">
56-
<mat-icon>edit</mat-icon>
57-
<span>{{ "Edit" | localize }}</span>
58-
</button>
59-
<button mat-menu-item (click)="delete(user)">
60-
<mat-icon>delete</mat-icon>
61-
<span>{{ "Delete" | localize }}</span>
62-
</button>
63-
</mat-menu>
64-
</td>
6550
<td>{{ user.userName }}</td>
6651
<td>{{ user.fullName }}</td>
6752
<td>{{ user.emailAddress }}</td>
@@ -81,6 +66,21 @@ <h2>{{ "Users" | localize }}</h2>
8166
indeterminate_check_box
8267
</i>
8368
</td>
69+
<td>
70+
<button mat-icon-button [matMenuTriggerFor]="actionsMenu">
71+
<mat-icon>menu</mat-icon>
72+
</button>
73+
<mat-menu #actionsMenu="matMenu">
74+
<button mat-menu-item (click)="editUser(user)">
75+
<mat-icon>edit</mat-icon>
76+
<span>{{ "Edit" | localize }}</span>
77+
</button>
78+
<button mat-menu-item (click)="delete(user)">
79+
<mat-icon>delete</mat-icon>
80+
<span>{{ "Delete" | localize }}</span>
81+
</button>
82+
</mat-menu>
83+
</td>
8484
</tr>
8585
</tbody>
8686
</table>

0 commit comments

Comments
 (0)