UI-706: merging latest code from master

i18n/en-US.json

@@ -357,7 +357,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",

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'
 					});
 				}

submodules/groups/groups.js

@@ -48,11 +48,11 @@ define(function(require){
 					parent
 						.empty()
 						.append(template);
-
+						
 					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) {

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;

submodules/strategy/strategy.js

@@ -12,7 +12,8 @@ define(function(require){
 		},
 
 		subscribe: {
-			'voip.strategy.render': 'strategyRender'
+			'voip.strategy.render': 'strategyRender',
+			'auth.currentAccountUpdated': '_strategyOnCurrentAccountUpdated'
 		},
 
 		weekdays: ["monday","tuesday","wednesday","thursday","friday","saturday","sunday"],
@@ -217,7 +218,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),
@@ -1751,9 +1752,7 @@ define(function(require){
 													module:"callflow"
 												}
 											},
-											data: {
-												timezone: monster.apps["auth"].currentAccount.timezone
-											},
+											data: {},
 											module: "temporal_route"
 										}
 									}
@@ -1767,6 +1766,7 @@ define(function(require){
 								}
 							});
 						} else {
+							delete results["MainCallflow"].flow.data.timezone;
 							callback(results);
 						}
 					});
@@ -2273,6 +2273,11 @@ define(function(require){
 					callback(data.data);
 				}
 			});
+		},
+
+		_strategyOnCurrentAccountUpdated: function(accountData) {
+			var self = this;
+			$('#strategy_custom_hours_timezone').text(timezone.formatTimezone(accountData.timezone));
 		}
 	};
 

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);
 
@@ -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) {
@@ -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($('<div id="users_container_overlay"></div>'));
 					});
@@ -2569,7 +2571,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);
 				}

views/strategy-hours.html

@@ -23,8 +23,11 @@
 
 		<div class="custom-hours-div" {{#unless alwaysOpen}}style="display: block;"{{/unless}}>
 			<div class="custom-hours-header">
-				<span class="pull-right timezone">{{i18n.strategy.hours.timezone}} {{companyTimezone}}</span>
-				<span class="title">{{i18n.strategy.hours.listTitle}}</span>
+				<div class="pull-right timezone-container">
+					{{i18n.strategy.hours.timezone}}
+					<span id="strategy_custom_hours_timezone" class="timezone">{{companyTimezone}}</span>
+				</div>
+				<div class="title">{{i18n.strategy.hours.listTitle}}</div>
 			</div>
 			<div class="custom-days">
 				{{#each days}}