Merge branch 'UI-1887'

submodules/devices/devices.css

@@ -300,6 +300,10 @@
 	margin: 10px 25px;
 }
 
+.voip-edit-device-popup .edit-device .content #form_device .controls .text {
+	padding-top: 5px;
+}
+
 .voip-edit-device-popup .edit-device .content #form_device .displayed-realm {
 	line-height: 30px;
 	font-weight: bold;

submodules/devices/devices.js

@@ -394,19 +394,21 @@ define(function(require){
 				}
 			});
 
-			templateDevice.find('#delete_device').on('click', function() {
-				var deviceId = $(this).parents('.edit-device').data('id');
+			if (type !== 'mobile') {
+				templateDevice.find('#delete_device').on('click', function() {
+					var deviceId = $(this).parents('.edit-device').data('id');
 
-				monster.ui.confirm(self.i18n.active().devices.confirmDeleteDevice, function() {
-					self.devicesDeleteDevice(deviceId, function(device) {
-						popup.dialog('close').remove();
+					monster.ui.confirm(self.i18n.active().devices.confirmDeleteDevice, function() {
+						self.devicesDeleteDevice(deviceId, function(device) {
+							popup.dialog('close').remove();
 
-						toastr.success(monster.template(self, '!' + self.i18n.active().devices.deletedDevice, { deviceName: device.name }));
+							toastr.success(monster.template(self, '!' + self.i18n.active().devices.deletedDevice, { deviceName: device.name }));
 
-						callbackDelete && callbackDelete(device);
+							callbackDelete && callbackDelete(device);
+						});
 					});
 				});
-			});
+			}
 
 			templateDevice.find('.actions .cancel-link').on('click', function() {
 				popup.dialog('close').remove();

views/devices-mobile.html

@@ -21,13 +21,17 @@
 					<b class="caret"></b>
 				</a>
 				<ul class="dropdown-menu pull-right">
+				{{#compare device_type "!==" "mobile"}}
 					<li><a class="tabs-selector change-section" data-section="audio" href="javascript:void(0)"><i class="fa fa-music"></i>{{ i18n.devices.popupSettings.audio.menuTitle }}</a></li>
 					<li><a class="tabs-selector change-section" data-section="video" href="javascript:void(0)"><i class="fa fa-video-camera"></i>{{ i18n.devices.popupSettings.video.menuTitle }}</a></li>
+				{{/compare}}
 					<li><a class="tabs-selector change-section" data-section="restrictions" href="javascript:void(0)"><i class="fa fa-ban"></i>{{ i18n.devices.popupSettings.restrictions.menuTitle }}</a></li>
+				{{#compare device_type "!==" "mobile"}}
 					{{#if showEmergencyCnam}}
 						<li><a class="tabs-selector change-section" data-section="callerId" href="javascript:void(0)"><i class="fa fa-ambulance"></i>{{ i18n.devices.popupSettings.callerId.menuTitle }}</a></li>
 					{{/if}}
 					<li><a class="tabs-selector change-section" data-section="miscellaneous" href="javascript:void(0)"><i class="fa fa-cogs"></i>{{ i18n.devices.popupSettings.miscellaneous.menuTitle }}</a></li>
+				{{/compare}}
 				</ul>
 			</li>
 		</ul>
@@ -39,28 +43,28 @@
 				<div class="control-group">
 					<label class="control-label" for="name">{{ i18n.devices.mobile.deviceName }}</label>
 					<div class="controls">
-						<input type="text" id="name" name="name" value="{{name}}">
+						<div class="text">{{name}}</div>
 					</div>
 				</div>
 
 				<div class="control-group">
 					<label class="control-label" for="mobile_mdn">{{ i18n.devices.mobile.mdn }}</label>
 					<div class="controls">
-						<input required minlength="10" maxlength="10" type="text" id="mobile_mdn" name="mobile.mdn" value="{{mobile.mdn}}" placeholder="{{ i18n.devices.mobile.mdnPlaceholder }}">
+						<div class="text">{{mobile.mdn}}</div>
 					</div>
 				</div>
 
 				<div class="control-group">
 					<label class="control-label" for="sip_username">{{ i18n.devices.sip.username }}</label>
 					<div class="controls">
-						<input type="text" id="sip_username" name="sip.username" value="{{sip.username}}">
+						<div class="text">{{sip.username}}</div>
 					</div>
 				</div>
 
 				<div class="control-group">
 					<label class="control-label" for="sip_password">{{ i18n.devices.sip.password }}</label>
 					<div class="controls">
-						<input type="password" id="sip_password" name="sip.password" value="{{sip.password}}">
+						<div class="text">{{sip.password}}</div>
 					</div>
 				</div>
 
@@ -193,10 +197,6 @@
 	</div>
 
 	<div class="actions clearfix">
-		{{#if id}}
-			<a id="delete_device" class="monster-link"><i class="fa fa-trash-o monster-red"></i>{{ i18n.devices.deleteDevice }}</a>
-		{{/if}}
-
 		<div class="pull-right">
 			<a class="cancel-link monster-link blue" href="javascript:void(0);">{{ i18n.cancel }}</a>
 				<button type="button" class="monster-button monster-button-success save">