Commit d5b789bde71bffdfee3ebe0935ec012dbc8124df
merged caViewIssues
Showing
2 changed files
with
25 additions
and
22 deletions
400-SOURCECODE/AIAHTML5.Web/app/views/ca/ca-view.html
| @@ -25,7 +25,7 @@ | @@ -25,7 +25,7 @@ | ||
| 25 | </div> | 25 | </div> |
| 26 | <div class="col-md-2 col-xs-6 col-sm-3 pad-lftrgt3"> | 26 | <div class="col-md-2 col-xs-6 col-sm-3 pad-lftrgt3"> |
| 27 | <div class="form-group"> | 27 | <div class="form-group"> |
| 28 | - <h6 class="text-center text-primary txt-white f11">Medical Speciality</h6> | 28 | + <h6 class="text-center text-primary txt-white f11">Medical Specialty</h6> |
| 29 | <select class="form-control input-sm" ng-change="hideListViewDiv()" ng-model="query.selectedspecialty" ng-options="item for item in CAAllSpeciality track by item"> | 29 | <select class="form-control input-sm" ng-change="hideListViewDiv()" ng-model="query.selectedspecialty" ng-options="item for item in CAAllSpeciality track by item"> |
| 30 | <option value="">All</option> | 30 | <option value="">All</option> |
| 31 | </select> | 31 | </select> |
| @@ -33,15 +33,18 @@ | @@ -33,15 +33,18 @@ | ||
| 33 | </div> | 33 | </div> |
| 34 | <div class="col-md-2 col-xs-6 col-sm-3 pad-lftrgt3"> | 34 | <div class="col-md-2 col-xs-6 col-sm-3 pad-lftrgt3"> |
| 35 | <div class="form-group"> | 35 | <div class="form-group"> |
| 36 | - <h6 class="text-center text-primary txt-white f11">Search</h6> | ||
| 37 | - | ||
| 38 | - | ||
| 39 | - <div class="btn-group col-xs-12" style="padding:0;"> | ||
| 40 | - <button type="button" class="btn btn-primary btn-sm col-xs-9" ng-click="Reset(query)"><i class="fa fa-eye"></i> Show All</button> | ||
| 41 | - <button type="button" class="btn btn-primary btn-sm col-xs-3" ng-click="ApplySearch(query)"> | ||
| 42 | - <i class="fa fa-search"></i> | ||
| 43 | - </button> | ||
| 44 | - | 36 | + |
| 37 | + <div class="col-xs-12" style="padding:0;"> | ||
| 38 | + <div class="col-xs-5" style="padding:0 2px 0 0;"> | ||
| 39 | + <h6 class="text-center text-primary txt-white f11">Search</h6> | ||
| 40 | + <button type="button" class="btn btn-primary btn-sm col-xs-12" ng-click="ApplySearch(query)"> | ||
| 41 | + <i class="fa fa-search"></i> | ||
| 42 | + </button> | ||
| 43 | + </div> | ||
| 44 | + <div class="col-xs-7" style="padding:0;"> | ||
| 45 | + <h6 class="text-center text-primary txt-white f11" style="padding:0;">Show All</h6> | ||
| 46 | + <button type="button" class="btn btn-primary btn-sm col-xs-12" ng-click="Reset(query)"><i class="fa fa-eye"></i></button> | ||
| 47 | + </div> | ||
| 45 | </div> | 48 | </div> |
| 46 | 49 | ||
| 47 | 50 |
400-SOURCECODE/AIAHTML5.Web/app/views/ci/ci-view.html
| @@ -41,7 +41,7 @@ | @@ -41,7 +41,7 @@ | ||
| 41 | </div> | 41 | </div> |
| 42 | <div class="col-md-2 col-sm-4 pad-lftrgt3"> | 42 | <div class="col-md-2 col-sm-4 pad-lftrgt3"> |
| 43 | <div class="form-group"> | 43 | <div class="form-group"> |
| 44 | - <h6 class="text-center text-primary txt-white f11">Medical Speciality</h6> | 44 | + <h6 class="text-center text-primary txt-white f11">Medical Specialty</h6> |
| 45 | <select ng-change="hideListViewDiv()"class="form-control input-sm" ng-model="query.selectedspecialty" ng-options="item for item in CIAllSpeciality track by item"> | 45 | <select ng-change="hideListViewDiv()"class="form-control input-sm" ng-model="query.selectedspecialty" ng-options="item for item in CIAllSpeciality track by item"> |
| 46 | <option value="">All</option> | 46 | <option value="">All</option> |
| 47 | </select> | 47 | </select> |
| @@ -49,18 +49,18 @@ | @@ -49,18 +49,18 @@ | ||
| 49 | </div> | 49 | </div> |
| 50 | <div class="col-md-2 col-sm-4 pad-lftrgt3"> | 50 | <div class="col-md-2 col-sm-4 pad-lftrgt3"> |
| 51 | <div class="form-group"> | 51 | <div class="form-group"> |
| 52 | - <h6 class="text-center text-primary txt-white f11">Search</h6> | ||
| 53 | - | ||
| 54 | - <div class="btn-group col-xs-12" style="padding:0;"> | ||
| 55 | - <button type="button" class="btn btn-primary btn-sm col-xs-9" ng-click="Reset(query)"><i class="fa fa-eye"></i> Show All</button> | ||
| 56 | - <button type="button" class="btn btn-primary btn-sm col-xs-3" ng-click="ApplySearch(query)"> | ||
| 57 | - <i class="fa fa-search"></i> | ||
| 58 | - </button> | ||
| 59 | - | 52 | + <div class="col-xs-12" style="padding:0;"> |
| 53 | + <div class="col-xs-5" style="padding:0 2px 0 0;"> | ||
| 54 | + <h6 class="text-center text-primary txt-white f11 col-xs-12">Search</h6> | ||
| 55 | + <button type="button" class="btn btn-primary btn-sm col-xs-12" ng-click="ApplySearch(query)" style="margin-right:2px;"> | ||
| 56 | + <i class="fa fa-search"></i> | ||
| 57 | + </button> | ||
| 58 | + </div> | ||
| 59 | + <div class="col-xs-7" style="padding:0;"> | ||
| 60 | + <h6 class="text-center text-primary txt-white f11 col-xs-12" style="padding:0;">Show All</h6> | ||
| 61 | + <button type="button" class="btn btn-primary btn-sm col-xs-12" ng-click="Reset(query)"><i class="fa fa-eye"></i></button> | ||
| 62 | + </div> | ||
| 60 | </div> | 63 | </div> |
| 61 | - | ||
| 62 | - | ||
| 63 | - | ||
| 64 | <!--<button class="btn btn-primary btn-sm" ng-click="ApplySearch(query)"><i class="fa fa-search"></i></button> <button class="btn btn-primary btn-sm col-md-9" ng-click="Reset(query)"><i class="fa fa-eye"></i> Show All</button>--> | 64 | <!--<button class="btn btn-primary btn-sm" ng-click="ApplySearch(query)"><i class="fa fa-search"></i></button> <button class="btn btn-primary btn-sm col-md-9" ng-click="Reset(query)"><i class="fa fa-eye"></i> Show All</button>--> |
| 65 | </div> | 65 | </div> |
| 66 | </div> | 66 | </div> |