This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit 2f4189087c965985e62fed77bf2710953bc5af49 Author: Yannick Martel <martel@©odelutin.com> Date: Thu Jan 15 10:53:20 2015 +0100 can switch simple/advanced search on user --- coselmar-ui/src/main/webapp/views/users/users.html | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/coselmar-ui/src/main/webapp/views/users/users.html b/coselmar-ui/src/main/webapp/views/users/users.html index db11036..765d71a 100644 --- a/coselmar-ui/src/main/webapp/views/users/users.html +++ b/coselmar-ui/src/main/webapp/views/users/users.html @@ -30,11 +30,11 @@ </div> <div class="table-responsive"> - <div> - <div class="form-group"> + <div class="row"> + <div class="form-group col-md-5"> <a href="#/users/new" class="form-inline navbar-left btn btn-primary">Add an user</a> </div> - <form class="form-inline pull-right" name="userOptions" role="userOptions" ng-submit="searchUsers()"> + <form class="form-inline cold-md-7" name="userOptions" role="userOptions" ng-submit="searchUsers()" ng-if="!advanced"> <div class="form-group"> <input type="checkbox" class="form-control" ng-model="search.showDisable" /> <span>Show Disable</span> @@ -47,10 +47,18 @@ </div> </form> </div> + <div class="row"> + <div class="form-group col-md-5" ng-show="!advanced"> + <a ng-click="advanced=true" class="fa fa-sort-down">Advanced Search</a> + </div> + <div class="form-group col-md-5" ng-show="advanced"> + <a ng-click="advanced=false" class="fa fa-sort-up">Simple Search</a> + </div> + </div> <br/> <table class="table"> - <tr> + <tr ng-if="advanced"> <form class="form-inline" name="userFullOption" role="userFullOptions" ng-submit="advancedSearchUsers()"> <td class="form-group"> <input type="search" class="form-control" placeholder="Name" ng-model="example.name" /> @@ -81,16 +89,16 @@ </select> </td> <td class="form-group text-center"> - <button type="submit" class="btn btn-default fa fa-search"></button> + <button type="submit" class="btn btn-default fa fa-search" ng-click="advancedSearchUsers()">Search</button> </td> </form> </tr> <tr> - <th class="col-md-1">Name</th> + <th class="col-md-2">Name</th> <th class="col-md-2">Mail</th> <th class="col-md-2">Qualification</th> <th class="col-md-2">Organization</th> - <th class="col-md-1">Role</th> + <th class="col-md-2">Role</th> <th class="col-md-1">Status</th> <th class="col-md-1"></th> </tr> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.