[Pollen-commits] [pollen] 01/01: Merge Import Favorite List from csv file

21 Aug 2014

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 6da8eb9565fa1d0c12926e49f05ddfe4ac9bec78
Merge: a2c4bac 816ac2a
Author: Adrien Garandel <a.garandel@dralagen.fr>
Date:   Thu Aug 21 13:36:22 2014 +0200

    Merge Import Favorite List from csv file

 .../org/chorem/pollen/rest/api/JsonHelper.java     | 20 +++++++++
 .../org/chorem/pollen/rest/api/PollenRender.java   |  3 +-
 .../org/chorem/pollen/rest/api/v1/ErrorAction.java | 10 +++++
 .../chorem/pollen/rest/api/v1/FavoriteListApi.java |  5 ++-
 .../pollen/rest/api/v1/PollenResourceApi.java      |  1 +
 pollen-rest-api/src/main/resources/mapping         |  1 +
 .../i18n/pollen-services_en_GB.properties          |  6 +--
 .../i18n/pollen-services_fr_FR.properties          |  6 +--
 pollen-ui-angular/src/main/webapp/i18n/en.js       |  2 +
 pollen-ui-angular/src/main/webapp/i18n/fr.js       |  2 +
 .../main/webapp/js/controllers/favoriteListCtrl.js | 38 ++++++++++++-----
 pollen-ui-angular/src/main/webapp/js/directives.js | 48 +++++++++++++++++++++-
 pollen-ui-angular/src/main/webapp/js/services.js   |  8 ++++
 pollen-ui-angular/src/main/webapp/less/style.less  |  4 ++
 .../main/webapp/partials/favoriteList-edit.html    |  6 +++
 15 files changed, 138 insertions(+), 22 deletions(-)

diff --cc pollen-ui-angular/src/main/webapp/js/directives.js
index 896b54f,6507618..8ea10a5

--- a/pollen-ui-angular/src/main/webapp/js/directives.js
+++ b/pollen-ui-angular/src/main/webapp/js/directives.js
@@@ -658,22 -704,4 +702,22 @@@ angular.module('pollenDirective', []
      }
  
    };
 -}]);
 +}])
 +
 +/////////////////////////////////////////////////////////
 +//               SHOW ON HOVER PARENT                  //
 +/////////////////////////////////////////////////////////
 +.directive('showonhoverparent',
 +   function() {
 +      return {
 +         link : function(scope, element, attrs) {
 +            element.hide();
 +            element.parent().bind('mouseenter', function() {
 +                element.show();
 +            });
 +            element.parent().bind('mouseleave', function() {
 +                 element.hide();
 +            });
 +       }
 +   };
- });
++});

-- 
To stop receiving notification emails like this one, please contact
chorem.org SCM administrator <admin+scm@chorem.org>.

    

[Pollen-commits] [pollen] 01/01: Merge Import Favorite List from csv file

chorem.org scm