diff --git a/src/apps/callflows/i18n/en-US.json b/src/apps/callflows/i18n/en-US.json index 692d4aa..35e8066 100644 --- a/src/apps/callflows/i18n/en-US.json +++ b/src/apps/callflows/i18n/en-US.json @@ -1324,6 +1324,8 @@ "callcenter": { "queue": "Queue", "category": "Callcenter", + "priority": "Priority", + "priority_tooltip": "Assign a priority to the caller", "tooltip": "Ask the caller to input the first letters of the name of the person that he wants to reach.", "connect_caller_to_queue": "Connect caller to queue...", "queue_edit_options": "Edit queue options", diff --git a/src/apps/callflows/style/app.css b/src/apps/callflows/style/app.css index 8d4a0f1..8c04a99 100644 --- a/src/apps/callflows/style/app.css +++ b/src/apps/callflows/style/app.css @@ -1083,10 +1083,6 @@ margin-top: 3px; } -.dialog_popup .form_content .popup_field { - padding-bottom: 15px; -} - .dialog_popup .parameter_div { padding: 10px 0px 10px 0px; width: auto; @@ -1377,6 +1373,37 @@ color: #333; } +.dialog_popup.callflows-port form label.monster-switch { + width: inherit; + margin-bottom: 7px; +} + +.dialog_popup .form_content .field_wrapper { + float: left; + text-align: left; + width: 214px; +} + +.dialog_popup .form_content .field_wrapper input[type="text"], +.dialog_popup .form_content .field_wrapper input[type="number"] { + width: 200px; +} + +.dialog_popup .form_content .field_wrapper select { + width: 214px !important; + max-width: 214px; +} + + +.dialog_popup .form_content .checkbox-label-wrapper { + padding-left: 140px; + text-align: left; + width: 200px; + margin-right: 0; + margin-bottom: 13px; + padding-top: 0; +} + .callflows-port form label:not(.monster-invalid) { float: left; font-size: 15px; diff --git a/src/apps/callflows/submodules/callcenter/callcenter.css b/src/apps/callflows/submodules/callcenter/callcenter.css index cd98801..b72085f 100644 --- a/src/apps/callflows/submodules/callcenter/callcenter.css +++ b/src/apps/callflows/submodules/callcenter/callcenter.css @@ -19,4 +19,8 @@ .callflows-callcenter-popup .inline_content.main_content { width: auto; -} \ No newline at end of file +} + +.queue-callflow-dialog .action_links_div { + margin-bottom: 15px; +} diff --git a/src/apps/callflows/submodules/callcenter/callcenter.js b/src/apps/callflows/submodules/callcenter/callcenter.js index d4feac3..980617c 100644 --- a/src/apps/callflows/submodules/callcenter/callcenter.js +++ b/src/apps/callflows/submodules/callcenter/callcenter.js @@ -127,7 +127,8 @@ define(function(require) { i18n: self.i18n.active(), objects: { items: queues, - selected: node.getMetadata('id') || '' + selected: node.getMetadata('id') || '', + priority: node.getMetadata('priority') || '', } }, submodule: 'callcenter' @@ -138,14 +139,21 @@ define(function(require) { } $('.inline_action', popup_html).click(function(ev) { - var _data = ($(this).data('action') === 'edit') ? { id: $('#queue_selector', popup_html).val() } : {}; - ev.preventDefault(); + var _data = {}; + if ($(this).data('action') === 'edit') { + _data = { + id: $('#queue_selector', popup_html).val(), + priority: $('#queue_priority', popup_html).val() + } + } + self.queuePopupEdit({ data: _data, callback: function(_data) { node.setMetadata('id', _data.id || 'null'); + _data.priority && node.setMetadata('priority', _data.priority); node.caption = _data.name || ''; popup.dialog('close'); @@ -155,6 +163,7 @@ define(function(require) { $('#add', popup_html).click(function() { node.setMetadata('id', $('#queue_selector', popup).val()); + node.setMetadata('priority', parseInt($('#queue_priority', popup).val())); node.caption = $('#queue_selector option:selected', popup).text(); popup.dialog('close'); }); @@ -168,6 +177,8 @@ define(function(require) { } } }); + + monster.ui.tooltips(popup); }); }, listEntities: function(callback) { diff --git a/src/apps/callflows/submodules/callcenter/views/queue-callflow.html b/src/apps/callflows/submodules/callcenter/views/queue-callflow.html index 4d866ce..f3c4576 100644 --- a/src/apps/callflows/submodules/callcenter/views/queue-callflow.html +++ b/src/apps/callflows/submodules/callcenter/views/queue-callflow.html @@ -1,30 +1,41 @@ -