Merge remote-tracking branch 'origin/master'

2600hz · May 7, 2015 · 31774a1 · 31774a1
2 parents 6cd0b07 + 560700d
commit 31774a1
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 54 deletions.
diff --git a/submodules/callLogs/callLogs.css b/submodules/callLogs/callLogs.css
@@ -216,58 +216,6 @@
 	max-height: 500px;
 	overflow: auto;
 }
-#call_logs_details_popup .details-table {
-	font-size: 14px;
-	width: 100%;
-	table-layout: fixed;
-	border: solid 1px #666;
-	border-radius: 4px;
-	border-collapse: initial;
-}
-#call_logs_details_popup .details-table tr td {
-	padding: 2px 10px;
-}
-#call_logs_details_popup .details-table tr td:first-of-type {
-	width: 220px;
-	border-right: solid 1px #A6A6A6;
-}
-#call_logs_details_popup .details-table thead tr {
-	background-color: #ccc;
-	font-weight: 600;
-	text-align: center;
-}
-#call_logs_details_popup .details-table thead tr td {
-	border-bottom: solid 1px #666;
-}
-#call_logs_details_popup .details-table thead tr td:first-of-type {
-	border-top-left-radius: 4px;
-}
-#call_logs_details_popup .details-table thead tr td:last-of-type {
-	border-top-right-radius: 4px;
-}
-#call_logs_details_popup .details-table tbody tr td:first-of-type {
-	overflow: hidden;
-	text-overflow: ellipsis;
-	text-align: right;
-}
-#call_logs_details_popup .details-table tbody tr td:last-of-type {
-	word-wrap: break-word;
-}
-#call_logs_details_popup .details-table tbody tr:not(:last-of-type) td {
-	border-bottom: solid 1px #A6A6A6;
-}
-#call_logs_details_popup .details-table tbody tr:nth-child(odd) {
-	background-color: #eee;
-}
-#call_logs_details_popup .details-table tbody tr:nth-child(even) {
-	background-color: #ddd;
-}
-#call_logs_details_popup .details-table tbody tr:last-of-type td:first-of-type {
-	border-bottom-left-radius: 4px;
-}
-#call_logs_details_popup .details-table tbody tr:last-of-type td:last-of-type {
-	border-bottom-right-radius: 4px;
-}
 
 /********************** COLORBLIND SETTINGS **********************/
 body.colorblind #call_logs_container .grid-row:not(.header-row) .grid-cell.direction {

diff --git a/submodules/callLogs/callLogs.js b/submodules/callLogs/callLogs.js
@@ -288,7 +288,7 @@ define(function(require){
 				},
 				success: function(data, status) {
 					var cdrs = {},
-						groupedLegs = _.groupBy(data.data, function(val) { return val.direction === 'inbound' ? 'aLegs' : 'bLegs' });
+						groupedLegs = _.groupBy(data.data, function(val) { return (val.direction === 'inbound' || !val.bridge_id) ? 'aLegs' : 'bLegs' });
 
 					if(self.lastALeg) {
 						groupedLegs.aLegs.splice(0, 0, self.lastALeg);

diff --git a/submodules/strategy/strategy.css b/submodules/strategy/strategy.css
@@ -433,6 +433,7 @@
 }
 
 #strategy_container .element-container.strategy-calls .callflow-tabs {
+	overflow: visible;
 	padding: 20px;
 	border: none;
 	background: transparent;
@@ -472,6 +473,10 @@
 	margin-top: 10px;
 }
 
+#strategy_container .element-container.strategy-calls .callflow-tabs .call-option .chosen-container {
+	text-align: left;
+}
+
 #strategy_container .element-container.strategy-calls .callflow-tabs .call-option .menu-div .link-icon i {
 	margin-right: 5px;
 }

diff --git a/submodules/strategy/strategy.js b/submodules/strategy/strategy.js
@@ -411,9 +411,12 @@ define(function(require){
 
 						$.each(template.find('.user-select select'), function() {
 							var $this = $(this);
+							$this.chosen({ search_contains: true, width: '160px' });
 							$this.siblings('.title').text($this.find('option:selected').closest('optgroup').prop('label'));
 						});
 
+						template.find('.voicemail-select select').chosen({ search_contains: true, width: '160px' });
+
 						callback && callback();
 						break;
 					default:

diff --git a/views/callLogs-detailsPopup.html b/views/callLogs-detailsPopup.html
@@ -1,5 +1,5 @@
 <div id="call_logs_details_popup">
-	<table class="details-table">
+	<table class="monster-details-table">
 		<thead>
 			<tr>
 				<td>{{i18n.callLogs.key}}</td>