Browse Source

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"
4.3
Joris Tirado 7 years ago
committed by GitHub
parent
commit
dae10494be
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 250 additions and 66 deletions
  1. +1
    -1
      submodules/devices/devices.js
  2. +25
    -7
      submodules/devices/views/devices-ata.html
  3. +11
    -3
      submodules/devices/views/devices-cellphone.html
  4. +25
    -7
      submodules/devices/views/devices-fax.html
  5. +16
    -8
      submodules/devices/views/devices-landline.html
  6. +36
    -8
      submodules/devices/views/devices-mobile.html
  7. +51
    -13
      submodules/devices/views/devices-sip_device.html
  8. +11
    -3
      submodules/devices/views/devices-sip_uri.html
  9. +37
    -7
      submodules/devices/views/devices-smartphone.html
  10. +37
    -9
      submodules/devices/views/devices-softphone.html

+ 1
- 1
submodules/devices/devices.js View File

@ -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'
})),


+ 25
- 7
submodules/devices/views/devices-ata.html View File

@ -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>


+ 11
- 3
submodules/devices/views/devices-cellphone.html View File

@ -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>


+ 25
- 7
submodules/devices/views/devices-fax.html View File

@ -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>


+ 16
- 8
submodules/devices/views/devices-landline.html View File

@ -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>


+ 36
- 8
submodules/devices/views/devices-mobile.html View File

@ -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>


+ 51
- 13
submodules/devices/views/devices-sip_device.html View File

@ -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>


+ 11
- 3
submodules/devices/views/devices-sip_uri.html View File

@ -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>


+ 37
- 7
submodules/devices/views/devices-smartphone.html View File

@ -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>


+ 37
- 9
submodules/devices/views/devices-softphone.html View File

@ -14,20 +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="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>
<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>
</ul>
</li>
</ul>


Loading…
Cancel
Save