From 92f44d6507594480b0c99fa997c520e740e7b9b6 Mon Sep 17 00:00:00 2001 From: Joris Tirado Date: Mon, 27 Oct 2014 10:50:50 -0700 Subject: [PATCH 1/5] UI-749: Specify container element on tooltip initialization --- submodules/users/users.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/users/users.js b/submodules/users/users.js index 95264bd..6878859 100644 --- a/submodules/users/users.js +++ b/submodules/users/users.js @@ -206,7 +206,7 @@ define(function(require){ template.find('.user-rows').append(templateUser); }); - template.find('[data-toggle="tooltip"]').tooltip(); + template.find('[data-toggle="tooltip"]').tooltip({ container: 'body'}); self.usersBindEvents(template, parent, dataTemplate); @@ -2569,7 +2569,7 @@ define(function(require){ timezone.populateDropdown(template.find('#user_timezone'), dataTemplate.timezone); - template.find('[data-toggle="tooltip"]').tooltip(); + template.find('[data-toggle="tooltip"]').tooltip({ container: 'body'}); callbackAfterFormat && callbackAfterFormat(template, dataTemplate); } From c258b8e597fc1d975b363c6d7b4f609fb6333953 Mon Sep 17 00:00:00 2001 From: Joris Tirado Date: Mon, 27 Oct 2014 11:34:08 -0700 Subject: [PATCH 2/5] UI-802: Automatically scroll to put element in view when it dropdowns out of the viewport --- submodules/users/users.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/submodules/users/users.js b/submodules/users/users.js index 6878859..3b67cbd 100644 --- a/submodules/users/users.js +++ b/submodules/users/users.js @@ -575,7 +575,9 @@ define(function(require){ //FancyCheckboxes. monster.ui.prettyCheck.create(template); - row.find('.edit-user').append(template).slideDown(); + row.find('.edit-user').append(template).slideDown(400, function() { + $('body').animate({ scrollTop: row.offset().top - (window.innerHeight - row.height() - 10) }); + }); $('body').append($('
')); }); From 727a9f73ac33f2399214ebb67d8a7e25a2419687 Mon Sep 17 00:00:00 2001 From: Maxime Roux Date: Mon, 27 Oct 2014 11:42:29 -0700 Subject: [PATCH 3/5] UI-799: now always using current acount timezone for main callflow. --- submodules/strategy/strategy.css | 4 ++++ submodules/strategy/strategy.js | 15 ++++++++++----- views/strategy-hours.html | 7 +++++-- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/submodules/strategy/strategy.css b/submodules/strategy/strategy.css index a9c868d..847cfcc 100644 --- a/submodules/strategy/strategy.css +++ b/submodules/strategy/strategy.css @@ -196,6 +196,10 @@ padding: 15px; } +#strategy_container .element-container.strategy-hours .custom-hours-header .timezone { + margin-left: 5px; +} + #strategy_container .element-container.strategy-hours .custom-days { border: solid 1px #ccc; border-radius: 10px; diff --git a/submodules/strategy/strategy.js b/submodules/strategy/strategy.js index 252183c..98813c8 100644 --- a/submodules/strategy/strategy.js +++ b/submodules/strategy/strategy.js @@ -125,7 +125,8 @@ define(function(require){ }, subscribe: { - 'voip.strategy.render': 'strategyRender' + 'voip.strategy.render': 'strategyRender', + 'auth.currentAccountUpdated': '_strategyOnCurrentAccountUpdated' }, weekdays: ["monday","tuesday","wednesday","thursday","friday","saturday","sunday"], @@ -330,7 +331,7 @@ define(function(require){ weekdaysRules = strategyData.temporalRules.weekdays, templateData = { alwaysOpen: true, - companyTimezone: timezone.formatTimezone(strategyData.callflows["MainCallflow"].flow.data.timezone), + companyTimezone: timezone.formatTimezone(strategyData.callflows["MainCallflow"].flow.data.timezone || monster.apps["auth"].currentAccount.timezone), days: [], lunchbreak: { enabled: (strategyData.temporalRules.lunchbreak.id in strategyData.callflows["MainCallflow"].flow.children), @@ -1862,9 +1863,7 @@ define(function(require){ module:"callflow" } }, - data: { - timezone: monster.apps["auth"].currentAccount.timezone - }, + data: {}, module: "temporal_route" } } @@ -1878,6 +1877,7 @@ define(function(require){ } }); } else { + delete results["MainCallflow"].flow.data.timezone; callback(results); } }); @@ -2378,6 +2378,11 @@ define(function(require){ callback(data.data); } }); + }, + + _strategyOnCurrentAccountUpdated: function(accountData) { + var self = this; + $('#strategy_custom_hours_timezone').text(timezone.formatTimezone(accountData.timezone)); } }; diff --git a/views/strategy-hours.html b/views/strategy-hours.html index 3bf15c7..9f8a501 100644 --- a/views/strategy-hours.html +++ b/views/strategy-hours.html @@ -23,8 +23,11 @@
- {{i18n.strategy.hours.timezone}} {{companyTimezone}} - {{i18n.strategy.hours.listTitle}} +
+ {{i18n.strategy.hours.timezone}} + {{companyTimezone}} +
+
{{i18n.strategy.hours.listTitle}}
{{#each days}} From 4b891613630d31f26987fa3c2efe618676795b06 Mon Sep 17 00:00:00 2001 From: Jean-Roch Maitre Date: Thu, 6 Nov 2014 11:03:37 -0800 Subject: [PATCH 4/5] UI-852: Fixed typo --- i18n/en-US.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/i18n/en-US.json b/i18n/en-US.json index 47a06ac..de19532 100644 --- a/i18n/en-US.json +++ b/i18n/en-US.json @@ -353,7 +353,7 @@ "errorCallerId": "Before configuring the Caller-ID of this user, you need to assign him a number", "errorNumberFaxing": "Before configuring the Faxing number of this user, you need to get some spare numbers on your account (You can buy new numbers in the Numbers section on the left menu).", "featureOn": "ON", - "includeInDirectory": "Include User to Company Directory", + "includeInDirectory": "Include User in the Company Directory", "noMatchingDevices": "No devices matching your search", "noMatchingNumbers": "There were no numbers found matching your search", "noMatchingUser": "No data found matching your search", From ec3974bc693021192fe1680b711f97615e44430c Mon Sep 17 00:00:00 2001 From: Maxime Roux Date: Tue, 11 Nov 2014 15:14:37 -0800 Subject: [PATCH 5/5] UI-879: renamed monster.ui.fade to monster.ui.highlight --- submodules/devices/devices.js | 2 +- submodules/groups/groups.js | 2 +- submodules/users/users.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/submodules/devices/devices.js b/submodules/devices/devices.js index 702ae74..ecdbdfc 100644 --- a/submodules/devices/devices.js +++ b/submodules/devices/devices.js @@ -90,7 +90,7 @@ define(function(require){ if(_deviceId) { var row = parent.find('.grid-row[data-id=' + _deviceId + ']'); - monster.ui.fade(row, { + monster.ui.hightlight(row, { endColor: '#FCFCFC' }); } diff --git a/submodules/groups/groups.js b/submodules/groups/groups.js index 739cb50..c19460d 100644 --- a/submodules/groups/groups.js +++ b/submodules/groups/groups.js @@ -134,7 +134,7 @@ define(function(require){ if(_groupId) { var cells = parent.find('.grid-row[data-id=' + _groupId + '] .grid-cell'); - monster.ui.fade(cells); + monster.ui.hightlight(cells); } for (var group in dataTemplate.groups) { diff --git a/submodules/users/users.js b/submodules/users/users.js index 3b67cbd..5ce1ae4 100644 --- a/submodules/users/users.js +++ b/submodules/users/users.js @@ -217,7 +217,7 @@ define(function(require){ if(_userId) { var cells = parent.find('.grid-row[data-id=' + _userId + '] .grid-cell'); - monster.ui.fade(cells); + monster.ui.hightlight(cells); } if ( dataTemplate.users.length == 0) {