Browse Source

UI-1153: Show warning icon next to numbers being transfered

4.3
Joris Tirado 11 years ago
parent
commit
5536c35f6c
10 changed files with 48 additions and 8 deletions
  1. +4
    -1
      i18n/en-US.json
  2. +2
    -1
      i18n/fr-FR.json
  3. +4
    -0
      submodules/groups/groups.css
  4. +11
    -3
      submodules/groups/groups.js
  5. +4
    -0
      submodules/users/users.css
  6. +11
    -3
      submodules/users/users.js
  7. +3
    -0
      views/groups-numbers.html
  8. +3
    -0
      views/groups-numbersItemRow.html
  9. +3
    -0
      views/users-numbers.html
  10. +3
    -0
      views/users-numbersItemRow.html

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

@ -917,5 +917,8 @@
"__comment": "UI-1219: Adding the prepend feature to numbers",
"__version": "v3.20_s1",
"numberPrepend": "Prepend"
"numberPrepend": "Prepend",
"__comment": "UI-1153: Show warning icon next to numbers being transfered",
"__version": "v3.20_s3",
"portIconHelp": "This number is in the process of being ported and will be deleted if the port fails. It only appears for setting up purposes and is not configured to handle calls"
}

+ 2
- 1
i18n/fr-FR.json View File

@ -796,6 +796,7 @@
"parking": "Stationnement",
"do_not_disturb": "\"Ne pas déranger\"",
"misc": "Divers"
}
},
"portIconHelp": "Ce numéro est en cours de transfert et sera supprimé si celui-ci échoue. Il peut être configuré mais ne sera pas utilisable"
}
}

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

@ -380,6 +380,10 @@
}
/* Numbers */
#groups_container .list-wrapper .item-row .features .tooltip-inner {
white-space:pre-wrap;
}
#groups_container .list-wrapper .item-row .features > i {
display: none;
}


+ 11
- 3
submodules/groups/groups.js View File

@ -180,7 +180,8 @@ define(function(require){
cell.parent().siblings('.edit-groups').css({
'position': 'block',
'z-index': '0'
'z-index': '0',
'border-top-color': '#a6a7a9'
});
}
else {
@ -191,18 +192,21 @@ define(function(require){
cell.css({
'position': 'relative',
'z-index': '3'
'z-index': '2'
});
cell.parent().siblings('.edit-groups').css({
'position': 'relative',
'z-index': '2'
'z-index': '2',
'border-top-color': 'transparent'
});
self.groupsGetTemplate(type, groupId, function(template, data) {
//FancyCheckboxes.
monster.ui.prettyCheck.create(template);
template.find('[data-toggle="tooltip"]').tooltip();
row.find('.edit-groups').append(template).slideDown();
$('body').append($('<div id="groups_container_overlay"></div>'));
@ -969,6 +973,8 @@ define(function(require){
extraSpareNumbers = _.without(extraSpareNumbers, val.phoneNumber);
});
template.find('[data-toggle="tooltip"]').tooltip();
if(remainingQuantity === 0) {
template.find('.spare-link').addClass('disabled');
}
@ -992,6 +998,8 @@ define(function(require){
var rowTemplate = monster.template(self, 'groups-numbersItemRow', { number: number });
rowTemplate.find('[data-toggle="tooltip"]').tooltip();
template.find('.list-unassigned-items .empty-row').hide();
template.find('.list-unassigned-items').append(rowTemplate);
});


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

@ -416,6 +416,10 @@
}
/* Detail Numbers */
#users_container .detail-numbers .list-wrapper .item-row .features .tooltip-inner {
white-space:pre-wrap;
}
#users_container .detail-numbers .list-wrapper .item-row .features > i {
display: none;
}


+ 11
- 3
submodules/users/users.js View File

@ -392,7 +392,8 @@ define(function(require){
cell.parent().siblings('.edit-user').css({
'position': 'initial',
'z-index': '0'
'z-index': '0',
'border-top-color': '#a6a7a9'
});
}
else {
@ -403,12 +404,13 @@ define(function(require){
cell.css({
'position': 'relative',
'z-index': '3'
'z-index': '2'
});
cell.parent().siblings('.edit-user').css({
'position': 'relative',
'z-index': '2'
'z-index': '2',
'border-top-color': 'transparent'
});
self.usersGetTemplate(type, userId, listUsers, function(template, data) {
@ -433,6 +435,8 @@ define(function(require){
currentCallflow = data.callflow;
currentUser = data.user;
template.find('[data-toggle="tooltip"]').tooltip();
_.each(data.extensions, function(number) {
extensionsToSave.push(number);
});
@ -1008,6 +1012,8 @@ define(function(require){
extraSpareNumbers = _.without(extraSpareNumbers, val.phoneNumber);
});
template.find('[data-toggle="tooltip"]').tooltip();
if(remainingQuantity == 0) {
template.find('.spare-link').addClass('disabled');
}
@ -1029,6 +1035,8 @@ define(function(require){
var rowTemplate = monster.template(self, 'users-numbersItemRow', { number: number });
rowTemplate.find('[data-toggle="tooltip"]').tooltip();
template.find('.list-unassigned-items .empty-row').hide();
template.find('.list-unassigned-items').append(rowTemplate);
});


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

@ -24,6 +24,9 @@
</div>
</div>
<div class="features">
{{#compare this.state '===' 'port_in'}}
<i class="icon-warning-sign icon-red active help-popover" data-toggle="tooltip" data-placement="top" data-original-title="{{../../i18n.portIconHelp}}"></i>
{{/compare}}
{{#each viewFeatures}}
<i class="{{icon}} {{active}} help-popover" data-toggle="tooltip" data-placement="top" data-original-title="{{ help }}"></i>
{{/each}}


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

@ -17,6 +17,9 @@
</div>
</div>
<div class="features">
{{#compare number.state '===' 'port_in'}}
<i class="icon-warning-sign icon-red active help-popover" data-toggle="tooltip" data-placement="top" data-original-title="{{../i18n.portIconHelp}}"></i>
{{/compare}}
{{#each number.viewFeatures}}
<i class="{{icon}} {{active}} help-popover" data-toggle="tooltip" data-placement="top" data-original-title="{{ help }}"></i>
{{/each}}


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

@ -24,6 +24,9 @@
</div>
</div>
<div class="features">
{{#compare this.state '===' 'port_in'}}
<i class="icon-warning-sign icon-red active help-popover" data-toggle="tooltip" data-placement="top" data-original-title="{{../../i18n.portIconHelp}}"></i>
{{/compare}}
{{#each this.viewFeatures}}
<i class="{{icon}} {{active}} help-popover" data-toggle="tooltip" data-placement="top" data-original-title="{{ help }}"></i>
{{/each}}


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

@ -17,6 +17,9 @@
</div>
</div>
<div class="features">
{{#compare number.state '===' 'port_in'}}
<i class="icon-warning-sign icon-red active help-popover" data-toggle="tooltip" data-placement="top" data-original-title="{{../i18n.portIconHelp}}"></i>
{{/compare}}
{{#each number.viewFeatures}}
<i class="{{icon}} {{active}} help-popover" data-toggle="tooltip" data-placement="top" data-original-title="{{ help }}"></i>
{{/each}}


Loading…
Cancel
Save