ruhnet
/
monster-ui-voip
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

UI-1170: Disable ability to edit features for local numbers on smart pbx

4.3
Joris Tirado 11 years ago
parent
ee08315750
commit
a19d6a8864
11 changed files with 60 additions and 16 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +10
    -0
      submodules/groups/groups.css
  2. +2
    -0
      submodules/groups/groups.js
  3. +9
    -0
      submodules/strategy/strategy.css
  4. +1
    -0
      submodules/strategy/strategy.js
  5. +10
    -0
      submodules/users/users.css
  6. +2
    -0
      submodules/users/users.js
  7. +6
    -4
      views/groups-numbers.html
  8. +4
    -2
      views/groups-numbersItemRow.html
  9. +6
    -4
      views/strategy-numbers.html
  10. +6
    -4
      views/users-numbers.html
  11. +4
    -2
      views/users-numbersItemRow.html

+ 10
- 0
submodules/groups/groups.css View File

@ -349,6 +349,7 @@
}
#groups_container .list-wrapper .item-row {
position: relative;
border-bottom: 1px solid #ccc;
white-space: nowrap;
}
@ -401,6 +402,15 @@
margin-right: 5px;
}
#groups_container .detail-numbers .list-wrapper .features-block .edit-features {
position: absolute;
right: 10px;
}
#groups_container .detail-numbers .list-wrapper .features-block .features {
margin-right: 46px;
}
#groups_container .list-wrapper .list-unassigned-items .features-block {
display: none;
}


+ 2
- 0
submodules/groups/groups.js View File

@ -952,6 +952,7 @@ define(function(require){
_.each(numberList, function(val, idx) {
dataNumbers.push(val.phoneNumber);
val.isLocal = val.features.indexOf('local') > -1;
template
.find('.list-assigned-items')
@ -1273,6 +1274,7 @@ define(function(require){
response.extensions.push(number);
}
else {
data.numbers.numbers[number].isLocal = data.numbers.numbers[number].features.indexOf('local') > -1;
response.assignedNumbers[number] = data.numbers.numbers[number];
}
});


+ 9
- 0
submodules/strategy/strategy.css View File

@ -106,6 +106,7 @@
}
#strategy_container .element-container .number-element {
position: relative;
border-bottom: solid 1px #dedede;
height: 70px;
}
@ -121,6 +122,14 @@
background-color: #ffffff;
margin-top: 5px;
}
#strategy_container .element-container .number-element .features-block .edit-features {
position: absolute;
right: 10px;
}
#strategy_container .element-container .number-element .features-block .features {
margin-right: 45px;
}
#strategy_container .element-container .number-element .features-block .features > i {
display: none;
}


+ 1
- 0
submodules/strategy/strategy.js View File

@ -172,6 +172,7 @@ define(function(require){
_.each(accountNumbers[val].features, function(feature) {
ret.features[feature].active = 'active';
});
ret.isLocal = accountNumbers[val].features.indexOf('local') > -1;
return ret;
}
}),


+ 10
- 0
submodules/users/users.css View File

@ -384,6 +384,7 @@
}
#users_container .list-wrapper .item-row {
position: relative;
border-bottom: 1px solid #ccc;
white-space: nowrap;
}
@ -444,6 +445,15 @@
margin-top: -4px;
}
#users_container .detail-numbers .list-wrapper .features-block .edit-features {
position: absolute;
right: 10px;
}
#users_container .detail-numbers .list-wrapper .features-block .features {
margin-right: 46px;
}
#users_container .detail-numbers .list-wrapper .navbar .nav li.dropdown.open.active > .dropdown-toggle,
#users_container .detail-numbers .list-wrapper .navbar .nav li.dropdown.open > .dropdown-toggle,
#users_container .detail-numbers .navbar .nav li.dropdown.active {


+ 2
- 0
submodules/users/users.js View File

@ -1231,6 +1231,7 @@ define(function(require){
_.each(numberList, function(val, idx) {
dataNumbers.push(val.phoneNumber);
val.isLocal = val.features.indexOf('local') > -1;
template
.find('.list-assigned-items')
@ -2690,6 +2691,7 @@ define(function(require){
if(number in data.numbers.numbers) {
var numberElement = data.numbers.numbers[number];
numberElement.phoneNumber = number;
numberElement.isLocal = numberElement.features.indexOf('local') > -1;
response.assignedNumbers.push(numberElement);
}


+ 6
- 4
views/groups-numbers.html View File

@ -7,20 +7,22 @@
{{#each assignedNumbers}}
<div class="item-row" data-id="{{@key}}" data-search="{{formatPhoneNumber @key}} {{@key}} {{locality.city}} {{locality.country}}">
<div class="features-block pull-right">
<div class="pull-right">
{{#unless isLocal}}
<div class="edit-features">
<div class="navbar">
<ul class="nav pull-right">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="icon-cog"></i></a>
<ul class="dropdown-menu">
<li><a class="callerId-number" href="#"><i class="icon-user"></i>{{ ../i18n.callerId }}</a></li>
<li><a class="e911-number" href="#"><i class="icon-ambulance"></i>{{ ../i18n.e911 }}</a></li>
<li><a class="callerId-number" href="#"><i class="icon-user"></i>{{ ../../i18n.callerId }}</a></li>
<li><a class="e911-number" href="#"><i class="icon-ambulance"></i>{{ ../../i18n.e911 }}</a></li>
</ul>
</li>
</ul>
</div>
</div>
<div class="features pull-right">
{{/unless}}
<div class="features">
{{#each viewFeatures}}
<i class="{{icon}} {{active}} help-popover" data-toggle="tooltip" data-placement="top" data-original-title="{{ help }}"></i>
{{/each}}


+ 4
- 2
views/groups-numbersItemRow.html View File

@ -1,6 +1,7 @@
<div class="item-row" data-id="{{number.phoneNumber}}" data-search="{{formatPhoneNumber number.phoneNumber}} {{number.phoneNumber}} {{number.locality.city}} {{number.locality.country}}">
<div class="features-block pull-right">
<div class="pull-right">
{{#unless number.isLocal}}
<div class="edit-features">
<div class="navbar">
<ul class="nav pull-right">
<li class="dropdown">
@ -13,7 +14,8 @@
</ul>
</div>
</div>
<div class="features pull-right">
{{/unless}}
<div class="features">
{{#each number.viewFeatures}}
<i class="{{icon}} {{active}} help-popover" data-toggle="tooltip" data-placement="top" data-original-title="{{ help }}"></i>
{{/each}}


+ 6
- 4
views/strategy-numbers.html View File

@ -7,20 +7,22 @@
<span>{{formatPhoneNumber this.number}}</span>
</div>
<div class="features-block pull-right">
<div class="pull-right">
{{#unless isLocal}}
<div class="edit-features">
<div class="navbar">
<ul class="nav pull-right">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="icon-cog"></i></a>
<ul class="dropdown-menu">
<li><a class="callerId-number" href="#"><i class="icon-user"></i>{{ ../i18n.callerId }}</a></li>
<li><a class="e911-number" href="#"><i class="icon-ambulance"></i>{{ ../i18n.e911 }}</a></li>
<li><a class="callerId-number" href="#"><i class="icon-user"></i>{{ ../../i18n.callerId }}</a></li>
<li><a class="e911-number" href="#"><i class="icon-ambulance"></i>{{ ../../i18n.e911 }}</a></li>
</ul>
</li>
</ul>
</div>
</div>
<div class="features pull-right">
{{/unless}}
<div class="features">
{{#each this.features}}
<i class="{{icon}} {{active}} help-popover" data-toggle="tooltip" data-placement="top" data-original-title="{{ help }}"></i>
{{/each}}


+ 6
- 4
views/users-numbers.html View File

@ -7,20 +7,22 @@
{{#each assignedNumbers}}
<div class="item-row" data-id="{{this.phoneNumber}}" data-search="{{formatPhoneNumber this.phoneNumber}} {{this.phoneNumber}} {{this.locality.city}} {{this.locality.country}}">
<div class="features-block pull-right">
<div class="pull-right">
{{#unless this.isLocal}}
<div class="edit-features">
<div class="navbar">
<ul class="nav pull-right">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="icon-cog"></i></a>
<ul class="dropdown-menu">
<li><a class="callerId-number" href="#"><i class="icon-user"></i>{{ ../i18n.callerId }}</a></li>
<li><a class="e911-number" href="#"><i class="icon-ambulance"></i>{{ ../i18n.e911 }}</a></li>
<li><a class="callerId-number" href="#"><i class="icon-user"></i>{{ ../../i18n.callerId }}</a></li>
<li><a class="e911-number" href="#"><i class="icon-ambulance"></i>{{ ../../i18n.e911 }}</a></li>
</ul>
</li>
</ul>
</div>
</div>
<div class="features pull-right">
{{/unless}}
<div class="features">
{{#each this.viewFeatures}}
<i class="{{icon}} {{active}} help-popover" data-toggle="tooltip" data-placement="top" data-original-title="{{ help }}"></i>
{{/each}}


+ 4
- 2
views/users-numbersItemRow.html View File

@ -1,6 +1,7 @@
<div class="item-row" data-id="{{number.phoneNumber}}" data-search="{{formatPhoneNumber number.phoneNumber}} {{number.phoneNumber}} {{number.locality.city}} {{number.locality.country}}">
<div class="features-block pull-right">
<div class="pull-right">
{{#unless number.isLocal}}
<div class="edit-features">
<div class="navbar">
<ul class="nav pull-right">
<li class="dropdown">
@ -13,7 +14,8 @@
</ul>
</div>
</div>
<div class="features pull-right">
{{/unless}}
<div class="features">
{{#each number.viewFeatures}}
<i class="{{icon}} {{active}} help-popover" data-toggle="tooltip" data-placement="top" data-original-title="{{ help }}"></i>
{{/each}}


Write Preview
Loading…
Cancel
Save