From 8c6b7deec15de55e4bff3b929d30e212f5f6bcfb Mon Sep 17 00:00:00 2001
From: reliberate <git@reliberate.com>
Date: Mon, 28 Mar 2016 08:22:59 -0600
Subject: [PATCH] Theme: Explicitly set file input class to be inline. MOH:
 Revert last change.

---
 app/music_on_hold/music_on_hold.php | 2 +-
 themes/default/template.php         | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/music_on_hold/music_on_hold.php b/app/music_on_hold/music_on_hold.php
index 111506469f..8cbe4788e3 100644
--- a/app/music_on_hold/music_on_hold.php
+++ b/app/music_on_hold/music_on_hold.php
@@ -315,7 +315,7 @@ else {
 		echo "	<tr>\n";
 		echo "		<td style='padding-right: 15px; white-space: nowrap'>\n";
 		echo "			".$text['label-file-path'];
-		echo "			<input name='upload_file' id='upload_file' type='file' class='formfld fileinput' style='width: 300px; margin-right: 3px; display: inline;' onchange=\"check_filetype(this);\">";
+		echo "			<input name='upload_file' id='upload_file' type='file' class='formfld fileinput' style='width: 300px; margin-right: 3px;' onchange=\"check_filetype(this);\">";
 		echo 			"<input type='button' class='btn' value='".$text['button-clear']."' onclick=\"reset_file_input('upload_file'); document.getElementById('sampling_rate').style.display='inline';\">\n";
 		echo "		</td>\n";
 		echo "		<td id='sampling_rate' style='padding-right: 15px;' nowrap>";
diff --git a/themes/default/template.php b/themes/default/template.php
index 7adfa9918b..9735ddcb2d 100644
--- a/themes/default/template.php
+++ b/themes/default/template.php
@@ -685,6 +685,7 @@
 
 	input.fileinput {
 		padding: 1px;
+		display: inline;
 		}
 
 	label {
@@ -1617,12 +1618,12 @@
 								}
 							//define menu brand mark
 								$menu_brand_text = ($_SESSION['theme']['menu_brand_text']['text'] != '') ? $_SESSION['theme']['menu_brand_text']['text'] : "FusionPBX";
-								if ($_SESSION['theme']['menu_brand_type']['text'] == 'image') {
+								if ($_SESSION['theme']['menu_brand_type']['text'] == 'image' || $_SESSION['theme']['menu_brand_type']['text'] == '') {
 									$menu_brand_image = (isset($_SESSION['theme']['menu_brand_image']['text'])) ? $_SESSION['theme']['menu_brand_image']['text'] : PROJECT_PATH."/themes/default/images/logo_header.png";
 									echo "<img class='pull-left hidden-xs navbar-logo' src='".$menu_brand_image."' title=\"".$menu_brand_text."\" onclick=\"document.location.href='".$menu_brand_link."';\">";
 									echo "<img class='pull-left visible-xs navbar-logo' src='".$menu_brand_image."' title=\"".$menu_brand_text."\" onclick=\"document.location.href='".$menu_brand_link."';\" style='margin-left: 21px;'>";
 								}
-								else if ($_SESSION['theme']['menu_brand_type']['text'] == 'text' || $_SESSION['theme']['menu_brand_type']['text'] == '') {
+								else if ($_SESSION['theme']['menu_brand_type']['text'] == 'text') {
 									echo "<div class='pull-left'><a class='navbar-brand' href=\"".$menu_brand_link."\">".$menu_brand_text."</a></div>\n";
 								}
 						}