diff --git a/i18n/en-US.json b/i18n/en-US.json index 622f93d..8aed9e6 100644 --- a/i18n/en-US.json +++ b/i18n/en-US.json @@ -293,7 +293,7 @@ "realm": "Realm" }, "spare": "Spare", - "title": "Devices", + "title": "Total Devices", "titleGrid": { "edit": "Edit", "enable": "Enable", diff --git a/i18n/fr-FR.json b/i18n/fr-FR.json index e8a57f7..6a727db 100644 --- a/i18n/fr-FR.json +++ b/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", diff --git a/submodules/devices/devices.css b/submodules/devices/devices.css index 5e24d5c..5c37428 100644 --- a/submodules/devices/devices.css +++ b/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; diff --git a/submodules/groups/groups.css b/submodules/groups/groups.css index fa3a057..3b6a6cf 100644 --- a/submodules/groups/groups.css +++ b/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; } diff --git a/submodules/groups/groups.js b/submodules/groups/groups.js index b03f77f..bb285df 100644 --- a/submodules/groups/groups.js +++ b/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]; } }); diff --git a/submodules/strategy/strategy.css b/submodules/strategy/strategy.css index 78380f5..8ece855 100644 --- a/submodules/strategy/strategy.css +++ b/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; } diff --git a/submodules/strategy/strategy.js b/submodules/strategy/strategy.js index 2f31b6f..86c3755 100644 --- a/submodules/strategy/strategy.js +++ b/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; } }), diff --git a/submodules/users/users.css b/submodules/users/users.css index 648e9ab..cf21e13 100644 --- a/submodules/users/users.css +++ b/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 { diff --git a/submodules/users/users.js b/submodules/users/users.js index 5b75385..c07735b 100644 --- a/submodules/users/users.js +++ b/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); } diff --git a/views/app.html b/views/app.html index cbb1237..151b846 100644 --- a/views/app.html +++ b/views/app.html @@ -7,13 +7,6 @@ -
-
- - {{ i18n.menuTitles.mainNumber }} -
-
-
@@ -44,6 +37,13 @@
+
+
+ + {{ i18n.menuTitles.mainNumber }} +
+
+
diff --git a/views/devices-layout.html b/views/devices-layout.html index 0c4268a..6de3a51 100644 --- a/views/devices-layout.html +++ b/views/devices-layout.html @@ -4,8 +4,12 @@ {{ i18n.devices.title }} {{countDevices}}
+
- {{i18n.devices.add }} + + + {{i18n.devices.add }} +
  • {{ i18n.devices.types.sip_device }}
  • {{ i18n.devices.types.cellphone }}
    • diff --git a/views/groups-numbers.html b/views/groups-numbers.html index 26e6658..342a77f 100644 --- a/views/groups-numbers.html +++ b/views/groups-numbers.html @@ -7,20 +7,22 @@ {{#each assignedNumbers}}
    -
    + {{#unless isLocal}} +
    -
    + {{/unless}} +
    {{#each viewFeatures}} {{/each}} diff --git a/views/groups-numbersItemRow.html b/views/groups-numbersItemRow.html index c4d60aa..3000eb4 100644 --- a/views/groups-numbersItemRow.html +++ b/views/groups-numbersItemRow.html @@ -1,6 +1,7 @@
    -
    + {{#unless number.isLocal}} +
    • @@ -13,7 +14,8 @@
    -
    + {{/unless}} +
    {{#each number.viewFeatures}} {{/each}} diff --git a/views/strategy-numbers.html b/views/strategy-numbers.html index 9357711..35f8ccc 100644 --- a/views/strategy-numbers.html +++ b/views/strategy-numbers.html @@ -7,20 +7,22 @@ {{formatPhoneNumber this.number}}
    -
    + {{#unless isLocal}} +
    -
    + {{/unless}} +
    {{#each this.features}} {{/each}} diff --git a/views/users-numbers.html b/views/users-numbers.html index 1aeb3cb..014c990 100644 --- a/views/users-numbers.html +++ b/views/users-numbers.html @@ -7,20 +7,22 @@ {{#each assignedNumbers}}
    -
    + {{#unless this.isLocal}} +
    -
    + {{/unless}} +
    {{#each this.viewFeatures}} {{/each}} diff --git a/views/users-numbersItemRow.html b/views/users-numbersItemRow.html index c4d60aa..3000eb4 100644 --- a/views/users-numbersItemRow.html +++ b/views/users-numbersItemRow.html @@ -1,6 +1,7 @@
    -
    + {{#unless number.isLocal}} +
    • @@ -13,7 +14,8 @@
    -
    + {{/unless}} +
    {{#each number.viewFeatures}} {{/each}}