UI-3170: Enforce e911 feature check for device popup dropdown menu (#88)

* Clean up device popup menu section * Enforce e911 feature check for "Emergency Caller-ID"
2600hz · Oct 12, 2018 · dae1049 · dae1049
1 parent 0c5b27b
commit dae1049
Show file tree

Hide file tree

Showing 10 changed files with 250 additions and 66 deletions.
diff --git a/submodules/devices/devices.js b/submodules/devices/devices.js
@@ -331,7 +331,7 @@ define(function(require) {
 					name: 'devices-' + type,
 					data: $.extend(true, {}, data, {
 						isProvisionerConfigured: monster.config.api.hasOwnProperty('provisioner'),
-						showEmergencyCnam: monster.util.isNumberFeatureEnabled('cnam') && monster.util.isNumberFeatureEnabled('e911')
+						showEmergencyCallerId: monster.util.isNumberFeatureEnabled('e911')
 					}),
 					submodule: 'devices'
 				})),

diff --git a/submodules/devices/views/devices-ata.html b/submodules/devices/views/devices-ata.html
@@ -14,18 +14,36 @@
 
 		<ul class="nav nav-pills pull-right">
 			<li class="tabs-main-selector main-section active">
-				<a class="tabs-selector change-section" data-section="basic" href="javascript:void(0)">{{ i18n.devices.popupSettings.basicTitle }}</a>
+				<a class="tabs-selector change-section" data-section="basic" href="javascript:void(0)">
+					{{ i18n.devices.popupSettings.basicTitle }}
+				</a>
 			</li>
 			<li class="tabs-main-selector main-section dropdown">
-				<a class="dropdown-toggle" data-toggle="dropdown" href="javascript:void(0)">{{ i18n.devices.popupSettings.advancedTitle }}
+				<a class="dropdown-toggle" data-toggle="dropdown" href="javascript:void(0)">
+					{{ i18n.devices.popupSettings.advancedTitle }}
 					<b class="caret"></b>
 				</a>
 				<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>
-					{{#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="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>
+				{{#if showEmergencyCallerId}}
+					<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>

diff --git a/submodules/devices/views/devices-cellphone.html b/submodules/devices/views/devices-cellphone.html
@@ -14,14 +14,22 @@
 
 		<ul class="nav nav-pills pull-right">
 			<li class="tabs-main-selector main-section active">
-				<a class="tabs-selector change-section" data-section="basic" href="javascript:void(0)">{{ i18n.devices.popupSettings.basicTitle }}</a>
+				<a class="tabs-selector change-section" data-section="basic" href="javascript:void(0)">
+					{{ i18n.devices.popupSettings.basicTitle }}
+				</a>
 			</li>
 			<li class="tabs-main-selector main-section dropdown">
-                <a class="dropdown-toggle" data-toggle="dropdown" href="javascript:void(0)">{{ i18n.devices.popupSettings.advancedTitle }}
+                <a class="dropdown-toggle" data-toggle="dropdown" href="javascript:void(0)">
+                	{{ i18n.devices.popupSettings.advancedTitle }}
                     <b class="caret"></b>
                 </a>
                 <ul class="dropdown-menu pull-right">
-                    <li><a class="tabs-selector change-section" data-section="options" href="javascript:void(0)"><i class="fa fa-ambulance"></i>{{ i18n.devices.popupSettings.options.menuTitle }}</a></li>
+                    <li>
+                    	<a class="tabs-selector change-section" data-section="options" href="javascript:void(0)">
+                    		<i class="fa fa-ambulance"></i>
+                    		{{ i18n.devices.popupSettings.options.menuTitle }}
+                    	</a>
+                    </li>
                 </ul>
             </li>
 		</ul>

diff --git a/submodules/devices/views/devices-fax.html b/submodules/devices/views/devices-fax.html
@@ -14,18 +14,36 @@
 
 		<ul class="nav nav-pills pull-right">
 			<li class="tabs-main-selector main-section active">
-				<a class="tabs-selector change-section" data-section="basic" href="javascript:void(0)">{{ i18n.devices.popupSettings.basicTitle }}</a>
+				<a class="tabs-selector change-section" data-section="basic" href="javascript:void(0)">
+					{{ i18n.devices.popupSettings.basicTitle }}
+				</a>
 			</li>
 			<li class="tabs-main-selector main-section dropdown">
-				<a class="dropdown-toggle" data-toggle="dropdown" href="javascript:void(0)">{{ i18n.devices.popupSettings.advancedTitle }}
+				<a class="dropdown-toggle" data-toggle="dropdown" href="javascript:void(0)">
+					{{ i18n.devices.popupSettings.advancedTitle }}
 					<b class="caret"></b>
 				</a>
 				<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>
-					{{#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="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>
+				{{#if showEmergencyCallerId}}
+					<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>

diff --git a/submodules/devices/views/devices-landline.html b/submodules/devices/views/devices-landline.html
@@ -14,16 +14,24 @@
 
 		<ul class="nav nav-pills pull-right">
 			<li class="tabs-main-selector main-section active">
-				<a class="tabs-selector change-section" data-section="basic" href="javascript:void(0)">{{ i18n.devices.popupSettings.basicTitle }}</a>
+				<a class="tabs-selector change-section" data-section="basic" href="javascript:void(0)">
+					{{ i18n.devices.popupSettings.basicTitle }}
+				</a>
 			</li>
 			<li class="tabs-main-selector main-section dropdown">
-                <a class="dropdown-toggle" data-toggle="dropdown" href="javascript:void(0)">{{ i18n.devices.popupSettings.advancedTitle }}
-                    <b class="caret"></b>
-                </a>
-                <ul class="dropdown-menu pull-right">
-                    <li><a class="tabs-selector change-section" data-section="options" href="javascript:void(0)"><i class="fa fa-ambulance"></i>{{ i18n.devices.popupSettings.options.menuTitle }}</a></li>
-                </ul>
-            </li>
+				<a class="dropdown-toggle" data-toggle="dropdown" href="javascript:void(0)">
+					{{ i18n.devices.popupSettings.advancedTitle }}
+					<b class="caret"></b>
+				</a>
+				<ul class="dropdown-menu pull-right">
+					<li>
+						<a class="tabs-selector change-section" data-section="options" href="javascript:void(0)">
+							<i class="fa fa-ambulance"></i>
+							{{ i18n.devices.popupSettings.options.menuTitle }}
+						</a>
+					</li>
+				</ul>
+			</li>
 		</ul>
 	</div>
 

diff --git a/submodules/devices/views/devices-mobile.html b/submodules/devices/views/devices-mobile.html
@@ -14,23 +14,51 @@
 
 		<ul class="nav nav-pills pull-right">
 			<li class="tabs-main-selector main-section active">
-				<a class="tabs-selector change-section" data-section="basic" href="javascript:void(0)">{{ i18n.devices.popupSettings.basicTitle }}</a>
+				<a class="tabs-selector change-section" data-section="basic" href="javascript:void(0)">
+					{{ i18n.devices.popupSettings.basicTitle }}
+				</a>
 			</li>
 			<li class="tabs-main-selector main-section dropdown">
-				<a class="dropdown-toggle" data-toggle="dropdown" href="javascript:void(0)">{{ i18n.devices.popupSettings.advancedTitle }}
+				<a class="dropdown-toggle" data-toggle="dropdown" href="javascript:void(0)">
+					{{ i18n.devices.popupSettings.advancedTitle }}
 					<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>
+					<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>
+					<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 showEmergencyCallerId}}
+						<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>
+					<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>

diff --git a/submodules/devices/views/devices-sip_device.html b/submodules/devices/views/devices-sip_device.html
@@ -19,25 +19,63 @@
 
 		<ul class="nav nav-pills pull-right">
 			<li class="tabs-main-selector main-section active">
-				<a class="tabs-selector change-section" data-section="basic" href="javascript:void(0)">{{ i18n.devices.popupSettings.basicTitle }}</a>
+				<a class="tabs-selector change-section" data-section="basic" href="javascript:void(0)">
+					{{ i18n.devices.popupSettings.basicTitle }}
+				</a>
 			</li>
 			<li class="tabs-main-selector main-section dropdown">
-				<a class="dropdown-toggle" data-toggle="dropdown" href="javascript:void(0)">{{ i18n.devices.popupSettings.advancedTitle }}
+				<a class="dropdown-toggle" data-toggle="dropdown" href="javascript:void(0)">
+					{{ i18n.devices.popupSettings.advancedTitle }}
 					<b class="caret"></b>
 				</a>
 				<ul class="dropdown-menu pull-right">
-					{{#if provision}}
-					<li><a class="tabs-selector change-section" data-section="sip" href="javascript:void(0)"><i class="fa fa-user"></i>{{ i18n.devices.popupSettings.sip.menuTitle }}</a></li>
-					{{/if}}
-					<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>
-					{{#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>
+				{{#if provision}}
+					<li>
+						<a class="tabs-selector change-section" data-section="sip" href="javascript:void(0)">
+							<i class="fa fa-user"></i>
+							{{ i18n.devices.popupSettings.sip.menuTitle }}
+						</a>
+					</li>
+				{{/if}}
+					<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>
+				{{#if showEmergencyCallerId}}
+					<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>
 				{{#each extra.provision.keys}}
-					<li><a class="tabs-selector change-section" data-section="{{type}}" href="javascript:void(0);"><i class="fa fa-lightbulb-o"></i>{{title}}</a></li>
+					<li>
+						<a class="tabs-selector change-section" data-section="{{type}}" href="javascript:void(0);">
+							<i class="fa fa-lightbulb-o"></i>
+							{{title}}
+						</a>
+					</li>
 				{{/each}}
 				</ul>
 			</li>

diff --git a/submodules/devices/views/devices-sip_uri.html b/submodules/devices/views/devices-sip_uri.html
@@ -14,14 +14,22 @@
 
 		<ul class="nav nav-pills pull-right">
 			<li class="tabs-main-selector main-section active">
-				<a class="tabs-selector change-section" data-section="basic" href="javascript:void(0)">{{ i18n.devices.popupSettings.basicTitle }}</a>
+				<a class="tabs-selector change-section" data-section="basic" href="javascript:void(0)">
+					{{ i18n.devices.popupSettings.basicTitle }}
+				</a>
 			</li>
 			<li class="tabs-main-selector main-section dropdown">
-				<a class="dropdown-toggle" data-toggle="dropdown" href="javascript:void(0)">{{ i18n.devices.popupSettings.advancedTitle }}
+				<a class="dropdown-toggle" data-toggle="dropdown" href="javascript:void(0)">
+					{{ i18n.devices.popupSettings.advancedTitle }}
 					<b class="caret"></b>
 				</a>
 				<ul class="dropdown-menu pull-right">
-					<li><a class="tabs-selector change-section" data-section="options" href="javascript:void(0)"><i class="fa fa-ambulance"></i>{{ i18n.devices.popupSettings.options.menuTitle }}</a></li>
+					<li>
+						<a class="tabs-selector change-section" data-section="options" href="javascript:void(0)">
+							<i class="fa fa-ambulance"></i>
+							{{ i18n.devices.popupSettings.options.menuTitle }}
+						</a>
+					</li>
 				</ul>
 			</li>
 		</ul>

diff --git a/submodules/devices/views/devices-smartphone.html b/submodules/devices/views/devices-smartphone.html
@@ -14,18 +14,48 @@
 
 		<ul class="nav nav-pills pull-right">
 			<li class="tabs-main-selector main-section active">
-				<a class="tabs-selector change-section" data-section="basic" href="javascript:void(0)">{{ i18n.devices.popupSettings.basicTitle }}</a>
+				<a class="tabs-selector change-section" data-section="basic" href="javascript:void(0)">
+					{{ i18n.devices.popupSettings.basicTitle }}
+				</a>
 			</li>
 			<li class="tabs-main-selector main-section dropdown">
-				<a class="dropdown-toggle" data-toggle="dropdown" href="javascript:void(0)">{{ i18n.devices.popupSettings.advancedTitle }}
+				<a class="dropdown-toggle" data-toggle="dropdown" href="javascript:void(0)">
+					{{ i18n.devices.popupSettings.advancedTitle }}
 					<b class="caret"></b>
 				</a>
 				<ul class="dropdown-menu pull-right">
-					<li><a class="tabs-selector change-section" data-section="options" href="javascript:void(0)"><i class="fa fa-cogs"></i>{{ i18n.devices.popupSettings.options.menuTitle }}</a></li>
-					<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>
+					<li>
+						<a class="tabs-selector change-section" data-section="options" href="javascript:void(0)">
+							<i class="fa fa-cogs"></i>
+							{{ i18n.devices.popupSettings.options.menuTitle }}
+						</a>
+					</li>
+					<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>
+				{{#if showEmergencyCallerId}}
+					<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>