Skip to content

Commit bb1a626

Browse files
alirizaadiyahsialirizaadiyahsi
committed
Changed filter form alignments
1 parent 92f8bf5 commit bb1a626

File tree

4 files changed

+190
-177
lines changed

4 files changed

+190
-177
lines changed

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

Lines changed: 70 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,48 @@
11
<div class="row clearfix" [@routerTransition]>
2-
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
3-
<div class="card main-content">
4-
<div class="header">
5-
<h2>{{ "Roles" | localize }}</h2>
6-
<ul class="header-dropdown m-r--5">
7-
<li>
8-
<button mat-icon-button [matMenuTriggerFor]="headerMenu" class="header-dropdown-mat-icon-button">
9-
<mat-icon>more_vert</mat-icon>
10-
</button>
11-
<mat-menu #headerMenu="matMenu">
12-
<button mat-menu-item (click)="refresh()">
13-
<mat-icon>refresh</mat-icon>
14-
<span>{{ "Refresh" | localize }}</span>
15-
</button>
16-
</mat-menu>
17-
</li>
18-
</ul>
19-
</div>
20-
<div class="body table-responsive">
21-
<!--query start-->
22-
<div class="row clearfix">
23-
<form>
24-
<mat-form-field>
25-
<input matInput [placeholder]="l('Filter')" [(ngModel)]="keyword" name="keyword">
26-
</mat-form-field>
2+
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
3+
<div class="card main-content">
4+
<div class="header">
5+
<h2>{{ "Roles" | localize }}</h2>
6+
<ul class="header-dropdown m-r--5">
7+
<li>
8+
<button mat-icon-button [matMenuTriggerFor]="headerMenu" class="header-dropdown-mat-icon-button">
9+
<mat-icon>more_vert</mat-icon>
10+
</button>
11+
<mat-menu #headerMenu="matMenu">
12+
<button mat-menu-item (click)="refresh()">
13+
<mat-icon>refresh</mat-icon>
14+
<span>{{ "Refresh" | localize }}</span>
15+
</button>
16+
</mat-menu>
17+
</li>
18+
</ul>
19+
</div>
20+
<div class="body table-responsive">
21+
<!--query start-->
22+
<div class="row clearfix">
23+
<form>
24+
<mat-form-field>
25+
<input matInput [placeholder]="l('Filter')" [(ngModel)]="keyword" name="keyword">
26+
</mat-form-field>
2727

28-
<button mat-raised-button color="primary" (click)="getDataPage(1)">{{ 'Search' | localize }}</button>
29-
30-
</form>
31-
</div>
32-
<!--query end-->
33-
<table class="table table-hover table-striped" [busy]="isTableLoading">
34-
<thead>
35-
<tr>
36-
<th>{{ "RoleName" | localize }}</th>
37-
<th>{{ "DisplayName" | localize }}</th>
38-
<th>{{ "Actions" | localize }}</th>
39-
</tr>
40-
</thead>
41-
<tbody>
42-
<tr *ngFor="
28+
<div class="row">
29+
<div class="col-md-12 text-right p-r-25">
30+
<button mat-raised-button color="primary" (click)="getDataPage(1)">{{ 'Search' | localize }}</button>
31+
</div>
32+
</div>
33+
</form>
34+
</div>
35+
<!--query end-->
36+
<table class="table table-hover table-striped" [busy]="isTableLoading">
37+
<thead>
38+
<tr>
39+
<th>{{ "RoleName" | localize }}</th>
40+
<th>{{ "DisplayName" | localize }}</th>
41+
<th>{{ "Actions" | localize }}</th>
42+
</tr>
43+
</thead>
44+
<tbody>
45+
<tr *ngFor="
4346
let role of (roles
4447
| paginate
4548
: {
@@ -49,34 +52,34 @@ <h2>{{ "Roles" | localize }}</h2>
4952
totalItems: totalItems
5053
})
5154
">
52-
<td>{{ role.name }}</td>
53-
<td>{{ role.displayName }}</td>
54-
<td>
55-
<button class="action-button" mat-icon-button [matMenuTriggerFor]="actionsMenu">
56-
<mat-icon>menu</mat-icon>
55+
<td>{{ role.name }}</td>
56+
<td>{{ role.displayName }}</td>
57+
<td>
58+
<button class="action-button" mat-icon-button [matMenuTriggerFor]="actionsMenu">
59+
<mat-icon>menu</mat-icon>
60+
</button>
61+
<mat-menu #actionsMenu="matMenu">
62+
<button mat-menu-item (click)="editRole(role)">
63+
<mat-icon>edit</mat-icon>
64+
<span>{{ "Edit" | localize }}</span>
65+
</button>
66+
<button mat-menu-item (click)="delete(role)">
67+
<mat-icon>delete</mat-icon>
68+
<span>{{ "Delete" | localize }}</span>
69+
</button>
70+
</mat-menu>
71+
</td>
72+
</tr>
73+
</tbody>
74+
</table>
75+
<div class="abp-pagination-controls-wrapper" *ngIf="totalItems > pageSize">
76+
<abp-pagination-controls (pageChange)="getDataPage($event)" id="server">
77+
</abp-pagination-controls>
78+
</div>
79+
<button mat-mini-fab color="primary" class="pull-right" (click)="createRole()">
80+
<mat-icon>add</mat-icon>
5781
</button>
58-
<mat-menu #actionsMenu="matMenu">
59-
<button mat-menu-item (click)="editRole(role)">
60-
<mat-icon>edit</mat-icon>
61-
<span>{{ "Edit" | localize }}</span>
62-
</button>
63-
<button mat-menu-item (click)="delete(role)">
64-
<mat-icon>delete</mat-icon>
65-
<span>{{ "Delete" | localize }}</span>
66-
</button>
67-
</mat-menu>
68-
</td>
69-
</tr>
70-
</tbody>
71-
</table>
72-
<div class="abp-pagination-controls-wrapper" *ngIf="totalItems > pageSize">
73-
<abp-pagination-controls (pageChange)="getDataPage($event)" id="server">
74-
</abp-pagination-controls>
82+
</div>
7583
</div>
76-
<button mat-mini-fab color="primary" class="pull-right" (click)="createRole()">
77-
<mat-icon>add</mat-icon>
78-
</button>
79-
</div>
8084
</div>
81-
</div>
8285
</div>

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

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,27 @@ <h2>{{ "Tenants" | localize }}</h2>
2424
<div class="body table-responsive">
2525
<!--query start-->
2626
<div class="row clearfix">
27-
<form>
28-
<mat-form-field>
29-
<input matInput [placeholder]="l('Filter')" [(ngModel)]="keyword" name="keyword">
30-
</mat-form-field>
31-
32-
<mat-form-field>
33-
<mat-select [placeholder]="l('IsActive')" [(ngModel)]="isActive" name="isActive">
34-
<mat-option value="">{{ 'All' | localize }}</mat-option>
35-
<mat-option value="true">{{ 'Yes' | localize }}</mat-option>
36-
<mat-option value="false">{{ 'No' | localize }}</mat-option>
37-
</mat-select>
38-
</mat-form-field>
39-
40-
<button mat-raised-button color="primary" (click)="getDataPage(1)">{{ 'Search' | localize }}</button>
41-
42-
</form>
27+
<form>
28+
<div class="row">
29+
<div class="col-md-6">
30+
<mat-form-field>
31+
<input matInput [placeholder]="l('Filter')" [(ngModel)]="keyword" name="keyword">
32+
</mat-form-field>
33+
</div>
34+
<div class="col-md-6">
35+
<mat-form-field>
36+
<mat-select [placeholder]="l('IsActive')" [(ngModel)]="isActive" name="isActive">
37+
<mat-option value="">{{ 'All' | localize }}</mat-option>
38+
<mat-option value="true">{{ 'Yes' | localize }}</mat-option>
39+
<mat-option value="false">{{ 'No' | localize }}</mat-option>
40+
</mat-select>
41+
</mat-form-field>
42+
</div>
43+
<div class="col-md-12 text-right p-r-25">
44+
<button mat-raised-button color="primary" (click)="getDataPage(1)">{{ 'Search' | localize }}</button>
45+
</div>
46+
</div>
47+
</form>
4348
</div>
4449
<!--query end-->
4550
<table class="table table-hover table-striped" [busy]="isTableLoading">

‎angular/src/app/users/create-user/create-user-dialog.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<form autocomplete="off" #createUserModal="ngForm" (ngSubmit)="save()">
1+
<form autocomplete="off" #createUserModal="ngForm" (ngSubmit)="save()">
22
<h1 mat-dialog-title>{{ "CreateNewUser" | localize }}</h1>
33
<mat-dialog-content style="width:800px;height:300px;">
44
<mat-tab-group>

0 commit comments

Comments
 (0)