From fb64963f7be5b4c3c0367974716ba637d14a4cc6 Mon Sep 17 00:00:00 2001 From: vbarkasov Date: Tue, 3 Apr 2018 21:12:45 +0700 Subject: [PATCH] Change header submenu behavior --- src/apps/callcenter/app.js | 24 ++++++---- src/apps/callcenter/i18n/de-DE.json | 1 + src/apps/callcenter/i18n/dk-DK.json | 1 + src/apps/callcenter/i18n/en-NZ.json | 1 + src/apps/callcenter/i18n/en-US.json | 1 + src/apps/callcenter/i18n/es-ES.json | 1 + src/apps/callcenter/i18n/fr-FR.json | 1 + src/apps/callcenter/i18n/it-IT.json | 1 + src/apps/callcenter/i18n/nl-NL.json | 1 + src/apps/callcenter/i18n/pt-PT.json | 1 + src/apps/callcenter/i18n/ro-RO.json | 1 + src/apps/callcenter/i18n/ru-RU.json | 1 + src/apps/callcenter/i18n/zh-CN.json | 1 + src/apps/callcenter/style/app.scss | 14 ++++-- src/apps/callcenter/views/dashboard.html | 38 ++++++++-------- src/apps/callcenter/views/settings.html | 58 ++++++++++++------------ 16 files changed, 87 insertions(+), 59 deletions(-) diff --git a/src/apps/callcenter/app.js b/src/apps/callcenter/app.js index dd3e8f0..a79261e 100644 --- a/src/apps/callcenter/app.js +++ b/src/apps/callcenter/app.js @@ -161,15 +161,22 @@ var app = { }, initHeaderSubmenu: function() { + var self = this; var $headerMenu = $('#cc-header-menu'); - $headerMenu.on('mouseenter', function(){ - $(this).find('.js-header-menu-items').show(); - $(this).find('.js-header-menu-title').hide(); - }).on('mouseleave', function(){ - $(this).find('.js-header-menu-items').hide(); - $(this).find('.js-header-menu-title').show(); - }).on('click', function(e){ + + $headerMenu.find('.js-header-menu-title').on('click', function(e) { e.preventDefault(); + $(this).hide(); + $headerMenu.find('.js-header-menu-items').show(); + + if(self.vars.hasOwnProperty('headerMenuTimeoutId')) { + window.clearTimeout(self.vars.headerMenuTimeoutId); + } + + self.vars.headerMenuTimeoutId = window.setTimeout(function(){ + $headerMenu.find('.js-header-menu-items').hide(); + $headerMenu.find('.js-header-menu-title').show(); + }, 5000); }); }, @@ -332,7 +339,8 @@ var app = { map_agents[v.id] = 'logged_out'; }); - self.global_timer = setInterval(huge_poll, polling_interval * 1000); + // TODO: uncomment next + //self.global_timer = setInterval(huge_poll, polling_interval * 1000); }, get_queues_stats: function (callback) { diff --git a/src/apps/callcenter/i18n/de-DE.json b/src/apps/callcenter/i18n/de-DE.json index d698bcc..d89f6c3 100644 --- a/src/apps/callcenter/i18n/de-DE.json +++ b/src/apps/callcenter/i18n/de-DE.json @@ -83,6 +83,7 @@ "mediaSilence": "Silence" }, "headerMenu": { + "mainBtnText": "Menu", "dashboard": "Dashboard", "manageQueues": "Manage Queues" } diff --git a/src/apps/callcenter/i18n/dk-DK.json b/src/apps/callcenter/i18n/dk-DK.json index aba3695..4274c27 100644 --- a/src/apps/callcenter/i18n/dk-DK.json +++ b/src/apps/callcenter/i18n/dk-DK.json @@ -84,6 +84,7 @@ "mediaSilence": "Silence" }, "headerMenu": { + "mainBtnText": "Menu", "dashboard": "Dashboard", "manageQueues": "Manage Queues" } diff --git a/src/apps/callcenter/i18n/en-NZ.json b/src/apps/callcenter/i18n/en-NZ.json index aba3695..4274c27 100644 --- a/src/apps/callcenter/i18n/en-NZ.json +++ b/src/apps/callcenter/i18n/en-NZ.json @@ -84,6 +84,7 @@ "mediaSilence": "Silence" }, "headerMenu": { + "mainBtnText": "Menu", "dashboard": "Dashboard", "manageQueues": "Manage Queues" } diff --git a/src/apps/callcenter/i18n/en-US.json b/src/apps/callcenter/i18n/en-US.json index aba3695..4274c27 100644 --- a/src/apps/callcenter/i18n/en-US.json +++ b/src/apps/callcenter/i18n/en-US.json @@ -84,6 +84,7 @@ "mediaSilence": "Silence" }, "headerMenu": { + "mainBtnText": "Menu", "dashboard": "Dashboard", "manageQueues": "Manage Queues" } diff --git a/src/apps/callcenter/i18n/es-ES.json b/src/apps/callcenter/i18n/es-ES.json index 40697af..fdcc4f7 100644 --- a/src/apps/callcenter/i18n/es-ES.json +++ b/src/apps/callcenter/i18n/es-ES.json @@ -83,6 +83,7 @@ "mediaSilence": "Silence" }, "headerMenu": { + "mainBtnText": "Menu", "dashboard": "Dashboard", "manageQueues": "Manage Queues" } diff --git a/src/apps/callcenter/i18n/fr-FR.json b/src/apps/callcenter/i18n/fr-FR.json index 30832e4..1665f7d 100644 --- a/src/apps/callcenter/i18n/fr-FR.json +++ b/src/apps/callcenter/i18n/fr-FR.json @@ -82,6 +82,7 @@ "mediaSilence": "Silence" }, "headerMenu": { + "mainBtnText": "Menu", "dashboard": "Dashboard", "manageQueues": "Manage Queues" } diff --git a/src/apps/callcenter/i18n/it-IT.json b/src/apps/callcenter/i18n/it-IT.json index 30832e4..1665f7d 100644 --- a/src/apps/callcenter/i18n/it-IT.json +++ b/src/apps/callcenter/i18n/it-IT.json @@ -82,6 +82,7 @@ "mediaSilence": "Silence" }, "headerMenu": { + "mainBtnText": "Menu", "dashboard": "Dashboard", "manageQueues": "Manage Queues" } diff --git a/src/apps/callcenter/i18n/nl-NL.json b/src/apps/callcenter/i18n/nl-NL.json index 7a0790f..7c3e691 100644 --- a/src/apps/callcenter/i18n/nl-NL.json +++ b/src/apps/callcenter/i18n/nl-NL.json @@ -82,6 +82,7 @@ "mediaSilence": "Silence" }, "headerMenu": { + "mainBtnText": "Menu", "dashboard": "Dashboard", "manageQueues": "Manage Queues" } diff --git a/src/apps/callcenter/i18n/pt-PT.json b/src/apps/callcenter/i18n/pt-PT.json index aba3695..4274c27 100644 --- a/src/apps/callcenter/i18n/pt-PT.json +++ b/src/apps/callcenter/i18n/pt-PT.json @@ -84,6 +84,7 @@ "mediaSilence": "Silence" }, "headerMenu": { + "mainBtnText": "Menu", "dashboard": "Dashboard", "manageQueues": "Manage Queues" } diff --git a/src/apps/callcenter/i18n/ro-RO.json b/src/apps/callcenter/i18n/ro-RO.json index c5f3003..f8c3b99 100644 --- a/src/apps/callcenter/i18n/ro-RO.json +++ b/src/apps/callcenter/i18n/ro-RO.json @@ -85,6 +85,7 @@ "mediaSilence": "Silence" }, "headerMenu": { + "mainBtnText": "Menu", "dashboard": "Dashboard", "manageQueues": "Manage Queues" } diff --git a/src/apps/callcenter/i18n/ru-RU.json b/src/apps/callcenter/i18n/ru-RU.json index 6e29298..0cc2662 100644 --- a/src/apps/callcenter/i18n/ru-RU.json +++ b/src/apps/callcenter/i18n/ru-RU.json @@ -83,6 +83,7 @@ "mediaSilence": "Без звука" }, "headerMenu": { + "mainBtnText": "Меню", "dashboard": "Инфо-панель", "manageQueues": "Редактировать очереди" } diff --git a/src/apps/callcenter/i18n/zh-CN.json b/src/apps/callcenter/i18n/zh-CN.json index b6e551e..db34322 100644 --- a/src/apps/callcenter/i18n/zh-CN.json +++ b/src/apps/callcenter/i18n/zh-CN.json @@ -82,6 +82,7 @@ "mediaSilence": "Silence" }, "headerMenu": { + "mainBtnText": "Menu", "dashboard": "Dashboard", "manageQueues": "Manage Queues" } diff --git a/src/apps/callcenter/style/app.scss b/src/apps/callcenter/style/app.scss index 6ac2238..0442bc5 100644 --- a/src/apps/callcenter/style/app.scss +++ b/src/apps/callcenter/style/app.scss @@ -1101,6 +1101,12 @@ list-style: none; } + .header-menu-title, + .header-menu-title:hover { + color: #555; + padding: 5px 14px; + } + .header-menu-badge, .btn { margin-right: 5px; @@ -1108,8 +1114,6 @@ .header-menu-badge { font-weight: 600; - padding-right: 20px; - padding-left: 20px; letter-spacing: 1px; display: inline-block; *display: inline; @@ -1121,7 +1125,7 @@ text-align: center; vertical-align: middle; cursor: default; - color: #333333; + color: #909099; text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); background: white; border-color: #e6e6e6 #e6e6e6 #bfbfbf; @@ -1136,6 +1140,10 @@ -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .2), 0 1px 2px rgba(0, 0, 0, .05); -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .2), 0 1px 2px rgba(0, 0, 0, .05); box-shadow: inset 0 1px 0 rgba(255, 255, 255, .2), 0 1px 2px rgba(0, 0, 0, .05); + + i { + color: #909099; + } } .btn { diff --git a/src/apps/callcenter/views/dashboard.html b/src/apps/callcenter/views/dashboard.html index 43a3287..089fde0 100644 --- a/src/apps/callcenter/views/dashboard.html +++ b/src/apps/callcenter/views/dashboard.html @@ -1,30 +1,30 @@
- - Menu - -
-
-
-
-
- -
-
-
-
-
-
+
+
+
+
+ +
+
+
+
+
+
diff --git a/src/apps/callcenter/views/settings.html b/src/apps/callcenter/views/settings.html index 5bb7316..fd310e4 100644 --- a/src/apps/callcenter/views/settings.html +++ b/src/apps/callcenter/views/settings.html @@ -1,34 +1,34 @@
- - Menu - - + + {{ i18n.callcenter.headerMenu.mainBtnText }} + +
-
-
-
-

- {{ i18n.callcenter.settings.sidebar.title }} - - - -

+
+
+
+

+ {{ i18n.callcenter.settings.sidebar.title }} + + + +

-
-
-
-
-
+
+
+
+
+
\ No newline at end of file