This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit 533aff9468c5e02d0dc7a47814792616046f7510 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Thu Aug 21 16:31:04 2014 +0200 improve UI --- pollen-ui-angular/src/main/webapp/js/directives.js | 8 ++++---- pollen-ui-angular/src/main/webapp/less/style.less | 16 ++++++++++++++++ .../src/main/webapp/partials/favoriteList-edit.html | 17 ++++++++--------- 3 files changed, 28 insertions(+), 13 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/directives.js b/pollen-ui-angular/src/main/webapp/js/directives.js index 8ea10a5..5916db9 100644 --- a/pollen-ui-angular/src/main/webapp/js/directives.js +++ b/pollen-ui-angular/src/main/webapp/js/directives.js @@ -475,16 +475,16 @@ angular.module('pollenDirective', []) fvId: "=" }, template: - '<form>' + - '<input type="file" name="csvFile"/>' + + '<form class="form-inline">' + + '<input type="file" name="csvFile" />' + '<button class="btn btn-primary" type="submit"><span class="fa fa-download"></span> {{ \'action.favoriteList.import.fromCSV\' | translate }}</button>' + '</form>', link: function (scope, element) { - element.find('button').bind("click", function (event) { + element.find('button').bind("click", function () { var reader = new FileReader(); reader.onload = function () { var formData = new FormData(element[0].firstChild); - FavoriteList.importcsv({favoriteListId: scope.fvId}, formData, function (data) { + FavoriteList.importcsv({favoriteListId: scope.fvId}, formData, function () { $route.reload(); }, function (error) { $rootScope.$broadcast('newError', error.data.error); diff --git a/pollen-ui-angular/src/main/webapp/less/style.less b/pollen-ui-angular/src/main/webapp/less/style.less index 5a11f8d..754196b 100644 --- a/pollen-ui-angular/src/main/webapp/less/style.less +++ b/pollen-ui-angular/src/main/webapp/less/style.less @@ -485,6 +485,18 @@ a { width:@width-action; } + &.cell-lg { + div { + float: right; + display: inline-block; + margin:3px; + + &:first-child { + float: left; + } + } + } + input[type=file] { display: inline-block; } @@ -530,6 +542,10 @@ label.label-block { margin-top: 5px; } +.form-inline { + display: inline; +} + footer { position: absolute; right: 0; diff --git a/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html b/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html index 59b1b8b..cc434bb 100644 --- a/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html +++ b/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html @@ -65,15 +65,14 @@ </tr> <tr> - <th colspan="3"> - <button class="btn btn-info" ng-click="addMember();"><span class="fa fa-plus"></span> {{ 'action.favoriteList.addMember' | translate }} </button> - <button class="btn btn-danger" ng-click="deleteFavoriteList();"><span class="fa fa-trash-o"></span> {{ 'action.favoriteList.delete' | translate }} </button> - </th> - </tr> - - <tr ng-if="data.favoriteList.id"> - <th colspan="3"> - <import-csv fv-id="data.favoriteList.id"></import-csv> + <th class="cell-lg" colspan="3"> + <div> + <button class="btn btn-info" ng-click="addMember();"><span class="fa fa-plus"></span> {{ 'action.favoriteList.addMember' | translate }} </button> + <button class="btn btn-danger" ng-click="deleteFavoriteList();"><span class="fa fa-trash-o"></span> {{ 'action.favoriteList.delete' | translate }} </button> + </div> + <div> + <import-csv fv-id="data.favoriteList.id" ng-if="data.favoriteList.id"></import-csv> + </div> </th> </tr> </table> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.