diff --git a/i18n/en-US.json b/i18n/en-US.json
index 1f1b68f..eab2125 100644
--- a/i18n/en-US.json
+++ b/i18n/en-US.json
@@ -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"
}
diff --git a/i18n/fr-FR.json b/i18n/fr-FR.json
index dc47201..a7154ba 100644
--- a/i18n/fr-FR.json
+++ b/i18n/fr-FR.json
@@ -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"
}
}
diff --git a/submodules/groups/groups.css b/submodules/groups/groups.css
index 3b6a6cf..f1c1267 100644
--- a/submodules/groups/groups.css
+++ b/submodules/groups/groups.css
@@ -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;
}
diff --git a/submodules/groups/groups.js b/submodules/groups/groups.js
index 9e5b3c0..8099419 100644
--- a/submodules/groups/groups.js
+++ b/submodules/groups/groups.js
@@ -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($(''));
@@ -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);
});
diff --git a/submodules/users/users.css b/submodules/users/users.css
index 7e9e52e..8a0df52 100644
--- a/submodules/users/users.css
+++ b/submodules/users/users.css
@@ -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;
}
diff --git a/submodules/users/users.js b/submodules/users/users.js
index b9f10c6..3946c90 100644
--- a/submodules/users/users.js
+++ b/submodules/users/users.js
@@ -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);
});
diff --git a/views/groups-numbers.html b/views/groups-numbers.html
index dbdf59f..50ea97c 100644
--- a/views/groups-numbers.html
+++ b/views/groups-numbers.html
@@ -24,6 +24,9 @@
+ {{#compare this.state '===' 'port_in'}}
+
+ {{/compare}}
{{#each viewFeatures}}
{{/each}}
diff --git a/views/groups-numbersItemRow.html b/views/groups-numbersItemRow.html
index e5492eb..9fc3dcd 100644
--- a/views/groups-numbersItemRow.html
+++ b/views/groups-numbersItemRow.html
@@ -17,6 +17,9 @@
+ {{#compare number.state '===' 'port_in'}}
+
+ {{/compare}}
{{#each number.viewFeatures}}
{{/each}}
diff --git a/views/users-numbers.html b/views/users-numbers.html
index bb8c34b..d4ffea5 100644
--- a/views/users-numbers.html
+++ b/views/users-numbers.html
@@ -24,6 +24,9 @@
+ {{#compare this.state '===' 'port_in'}}
+
+ {{/compare}}
{{#each this.viewFeatures}}
{{/each}}
diff --git a/views/users-numbersItemRow.html b/views/users-numbersItemRow.html
index e5492eb..9fc3dcd 100644
--- a/views/users-numbersItemRow.html
+++ b/views/users-numbersItemRow.html
@@ -17,6 +17,9 @@
+ {{#compare number.state '===' 'port_in'}}
+
+ {{/compare}}
{{#each number.viewFeatures}}
{{/each}}