Merge remote-tracking branch 'origin/master'

i18n/en-US.json

@@ -293,7 +293,7 @@
 			"realm": "Realm"
 		},
 		"spare": "Spare",
-		"title": "Devices",
+		"title": "Total Devices",
 		"titleGrid": {
 			"edit": "Edit",
 			"enable": "Enable",

i18n/fr-FR.json

@@ -268,7 +268,7 @@
 			"realm": "Royaume"
 		},
 		"spare": "Disponibles",
-		"title": "Téléphones",
+		"title": " Nombre de Téléphones",
 		"titleGrid": {
 			"edit": "Modifier",
 			"enable": "Activer",

submodules/devices/devices.css

@@ -1,36 +1,72 @@
 #devices_container .devices-header {
-	background: #fcfcfc;
-	border: 1px solid #ddd;
-	border-radius: 4px;
 	font-size: 18px;
-	height: 30px;
 	line-height: 30px;
-	padding: 15px;
 }
 
 #devices_container .devices-header > * {
 	display: inline-block;
 }
 
+#devices_container .devices-header .title {
+	padding: 15px;
+	border: 1px solid #dcdcdc;
+	border-radius: 4px 0 0 4px;
+}
+
 #devices_container .devices-header .count-devices {
-	color: #22ccff;
 	display: inline-block;
-	font-size: 28px;
-	font-weight: 600;
-	margin-left: 10px;
-	margin-right: 25px;
 	margin-top: -5px;
+	margin-left: 15px;
+	color: #22ccff;
+	font-weight: 600;
+	font-size: 28px;
+}
+
+#devices_container .devices-header .dropdown {
+	vertical-align: bottom;
 }
 
 #devices_container .devices-header .add-device {
-	font-size: 14px;
+	display: block;
+	margin: 0;
+	padding: 9px 13px;
+	border: 1px solid #dcdcdc;
+	border-left: 0;
+	border-radius: 0 4px 4px 0;
+	background-image: -webkit-linear-gradient(top, hsl(0, 0%, 98%) 0%, hsl(0, 0%, 95%) 100%);
+	background-image:    -moz-linear-gradient(top, hsl(0, 0%, 98%) 0%, hsl(0, 0%, 95%) 100%);
+	background-image:     -ms-linear-gradient(top, hsl(0, 0%, 98%) 0%, hsl(0, 0%, 95%) 100%);
+	background-image:      -o-linear-gradient(top, hsl(0, 0%, 98%) 0%, hsl(0, 0%, 95%) 100%);
+	background-image:         linear-gradient(top, hsl(0, 0%, 98%) 0%, hsl(0, 0%, 95%) 100%);
+	height: 42px;
+	vertical-align: top;
+	text-align: center;
+	font-size: 12px;
+}
+
+#devices_container .devices-header .add-device:hover {
+	background-image: none;
+	background-color: #eee;
+	text-decoration: none;
 }
 
 #devices_container .devices-header .add-device i {
+	display: block;
+	margin: 0;
+	color: #929799;
 	text-decoration: none;
-	margin-right: 5px;
 }
 
+#devices_container .devices-header .add-device:hover i {
+	color: #22ccff;
+}
+
+#devices_container .devices-header .search-box { margin: 16px 0 16px 15px; }
+
+
+
+
+
 #devices_container .devices-grid {
 	background: #fcfcfc;
 	border: 1px solid #ddd;

submodules/groups/groups.css

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

submodules/groups/groups.js

@@ -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')
@@ -1218,11 +1219,13 @@ define(function(require){
 				},
 				function(err, results) {
 					results.group.extra = self.groupsGetGroupFeatures(results.group);
-					_.each(results.userCallflows, function(userCallflow) {
+					results.userCallflows = _.filter(results.userCallflows, function(userCallflow) {
 						var user = _.find(results.users, function(user) { return userCallflow.owner_id === user.id });
 						if(user) {
 							userCallflow.userName = user.first_name + ' ' + user.last_name;
+							return true;
 						}
+						return false;
 					});
 					callback && callback(results);
 				}
@@ -1273,6 +1276,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];
 						}
 					});

submodules/strategy/strategy.css

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

submodules/strategy/strategy.js

@@ -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;
 										}
 									}),

submodules/users/users.css

@@ -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 {

submodules/users/users.js

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

views/app.html

@@ -7,13 +7,6 @@
 			</div>
 		</div>
 
-		<div id="strategy" class="category simple separated">
-			<div class="title">
-				<i class="icon-telicon-home-phone"></i>
-				<span class="title-text visible-desktop">{{ i18n.menuTitles.mainNumber }}</span>
-			</div>
-		</div>
-
 		<div class="category-group">
 			<div id="users" class="category">
 				<div class="title">
@@ -44,6 +37,13 @@
 			</div>
 		</div>
 
+		<div id="strategy" class="category simple separated">
+			<div class="title">
+				<i class="icon-telicon-home-phone"></i>
+				<span class="title-text visible-desktop">{{ i18n.menuTitles.mainNumber }}</span>
+			</div>
+		</div>
+
 		<div id="call_logs" class="category simple separated">
 			<div class="title">
 				<i class="icon-telicon-pbx"></i>

views/devices-layout.html

@@ -4,8 +4,12 @@
 			{{ i18n.devices.title }}
 			<span class="count-devices">{{countDevices}}</span>
 		</div>
+
 		<div class="dropdown">
-			<a href="#" class="add-device monster-link dropdown-toggle" data-toggle="dropdown"><i class="icon-plus-sign icon-green"></i>{{i18n.devices.add }}</a>
+			<a href="#" class="add-device monster-link dropdown-toggle" data-toggle="dropdown">
+				<i class="icon-plus-sign"></i>
+				{{i18n.devices.add }}
+			</a>
 			<ul class="dropdown-menu">
 				<li><a class="create-device" data-type="sip_device"><i class="icon-telicon-voip-phone"></i>{{ i18n.devices.types.sip_device }}</a></li>
 				<li><a class="create-device" data-type="cellphone"><i class="icon-phone"></i>{{ i18n.devices.types.cellphone }}</a></li>

views/groups-numbers.html

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

views/groups-numbersItemRow.html

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

views/strategy-numbers.html

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

views/users-numbers.html

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

views/users-numbersItemRow.html

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