diff --git a/i18n/en-US.json b/i18n/en-US.json index 9658dc5..d414933 100644 --- a/i18n/en-US.json +++ b/i18n/en-US.json @@ -918,9 +918,7 @@ "hangup1": "Hangup", "hangup2": "Cause", "details1": "Call", - "details2": "Details", - "report1": "Submit", - "report2": "Report" + "actions": "Actions" }, "reportCall": "Report Call", "loaderMessage": "Scroll down or click here to load additional Call Logs.", @@ -937,7 +935,14 @@ "thisDay": "Today", "custom": "Custom", "callsFrom": "Showing calls from", - "callsTo": "to" + "callsTo": "to", + "__comment": "UI-", + "__version": "v4.0", + "loading": "Loading additional information...", + "actions": { + "report": "Report Call", + "details": "Technical Details" + } }, "myOffice": { @@ -1059,7 +1064,10 @@ "call_recording": "Call Recording", "__comment": "UI-1395: Added voicemail[single_mailbox_login] feature code", "__version": "3.20", - "voicemail[single_mailbox_login]": "Check Voicemail (auto login)" + "voicemail[single_mailbox_login]": "Check Voicemail (auto login)", + "__comment": "UI-2256: adding move feature code", + "__version": "4.0", + "move": "Move" }, "__comment": "UI-1028, v3.20_s0: Added categories for the feature codes.", "categories": { diff --git a/metadata/icon/SmartPBX_app.png b/metadata/icon/SmartPBX_app.png index f2748ad..a00fd04 100644 Binary files a/metadata/icon/SmartPBX_app.png and b/metadata/icon/SmartPBX_app.png differ diff --git a/style/app.css b/style/app.css index ece83c9..e23ddff 100644 --- a/style/app.css +++ b/style/app.css @@ -14,47 +14,4 @@ #voip_container .left-menu > div { margin-top: 10px; -} - -/* Feature Popups */ -.feature-popup-container { - width: 510px; -} - -.feature-popup-container .actions, -.feature-popup-container .content { - padding: 15px 25px; - border-top: 1px solid #ccc; -} - -.feature-popup-container .actions .monster-link { - margin-right: 10px; -} - -.feature-popup-container .switch { - display: inline-block; - margin-left: 15px; -} - -.feature-popup-container .content.disabled { - display: none; -} - -.feature-popup-container form { - margin-bottom: 40px; -} - -.feature-popup-container form .main-line { - position: relative; - height: 70px; /* Adding extra space for validation messages */ - line-height: 60px; -} - -.feature-popup-container form .main-line label.monster-invalid { - top: 45px; -} - -.feature-popup-container input, -.feature-popup-container select { - margin-left: 10px; } \ No newline at end of file diff --git a/submodules/callLogs/callLogs.css b/submodules/callLogs/callLogs.css index 26fcbb1..82be377 100644 --- a/submodules/callLogs/callLogs.css +++ b/submodules/callLogs/callLogs.css @@ -82,11 +82,11 @@ #call_logs_container .grid-row-group .grid-row:not(:first-of-type) { border-top: solid 1px #e3e3e3; } -#call_logs_container .grid-row-group:last-of-type:not(.open) .a-leg { +#call_logs_container .grid-row-group:last-of-type:not(.open) .main-leg { border-bottom-left-radius: 4px; border-bottom-right-radius: 4px; } -#call_logs_container .grid-row-group.open:last-of-type .b-leg:last-of-type { +#call_logs_container .grid-row-group.open:last-of-type .extra-leg:last-of-type { border-bottom-left-radius: 4px; border-bottom-right-radius: 4px; } @@ -110,21 +110,37 @@ #call_logs_container .grid-row.no-match { display: none; } -#call_logs_container .grid-row-group:not(.open) .grid-row.a-leg.has-b-legs > .grid-cell:first-child { +#call_logs_container .grid-row-group:not(.open) .grid-row.main-leg > .grid-cell:first-child { border-left: solid 2px #22a5ff; } #call_logs_container .grid-row-group.open .grid-row > .grid-cell:first-child { border-left: solid 2px #44cc44; } -#call_logs_container .grid-row.a-leg.has-b-legs:hover { +#call_logs_container .grid-row.main-leg:hover { background-color: #eee; cursor: pointer; } -#call_logs_container .grid-row.b-leg { - background-color: #fcfcfc; +#call_logs_container .grid-row-group .extra-legs { display: none; } +#call_logs_container .grid-row-group .extra-legs .loading-container { + background: #fff; + border-left: 1px solid #ddd; + border-top: 1px solid #ddd; + padding: 15px; + text-align: center; +} + +#call_logs_container .grid-row-group .extra-legs .loading-container i { + margin-left: 10px; +} + +#call_logs_container .grid-row.extra-leg { + background-color: #fcfcfc; + border-top: solid 1px #e3e3e3; +} + #call_logs_container .grid-cell { display: inline-block; padding: 10px 5px; @@ -144,10 +160,10 @@ width: 12%; } #call_logs_container .grid-cell.from { - width: 20%; + width: 25%; } #call_logs_container .grid-cell.to { - width: 20%; + width: 25%; } #call_logs_container .grid-cell.duration { width: 9%; @@ -155,9 +171,6 @@ #call_logs_container .grid-cell.hangup { width: 15%; } -#call_logs_container .call-logs-grid.no-report-link .grid-cell.hangup { - width: 25%; -} #call_logs_container .grid-cell.full-width { width: 100%; } @@ -166,16 +179,14 @@ font-size: 12px; font-style: italic; } -#call_logs_container .grid-cell.details { +#call_logs_container .grid-cell.actions { width: 10%; } -#call_logs_container .grid-cell.details i:hover { +#call_logs_container .grid-cell.actions i:hover { color: #22a5ff; cursor: pointer; } -#call_logs_container .grid-cell.report { - width: 10%; -} + #call_logs_container .sub-cell { height: 20px; overflow: hidden; diff --git a/submodules/callLogs/callLogs.js b/submodules/callLogs/callLogs.js index 3b85aba..c8331dd 100644 --- a/submodules/callLogs/callLogs.js +++ b/submodules/callLogs/callLogs.js @@ -42,6 +42,7 @@ define(function(require){ delete self.loneBLegs; self.callLogsGetCdrs(fromDate, toDate, function(cdrs, nextStartKey) { cdrs = self.callLogsFormatCdrs(cdrs); + dataTemplate.cdrs = cdrs; template = $(monster.template(self, 'callLogs-layout', dataTemplate)); @@ -145,7 +146,7 @@ define(function(require){ + cdr.fromNumber + "|" + cdr.toName + "|" + cdr.toNumber + "|" + cdr.hangupCause + "|" + callIds).toLowerCase(), - rowGroup = template.find('.grid-row.a-leg[data-id="'+cdr.id+'"]').parents('.grid-row-group'); + rowGroup = template.find('.grid-row.main-leg[data-id="'+cdr.id+'"]').parents('.grid-row-group'); if(searchString.indexOf(searchValue) >= 0) { matchedResults = true; rowGroup.show(); @@ -174,20 +175,38 @@ define(function(require){ } }); - template.on('click', '.a-leg.has-b-legs', function(e) { - var rowGroup = $(this).parents('.grid-row-group'); + template.on('click', '.grid-row.main-leg', function(e) { + var $this = $(this), + rowGroup = $this.parents('.grid-row-group'), + callId = $this.data('id'), + extraLegs = rowGroup.find('.extra-legs'); + if(rowGroup.hasClass('open')) { rowGroup.removeClass('open'); - rowGroup.find('.b-leg').slideUp(); + extraLegs.slideUp(); } else { + // Reset all slidedDown legs template.find('.grid-row-group').removeClass('open'); - template.find('.b-leg').slideUp(); + template.find('.extra-legs').slideUp(); + + // Slide down current leg rowGroup.addClass('open'); - rowGroup.find('.b-leg').slideDown(); + extraLegs.slideDown(); + + if(!extraLegs.hasClass('data-loaded')) { + self.callLogsGetLegs(callId, function(cdrs) { + var formattedCdrs = self.callLogsFormatCdrs(cdrs); + + rowGroup.find('.extra-legs') + .empty() + .addClass('data-loaded') + .append(monster.template(self, 'callLogs-interactionLegs', { cdrs: formattedCdrs })); + }); + } } }); - template.on('click', '.grid-cell.details i', function(e) { + template.on('click', '.grid-cell.actions .details-cdr', function(e) { e.stopPropagation(); var cdrId = $(this).parents('.grid-row').data('id'); self.callLogsShowDetailsPopup(cdrId); @@ -285,49 +304,28 @@ define(function(require){ } self.callApi({ - resource: 'cdrs.list', + resource: 'cdrs.listByInteraction', data: { accountId: self.accountId, filters: filters }, success: function(data, status) { - var cdrs = {}, - groupedLegs = _.groupBy(data.data, function(val) { return (val.direction === 'inbound' || !val.bridge_id) ? 'aLegs' : 'bLegs' }); - - if(self.lastALeg) { - groupedLegs.aLegs.splice(0, 0, self.lastALeg); - } - // if(self.loneBLegs && self.loneBLegs.length) { - // groupedLegs.bLegs = self.loneBLegs.concat(groupedLegs.bLegs); - // } - if(data['next_start_key']) { - self.lastALeg = groupedLegs.aLegs.pop(); - } - - _.each(groupedLegs.aLegs, function(val) { - var call_id = val.call_id || val.id; - cdrs[call_id] = { aLeg: val, bLegs: {} }; - }); + callback(data.data, data['next_start_key']); + } + }); + }, - if(self.loneBLegs && self.loneBLegs.length > 0) { - _.each(self.loneBLegs, function(val) { - if('other_leg_call_id' in val && val.other_leg_call_id in cdrs) { - cdrs[val.other_leg_call_id].bLegs[val.id] = val; - } - }); - } - self.loneBLegs = []; - _.each(groupedLegs.bLegs, function(val) { - if('other_leg_call_id' in val) { - if(val.other_leg_call_id in cdrs) { - cdrs[val.other_leg_call_id].bLegs[val.id] = val; - } else { - self.loneBLegs.push(val); - } - } - }); + callLogsGetLegs: function(callId, callback) { + var self = this; - callback(cdrs, data['next_start_key']); + self.callApi({ + resource: 'cdrs.listLegs', + data: { + accountId: self.accountId, + callId: callId + }, + success: function(data) { + callback && callback(data.data); } }); }, @@ -387,20 +385,8 @@ define(function(require){ }; }; - _.each(cdrs, function(val, key) { - if(!('aLeg' in val)) { - // Handling lone b-legs as standalone a-legs - _.each(val.bLegs, function(v, k) { - result.push($.extend({ bLegs: [] }, formatCdr(v))); - }); - } else { - var cdr = formatCdr(val.aLeg); - cdr.bLegs = []; - _.each(val.bLegs, function(v, k) { - cdr.bLegs.push(formatCdr(v)); - }); - result.push(cdr); - } + _.each(cdrs, function(v) { + result.push(formatCdr(v)); }); result.sort(function(a, b) { diff --git a/submodules/featureCodes/featureCodes.js b/submodules/featureCodes/featureCodes.js index f199912..b9642b0 100644 --- a/submodules/featureCodes/featureCodes.js +++ b/submodules/featureCodes/featureCodes.js @@ -48,7 +48,8 @@ define(function(require){ "call_waiting[action=enable]", "call_waiting[action=disable]", "sound_test_service", - "call_recording" + "call_recording", + "move" ] }, @@ -98,7 +99,9 @@ define(function(require){ _.each(featureCodeData, function(callflow) { // Some old callflows have been created with the feature code key, so we had the check to make sure they also have a name associated if(callflow.featurecode.hasOwnProperty('name')) { - var category = 'misc'; + var category = 'misc', + hasStar = (callflow.hasOwnProperty('numbers') && callflow.numbers.length && callflow.numbers[0].substr(0,1) === '*') || (callflow.hasOwnProperty('patterns') && callflow.patterns.length && callflow.patterns[0].substr(0,3) === '^\\*'); + _.find(self.categories, function(cat, key) { if(cat.indexOf(callflow.featurecode.name) >= 0) { category = key; @@ -114,10 +117,12 @@ define(function(require){ }; } + console.log(hasStar); featureCodes[category].codes.push({ key: callflow.featurecode.name, name: self.i18n.active().featureCodes.labels[callflow.featurecode.name] || callflow.featurecode.name, - number: callflow.featurecode.number ? callflow.featurecode.number.replace(/\\/g,'') : '' + number: callflow.featurecode.number ? callflow.featurecode.number.replace(/\\/g,'') : '', + hasStar: hasStar }); } }); diff --git a/submodules/groups/groups.css b/submodules/groups/groups.css index 1e1e704..f7dcabf 100644 --- a/submodules/groups/groups.css +++ b/submodules/groups/groups.css @@ -441,7 +441,7 @@ } #groups_container .detail-features .features-grid .feature .fa-wrapper, -.feature-popup-container .feature-fa-wrapper{ +.monster-feature-popup-container .feature-fa-wrapper{ display: inline-block; margin: 20px; width: 60px; @@ -463,7 +463,7 @@ } #groups_container .detail-features .features-grid .feature .fa-wrapper.active, -.feature-popup-container .feature-fa-wrapper.active{ +.monster-feature-popup-container .feature-fa-wrapper.active{ background: #19d332; /* Old browsers */ background: -moz-radial-gradient(center, ellipse cover, hsl(128,79%,46%) 0%, hsl(132,46%,46%) 61%, hsl(0,0%,0%) 99%); /* FF3.6+ */ background: -webkit-gradient(radial, center center, 0px, center center, 100%, color-stop(0%,hsl(128,79%,46%)), color-stop(61%,hsl(132,46%,46%)), color-stop(99%,hsl(0,0%,0%))); /* Chrome,Safari4+ */ @@ -480,99 +480,99 @@ } /* Call Recording Feature */ -.feature-popup-container[data-feature="call_recording"] form { +.monster-feature-popup-container[data-feature="call_recording"] form { margin-bottom: 0; } -.feature-popup-container[data-feature="call_recording"] form > div { +.monster-feature-popup-container[data-feature="call_recording"] form > div { position: relative; margin-bottom: 10px; } -.feature-popup-container[data-feature="call_recording"] form span { +.monster-feature-popup-container[data-feature="call_recording"] form span { display: inline-block; width: 120px; vertical-align: text-bottom; text-align: right; } -.feature-popup-container[data-feature="call_recording"] form label.monster-invalid { +.monster-feature-popup-container[data-feature="call_recording"] form label.monster-invalid { top: 30px; left: 130px; } /* Ringback Feature */ -.feature-popup-container[data-feature="ringback"] { +.monster-feature-popup-container[data-feature="ringback"] { width: 516px; } -.feature-popup-container[data-feature="ringback"] .media-dropdown { +.monster-feature-popup-container[data-feature="ringback"] .media-dropdown { margin-bottom: 0px; } -.feature-popup-container[data-feature="ringback"] .upload-toggle { +.monster-feature-popup-container[data-feature="ringback"] .upload-toggle { margin-left: 10px; width: 117px; } -.feature-popup-container[data-feature="ringback"] .upload-div { +.monster-feature-popup-container[data-feature="ringback"] .upload-div { display: none; margin-top: 20px; } -.feature-popup-container[data-feature="ringback"] .upload-div .upload-input { +.monster-feature-popup-container[data-feature="ringback"] .upload-div .upload-input { margin: 0; width: 330px; } -.feature-popup-container[data-feature="ringback"] .upload-div button.upload-action { +.monster-feature-popup-container[data-feature="ringback"] .upload-div button.upload-action { margin-left: 10px; padding-left: 19px; padding-right: 19px; } -.feature-popup-container[data-feature="ringback"] .upload-div button > i { +.monster-feature-popup-container[data-feature="ringback"] .upload-div button > i { margin-right: 0; padding-right: 0; } -.feature-popup-container[data-feature="ringback"] .upload-div .file-upload { +.monster-feature-popup-container[data-feature="ringback"] .upload-div .file-upload { margin: 0; } -.feature-popup-container[data-feature="ringback"] .upload-div .file-upload > input { +.monster-feature-popup-container[data-feature="ringback"] .upload-div .file-upload > input { margin: 0; width: 205px; padding: 6px; } /* Next Action Feature */ -.feature-popup-container[data-feature="next_action"] { +.monster-feature-popup-container[data-feature="next_action"] { width: 540px; } -.feature-popup-container[data-feature="next_action"] .next-action > * { +.monster-feature-popup-container[data-feature="next_action"] .next-action > * { vertical-align: middle; margin: 0; } -.feature-popup-container[data-feature="next_action"] .next-action > *:not(:first-child) { +.monster-feature-popup-container[data-feature="next_action"] .next-action > *:not(:first-child) { margin-left: 10px; } /* Allow Call Forward Feature */ -.feature-popup-container[data-feature="forward"] .help-box { +.monster-feature-popup-container[data-feature="forward"] .help-box { margin: 5px 20px 20px } /* CID Prepend Feature */ -.feature-popup-container[data-feature="prepend"] form { +.monster-feature-popup-container[data-feature="prepend"] form { margin-bottom: 0; } -.feature-popup-container[data-feature="prepend"] form > div { +.monster-feature-popup-container[data-feature="prepend"] form > div { position: relative; margin-bottom: 10px; } -.feature-popup-container[data-feature="prepend"] form span { +.monster-feature-popup-container[data-feature="prepend"] form span { display: inline-block; width: 160px; vertical-align: middle; text-align: right; } -.feature-popup-container[data-feature="prepend"] form input { +.monster-feature-popup-container[data-feature="prepend"] form input { margin-bottom: 0; width: 100px; } \ No newline at end of file diff --git a/submodules/strategy/strategy.js b/submodules/strategy/strategy.js index c028449..b6ed201 100644 --- a/submodules/strategy/strategy.js +++ b/submodules/strategy/strategy.js @@ -142,6 +142,12 @@ define(function(require){ pattern: '^\\*5([0-9]*)$', moduleName: 'park', actionName: 'retrieve' + }, + { + name: 'move', + number: '6683', + callflowNumber: '6683', + moduleName: 'move' } ], @@ -2879,9 +2885,7 @@ define(function(require){ var callflow = { flow: { children: {}, - data: $.extend(true, (featureCode.extraData || {}), { - action: featureCode.actionName - }), + data: featureCode.extraData || {}, module: featureCode.moduleName }, featurecode: { @@ -2890,6 +2894,12 @@ define(function(require){ } }; + if(featureCode.hasOwnProperty('actionName')) { + callflow.flow.data = $.extend(callflow.flow.data, { + action: featureCode.actionName + }); + } + if('pattern' in featureCode) { callflow.patterns = [ featureCode.pattern ]; } @@ -3119,13 +3129,15 @@ define(function(require){ resource: 'callflow.list', data: { accountId: self.accountId, - filters: { 'has_key':'owner_id' } + filters: { + has_key:'owner_id', + filter_type: 'mainUserCallflow', + paginate: 'false' + } }, success: function(data, status) { - var userCallflows = _.filter(data.data, function(callflow) { - return (callflow.type === 'mainUserCallflow' || !('type' in callflow)); - }); - _callback(null, userCallflows); + var mapCallflowsByOwnerId = _.indexBy(data.data, 'owner_id'); + _callback(null, mapCallflowsByOwnerId); } }); }, @@ -3220,11 +3232,11 @@ define(function(require){ }); _.each(results.users, function(user) { - var userCallflow = _.find(results.userCallflows, function(callflow) { return callflow.owner_id === user.id }); - if(userCallflow) { - user.id = userCallflow.id; + if(results.userCallflows.hasOwnProperty(user.id)) { + user.id = results.userCallflows[user.id].id; user.module = 'callflow'; - } else { + } + else { user.module = 'user'; } callEntities.userCallflows.push(user); diff --git a/submodules/users/users.css b/submodules/users/users.css index 5968ce9..cfdb99e 100644 --- a/submodules/users/users.css +++ b/submodules/users/users.css @@ -253,7 +253,7 @@ #users_container .actions .spare-devices { line-height: 30px; - margin-left: 10px; + margin-right: 10px; } #users_container .actions .buy-dropdown { @@ -527,7 +527,7 @@ } #users_container .detail-features .features-grid .feature .fa-wrapper, -.feature-popup-container .feature-fa-wrapper{ +.monster-feature-popup-container .feature-fa-wrapper{ display: inline-block; margin: 20px; width: 60px; @@ -549,7 +549,7 @@ } #users_container .detail-features .features-grid .feature .fa-wrapper.active, -.feature-popup-container .feature-fa-wrapper.active{ +.monster-feature-popup-container .feature-fa-wrapper.active{ background: #19d332; /* Old browsers */ background: -moz-radial-gradient(center, ellipse cover, hsl(128,79%,46%) 0%, hsl(132,46%,46%) 61%, hsl(0,0%,0%) 99%); /* FF3.6+ */ background: -webkit-gradient(radial, center center, 0px, center center, 100%, color-stop(0%,hsl(128,79%,46%)), color-stop(61%,hsl(132,46%,46%)), color-stop(99%,hsl(0,0%,0%))); /* Chrome,Safari4+ */ @@ -661,36 +661,36 @@ } /* Caller-ID User Feature Popup */ -.feature-popup-container[data-feature="caller_id"] { +.monster-feature-popup-container[data-feature="caller_id"] { width: 525px; } -.feature-popup-container .caller-id-select { +.monster-feature-popup-container .caller-id-select { margin-top: 5px; } /* Hot Desking User Feature Popup */ -.feature-popup-container[data-feature="hotdesk"] #pin { +.monster-feature-popup-container[data-feature="hotdesk"] #pin { margin-top: 10px; } /* VM To Email User Feature Popup */ -.feature-popup-container[data-feature="vm_to_email"] #email { +.monster-feature-popup-container[data-feature="vm_to_email"] #email { margin-top: 8px; } -.feature-popup-container[data-feature="vm_to_email"] .main-line { +.monster-feature-popup-container[data-feature="vm_to_email"] .main-line { height: auto; line-height: 20px; margin: 10px 0 30px 0; } /* Conferencing */ -.feature-popup-container[data-feature="conferencing"] form { +.monster-feature-popup-container[data-feature="conferencing"] form { margin-bottom: 0; } -.feature-popup-container[data-feature="conferencing"] form .list-numbers { +.monster-feature-popup-container[data-feature="conferencing"] form .list-numbers { display: inline-block; font-weight: 600; height: 65px; @@ -701,86 +701,86 @@ width: 180px; } -.feature-popup-container[data-feature="conferencing"] form .list-numbers[data-count="1"] { +.monster-feature-popup-container[data-feature="conferencing"] form .list-numbers[data-count="1"] { line-height: 61px; } -.feature-popup-container[data-feature="conferencing"] form .list-numbers[data-count="2"] { +.monster-feature-popup-container[data-feature="conferencing"] form .list-numbers[data-count="2"] { line-height: 32px; } -.feature-popup-container[data-feature="conferencing"] form .list-numbers[data-count="3"] { +.monster-feature-popup-container[data-feature="conferencing"] form .list-numbers[data-count="3"] { line-height: 20px; } /* Music-On-Hold Feature */ -.feature-popup-container[data-feature="music_on_hold"] .media-dropdown { +.monster-feature-popup-container[data-feature="music_on_hold"] .media-dropdown { margin-bottom: 0px; } -.feature-popup-container[data-feature="music_on_hold"] .upload-toggle { +.monster-feature-popup-container[data-feature="music_on_hold"] .upload-toggle { margin-left: 10px; min-width: 117px; } -.feature-popup-container[data-feature="music_on_hold"] .upload-div { +.monster-feature-popup-container[data-feature="music_on_hold"] .upload-div { display: none; margin-top: 20px; } -.feature-popup-container[data-feature="music_on_hold"] .upload-div .upload-input { +.monster-feature-popup-container[data-feature="music_on_hold"] .upload-div .upload-input { margin: 0; width: 330px; } -.feature-popup-container[data-feature="music_on_hold"] .upload-div button.upload-action { +.monster-feature-popup-container[data-feature="music_on_hold"] .upload-div button.upload-action { margin-left: 10px; padding-left: 19px; padding-right: 19px; } -.feature-popup-container[data-feature="music_on_hold"] .upload-div button > i { +.monster-feature-popup-container[data-feature="music_on_hold"] .upload-div button > i { margin-right: 0; padding-right: 0; } -.feature-popup-container[data-feature="music_on_hold"] .upload-div .file-upload { +.monster-feature-popup-container[data-feature="music_on_hold"] .upload-div .file-upload { margin: 0; } -.feature-popup-container[data-feature="music_on_hold"] .upload-div .file-upload > input { +.monster-feature-popup-container[data-feature="music_on_hold"] .upload-div .file-upload > input { margin: 0; padding: 6px; width: 192px; } /* Faxing Feature Popup */ -.feature-popup-container[data-feature='faxing'] { +.monster-feature-popup-container[data-feature='faxing'] { overflow: hidden; } -.feature-popup-container[data-feature='faxing'] #faxbox_form { +.monster-feature-popup-container[data-feature='faxing'] #faxbox_form { margin-bottom: 0; } -.feature-popup-container[data-feature='faxing'] #faxbox_form a { +.monster-feature-popup-container[data-feature='faxing'] #faxbox_form a { color: #22a5ff; text-decoration: underline; } -.feature-popup-container[data-feature='faxing'] #faxbox_form a:hover { +.monster-feature-popup-container[data-feature='faxing'] #faxbox_form a:hover { text-decoration: none; } -.feature-popup-container[data-feature='faxing'] #faxbox_form p { +.monster-feature-popup-container[data-feature='faxing'] #faxbox_form p { line-height: 30px; } -.feature-popup-container[data-feature='faxing'] #faxbox_form .monster-primary-color { +.monster-feature-popup-container[data-feature='faxing'] #faxbox_form .monster-primary-color { color: #22a5ff; } -.feature-popup-container[data-feature='faxing'] #faxbox_form .number-selector { +.monster-feature-popup-container[data-feature='faxing'] #faxbox_form .number-selector { display: inline-block; margin: 0 10px; } -.feature-popup-container[data-feature='faxing'] #faxbox_form #helper_content { +.monster-feature-popup-container[data-feature='faxing'] #faxbox_form #helper_content { margin-top: 10px; } @@ -808,7 +808,7 @@ } /* Find me Follow me feature popup */ -.feature-popup-container[data-feature="find_me_follow_me"] { +.monster-feature-popup-container[data-feature="find_me_follow_me"] { width: 620px; } diff --git a/views/callLogs-cdrsList.html b/views/callLogs-cdrsList.html index 8ac4e2c..b494265 100644 --- a/views/callLogs-cdrsList.html +++ b/views/callLogs-cdrsList.html @@ -1,6 +1,6 @@ {{#each cdrs}}
-
+
{{#if this.isOutboundCall}} @@ -40,65 +40,16 @@ {{this.hangupCause}}
-
+
- + {{#if ../showReport}}{{/if}}
- {{#if ../showReport}} -
-
- {{@root.i18n.callLogs.reportCall}} -
-
- {{/if}}
- {{#each this.bLegs}} -
-
-
-
-
-
{{this.date}}
-
{{this.time}}
-
-
- {{#if this.fromName}} -
{{formatPhoneNumber this.fromNumber}}
-
{{this.fromName}}
- {{else}} -
{{formatPhoneNumber this.fromNumber}}
- {{/if}} -
-
- {{#if this.toName}} -
{{formatPhoneNumber this.toNumber}}
-
{{this.toName}}
- {{else}} -
{{formatPhoneNumber this.toNumber}}
- {{/if}} -
-
-
- {{this.duration}} -
-
-
-
- {{this.hangupCause}} -
-
-
-
- -
-
- {{#if ../../showReport}} -
-
+
+
+ {{@root.i18n.callLogs.loading}}
- {{/if}}
- {{/each}}
{{/each}} \ No newline at end of file diff --git a/views/callLogs-interactionLegs.html b/views/callLogs-interactionLegs.html new file mode 100644 index 0000000..2094d49 --- /dev/null +++ b/views/callLogs-interactionLegs.html @@ -0,0 +1,42 @@ +{{#each cdrs}} +
+
+
+
+
+
{{this.date}}
+
{{this.time}}
+
+
+ {{#if this.fromName}} +
{{formatPhoneNumber this.fromNumber}}
+
{{this.fromName}}
+ {{else}} +
{{formatPhoneNumber this.fromNumber}}
+ {{/if}} +
+
+ {{#if this.toName}} +
{{formatPhoneNumber this.toNumber}}
+
{{this.toName}}
+ {{else}} +
{{formatPhoneNumber this.toNumber}}
+ {{/if}} +
+
+
+ {{this.duration}} +
+
+
+
+ {{this.hangupCause}} +
+
+
+
+ +
+
+
+{{/each}} \ No newline at end of file diff --git a/views/callLogs-layout.html b/views/callLogs-layout.html index 8318752..1edf8aa 100644 --- a/views/callLogs-layout.html +++ b/views/callLogs-layout.html @@ -42,7 +42,7 @@
-
+
@@ -71,16 +71,9 @@
{{i18n.callLogs.gridHeaders.hangup1}}
{{i18n.callLogs.gridHeaders.hangup2}}
-
-
{{i18n.callLogs.gridHeaders.details1}}
-
{{i18n.callLogs.gridHeaders.details2}}
+
+
{{i18n.callLogs.gridHeaders.actions}}
- {{#if showReport}} -
-
{{i18n.callLogs.gridHeaders.report1}}
-
{{i18n.callLogs.gridHeaders.report2}}
-
- {{/if}}
diff --git a/views/featureCodes-layout.html b/views/featureCodes-layout.html index 8cb5e5c..f24da20 100644 --- a/views/featureCodes-layout.html +++ b/views/featureCodes-layout.html @@ -5,16 +5,16 @@
{{#each featureCodes}}
-
{{this.category}}
+
{{category}}
- {{#each this.codes}} + {{#each codes}}
- {{this.name}} + {{name}}
-
*
-
{{this.number}}
+
{{#if hasStar}}*{{/if}}
+
{{number}}
{{/each}} diff --git a/views/groups-feature-call_recording.html b/views/groups-feature-call_recording.html index 91311ff..5016e93 100644 --- a/views/groups-feature-call_recording.html +++ b/views/groups-feature-call_recording.html @@ -1,4 +1,4 @@ -
+
diff --git a/views/groups-feature-forward.html b/views/groups-feature-forward.html index b1b218b..fca0212 100644 --- a/views/groups-feature-forward.html +++ b/views/groups-feature-forward.html @@ -1,4 +1,4 @@ -
+
diff --git a/views/groups-feature-next_action.html b/views/groups-feature-next_action.html index f54db24..4b26037 100644 --- a/views/groups-feature-next_action.html +++ b/views/groups-feature-next_action.html @@ -1,4 +1,4 @@ -
+
diff --git a/views/groups-feature-prepend.html b/views/groups-feature-prepend.html index b183bc9..8930745 100644 --- a/views/groups-feature-prepend.html +++ b/views/groups-feature-prepend.html @@ -1,4 +1,4 @@ -
+
diff --git a/views/groups-feature-ringback.html b/views/groups-feature-ringback.html index 48781ff..2e3bc4a 100644 --- a/views/groups-feature-ringback.html +++ b/views/groups-feature-ringback.html @@ -1,4 +1,4 @@ -
+
diff --git a/views/groups-numbers.html b/views/groups-numbers.html index 345dfd0..f0495ef 100644 --- a/views/groups-numbers.html +++ b/views/groups-numbers.html @@ -66,7 +66,7 @@ diff --git a/views/myOffice-callerIdPopup.html b/views/myOffice-callerIdPopup.html index c05d647..16caeea 100644 --- a/views/myOffice-callerIdPopup.html +++ b/views/myOffice-callerIdPopup.html @@ -1,4 +1,4 @@ -
+
diff --git a/views/strategy-customConferenceGreeting.html b/views/strategy-customConferenceGreeting.html index b06db9c..4cf669a 100644 --- a/views/strategy-customConferenceGreeting.html +++ b/views/strategy-customConferenceGreeting.html @@ -1,4 +1,4 @@ -
+
diff --git a/views/strategy-faxingnum.html b/views/strategy-faxingnum.html index c24c4d8..775c44a 100644 --- a/views/strategy-faxingnum.html +++ b/views/strategy-faxingnum.html @@ -23,7 +23,7 @@ diff --git a/views/strategy-numbers.html b/views/strategy-numbers.html index ea9b417..f0b076b 100644 --- a/views/strategy-numbers.html +++ b/views/strategy-numbers.html @@ -49,7 +49,7 @@ diff --git a/views/users-devices.html b/views/users-devices.html index 9813a54..c6890f0 100644 --- a/views/users-devices.html +++ b/views/users-devices.html @@ -18,8 +18,9 @@
+ {{ i18n.users.devices.spareDevice }}
- {{ i18n.users.devices.newDevice }} + {{ i18n.users.devices.newDevice }}
- {{ i18n.users.devices.spareDevice }}
{{ i18n.cancel }} diff --git a/views/users-feature-call_forward.html b/views/users-feature-call_forward.html index 629d9ce..3c04b0a 100644 --- a/views/users-feature-call_forward.html +++ b/views/users-feature-call_forward.html @@ -1,4 +1,4 @@ -
+
diff --git a/views/users-feature-call_recording.html b/views/users-feature-call_recording.html index 3d44a80..4dce4a6 100644 --- a/views/users-feature-call_recording.html +++ b/views/users-feature-call_recording.html @@ -1,4 +1,4 @@ -
+
diff --git a/views/users-feature-caller_id.html b/views/users-feature-caller_id.html index bf5fc8b..fe7fe97 100644 --- a/views/users-feature-caller_id.html +++ b/views/users-feature-caller_id.html @@ -1,4 +1,4 @@ -
+
diff --git a/views/users-feature-conferencing.html b/views/users-feature-conferencing.html index d24420e..67dd3cc 100644 --- a/views/users-feature-conferencing.html +++ b/views/users-feature-conferencing.html @@ -1,4 +1,4 @@ -
+
diff --git a/views/users-feature-faxing.html b/views/users-feature-faxing.html index d44f842..d3227e8 100644 --- a/views/users-feature-faxing.html +++ b/views/users-feature-faxing.html @@ -1,4 +1,4 @@ -
+
diff --git a/views/users-feature-find_me_follow_me.html b/views/users-feature-find_me_follow_me.html index 6441481..732621c 100644 --- a/views/users-feature-find_me_follow_me.html +++ b/views/users-feature-find_me_follow_me.html @@ -1,4 +1,4 @@ -
+
diff --git a/views/users-feature-hotdesk.html b/views/users-feature-hotdesk.html index 373e3aa..cd01b2f 100644 --- a/views/users-feature-hotdesk.html +++ b/views/users-feature-hotdesk.html @@ -1,4 +1,4 @@ -
+
diff --git a/views/users-feature-music_on_hold.html b/views/users-feature-music_on_hold.html index cab9da3..66eb7e8 100644 --- a/views/users-feature-music_on_hold.html +++ b/views/users-feature-music_on_hold.html @@ -1,4 +1,4 @@ -
+
diff --git a/views/users-feature-vm_to_email.html b/views/users-feature-vm_to_email.html index f083ed2..788ce61 100644 --- a/views/users-feature-vm_to_email.html +++ b/views/users-feature-vm_to_email.html @@ -1,4 +1,4 @@ -
+
diff --git a/views/users-numbers.html b/views/users-numbers.html index ab9d118..6cb3e7c 100644 --- a/views/users-numbers.html +++ b/views/users-numbers.html @@ -62,15 +62,15 @@
- {{ i18n.users.addFromSpare }} + {{ i18n.users.addFromSpare }}