Skip to content

Commit

Permalink
Changed filter form alignments
Browse files Browse the repository at this point in the history
  • Loading branch information
@alirizaadiyahsi
alirizaadiyahsi committed Feb 28, 2019
1 parent 92f8bf5 commit bb1a626
Show file tree
Hide file tree
Showing 4 changed files with 190 additions and 177 deletions.
137 changes: 70 additions & 67 deletions angular/src/app/roles/roles.component.html
View file
Original file line number Diff line number Diff line change
@@ -1,45 +1,48 @@
<div class="row clearfix" [@routerTransition]>
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<div class="card main-content">
<div class="header">
<h2>{{ "Roles" | localize }}</h2>
<ul class="header-dropdown m-r--5">
<li>
<button mat-icon-button [matMenuTriggerFor]="headerMenu" class="header-dropdown-mat-icon-button">
<mat-icon>more_vert</mat-icon>
</button>
<mat-menu #headerMenu="matMenu">
<button mat-menu-item (click)="refresh()">
<mat-icon>refresh</mat-icon>
<span>{{ "Refresh" | localize }}</span>
</button>
</mat-menu>
</li>
</ul>
</div>
<div class="body table-responsive">
<!--query start-->
<div class="row clearfix">
<form>
<mat-form-field>
<input matInput [placeholder]="l('Filter')" [(ngModel)]="keyword" name="keyword">
</mat-form-field>
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<div class="card main-content">
<div class="header">
<h2>{{ "Roles" | localize }}</h2>
<ul class="header-dropdown m-r--5">
<li>
<button mat-icon-button [matMenuTriggerFor]="headerMenu" class="header-dropdown-mat-icon-button">
<mat-icon>more_vert</mat-icon>
</button>
<mat-menu #headerMenu="matMenu">
<button mat-menu-item (click)="refresh()">
<mat-icon>refresh</mat-icon>
<span>{{ "Refresh" | localize }}</span>
</button>
</mat-menu>
</li>
</ul>
</div>
<div class="body table-responsive">
<!--query start-->
<div class="row clearfix">
<form>
<mat-form-field>
<input matInput [placeholder]="l('Filter')" [(ngModel)]="keyword" name="keyword">
</mat-form-field>

<button mat-raised-button color="primary" (click)="getDataPage(1)">{{ 'Search' | localize }}</button>

</form>
</div>
<!--query end-->
<table class="table table-hover table-striped" [busy]="isTableLoading">
<thead>
<tr>
<th>{{ "RoleName" | localize }}</th>
<th>{{ "DisplayName" | localize }}</th>
<th>{{ "Actions" | localize }}</th>
</tr>
</thead>
<tbody>
<tr *ngFor="
<div class="row">
<div class="col-md-12 text-right p-r-25">
<button mat-raised-button color="primary" (click)="getDataPage(1)">{{ 'Search' | localize }}</button>
</div>
</div>
</form>
</div>
<!--query end-->
<table class="table table-hover table-striped" [busy]="isTableLoading">
<thead>
<tr>
<th>{{ "RoleName" | localize }}</th>
<th>{{ "DisplayName" | localize }}</th>
<th>{{ "Actions" | localize }}</th>
</tr>
</thead>
<tbody>
<tr *ngFor="
let role of (roles
| paginate
: {
Expand All @@ -49,34 +52,34 @@ <h2>{{ "Roles" | localize }}</h2>
totalItems: totalItems
})
">
<td>{{ role.name }}</td>
<td>{{ role.displayName }}</td>
<td>
<button class="action-button" mat-icon-button [matMenuTriggerFor]="actionsMenu">
<mat-icon>menu</mat-icon>
<td>{{ role.name }}</td>
<td>{{ role.displayName }}</td>
<td>
<button class="action-button" mat-icon-button [matMenuTriggerFor]="actionsMenu">
<mat-icon>menu</mat-icon>
</button>
<mat-menu #actionsMenu="matMenu">
<button mat-menu-item (click)="editRole(role)">
<mat-icon>edit</mat-icon>
<span>{{ "Edit" | localize }}</span>
</button>
<button mat-menu-item (click)="delete(role)">
<mat-icon>delete</mat-icon>
<span>{{ "Delete" | localize }}</span>
</button>
</mat-menu>
</td>
</tr>
</tbody>
</table>
<div class="abp-pagination-controls-wrapper" *ngIf="totalItems > pageSize">
<abp-pagination-controls (pageChange)="getDataPage($event)" id="server">
</abp-pagination-controls>
</div>
<button mat-mini-fab color="primary" class="pull-right" (click)="createRole()">
<mat-icon>add</mat-icon>
</button>
<mat-menu #actionsMenu="matMenu">
<button mat-menu-item (click)="editRole(role)">
<mat-icon>edit</mat-icon>
<span>{{ "Edit" | localize }}</span>
</button>
<button mat-menu-item (click)="delete(role)">
<mat-icon>delete</mat-icon>
<span>{{ "Delete" | localize }}</span>
</button>
</mat-menu>
</td>
</tr>
</tbody>
</table>
<div class="abp-pagination-controls-wrapper" *ngIf="totalItems > pageSize">
<abp-pagination-controls (pageChange)="getDataPage($event)" id="server">
</abp-pagination-controls>
</div>
</div>
<button mat-mini-fab color="primary" class="pull-right" (click)="createRole()">
<mat-icon>add</mat-icon>
</button>
</div>
</div>
</div>
</div>
37 changes: 21 additions & 16 deletions angular/src/app/tenants/tenants.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,27 @@ <h2>{{ "Tenants" | localize }}</h2>
<div class="body table-responsive">
<!--query start-->
<div class="row clearfix">
<form>
<mat-form-field>
<input matInput [placeholder]="l('Filter')" [(ngModel)]="keyword" name="keyword">
</mat-form-field>

<mat-form-field>
<mat-select [placeholder]="l('IsActive')" [(ngModel)]="isActive" name="isActive">
<mat-option value="">{{ 'All' | localize }}</mat-option>
<mat-option value="true">{{ 'Yes' | localize }}</mat-option>
<mat-option value="false">{{ 'No' | localize }}</mat-option>
</mat-select>
</mat-form-field>

<button mat-raised-button color="primary" (click)="getDataPage(1)">{{ 'Search' | localize }}</button>

</form>
<form>
<div class="row">
<div class="col-md-6">
<mat-form-field>
<input matInput [placeholder]="l('Filter')" [(ngModel)]="keyword" name="keyword">
</mat-form-field>
</div>
<div class="col-md-6">
<mat-form-field>
<mat-select [placeholder]="l('IsActive')" [(ngModel)]="isActive" name="isActive">
<mat-option value="">{{ 'All' | localize }}</mat-option>
<mat-option value="true">{{ 'Yes' | localize }}</mat-option>
<mat-option value="false">{{ 'No' | localize }}</mat-option>
</mat-select>
</mat-form-field>
</div>
<div class="col-md-12 text-right p-r-25">
<button mat-raised-button color="primary" (click)="getDataPage(1)">{{ 'Search' | localize }}</button>
</div>
</div>
</form>
</div>
<!--query end-->
<table class="table table-hover table-striped" [busy]="isTableLoading">
Expand Down
2 changes: 1 addition & 1 deletion angular/src/app/users/create-user/create-user-dialog.component.html
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<form autocomplete="off" #createUserModal="ngForm" (ngSubmit)="save()">
<form autocomplete="off" #createUserModal="ngForm" (ngSubmit)="save()">
<h1 mat-dialog-title>{{ "CreateNewUser" | localize }}</h1>
<mat-dialog-content style="width:800px;height:300px;">
<mat-tab-group>
Expand Down
Loading

0 comments on commit bb1a626

Please sign in to comment.