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 " \n"; echo " \n"; echo " ".$text['label-file-path']; - echo " "; + echo " "; echo "\n"; echo " \n"; echo " "; 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 ""; echo ""; } - 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 "
".$menu_brand_text."
\n"; } }