Merge branch 'master' of github.com:2600hz/monster-ui-voip

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"
 }

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"
 	}
 }

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;
 }

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($('<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');
 						}
@@ -989,9 +995,12 @@ define(function(require){
 							monster.pub('common.numbers.getListFeatures', function(features) {
 								_.each(numbers, function(number, k) {
 									number.viewFeatures = $.extend(true, {}, features);
+									number.phoneNumber = number.id;
 
 									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);
 								});
@@ -1263,7 +1272,6 @@ define(function(require){
 					unassignedNumbers: {}
 				};
 
-
 			monster.pub('common.numbers.getListFeatures', function(features) {
 				_.each(data.numbers.numbers, function(number, id) {
 					/* Formating number */

submodules/myOffice/myOffice.js

@@ -532,7 +532,7 @@ define(function(require){
 						break;
 					case "numbers":
 						$('.category#numbers').addClass('active');
-						monster.pub('voip.numbers.render', parent);
+						monster.pub('voip.numbers.render', { parent: parent });
 						break;
 					case "strategy":
 						$('.category#strategy').addClass('active');

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;
 }

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');
 							}
@@ -1026,9 +1032,12 @@ define(function(require){
 							monster.pub('common.numbers.getListFeatures', function(features) {
 								_.each(numbers, function(number, k) {
 									number.viewFeatures = $.extend(true, {}, features);
+									number.phoneNumber = number.id;
 
 									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);
 								});

views/groups-numbers.html

@@ -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}}
@@ -51,7 +54,7 @@
 
 	<div class="actions">
 		<a href="#" class="spare-link monster-link pull-left{{#if emptySpare}} disabled{{/if}}">
-			<i class="icon-plus icon-green icon-large"></i>Add from Spare Numbers
+			<i class="icon-plus icon-green icon-large"></i>{{ i18n.groups.addFromSpare }}
 		</a>
 		<ul class="nav pull-left">
 			<li class="dropdown">

views/groups-numbersItemRow.html

@@ -1,4 +1,4 @@
-<div class="item-row" data-id="{{number.phoneNumber}}" data-search="{{formatPhoneNumber number.phoneNumber}} {{number.phoneNumber}} {{number.locality.city}} {{number.locality.country}}">
+<div class="item-row" data-id="{{number.phoneNumber}}">
 	<div class="features-block pull-right">
 		<div class="edit-features">
 			<div class="navbar">
@@ -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}}

views/users-name.html

@@ -67,9 +67,12 @@
 			<div class="row-fields">
             	<div class="icon-wrapper" data-original-title="{{i18n.users.editionForm.languageHelp}}" data-placement="top" data-toggle="tooltip"><i class="icon-flag"></i></div>
 				<select id="user_language" name="extra.language">
-					<option value="auto">{{i18n.languages.auto}}</option>
-					<option value="en-US"{{#compare language '===' 'en-US'}} selected{{/compare}}>{{i18n.languages.americanEnglish}}</option>
-					<option value="fr-FR"{{#compare language '===' 'fr-FR'}} selected{{/compare}}>{{i18n.languages.frenchFrench}}</option>
+					{{#select language}}
+						<option value="auto">{{i18n.languages.auto}}</option>
+						<option value="en-US">{{i18n.languages.americanEnglish}}</option>
+						<option value="fr-FR">{{i18n.languages.frenchFrench}}</option>
+						<option value="ru-RU">{{i18n.languages.russianRussian}}</option>
+					{{/select}}
 				</select>
 			</div>
 

views/users-numbers.html

@@ -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}}
@@ -51,7 +54,7 @@
 
 	<div class="actions">
 		<a href="#" class="spare-link monster-link pull-left{{#if emptySpare}} disabled{{/if}}">
-			<i class="icon-plus icon-green icon-large"></i>Add from Spare Numbers
+			<i class="icon-plus icon-green icon-large"></i>{{ i18n.users.addFromSpare }}
 		</a>
 		<ul class="nav pull-left">
 			<li class="dropdown">

views/users-numbersItemRow.html

@@ -1,4 +1,4 @@
-<div class="item-row" data-id="{{number.phoneNumber}}" data-search="{{formatPhoneNumber number.phoneNumber}} {{number.phoneNumber}} {{number.locality.city}} {{number.locality.country}}">
+<div class="item-row" data-id="{{number.phoneNumber}}">
 	<div class="features-block pull-right">
 		<div class="edit-features">
 			<div class="navbar">
@@ -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}}