add gravatars

This commit is contained in:
Matias Alejo Garcia 2014-11-11 16:53:30 -03:00
commit 99dd65ed07
6 changed files with 20 additions and 6 deletions

View file

@ -123,7 +123,7 @@ module.exports = function(grunt) {
'lib/file-saver/FileSaver.js', 'lib/file-saver/FileSaver.js',
'lib/socket.io-client/socket.io.js', 'lib/socket.io-client/socket.io.js',
'lib/sjcl.js', 'lib/sjcl.js',
'lib/ios-imagefile-megapixel/megapix-image.js', 'lib/ios-imagefile-megapixel/megapix-image.js',
'lib/qrcode-decoder-js/lib/qrcode-decoder.min.js', 'lib/qrcode-decoder-js/lib/qrcode-decoder.min.js',
'lib/zeroclipboard/ZeroClipboard.min.js' 'lib/zeroclipboard/ZeroClipboard.min.js'
], ],
@ -139,7 +139,9 @@ module.exports = function(grunt) {
'lib/angular-foundation/mm-foundation.min.js', 'lib/angular-foundation/mm-foundation.min.js',
'lib/angular-foundation/mm-foundation-tpls.min.js', 'lib/angular-foundation/mm-foundation-tpls.min.js',
'lib/angular-gettext/dist/angular-gettext.min.js', 'lib/angular-gettext/dist/angular-gettext.min.js',
'lib/angular-load/angular-load.min.js' 'lib/angular-load/angular-load.min.js',
'lib/angular-gravatar/build/md5.min.js',
'lib/angular-gravatar/build/angular-gravatar.min.js'
// If you add libs here, remember to add it too to karma.conf // If you add libs here, remember to add it too to karma.conf
], ],
dest: 'lib/angularjs-all.js' dest: 'lib/angularjs-all.js'

View file

@ -24,7 +24,8 @@
"ng-idle": "*", "ng-idle": "*",
"inherits": "~0.0.1", "inherits": "~0.0.1",
"angular-load": "0.2.0", "angular-load": "0.2.0",
"lodash": "~2.4.1" "lodash": "~2.4.1",
"angular-gravatar": "*"
}, },
"resolutions": { "resolutions": {
"angular": "=1.2.19" "angular": "=1.2.19"

View file

@ -23,6 +23,7 @@ var modules = [
'monospaced.qrcode', 'monospaced.qrcode',
'ngIdle', 'ngIdle',
'gettext', 'gettext',
'ui.gravatar',
'copayApp.filters', 'copayApp.filters',
'copayApp.services', 'copayApp.services',
'copayApp.controllers', 'copayApp.controllers',
@ -44,6 +45,15 @@ copayApp.config(function($sceDelegateProvider) {
]); ]);
}); });
angular.module('ui.gravatar').config([
'gravatarServiceProvider', function(gravatarServiceProvider) {
gravatarServiceProvider.defaults = {
size : 35
};
// Use https endpoint
gravatarServiceProvider.secure = true;
}
]);
angular.module('copayApp.filters', []); angular.module('copayApp.filters', []);
angular.module('copayApp.services', []); angular.module('copayApp.services', []);

View file

@ -88,6 +88,7 @@
"sinon": "^1.10.3", "sinon": "^1.10.3",
"socket.io-client": "^1.0.6", "socket.io-client": "^1.0.6",
"travis-cov": "^0.2.5", "travis-cov": "^0.2.5",
"uglifyify": "^1.2.3" "uglifyify": "^1.2.3",
"angular-gravatar": "*"
} }
} }

View file

@ -1,6 +1,6 @@
<div ng-controller="CopayersController"> <div ng-controller="CopayersController">
<div class="copay-box" ng-repeat="copayer in copayersList()"> <div class="copay-box" ng-repeat="copayer in copayersList()">
<span ng-include="'views/includes/photo.html'"></span> <img gravatar-src="'{{copayer.nick}}'" gravatar-size="35">
<div <div
class="ellipsis" class="ellipsis"
tooltip="ID: {{copayer.peerId}}" tooltip="ID: {{copayer.peerId}}"

View file

@ -17,7 +17,7 @@
<div class="menu" ng-mouseover="hoverIn()" ng-mouseleave="hoverOut()" <div class="menu" ng-mouseover="hoverIn()" ng-mouseleave="hoverOut()"
ng-click="hoverMenu = !hoverMenu"> ng-click="hoverMenu = !hoverMenu">
<a class="dropdown ellipsis text-gray" ng-class="{'hover': hoverMenu}"> <a class="dropdown ellipsis text-gray" ng-class="{'hover': hoverMenu}">
<span ng-include="'views/includes/photo.html'"></span> <img gravatar-src="'{{username}}'" gravatar-size="35">
<span class="m15t">{{username}} </span> <span class="m15t">{{username}} </span>
<i class="icon-arrow-down size-16 vm"></i> <i class="icon-arrow-down size-16 vm"></i>
</a> </a>