Merge branch 'master' of https://github.com/fusionpbx/fusionpbx

resources/classes/destinations.php

@@ -190,7 +190,9 @@ class destinations {
 
 				if (count($row['result']['data']) > 0 and strlen($row['select_value'][$destination_type]) > 0) {
 					$response .= "		<optgroup label='".$text2['title-'.$label]."'>\n";
+					$label2 = $label;
 					foreach ($row['result']['data'] as $data) {
+						$did = ($label2 == 'destinations') ? true : false;
 						$select_value = $row['select_value'][$destination_type];
 						$select_label = $row['select_label'];
 						foreach ($row['field'] as $key => $value) {
@@ -217,6 +219,7 @@ class destinations {
 						$select_label = str_replace("\${domain_name}", $_SESSION['domain_name'], $select_label);
 						$select_label = str_replace("\${context}", $_SESSION['context'], $select_label);
 						if ($select_value == $destination_value) { $selected = "selected='selected' "; $select_found = true; } else { $selected = ''; }
+						if ($did) { $select_label = format_phone(trim($select_label)); }
 						$response .= "			<option value='".$select_value."' ".$selected.">".trim($select_label)."</option>\n";
 					}
 					$response .= "		</optgroup>\n";

themes/minimized/template.php

@@ -886,12 +886,14 @@ legend {
 	}
 
 	#logout_icon {
+		width: 28px;
+		height: 23px;
+		border: none;
 		filter: alpha(opacity=80);
 		opacity: 0.85;
 		-moz-opacity: 0.85;
 		-khtml-opacity: 0.85;
 		margin-left: 8px;
-		margin-right: 18px;
 	}
 
 	#logout_icon:hover {
@@ -903,6 +905,9 @@ legend {
 	}
 
 	#domain_selector_icon {
+		width: 28px;
+		height: 23px;
+		border: none;
 		filter: alpha(opacity=80);
 		opacity: 0.85;
 		-moz-opacity: 0.85;
@@ -1403,17 +1408,17 @@ SPAN.playback_progress_bar {
 						<a href='<?php echo $logo_link; ?>'><img src='<?php echo $logo; ?>' style='border: none; height: 30px;'></a>
 					</td>
 					<td width="100%"><!--{menu}--></td>
-					<td style='white-space: nowrap;'>
+					<td style='white-space: nowrap; padding-right: 18px;'>
 						<?php
 						//domain selector icon
 						if ($_SESSION["username"] != '' && permission_exists("domain_select") && count($_SESSION['domains']) > 1) {
-							echo "<span id='domain_selector_domain'>".$_SESSION['domain_name']."</span><img id='domain_selector_icon' src='".PROJECT_PATH."/themes/minimized/images/icon_domain_selector.png' style='width: 28px; height: 23px; border: none;' title='".$_SESSION['domain_name']." &#10;".$text['theme-label-open_selector']."' align='absmiddle'>";
+							echo "<span id='domain_selector_domain'>".$_SESSION['domain_name']."</span><img id='domain_selector_icon' src='".PROJECT_PATH."/themes/minimized/images/icon_domain_selector.png' title='".$_SESSION['domain_name']." &#10;".$text['theme-label-open_selector']."' align='absmiddle'>";
 						}
 
 						//logout icon
 						if ($_SESSION['username'] != '' && $_SESSION['theme']['logout_icon_visible']['text'] == "true") {
 							$username_full = $_SESSION['username'].((count($_SESSION['domains']) > 1) ? "@".$_SESSION["user_context"] : null);
-							echo "<a href='".PROJECT_PATH."/logout.php' onclick=\"return confirm('".$text['theme-confirm-logout']."');\"><img id='logout_icon' src='".PROJECT_PATH."/themes/minimized/images/icon_logout.png' style='width: 28px; height: 23px; border: none;' title='".$text['theme-label-logout']." ".$username_full."' align='absmiddle'></a>";
+							echo "<a href='".PROJECT_PATH."/logout.php' onclick=\"return confirm('".$text['theme-confirm-logout']."');\"><img id='logout_icon' src='".PROJECT_PATH."/themes/minimized/images/icon_logout.png' title='".$text['theme-label-logout']." ".$username_full."' align='absmiddle'></a>";
 							unset($username_full);
 						}
 						?>