Theme: Explicitly set file input class to be inline.

MOH: Revert last change.
This commit is contained in:
reliberate
2016-03-28 08:22:59 -06:00
parent 242059a777
commit 8c6b7deec1
2 changed files with 4 additions and 3 deletions

View File

@@ -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>";

View File

@@ -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";
}
}