Merge branch 'UI-1855'

submodules/devices/devices.js

@@ -269,7 +269,9 @@ define(function(require){
 				mode = data.id ? 'edit' : 'add',
 				type = data.device_type,
 				popupTitle = mode === 'edit' ? monster.template(self, '!' + self.i18n.active().devices[type].editTitle, { name: data.name }) : self.i18n.active().devices[type].addTitle,
-				templateDevice = $(monster.template(self, 'devices-'+type, data)),
+				templateDevice = $(monster.template(self, 'devices-'+type, $.extend(true, {}, data, {
+					isE911Enabled: monster.util.isNumberFeatureEnabled('e911')
+				}))),
 				deviceForm = templateDevice.find('#form_device');
 
 			if (data.hasOwnProperty('provision') && data.provision.hasOwnProperty('feature_keys')) {

submodules/groups/groups.js

@@ -426,7 +426,9 @@ define(function(require){
 
 			self.groupsGetNumbersData(groupId, function(data) {
 				self.groupsFormatNumbersData(data, function(data) {
-					template = $(monster.template(self, 'groups-numbers', data));
+					template = $(monster.template(self, 'groups-numbers', $.extend(true, {}, data, {
+						isE911Enabled: monster.util.isNumberFeatureEnabled('e911')
+					})));
 
 					self.groupsBindNumbers(template, data);
 
@@ -1038,28 +1040,30 @@ define(function(require){
 				}
 			});
 
-			template.on('click', '.e911-number', function() {
-				var e911Cell = $(this).parents('.item-row').first(),
-					phoneNumber = e911Cell.data('id');
+			if (monster.util.isNumberFeatureEnabled('e911')) {
+				template.on('click', '.e911-number', function() {
+					var e911Cell = $(this).parents('.item-row').first(),
+						phoneNumber = e911Cell.data('id');
 
-				if(phoneNumber) {
-					var args = {
-						phoneNumber: phoneNumber,
-						callbacks: {
-							success: function(data) {
-								if(!($.isEmptyObject(data.data.dash_e911))) {
-									e911Cell.find('.features i.feature-dash_e911').addClass('active');
-								}
-								else {
-									e911Cell.find('.features i.feature-dash_e911').removeClass('active');
+					if(phoneNumber) {
+						var args = {
+							phoneNumber: phoneNumber,
+							callbacks: {
+								success: function(data) {
+									if(!($.isEmptyObject(data.data.dash_e911))) {
+										e911Cell.find('.features i.feature-dash_e911').addClass('active');
+									}
+									else {
+										e911Cell.find('.features i.feature-dash_e911').removeClass('active');
+									}
 								}
 							}
-						}
-					};
+						};
 
-					monster.pub('common.e911.renderPopup', args);
-				}
-			});
+						monster.pub('common.e911.renderPopup', args);
+					}
+				});
+			}
 
 			template.on('click', '.callerId-number', function() {
 				var cnamCell = $(this).parents('.item-row').first(),
@@ -1130,7 +1134,10 @@ define(function(require){
 
 							template
 								.find('.list-assigned-items')
-								.append($(monster.template(self, 'groups-numbersItemRow', { number: val })));
+								.append($(monster.template(self, 'groups-numbersItemRow', {
+									isE911Enabled: monster.util.isNumberFeatureEnabled('e911'),
+									number: val
+								})));
 
 							extraSpareNumbers = _.without(extraSpareNumbers, val.phoneNumber);
 						});
@@ -1141,7 +1148,7 @@ define(function(require){
 							template.find('.spare-link').addClass('disabled');
 						}
 					}
-				}
+				};
 
 				monster.pub('common.numbers.dialogSpare', args);
 			});
@@ -1153,13 +1160,15 @@ define(function(require){
 					searchType: $(this).data('type'),
 					callbacks: {
 						success: function(numbers) {
-
 							monster.pub('common.numbers.getListFeatures', function(features) {
 								_.each(numbers, function(number, k) {
 									number.viewFeatures = $.extend(true, {}, features);
 									number.phoneNumber = number.id;
 
-									var rowTemplate = monster.template(self, 'groups-numbersItemRow', { number: number });
+									var rowTemplate = $(monster.template(self, 'groups-numbersItemRow', {
+										isE911Enabled: monster.util.isNumberFeatureEnabled('e911'),
+										number: number
+									}));
 
 									monster.ui.tooltips(rowTemplate);
 
@@ -1454,7 +1463,9 @@ define(function(require){
 					number.localityEnabled = 'locality' in number ? true : false;
 
 					_.each(number.features, function(feature) {
-						number.viewFeatures[feature].active = 'active';
+						if(feature in number.viewFeatures) {
+							number.viewFeatures[feature].active = 'active';
+						}
 					});
 
 					if(number.used_by === '') {

submodules/myOffice/myOffice.js

@@ -523,11 +523,12 @@ define(function(require){
 				if(channelsArray.indexOf(val.bridge_id) < 0) {
 					channelsArray.push(val.bridge_id);
 				}
-			})
+			});
 
 			if(
 				data.mainNumbers
 			 && data.mainNumbers.length > 0
+			 && monster.util.isNumberFeatureEnabled('e911')
 			 && (
 			 	   !('caller_id' in data.account)
 				|| !('emergency' in data.account.caller_id)
@@ -539,7 +540,7 @@ define(function(require){
 				data.topMessage = {
 					class: 'btn-danger',
 					message: self.i18n.active().myOffice.missingE911Message
-				}
+				};
 			}
 
 			data.totalChannels = channelsArray.length;
@@ -754,35 +755,40 @@ define(function(require){
 			var self = this,
 				parent = args.parent,
 				myOfficeData = args.myOfficeData,
+				isE911Enabled = monster.util.isNumberFeatureEnabled('e911'),
 				templateData = {
+					isE911Enabled: isE911Enabled,
 					mainNumbers: myOfficeData.mainNumbers,
 					selectedMainNumber: 'caller_id' in myOfficeData.account && 'external' in myOfficeData.account.caller_id ? myOfficeData.account.caller_id.external.number || 'none' : 'none'
 				},
 				popupTemplate = $(monster.template(self, 'myOffice-callerIdPopup', templateData)),
-				e911Form = popupTemplate.find('.emergency-form > form'),
 				popup = monster.ui.dialog(popupTemplate, {
 					title: self.i18n.active().myOffice.callerId.title,
 					position: ['center', 20]
 				});
 
-			monster.ui.validate(e911Form, {
-				messages: {
-					'postal_code': {
-						required: '*'
-					},
-					'street_address': {
-						required: '*'
-					},
-					'locality': {
-						required: '*'
-					},
-					'region': {
-						required: '*'
+			if (isE911Enabled) {
+				var e911Form = popupTemplate.find('.emergency-form > form');
+
+				monster.ui.validate(e911Form, {
+					messages: {
+						'postal_code': {
+							required: '*'
+						},
+						'street_address': {
+							required: '*'
+						},
+						'locality': {
+							required: '*'
+						},
+						'region': {
+							required: '*'
+						}
 					}
-				}
-			});
+				});
 
-			monster.ui.valid(e911Form);
+				monster.ui.valid(e911Form);
+			}
 
 			self.myOfficeCallerIdPopupBindEvents({
 				parent: parent,
@@ -814,18 +820,20 @@ define(function(require){
 								callerIdNameInput.val("");
 							}
 
-							if("dash_e911" in numberData) {
-								emergencyZipcodeInput.val(numberData.dash_e911.postal_code);
-								emergencyAddress1Input.val(numberData.dash_e911.street_address);
-								emergencyAddress2Input.val(numberData.dash_e911.extended_address);
-								emergencyCityInput.val(numberData.dash_e911.locality);
-								emergencyStateInput.val(numberData.dash_e911.region);
-							} else {
-								emergencyZipcodeInput.val("");
-								emergencyAddress1Input.val("");
-								emergencyAddress2Input.val("");
-								emergencyCityInput.val("");
-								emergencyStateInput.val("");
+							if (monster.util.isNumberFeatureEnabled('e911')) {
+								if("dash_e911" in numberData) {
+									emergencyZipcodeInput.val(numberData.dash_e911.postal_code);
+									emergencyAddress1Input.val(numberData.dash_e911.street_address);
+									emergencyAddress2Input.val(numberData.dash_e911.extended_address);
+									emergencyCityInput.val(numberData.dash_e911.locality);
+									emergencyStateInput.val(numberData.dash_e911.region);
+								} else {
+									emergencyZipcodeInput.val("");
+									emergencyAddress1Input.val("");
+									emergencyAddress2Input.val("");
+									emergencyCityInput.val("");
+									emergencyStateInput.val("");
+								}
 							}
 						});
 					}
@@ -860,7 +868,6 @@ define(function(require){
 
 			popupTemplate.find('.save').on('click', function() {
 				var callerIdNumber = callerIdNumberSelect.val(),
-					e911Form = popupTemplate.find('.emergency-form > form'),
 					updateAccount = function() {
 						self.myOfficeUpdateAccount(account, function(updatedAccount) {
 							popup.dialog('close').remove();
@@ -868,9 +875,8 @@ define(function(require){
 								parent: parent
 							});
 						});
-					};
-				if(callerIdNumber) {
-					if(monster.ui.valid(e911Form)) {
+					},
+					setCallerId = function () {
 						var callerIdName = callerIdNameInput.val();
 
 						account.caller_id = $.extend(true, {}, account.caller_id, {
@@ -889,16 +895,32 @@ define(function(require){
 								delete numberData.cnam;
 							}
 
-							$.extend(true, numberData, {
-								dash_e911: monster.ui.getFormData(e911Form[0])
-							});
-
 							self.myOfficeUpdateNumber(numberData, function(data) {
 								updateAccount();
 							});
 						});
-					} else {
-						monster.ui.alert(self.i18n.active().myOffice.callerId.mandatoryE911Alert);
+					},
+					e911Form;
+
+				if (monster.util.isNumberFeatureEnabled('e911')) {
+					e911Form = popupTemplate.find('.emergency-form > form');
+				}
+
+				if(callerIdNumber) {
+					if (monster.util.isNumberFeatureEnabled('e911')) {
+						if (monster.ui.valid(e911Form)) {
+							$.extend(true, numberData, {
+								dash_e911: monster.ui.getFormData(e911Form[0])
+							});
+
+							setCallerId();
+						}
+						else {
+							monster.ui.alert(self.i18n.active().myOffice.callerId.mandatoryE911Alert);
+						}
+					}
+					else {
+						setCallerId();
 					}
 				} else {
 					delete account.caller_id.external;

submodules/strategy/strategy.js

@@ -399,6 +399,7 @@ define(function(require){
 											return ret;
 										}
 									}),
+									isE911Enabled: monster.util.isNumberFeatureEnabled('e911'),
 									spareLinkEnabled: (_.countBy(accountNumbers, function(number) {return number.used_by ? 'assigned' : 'spare';})['spare'] > 0)
 								},
 								template = $(monster.template(self, 'strategy-'+templateName, templateData));
@@ -750,9 +751,10 @@ define(function(require){
 				var $this = $(this),
 					numberToRemove = $this.data('number'),
 					e911Feature = $this.data('e911'),
+					isE911Enabled = monster.util.isNumberFeatureEnabled('e911'),
 					indexToRemove = strategyData.callflows["MainCallflow"].numbers.indexOf(numberToRemove.toString());
 
-				if(e911Feature === 'active' && container.find('.number-element .remove-number[data-e911="active"]').length === 1) {
+				if(e911Feature === 'active' && container.find('.number-element .remove-number[data-e911="active"]').length === 1 && isE911Enabled) {
 					monster.ui.alert('error', self.i18n.active().strategy.alertMessages.lastE911Error);
 				} else if(indexToRemove >= 0) {
 					self.strategyGetNumber(numberToRemove, function(dataNumber) {
@@ -871,28 +873,30 @@ define(function(require){
 				}
 			});
 
-			container.on('click', '.number-element .e911-number', function() {
-				var e911Cell = $(this).parents('.number-element').first(),
-					phoneNumber = e911Cell.find('.remove-number').data('number');
+			if (monster.util.isNumberFeatureEnabled('e911')) {
+				container.on('click', '.number-element .e911-number', function() {
+					var e911Cell = $(this).parents('.number-element').first(),
+						phoneNumber = e911Cell.find('.remove-number').data('number');
 
-				if(phoneNumber) {
-					var args = {
-						phoneNumber: phoneNumber,
-						callbacks: {
-							success: function(data) {
-								if(!($.isEmptyObject(data.data.dash_e911))) {
-									e911Cell.find('.features i.feature-dash_e911').addClass('active');
-								}
-								else {
-									e911Cell.find('.features i.feature-dash_e911').removeClass('active');
+					if(phoneNumber) {
+						var args = {
+							phoneNumber: phoneNumber,
+							callbacks: {
+								success: function(data) {
+									if(!($.isEmptyObject(data.data.dash_e911))) {
+										e911Cell.find('.features i.feature-dash_e911').addClass('active');
+									}
+									else {
+										e911Cell.find('.features i.feature-dash_e911').removeClass('active');
+									}
 								}
 							}
-						}
-					};
+						};
 
-					monster.pub('common.e911.renderPopup', args);
-				}
-			});
+						monster.pub('common.e911.renderPopup', args);
+					}
+				});
+			}
 
 			container.on('click', '.number-element .prepend-number', function() {
 				var prependCell = $(this).parents('.number-element').first(),

submodules/users/users.js

@@ -1053,7 +1053,10 @@ define(function(require){
 
 								template
 									.find('.list-assigned-items')
-									.append($(monster.template(self, 'users-numbersItemRow', { number: val })));
+									.append($(monster.template(self, 'users-numbersItemRow', {
+										isE911Enabled: monster.util.isNumberFeatureEnabled('e911'),
+										number: val
+									})));
 
 								extraSpareNumbers = _.without(extraSpareNumbers, val.phoneNumber);
 							});
@@ -1071,6 +1074,7 @@ define(function(require){
 
 			template.on('click', '.actions .buy-link', function(e) {
 				e.preventDefault();
+
 				monster.pub('common.buyNumbers', {
 					searchType: $(this).data('type'),
 					callbacks: {
@@ -1080,7 +1084,10 @@ define(function(require){
 									number.viewFeatures = $.extend(true, {}, features);
 									number.phoneNumber = number.id;
 
-									var rowTemplate = monster.template(self, 'users-numbersItemRow', { number: number });
+									var rowTemplate = $(monster.template(self, 'users-numbersItemRow', {
+										isE911Enabled: monster.util.isNumberFeatureEnabled('e911'),
+										number: number
+									}));
 
 									monster.ui.tooltips(rowTemplate);
 
@@ -1164,28 +1171,30 @@ define(function(require){
 				}
 			});
 
-			template.on('click', '.e911-number', function() {
-				var e911Cell = $(this).parents('.item-row').first(),
-					phoneNumber = e911Cell.data('id');
+			if (monster.util.isNumberFeatureEnabled('e911')) {
+				template.on('click', '.e911-number', function() {
+					var e911Cell = $(this).parents('.item-row').first(),
+						phoneNumber = e911Cell.data('id');
 
-				if(phoneNumber) {
-					var args = {
-						phoneNumber: phoneNumber,
-						callbacks: {
-							success: function(data) {
-								if(!($.isEmptyObject(data.data.dash_e911))) {
-									e911Cell.find('.features i.feature-dash_e911').addClass('active');
-								}
-								else {
-									e911Cell.find('.features i.feature-dash_e911').removeClass('active');
+					if(phoneNumber) {
+						var args = {
+							phoneNumber: phoneNumber,
+							callbacks: {
+								success: function(data) {
+									if(!($.isEmptyObject(data.data.dash_e911))) {
+										e911Cell.find('.features i.feature-dash_e911').addClass('active');
+									}
+									else {
+										e911Cell.find('.features i.feature-dash_e911').removeClass('active');
+									}
 								}
 							}
-						}
-					};
+						};
 
-					monster.pub('common.e911.renderPopup', args);
-				}
-			});
+						monster.pub('common.e911.renderPopup', args);
+					}
+				});
+			}
 
 			template.on('click', '.prepend-number', function() {
 				var prependCell = $(this).parents('.item-row').first(),
@@ -2608,7 +2617,9 @@ define(function(require){
 
 			self.usersGetNumbersData(userId, function(results) {
 				self.usersFormatNumbersData(userId, results, function(results) {
-					template = $(monster.template(self, 'users-numbers', results));
+					template = $(monster.template(self, 'users-numbers', $.extend(true, {}, results, {
+						isE911Enabled: monster.util.isNumberFeatureEnabled('e911')
+					})));
 
 					callback && callback(template, results);
 				});

views/devices-ata.html

@@ -23,7 +23,9 @@
 				<ul class="dropdown-menu pull-right">
 					<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="restrictions" href="javascript:void(0)"><i class="fa fa-ban"></i>{{ i18n.devices.popupSettings.restrictions.menuTitle }}</a></li>
-					<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 isE911Enabled}}
+						<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}}
 				</ul>
 			</li>
 		</ul>
@@ -113,22 +115,24 @@
 				</div>
 			</div>
 
-			<div class="tabs-section clearfix" data-section="callerId">
-				<div class="title">
-					{{ i18n.devices.popupSettings.callerId.sectionTitle }}
-				</div>
-
-				{{#if extra.hasE911Numbers}}
-					<div class="control-group">
-						<label class="control-label">{{ i18n.devices.popupSettings.callerId.emergency }}</label>
-						<div class="controls emergency-number"></div>
+			{{#if isE911Enabled}}
+				<div class="tabs-section clearfix" data-section="callerId">
+					<div class="title">
+						{{ i18n.devices.popupSettings.callerId.sectionTitle }}
 					</div>
-				{{else}}
-					{{#monsterText 'error'}}
-						{{ i18n.devices.popupSettings.callerId.noE911Numbers }}
-					{{/monsterText}}
-				{{/if}}
-			</div>
+
+					{{#if extra.hasE911Numbers}}
+						<div class="control-group">
+							<label class="control-label">{{ i18n.devices.popupSettings.callerId.emergency }}</label>
+							<div class="controls emergency-number"></div>
+						</div>
+					{{else}}
+						{{#monsterText 'error'}}
+							{{ i18n.devices.popupSettings.callerId.noE911Numbers }}
+						{{/monsterText}}
+					{{/if}}
+				</div>
+			{{/if}}
 		</form>
 	</div>
 

views/devices-fax.html

@@ -23,7 +23,9 @@
 				<ul class="dropdown-menu pull-right">
 					<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="restrictions" href="javascript:void(0)"><i class="fa fa-ban"></i>{{ i18n.devices.popupSettings.restrictions.menuTitle }}</a></li>
-					<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 isE911Enabled}}
+						<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}}
 				</ul>
 			</li>
 		</ul>
@@ -133,22 +135,24 @@
 				</div>
 			</div>
 
-			<div class="tabs-section clearfix" data-section="callerId">
-				<div class="title">
-					{{ i18n.devices.popupSettings.callerId.sectionTitle }}
-				</div>
-
-				{{#if extra.hasE911Numbers}}
-					<div class="control-group">
-						<label class="control-label">{{ i18n.devices.popupSettings.callerId.emergency }}</label>
-						<div class="controls emergency-number"></div>
+			{{#if isE911Enabled}}
+				<div class="tabs-section clearfix" data-section="callerId">
+					<div class="title">
+						{{ i18n.devices.popupSettings.callerId.sectionTitle }}
 					</div>
-				{{else}}
-					{{#monsterText 'error'}}
-						{{ i18n.devices.popupSettings.callerId.noE911Numbers }}
-					{{/monsterText}}
-				{{/if}}
-			</div>
+
+					{{#if extra.hasE911Numbers}}
+						<div class="control-group">
+							<label class="control-label">{{ i18n.devices.popupSettings.callerId.emergency }}</label>
+							<div class="controls emergency-number"></div>
+						</div>
+					{{else}}
+						{{#monsterText 'error'}}
+							{{ i18n.devices.popupSettings.callerId.noE911Numbers }}
+						{{/monsterText}}
+					{{/if}}
+				</div>
+			{{/if}}
 		</form>
 	</div>
 

views/devices-mobile.html

@@ -24,7 +24,9 @@
 					<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>
 					<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>
-					<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 isE911Enabled}}
+						<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>
 				</ul>
 			</li>
@@ -135,22 +137,24 @@
 				</div>
 			</div>
 
-			<div class="tabs-section clearfix" data-section="callerId">
-				<div class="title">
-					{{ i18n.devices.popupSettings.callerId.sectionTitle }}
-				</div>
-
-				{{#if extra.hasE911Numbers}}
-					<div class="control-group">
-						<label class="control-label">{{ i18n.devices.popupSettings.callerId.emergency }}</label>
-						<div class="controls emergency-number"></div>
+			{{#if isE911Enabled}}
+				<div class="tabs-section clearfix" data-section="callerId">
+					<div class="title">
+						{{ i18n.devices.popupSettings.callerId.sectionTitle }}
 					</div>
-				{{else}}
-					{{#monsterText 'error'}}
-						{{ i18n.devices.popupSettings.callerId.noE911Numbers }}
-					{{/monsterText}}
-				{{/if}}
-			</div>
+
+					{{#if extra.hasE911Numbers}}
+						<div class="control-group">
+							<label class="control-label">{{ i18n.devices.popupSettings.callerId.emergency }}</label>
+							<div class="controls emergency-number"></div>
+						</div>
+					{{else}}
+						{{#monsterText 'error'}}
+							{{ i18n.devices.popupSettings.callerId.noE911Numbers }}
+						{{/monsterText}}
+					{{/if}}
+				</div>
+			{{/if}}
 
 			<div class="tabs-section clearfix" data-section="miscellaneous">
 				<div class="title">

views/devices-sip_device.html

@@ -32,7 +32,9 @@
 					<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>
 					<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>
-					<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 isE911Enabled}}
+						<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>
 				{{#if provision.feature_keys}}
 					<li><a class="tabs-selector change-section" data-section="featureKeys" href="javascript:void(0);"><i class="fa fa-lightbulb-o"></i>{{ i18n.devices.popupSettings.featureKeys.menuTitle }}</a></li>
@@ -172,28 +174,30 @@
 				</div>
 			</div>
 
-			<div class="tabs-section clearfix" data-section="callerId">
-				<div class="title">
-					{{ i18n.devices.popupSettings.callerId.sectionTitle }}
-				</div>
-
-				{{#if extra.hasE911Numbers}}
-					<div class="control-group">
-						<label class="control-label">{{ i18n.devices.popupSettings.callerId.emergency }}</label>
-						<div class="controls emergency-number"></div>
+			{{#if isE911Enabled}}
+				<div class="tabs-section clearfix" data-section="callerId">
+					<div class="title">
+						{{ i18n.devices.popupSettings.callerId.sectionTitle }}
 					</div>
-					<div class="control-group number-address">
-						<label class="control-label">{{i18n.devices.popupSettings.callerId.address}}</label>
-						<div class="controls">
-							<p></p>
+
+					{{#if extra.hasE911Numbers}}
+						<div class="control-group">
+							<label class="control-label">{{ i18n.devices.popupSettings.callerId.emergency }}</label>
+							<div class="controls emergency-number"></div>
 						</div>
-					</div>
-				{{else}}
-					{{#monsterText 'error'}}
-						{{ i18n.devices.popupSettings.callerId.noE911Numbers }}
-					{{/monsterText}}
-				{{/if}}
-			</div>
+						<div class="control-group number-address">
+							<label class="control-label">{{i18n.devices.popupSettings.callerId.address}}</label>
+							<div class="controls">
+								<p></p>
+							</div>
+						</div>
+					{{else}}
+						{{#monsterText 'error'}}
+							{{ i18n.devices.popupSettings.callerId.noE911Numbers }}
+						{{/monsterText}}
+					{{/if}}
+				</div>
+			{{/if}}
 
 			<div class="tabs-section clearfix" data-section="miscellaneous">
 				<div class="title">

views/devices-softphone.html

@@ -24,7 +24,9 @@
 					<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>
 					<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>
-					<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 isE911Enabled}}
+						<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>
 				</ul>
 			</li>
@@ -129,28 +131,30 @@
 				</div>
 			</div>
 
-			<div class="tabs-section clearfix" data-section="callerId">
-				<div class="title">
-					{{ i18n.devices.popupSettings.callerId.sectionTitle }}
-				</div>
-
-				{{#if extra.hasE911Numbers}}
-					<div class="control-group">
-						<label class="control-label">{{ i18n.devices.popupSettings.callerId.emergency }}</label>
-						<div class="controls emergency-number"></div>
+			{{#if isE911Enabled}}
+				<div class="tabs-section clearfix" data-section="callerId">
+					<div class="title">
+						{{ i18n.devices.popupSettings.callerId.sectionTitle }}
 					</div>
-					<div class="control-group number-address">
-						<label class="control-label">{{i18n.devices.popupSettings.callerId.address}}</label>
-						<div class="controls">
-							<p></p>
+
+					{{#if extra.hasE911Numbers}}
+						<div class="control-group">
+							<label class="control-label">{{ i18n.devices.popupSettings.callerId.emergency }}</label>
+							<div class="controls emergency-number"></div>
 						</div>
-					</div>
-				{{else}}
-					{{#monsterText 'error'}}
-						{{ i18n.devices.popupSettings.callerId.noE911Numbers }}
-					{{/monsterText}}
-				{{/if}}
-			</div>
+						<div class="control-group number-address">
+							<label class="control-label">{{i18n.devices.popupSettings.callerId.address}}</label>
+							<div class="controls">
+								<p></p>
+							</div>
+						</div>
+					{{else}}
+						{{#monsterText 'error'}}
+							{{ i18n.devices.popupSettings.callerId.noE911Numbers }}
+						{{/monsterText}}
+					{{/if}}
+				</div>
+			{{/if}}
 
 			<div class="tabs-section clearfix" data-section="miscellaneous">
 				<div class="title">

views/groups-numbers.html

@@ -15,7 +15,9 @@
 										<ul class="dropdown-menu">
 										{{#unless isLocal}}
 											<li><a class="callerId-number" href="#"><i class="fa fa-user"></i>{{ ../../i18n.callerId }}</a></li>
-											<li><a class="e911-number" href="#"><i class="fa fa-ambulance"></i>{{ ../../i18n.e911 }}</a></li>
+											{{#if ../../isE911Enabled}}
+												<li><a class="e911-number" href="#"><i class="fa fa-ambulance"></i>{{ ../../../i18n.e911 }}</a></li>
+											{{/if}}
 										{{/unless}}
 											<li><a class="prepend-number" href="#"><i class="fa fa-file-text-o"></i>{{ ../i18n.numberPrepend }}</a></li>
 										</ul>

views/groups-numbersItemRow.html

@@ -8,7 +8,9 @@
 						<ul class="dropdown-menu">
 						{{#unless number.isLocal}}
 							<li><a class="callerId-number" href="#"><i class="fa fa-user"></i>{{ i18n.callerId }}</a></li>
-							<li><a class="e911-number" href="#"><i class="fa fa-ambulance"></i>{{ i18n.e911 }}</a></li>
+							{{#if isE911Enabled}}
+								<li><a class="e911-number" href="#"><i class="fa fa-ambulance"></i>{{ i18n.e911 }}</a></li>
+							{{/if}}
 						{{/unless}}
 							<li><a class="prepend-number" href="#"><i class="fa fa-file-text-o"></i>{{ i18n.numberPrepend }}</a></li>
 						</ul>

views/myOffice-callerIdPopup.html

@@ -33,6 +33,7 @@
 		{{/monsterText}}
 	</div>
 
+	{{#if isE911Enabled}}
 	<div class="content number-feature" {{#compare selectedMainNumber '===' 'none'}}style="display:none;"{{/compare}}>
 		<div>
 			<div>{{ i18n.myOffice.callerId.emergencyLabel }}</div>
@@ -67,6 +68,7 @@
 			<p>{{ i18n.myOffice.callerId.emergencyHelp2 }}</p>
 		{{/monsterText}}
 	</div>
+	{{/if}}
 
 	<div class="actions clearfix">
 		<div class="pull-right">

views/strategy-numbers.html

@@ -15,7 +15,9 @@
 						<ul class="dropdown-menu">
 						{{#unless isLocal}}
 							<li><a class="callerId-number" href="#"><i class="fa fa-user"></i>{{ ../../i18n.callerId }}</a></li>
-							<li><a class="e911-number" href="#"><i class="fa fa-ambulance"></i>{{ ../../i18n.e911 }}</a></li>
+							{{#if ../../isE911Enabled}}
+								<li><a class="e911-number" href="#"><i class="fa fa-ambulance"></i>{{ ../../../i18n.e911 }}</a></li>
+							{{/if}}
 						{{/unless}}
 							<li><a class="prepend-number" href="#"><i class="fa fa-file-text-o"></i>{{ ../i18n.numberPrepend }}</a></li>
 						</ul>

views/users-numbers.html

@@ -15,7 +15,9 @@
 										<ul class="dropdown-menu">
 										{{#unless this.isLocal}}
 											<li><a class="callerId-number" href="#"><i class="fa fa-user"></i>{{ ../../i18n.callerId }}</a></li>
-											<li><a class="e911-number" href="#"><i class="fa fa-ambulance"></i>{{ ../../i18n.e911 }}</a></li>
+											{{#if ../../isE911Enabled}}
+												<li><a class="e911-number" href="#"><i class="fa fa-ambulance"></i>{{ ../../../i18n.e911 }}</a></li>
+											{{/if}}
 										{{/unless}}
 											<li><a class="prepend-number" href="#"><i class="fa fa-file-text-o"></i>{{ ../i18n.numberPrepend }}</a></li>
 										</ul>

views/users-numbersItemRow.html

@@ -8,7 +8,9 @@
 						<ul class="dropdown-menu">
 						{{#unless number.isLocal}}
 							<li><a class="callerId-number" href="#"><i class="fa fa-user"></i>{{ i18n.callerId }}</a></li>
-							<li><a class="e911-number" href="#"><i class="fa fa-ambulance"></i>{{ i18n.e911 }}</a></li>
+							{{#if isE911Enabled}}
+								<li><a class="e911-number" href="#"><i class="fa fa-ambulance"></i>{{ i18n.e911 }}</a></li>
+							{{/if}}
 						{{/unless}}
 							<li><a class="prepend-number" href="#"><i class="fa fa-file-text-o"></i>{{ i18n.numberPrepend }}</a></li>
 						</ul>