diff --git a/i18n/en-US.json b/i18n/en-US.json index b80d404..a961688 100644 --- a/i18n/en-US.json +++ b/i18n/en-US.json @@ -47,6 +47,7 @@ "port": "Port Numbers", "ringThisMemberFor": "Ring this member for:", "ringGroupMissing": "No Ring Group are defined for this Group (group_id missing from callflow)", + "userDeleted": "User Deleted", "removeMember": "Remove Member", "distribute": "Distribute", "maxDurationTooltip": "Click this box to change the maximum duration for your ring group. You must enter a number between 30 and 999.", diff --git a/i18n/fr-FR.json b/i18n/fr-FR.json index 1e5f682..032ed78 100644 --- a/i18n/fr-FR.json +++ b/i18n/fr-FR.json @@ -47,6 +47,7 @@ "port": "Porter Numéros", "ringThisMemberFor": "Faire sonner ce membre pendant:", "ringGroupMissing": "Aucun groupe d'appels n'a été défini pour ce groupe d'utilisatuers (group_id missing from callflow)", + "userDeleted": "Utilisateur supprimé", "removeMember": "Supprimer ce membre", "distribute": "Répartir", "maxDurationTooltip": "Cliquez sur le label ci-contre pour changer la durée maximale de ce groupe d'appel. Vous devez saisir un nombre crompris entre 30 et 999.", diff --git a/submodules/groups/groups.css b/submodules/groups/groups.css index aaa1ae4..0351152 100644 --- a/submodules/groups/groups.css +++ b/submodules/groups/groups.css @@ -315,6 +315,11 @@ margin: 0 0 0 5px; } +#groups_container .detail-group .grid-time .group-row.deleted { + color: #999; + font-style: italic; +} + #groups_container .detail-group .grid-time .group-row .name { overflow: hidden; padding-left: 10px; @@ -446,12 +451,16 @@ height: 100%; border-right: solid 1px #ddd; } +#groups_container .scale-element:first-child { + border-left: solid 1px #ddd; +} #groups_container .group-row.title .scale-element { top: 65%; height: 35%; + border-right: solid 1px #cdcdcd; } -#groups_container .scale-element:first-child { - border-left: solid 1px #ddd; +#groups_container .group-row.title .scale-element:first-child { + border-left: solid 1px #cdcdcd; } #groups_container .scale-element > span { position: absolute; diff --git a/submodules/groups/groups.js b/submodules/groups/groups.js index df4dc72..21f61f7 100644 --- a/submodules/groups/groups.js +++ b/submodules/groups/groups.js @@ -1205,18 +1205,21 @@ define(function(require){ template.find('.group-row[data-user_id="'+ userId + '"] .slider-time .ui-slider-handle').last().html(tooltip2); }, createSlider = function(endpoint) { - var groupRow = template.find('.group-row[data-user_id="'+ endpoint.id +'"]'); - groupRow.find('.slider-time').slider({ - range: true, - min: 0, - max: scaleMaxSeconds, - values: [ endpoint.delay, endpoint.delay+endpoint.timeout ], - slide: sliderTooltip, - change: sliderTooltip, - create: function(event, ui) { - createTooltip(event, ui, endpoint.id, $(this)); - }, - }); + var groupRow = template.find('.group-row[data-user_id="'+ endpoint.id +'"]'), + slider = groupRow.find('.slider-time').slider({ + range: true, + min: 0, + max: scaleMaxSeconds, + values: [ endpoint.delay, endpoint.delay+endpoint.timeout ], + slide: sliderTooltip, + change: sliderTooltip, + create: function(event, ui) { + createTooltip(event, ui, endpoint.id, $(this)); + }, + }); + if(groupRow.hasClass('deleted')) { + slider.slider('disable'); + } createSliderScale(groupRow); }, createSliderScale = function(container, isHeader) { @@ -1533,7 +1536,8 @@ define(function(require){ endpoint.name = user.first_name + ' ' + user.last_name; mapUsers[endpoint.id].inUse = true; } else { - endpoint.name = 'Not a user'; + endpoint.name = self.i18n.active().groups.userDeleted; + endpoint.deleted = true; } }); diff --git a/views/groups-members.html b/views/groups-members.html index 7fbde05..c1b1d93 100644 --- a/views/groups-members.html +++ b/views/groups-members.html @@ -13,7 +13,7 @@ {{#each extra.ringGroup}} -
+
{{name}}
@@ -50,7 +50,7 @@