Merge branch 'master' of https://github.com/2600hz/monster-ui-voip

i18n/en-US.json

@@ -577,7 +577,6 @@
 			"inboundCall": "Inbound",
 			"outboundCall": "Outbound",
 			"dateTime1": "Date/Time",
-			"dateTime2": "(PST)",
 			"from": "From",
 			"to": "To",
 			"duration1": "Duration",

i18n/fr-FR.json

@@ -579,7 +579,6 @@
 			"inboundCall": "Entrant",
 			"outboundCall": "Sortant",
 			"dateTime1": "Date/Heure",
-			"dateTime2": "(PST)",
 			"from": "Depuis",
 			"to": "À",
 			"duration1": "Durée",

submodules/callLogs/callLogs.css

@@ -114,10 +114,10 @@
 	border-left: solid 1px #e3e3e3;
 }
 #call_logs_container .grid-cell.direction {
-	width: 5%;
+	width: 4%;
 }
 #call_logs_container .grid-cell.datetime {
-	width: 10%;
+	width: 12%;
 }
 #call_logs_container .grid-cell.from {
 	width: 20%;
@@ -126,7 +126,7 @@
 	width: 20%;
 }
 #call_logs_container .grid-cell.duration {
-	width: 10%;
+	width: 9%;
 }
 #call_logs_container .grid-cell.hangup {
 	width: 15%;
@@ -215,4 +215,4 @@
 }
 #call_logs_details_popup .details-table tbody tr:last-of-type td:last-of-type {
 	border-bottom-right-radius: 4px;
-}
+}

submodules/callLogs/callLogs.js

@@ -34,7 +34,9 @@ define(function(require){
 
 		callLogsRenderContent: function(parent, fromDate, toDate) {
 			var self = this,
-				dataTemplate = {},
+				dataTemplate = {
+					timezone: 'GMT' + jstz.determine_timezone().offset()
+				},
 				template;
 
 			if(!toDate) {
@@ -51,7 +53,6 @@ define(function(require){
 
 			self.callLogsGetCdrs(fromDate, toDate, function(cdrs) {
 				cdrs = self.callLogsFormatCdrs(cdrs);
-
 				dataTemplate.cdrs = cdrs;
 				template = $(monster.template(self, 'callLogs-layout', dataTemplate));
 

views/callLogs-layout.html

@@ -36,7 +36,7 @@
 					</div>
 					<div class="grid-cell datetime">
 						<div class="sub-cell cell-top">{{i18n.callLogs.gridHeaders.dateTime1}}</div>
-						<div class="sub-cell cell-bottom">{{i18n.callLogs.gridHeaders.dateTime2}}</div>
+						<div class="sub-cell cell-bottom">{{timezone}}</div>
 					</div>
 					<div class="grid-cell from">
 						<div class="sub-cell single-cell">{{i18n.callLogs.gridHeaders.from}}</div>
@@ -171,4 +171,4 @@
 			{{/each}}
 		</div>
 	</div>
-</div>
+</div>