branch develop updated (5b3ce0e -> ff5bb8b)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git from 5b3ce0e Fixes #6580 : Change advanced search button display new ff5bb8b Little display change on users list page The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit ff5bb8bbfaed8ab33af6dbd7ce2140e08217f85c Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Fri Jan 30 15:02:29 2015 +0100 Little display change on users list page Summary of changes: coselmar-ui/src/main/webapp/css/coselmar.css | 6 +++++- .../src/main/webapp/views/users/searchPart.html | 19 ++++++++++--------- 2 files changed, 15 insertions(+), 10 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 ff5bb8bbfaed8ab33af6dbd7ce2140e08217f85c Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Fri Jan 30 15:02:29 2015 +0100 Little display change on users list page --- coselmar-ui/src/main/webapp/css/coselmar.css | 6 +++++- .../src/main/webapp/views/users/searchPart.html | 19 ++++++++++--------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/coselmar-ui/src/main/webapp/css/coselmar.css b/coselmar-ui/src/main/webapp/css/coselmar.css index 6a33b0a..2634bce 100644 --- a/coselmar-ui/src/main/webapp/css/coselmar.css +++ b/coselmar-ui/src/main/webapp/css/coselmar.css @@ -123,8 +123,12 @@ a { clear: both; } -.marginBottom20 { +.marginVertical20 { margin-bottom: 20px; + margin-top: 20px; +} +.marginLeft20 { + margin-left: 20px; } .paddingLeft10 { padding-left: 10px; diff --git a/coselmar-ui/src/main/webapp/views/users/searchPart.html b/coselmar-ui/src/main/webapp/views/users/searchPart.html index 30ccc4b..74650d6 100644 --- a/coselmar-ui/src/main/webapp/views/users/searchPart.html +++ b/coselmar-ui/src/main/webapp/views/users/searchPart.html @@ -11,31 +11,32 @@ </a> </div> - <form class="form-inline pull-right search-zone" name="userOptions" role="userOptions" ng-submit="searchUsers()" ng-if="!advanced"> + <form class="form-inline pull-right search-zone" name="userOptions" role="userOptions" ng-submit="searchUsers()" ng-show="!advanced"> <div class="form-group"> <input type="checkbox" class="form-control" ng-model="search.showDisable" /> <span>{{ 'user.button.showDisable' | translate }}</span> </div> - <div class="form-group"> + <div class="form-group marginLeft20"> <input type="search" class="form-control" placeholder="Search an user" ng-model="search.searchKeyword" /> </div> <div class="form-group"> <button type="submit" class="btn btn-default glyphicon glyphicon-search"></button> </div> + <div class="form-group" ng-show="!advanced"> + <a ng-click="advanced=true" class="btn btn-action"><span class="glyphicon glyphicon-resize-full" aria-hidden="true"></span> {{ 'common.button.advanceSearch' | translate }}</a> + </div> </form> + </div> <div class="text-right clear"> - <div class="form-group" ng-show="!advanced"> - <a ng-click="advanced=true" class="btn btn-action"><span class="glyphicon glyphicon-resize-full" aria-hidden="true"></span> {{ 'common.button.advanceSearch' | translate }}</a> - </div> - <div class="form-group" ng-show="advanced"> - <a ng-click="advanced=false" class="btn btn-action"><span class="glyphicon glyphicon-resize-small" aria-hidden="true"></span> {{ 'common.button.simpleSearch' | translate }}</a> - </div> </div> <!-- Advanced Search part --> -<div ng-if="advanced" class="search-zone marginBottom20"> +<div ng-show="advanced" class="search-zone marginVertical20"> + <div class="form-group text-right"> + <a ng-click="advanced=false" class="btn btn-action"><span class="glyphicon glyphicon-resize-small" aria-hidden="true"></span> {{ 'common.button.simpleSearch' | translate }}</a> + </div> <form class="form-horizontal" name="userFullOption" role="userFullOptions" ng-submit="advancedSearchUsers()"> <div class="form-group row"> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm