Replace all pictures by avatar lib

Author: rodrigok

client/startup/startup.coffee

@@ -23,23 +23,20 @@ Meteor.startup ->
 	Meteor.users.find({}, { fields: { name: 1, pictures: 1, status: 1, emails: 1, phone: 1, services: 1 } }).observe
 		added: (user) ->
 			Session.set('user_' + user._id + '_name', user.name)
-			Session.set('user_' + user._id + '_picture', Avatar.getUrl(user))
 			Session.set('user_' + user._id + '_status', user.status)
 			Session.set('user_' + user._id + '_emails', user.emails)
 			Session.set('user_' + user._id + '_phone', user.phone)
 
 			UserAndRoom.insert({ type: 'u', uid: user._id, name: user.name})
 		changed: (user) ->
 			Session.set('user_' + user._id + '_name', user.name)
-			Session.set('user_' + user._id + '_picture', Avatar.getUrl(user))
 			Session.set('user_' + user._id + '_status', user.status)
 			Session.set('user_' + user._id + '_emails', user.emails)
 			Session.set('user_' + user._id + '_phone', user.phone)
 
 			UserAndRoom.update({ uid: user._id }, { $set: { name: user.name } })
 		removed: (user) ->
 			Session.set('user_' + user._id + '_name', null)
-			Session.set('user_' + user._id + '_picture', null)
 			Session.set('user_' + user._id + '_status', null)
 			Session.set('user_' + user._id + '_emails', null)
 			Session.set('user_' + user._id + '_phone', null)

client/stylesheets/dashboard.less

@@ -568,6 +568,15 @@ form.search-form {
 	}
 }
 
+.avatar {
+	height: 100%;
+	width: 100%;
+	overflow: hidden;
+	img {
+		height: auto !important;
+	}
+}
+
 .account-box {
 	position: relative;
 	height: 100%;
@@ -594,14 +603,6 @@ form.search-form {
 				right: 5px;
 				bottom: 10px;
 			}
-			.avatar {
-				height: 100%;
-				width: 100%;
-				overflow: hidden;
-				img {
-					height: auto;
-				}
-			}
 		}
 		.data {
 			float: left;
@@ -1619,9 +1620,7 @@ form.search-form {
 		float: left;
 		width: 100px;
 		height: 100px;
-		img {
-			width: 100%;
-			height: 100%;
+		.avatar {
 			border-radius: 4px;
 			box-shadow: 1px 1px 0 rgba(0, 0, 0, 0.3)
 		}

client/views/app/asideNav/userStatus.coffee

@@ -39,7 +39,6 @@ Template.userStatus.helpers
 				visualStatus = t("userStatus.invisible")
 		return {
 			name: Session.get('user_' + Meteor.userId() + '_name')
-			picture: Session.get('user_' + Meteor.userId() + '_picture')
 			status: Session.get('user_' + Meteor.userId() + '_status')
 			visualStatus: visualStatus
 			_id: Meteor.userId()

client/views/app/chatMessageDashboard.coffee

@@ -6,12 +6,6 @@ Template.chatMessageDashboard.helpers
 		if this.uid?
 			return Session.get('user_' + this.uid + '_name')
 
-	picture: ->
-		if this.uid?
-			return Session.get('user_' + this.uid + '_picture')
-		else
-			return '/images/no_picture.png'
-
 	isSystemMessage: ->
 		return this.t in ['s', 'p', 'f', 'r', 'au', 'ru', 'ul', 'nu', 'wm']
 

client/views/app/chatMessageDashboard.html

@@ -4,7 +4,9 @@
 			{{#if isSystemMessage}}
 				<p class="system">{{{message}}}</p>
 			{{else}}
-				<a class="thumb user-card-message" style="background-image:url('{{picture}}')" href="#" data-userid="{{uid}}" tabindex="1"></a>
+				<a class="thumb user-card-message" href="#" data-userid="{{uid}}" tabindex="1">
+					{{> avatar userId=uid}}
+				</a>
 				<a class="user user-card-message" href="#" data-userid="{{uid}}" tabindex="1">{{username}}</a>
 				<span class="time">
 					{{time}}

client/views/app/chatUserProfile.html

@@ -122,7 +122,7 @@ Template.chatWindowDashboard.helpers
 				name: Session.get('user_' + uid + '_name')
 				emails: Session.get('user_' + uid + '_emails') || []
 				phone: Session.get('user_' + uid + '_phone')
-				picture: Session.get('user_' + uid + '_picture')
+				uid: String(uid)
 			}
 			return userData
 
@@ -233,7 +233,7 @@ Template.chatWindowDashboard.helpers
 		userData = {
 			name: Session.get('user_' + uid + '_name')
 			emails: Session.get('user_' + uid + '_emails')
-			picture: Session.get('user_' + uid + '_picture')
+			uid: String(uid)
 		}
 		phone = Session.get('user_' + uid + '_phone')
 		if phone? and phone[0]?.phoneNumber

client/views/app/chatWindowDashboard.coffee

@@ -121,7 +121,7 @@ <h2>{{_ "chatWindowDashboard.Members_List"}}</h2>
 					{{#with flexUserInfo}}
 						<div class="about cf_">
 							<div class="thumb">
-								<img src="{{picture}}" />
+								{{> avatar userId=uid}}
 							</div>
 							<div class="info">
 								<h3>{{name}}</h3>
@@ -147,7 +147,7 @@ <h3>{{name}}</h3>
 					{{#with userData}}
 						<div class="about cf_">
 							<div class="thumb">
-								<img src="{{picture}}" />
+								{{> avatar userId=uid}}
 							</div>
 							<div class="info">
 								<h3>{{name}}</h3>

client/views/app/chatWindowDashboard.html

@@ -5,7 +5,7 @@ Template.userCard.helpers
 		userData = {
 			name: Session.get('user_' + uid + '_name')
 			emails: Session.get('user_' + uid + '_emails')
-			picture: Session.get('user_' + uid + '_picture')
+			uid: uid
 		}
 		phone = Session.get('user_' + uid + '_phone')
 		if phone? and phone[0]?.phoneNumber

client/views/app/typingMessageDashboard.html

@@ -3,7 +3,7 @@
 		<span class="-close"><i title="fechar" class="fa fa-remove"></i></span>
 		{{#with userData}}
 			<div class="thumb">
-				<img src="{{picture}}" />
+				{{> avatar userId=uid}}
 			</div>
 			<div class="info">
 				<h3>{{name}}</h3>

client/views/app/userCard.coffee

@@ -1,7 +1,4 @@
 Template.userImageProfile.helpers
-	userPicture: ->
-		return Session.get('user_' + this._id + '_picture')
-
 	userName: ->
 		return Session.get('user_' + this._id + '_name')
 

client/views/app/userCard.html

@@ -1,7 +1,7 @@
 <template name="userImageProfile">
 	<li class='user-image user-card-room {{userStatus}}'>
 		<a data-userid="{{this._id}}" tabindex="0">
-			<img src="{{userPicture}}">
+			{{> avatar userId=_id}}
 		</a>
 		<i class="status"></i>
 	</li>