Merge branch 'master' into UI-629

submodules/users/users.js

@@ -206,6 +206,8 @@ define(function(require){
 					template.find('.user-rows').append(templateUser);
 				});
 
+				template.find('[data-toggle="tooltip"]').tooltip();
+
 				self.usersBindEvents(template, parent, dataTemplate);
 
 				parent
@@ -422,10 +424,22 @@ define(function(require){
 
 				if(userId in mapUsers) {
 					if(mapUsers[userId].extra.devices.length == 2) {
-						mapUsers[userId].extra.additionalDevices++;
+						if(mapUsers[userId].extra.additionalDevices) {
+							mapUsers[userId].extra.additionalDevices.count++;
+							mapUsers[userId].extra.additionalDevices.tooltip += '<br>'+device.name + ' (' + device.device_type.replace('_', ' ') + ')';
+						} else {
+							mapUsers[userId].extra.additionalDevices = {
+								count: 1,
+								tooltip: device.name + ' (' + device.device_type.replace('_', ' ') + ')'
+							};
+						}
 					}
 					else {
-						mapUsers[userId].extra.devices.push(device.device_type);
+						console.log(device);
+						mapUsers[userId].extra.devices.push({
+							name: device.name + ' (' + device.device_type.replace('_', ' ') + ')',
+							type: device.device_type
+						});
 					}
 				}
 			});
@@ -510,12 +524,12 @@ define(function(require){
 
 					self.usersRemoveOverlay();
 					cell.css({
-						'position': 'inline-block',
+						'position': 'initial',
 						'z-index': '0'
 					});
 
 					cell.parent().siblings('.edit-user').css({
-						'position': 'block',
+						'position': 'initial',
 						'z-index': '0'
 					});
 				}

views/users-row.html

@@ -25,33 +25,33 @@
 		</div>
 		<div class="devices grid-cell" data-type="devices">
 			{{#each extra.devices}}
-				{{#compare this '===' 'softphone'}}
-					<i class="icon-telicon-soft-phone"></i>
+				{{#compare this.type '===' 'softphone'}}
+					<i class="icon-telicon-soft-phone help-popover" data-toggle="tooltip" data-placement="top" data-original-title="{{ this.name }}"></i>
 				{{/compare}}
-				{{#compare this '===' 'cellphone'}}
-					<i class="icon-phone"></i>
+				{{#compare this.type '===' 'cellphone'}}
+					<i class="icon-phone help-popover" data-toggle="tooltip" data-placement="top" data-original-title="{{ this.name }}"></i>
 				{{/compare}}
-				{{#compare this '===' 'smartphone'}}
-					<i class="icon-telicon-mobile-phone"></i>
+				{{#compare this.type '===' 'smartphone'}}
+					<i class="icon-telicon-mobile-phone help-popover" data-toggle="tooltip" data-placement="top" data-original-title="{{ this.name }}"></i>
 				{{/compare}}
-				{{#compare this '===' 'mobile'}}
-					<i class="icon-telicon-sprint-phone"></i>
+				{{#compare this.type '===' 'mobile'}}
+					<i class="icon-telicon-sprint-phone help-popover" data-toggle="tooltip" data-placement="top" data-original-title="{{ this.name }}"></i>
 				{{/compare}}
-				{{#compare this '===' 'sip_device'}}
-					<i class="icon-telicon-voip-phone"></i>
+				{{#compare this.type '===' 'sip_device'}}
+					<i class="icon-telicon-voip-phone help-popover" data-toggle="tooltip" data-placement="top" data-original-title="{{ this.name }}"></i>
 				{{/compare}}
-				{{#compare this '===' 'fax'}}
-					<i class="icon-telicon-fax"></i>
+				{{#compare this.type '===' 'fax'}}
+					<i class="icon-telicon-fax help-popover" data-toggle="tooltip" data-placement="top" data-original-title="{{ this.name }}"></i>
 				{{/compare}}
-				{{#compare this '===' 'landline'}}
-					<i class="icon-telicon-home-phone"></i>
+				{{#compare this.type '===' 'landline'}}
+					<i class="icon-telicon-home-phone help-popover" data-toggle="tooltip" data-placement="top" data-original-title="{{ this.name }}"></i>
 				{{/compare}}
 			{{else}}
 				{{ i18n.users.noUserDevices }}
 			{{/each}}
 
 			{{#if extra.additionalDevices}}
-				(+{{extra.additionalDevices}})
+				<span class="help-popover" data-toggle="tooltip" data-html="true" data-placement="top" data-original-title="{{ extra.additionalDevices.tooltip }}">(+{{extra.additionalDevices.count}})</span>
 			{{/if}}
 		</div>
 		<div class="features grid-cell right-aligned{{#compare extra.countFeatures ">" 5}} smaller{{/compare}}" data-type="features">