Browse Source

UI-1219: added the prepend feature everywhere there are number feature management in SmartPBX

4.3
Maxime Roux 11 years ago
parent
commit
e915802b1c
9 changed files with 86 additions and 11 deletions
  1. +5
    -1
      i18n/en-US.json
  2. +22
    -0
      submodules/groups/groups.js
  3. +22
    -0
      submodules/strategy/strategy.js
  4. +22
    -0
      submodules/users/users.js
  5. +3
    -2
      views/groups-numbers.html
  6. +3
    -2
      views/groups-numbersItemRow.html
  7. +3
    -2
      views/strategy-numbers.html
  8. +3
    -2
      views/users-numbers.html
  9. +3
    -2
      views/users-numbersItemRow.html

+ 5
- 1
i18n/en-US.json View File

@ -887,5 +887,9 @@
"create": "Add New Recipient"
}
}
}
},
"__comment": "UI-1219: Adding the prepend feature to numbers",
"__version": "v3.20_s1",
"numberPrepend": "Prepend"
}

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

@ -931,6 +931,28 @@ define(function(require){
}
});
template.on('click', '.prepend-number', function() {
var prependCell = $(this).parents('.item-row').first(),
phoneNumber = prependCell.data('id');
if(phoneNumber) {
var args = {
phoneNumber: phoneNumber,
callbacks: {
success: function(data) {
if('prepend' in data.data && data.data.prepend.enabled) {
prependCell.find('.features i.feature-prepend').addClass('active');
} else {
prependCell.find('.features i.feature-prepend').removeClass('active');
}
}
}
};
monster.pub('common.numberPrepend.renderPopup', args);
}
});
template.on('click', '.actions .spare-link:not(.disabled)', function(e) {
e.preventDefault();


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

@ -625,6 +625,28 @@ define(function(require){
monster.pub('common.e911.renderPopup', args);
}
});
container.on('click', '.number-element .prepend-number', function() {
var prependCell = $(this).parents('.number-element').first(),
phoneNumber = prependCell.find('.remove-number').data('number');
if(phoneNumber) {
var args = {
phoneNumber: phoneNumber,
callbacks: {
success: function(data) {
if('prepend' in data.data && data.data.prepend.enabled) {
prependCell.find('.features i.feature-prepend').addClass('active');
} else {
prependCell.find('.features i.feature-prepend').removeClass('active');
}
}
}
};
monster.pub('common.numberPrepend.renderPopup', args);
}
});
},
strategyConfNumBindEvents: function(container, strategyData) {


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

@ -1053,6 +1053,28 @@ define(function(require){
}
});
template.on('click', '.prepend-number', function() {
var prependCell = $(this).parents('.item-row').first(),
phoneNumber = prependCell.data('id');
if(phoneNumber) {
var args = {
phoneNumber: phoneNumber,
callbacks: {
success: function(data) {
if('prepend' in data.data && data.data.prepend.enabled) {
prependCell.find('.features i.feature-prepend').addClass('active');
} else {
prependCell.find('.features i.feature-prepend').removeClass('active');
}
}
}
};
monster.pub('common.numberPrepend.renderPopup', args);
}
});
template.on('click', '.feature[data-feature="caller_id"]', function() {
self.usersRenderCallerId(currentUser);
});


+ 3
- 2
views/groups-numbers.html View File

@ -7,21 +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">
{{#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">
{{#unless isLocal}}
<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>
{{/unless}}
<li><a class="prepend-number" href="#"><i class="icon-file-text-alt"></i>{{ ../i18n.numberPrepend }}</a></li>
</ul>
</li>
</ul>
</div>
</div>
{{/unless}}
<div class="features">
{{#each viewFeatures}}
<i class="{{icon}} {{active}} help-popover" data-toggle="tooltip" data-placement="top" data-original-title="{{ help }}"></i>


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

@ -1,20 +1,21 @@
<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">
{{#unless number.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">
{{#unless number.isLocal}}
<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>
{{/unless}}
<li><a class="prepend-number" href="#"><i class="icon-file-text-alt"></i>{{ i18n.numberPrepend }}</a></li>
</ul>
</li>
</ul>
</div>
</div>
{{/unless}}
<div class="features">
{{#each number.viewFeatures}}
<i class="{{icon}} {{active}} help-popover" data-toggle="tooltip" data-placement="top" data-original-title="{{ help }}"></i>


+ 3
- 2
views/strategy-numbers.html View File

@ -7,21 +7,22 @@
<span>{{formatPhoneNumber this.number}}</span>
</div>
<div class="features-block 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">
{{#unless isLocal}}
<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>
{{/unless}}
<li><a class="prepend-number" href="#"><i class="icon-file-text-alt"></i>{{ ../i18n.numberPrepend }}</a></li>
</ul>
</li>
</ul>
</div>
</div>
{{/unless}}
<div class="features">
{{#each this.features}}
<i class="{{icon}} {{active}} help-popover" data-toggle="tooltip" data-placement="top" data-original-title="{{ help }}"></i>


+ 3
- 2
views/users-numbers.html View File

@ -7,21 +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">
{{#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">
{{#unless this.isLocal}}
<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>
{{/unless}}
<li><a class="prepend-number" href="#"><i class="icon-file-text-alt"></i>{{ ../i18n.numberPrepend }}</a></li>
</ul>
</li>
</ul>
</div>
</div>
{{/unless}}
<div class="features">
{{#each this.viewFeatures}}
<i class="{{icon}} {{active}} help-popover" data-toggle="tooltip" data-placement="top" data-original-title="{{ help }}"></i>


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

@ -1,20 +1,21 @@
<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">
{{#unless number.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">
{{#unless number.isLocal}}
<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>
{{/unless}}
<li><a class="prepend-number" href="#"><i class="icon-file-text-alt"></i>{{ i18n.numberPrepend }}</a></li>
</ul>
</li>
</ul>
</div>
</div>
{{/unless}}
<div class="features">
{{#each number.viewFeatures}}
<i class="{{icon}} {{active}} help-popover" data-toggle="tooltip" data-placement="top" data-original-title="{{ help }}"></i>


Loading…
Cancel
Save