Browse Source

Default Theme updates. Enable URLs on top-level items (where defined) on Side menu. Code cleanup.

Nate 6 years ago
parent
commit
d7568e9de5
3 changed files with 374 additions and 374 deletions
  1. 1 2
      themes/default/css.php
  2. BIN
      themes/default/images/logo_login.png
  3. 373 372
      themes/default/template.php

+ 1 - 2
themes/default/css.php

@@ -829,8 +829,7 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false;
 		}
 		}
 
 
 	#login_logo {
 	#login_logo {
-		width: 250px;
-		height: auto;
+		text-decoration: none;
 		}
 		}
 
 
 	a.login_link {
 	a.login_link {

BIN
themes/default/images/logo_login.png


+ 373 - 372
themes/default/template.php

@@ -21,19 +21,19 @@
 	if (strlen(PROJECT_PATH) > 0) {
 	if (strlen(PROJECT_PATH) > 0) {
 		$php_self_dir = substr($php_self_dir, strlen(PROJECT_PATH), strlen($php_self_dir));
 		$php_self_dir = substr($php_self_dir, strlen(PROJECT_PATH), strlen($php_self_dir));
 	}
 	}
-?>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=device-width, initial-scale=1">
-
-<link rel="stylesheet" type="text/css" href="<!--{project_path}-->/resources/bootstrap/css/bootstrap.min.css">
-<link rel="stylesheet" type="text/css" href="<!--{project_path}-->/resources/bootstrap/css/bootstrap-datetimepicker.min.css" />
-<link rel="stylesheet" type="text/css" href="<!--{project_path}-->/resources/bootstrap/css/bootstrap-colorpicker.min.css">
-<link rel="stylesheet" type="text/css" href="<!--{project_path}-->/themes/<?php echo escape($_SESSION['domain']['template']['name']); ?>/css.php<?php echo ($default_login) ? '?login=default' : null; ?>">
-<?php
+
+echo "<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n";
+echo "<head>\n";
+echo "<meta charset='utf-8'>\n";
+echo "<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>\n";
+echo "<meta http-equiv='X-UA-Compatible' content='IE=edge'>\n";
+echo "<meta name='viewport' content='width=device-width, initial-scale=1'>\n";
+
+echo "<link rel='stylesheet' type='text/css' href='<!--{project_path}-->/resources/bootstrap/css/bootstrap.min.css'>\n";
+echo "<link rel='stylesheet' type='text/css' href='<!--{project_path}-->/resources/bootstrap/css/bootstrap-datetimepicker.min.css'>\n";
+echo "<link rel='stylesheet' type='text/css' href='<!--{project_path}-->/resources/bootstrap/css/bootstrap-colorpicker.min.css'>\n";
+echo "<link rel='stylesheet' type='text/css' href='<!--{project_path}-->/themes/".escape($_SESSION['domain']['template']['name'])."/css.php".($default_login ? '?login=default' : null)."'>\n";
+
 //load custom css
 //load custom css
 	if ($_SESSION['theme']['custom_css']['text'] != '') {
 	if ($_SESSION['theme']['custom_css']['text'] != '') {
 		echo "<link rel='stylesheet' type='text/css' href='".escape($_SESSION['theme']['custom_css']['text'])."'>\n\n";
 		echo "<link rel='stylesheet' type='text/css' href='".escape($_SESSION['theme']['custom_css']['text'])."'>\n\n";
@@ -42,18 +42,17 @@
 //set fav icon
 //set fav icon
 	$favicon = (isset($_SESSION['theme']['favicon']['text'])) ? escape($_SESSION['theme']['favicon']['text']) : '<!--{project_path}-->/themes/default/favicon.ico';
 	$favicon = (isset($_SESSION['theme']['favicon']['text'])) ? escape($_SESSION['theme']['favicon']['text']) : '<!--{project_path}-->/themes/default/favicon.ico';
 	echo "<link rel='icon' href='".$favicon."'>\n";
 	echo "<link rel='icon' href='".$favicon."'>\n";
-?>
 
 
-<title><!--{title}--></title>
+echo "<title><!--{title}--></title>\n";
+
+echo "<script language='JavaScript' type='text/javascript' src='<!--{project_path}-->/resources/jquery/jquery-1.11.1.js'></script>\n";
+echo "<script language='JavaScript' type='text/javascript' src='<!--{project_path}-->/resources/jquery/jquery.autosize.input.js'></script>\n";
+echo "<script language='JavaScript' type='text/javascript' src='<!--{project_path}-->/resources/momentjs/moment.js'></script>\n";
+echo "<script language='JavaScript' type='text/javascript' src='<!--{project_path}-->/resources/bootstrap/js/bootstrap.min.js'></script>\n";
+echo "<script language='JavaScript' type='text/javascript' src='<!--{project_path}-->/resources/bootstrap/js/bootstrap-datetimepicker.min.js'></script>\n";
+echo "<script language='JavaScript' type='text/javascript' src='<!--{project_path}-->/resources/bootstrap/js/bootstrap-colorpicker.js'></script>\n";
+echo "<script language='JavaScript' type='text/javascript' src='<!--{project_path}-->/resources/bootstrap/js/bootstrap-pwstrength.min.js'></script>\n";
 
 
-<script language="JavaScript" type="text/javascript" src="<!--{project_path}-->/resources/jquery/jquery-1.11.1.js"></script>
-<script language="JavaScript" type="text/javascript" src="<!--{project_path}-->/resources/jquery/jquery.autosize.input.js"></script>
-<script language="JavaScript" type="text/javascript" src="<!--{project_path}-->/resources/momentjs/moment.js"></script>
-<script language="JavaScript" type="text/javascript" src="<!--{project_path}-->/resources/bootstrap/js/bootstrap.min.js"></script>
-<script language="JavaScript" type="text/javascript" src="<!--{project_path}-->/resources/bootstrap/js/bootstrap-datetimepicker.min.js"></script>
-<script language="JavaScript" type="text/javascript" src="<!--{project_path}-->/resources/bootstrap/js/bootstrap-colorpicker.js"></script>
-<script language="JavaScript" type="text/javascript" src="<!--{project_path}-->/resources/bootstrap/js/bootstrap-pwstrength.min.js"></script>
-<?php
 //web font loader
 //web font loader
 	if ($_SESSION['theme']['font_loader']['text'] == 'true') {
 	if ($_SESSION['theme']['font_loader']['text'] == 'true') {
 		if ($_SESSION['theme']['font_retrieval']['text'] != 'asynchronous') {
 		if ($_SESSION['theme']['font_retrieval']['text'] != 'asynchronous') {
@@ -63,6 +62,7 @@
 		echo "<script language='JavaScript' type='text/javascript' src='<!--{project_path}-->/resources/fonts/web_font_loader.php?v=".escape($font_loader_version)."'></script>\n";
 		echo "<script language='JavaScript' type='text/javascript' src='<!--{project_path}-->/resources/fonts/web_font_loader.php?v=".escape($font_loader_version)."'></script>\n";
 	}
 	}
 ?>
 ?>
+
 <script language="JavaScript" type="text/javascript">
 <script language="JavaScript" type="text/javascript">
 
 
 	//display message bar via js
 	//display message bar via js
@@ -350,83 +350,79 @@
 
 
 </script>
 </script>
 
 
-<!--{head}-->
+<?php
 
 
-</head>
+echo "<!--{head}-->\n";
+echo "</head>\n";
 
 
-<?php
 //add multilingual support
 //add multilingual support
 	$language = new text;
 	$language = new text;
 	$text = $language->get(null,'themes/default');
 	$text = $language->get(null,'themes/default');
-?>
 
 
-<body onload="<?php echo $onload;?>">
+echo "<body onload=\"".$onload."\">\n";
 
 
-	<div id='message_container'></div>
+echo "	<div id='message_container'></div>\n";
 
 
-	<?php
-	//logged in show the domains block
+//logged in, show the domains block
 	if (strlen($_SESSION["username"]) > 0 && permission_exists("domain_select") && count($_SESSION['domains']) > 1) {
 	if (strlen($_SESSION["username"]) > 0 && permission_exists("domain_select") && count($_SESSION['domains']) > 1) {
-		?>
-		<div id="domains_container">
-			<input type="hidden" id="domains_visible" value="0">
-			<div id="domains_block">
-				<div id="domains_header">
-					<input id="domains_hide" type="button" class="btn" style="float: right" value="<?php echo $text['theme-button-close']; ?>">
-					<?php
-					if (file_exists($_SERVER["DOCUMENT_ROOT"]."/app/domains/domains.php")) {
-						$href = '/app/domains/domains.php';
-					}
-					else {
-						$href = '/core/domain_settings/domains.php';
-					}
-					echo "<a href=\"".$href."\"><b style=\"color: #000;\">".$text['theme-title-domains']."</b></a> (".sizeof($_SESSION['domains']).")";
-					?>
-					<br><br>
-					<input type="text" id="domain_filter" class="formfld" style="margin-left: 0; min-width: 100%; width: 100%;" placeholder="<?php echo $text['theme-label-search']; ?>" onkeyup="domain_search(this.value);">
-				</div>
-				<div id="domains_list">
-					<?php
-					$bgcolor1 = "#eaedf2";
-					$bgcolor2 = "#fff";
-					foreach($_SESSION['domains'] as $domain) {
-						$bgcolor = ($bgcolor == $bgcolor1) ? $bgcolor2 : $bgcolor1;
-						$bgcolor = ($domain['domain_uuid'] == $_SESSION['domain_uuid']) ? "#eeffee" : $bgcolor;
-						echo "<div id=\"".escape($domain['domain_name'])."\" class='domains_list_item' style='background-color: ".$bgcolor."' onclick=\"document.location.href='".PROJECT_PATH."/core/domain_settings/domains.php?domain_uuid=".escape($domain['domain_uuid'])."&domain_change=true';\">";
-						echo "<a href='".PROJECT_PATH."/core/domain_settings/domains.php?domain_uuid=".escape($domain['domain_uuid'])."&domain_change=true' ".(($domain['domain_uuid'] == $_SESSION['domain_uuid']) ? "style='font-weight: bold;'" : null).">".escape($domain['domain_name'])."</a>\n";
-						if ($domain['domain_description'] != '') {
-							echo "<span class=\"domain_list_item_description\"> - ".escape($domain['domain_description'])."</span>\n";
-						}
-						echo "</div>\n";
-						$ary_domain_names[] = escape($domain['domain_name']);
-						$ary_domain_descs[] = str_replace('"','\"',escape($domain['domain_description']));
-					}
-					?>
-				</div>
 
 
-				<script>
-					var domain_names = new Array("<?php echo implode('","', $ary_domain_names)?>");
-					var domain_descs = new Array("<?php echo implode('","', $ary_domain_descs)?>");
+		echo "<div id='domains_container'>\n";
+		echo "	<input type='hidden' id='domains_visible' value='0'>\n";
+		echo "	<div id='domains_block'>\n";
+		echo "		<div id='domains_header'>\n";
+		echo "			<input id='domains_hide' type='button' class='btn' style='float: right' value=\"".$text['theme-button-close']."\">\n";
 
 
-					function domain_search(criteria) {
-						for (var x = 0; x < domain_names.length; x++) {
-							if (domain_names[x].toLowerCase().match(criteria.toLowerCase()) || domain_descs[x].toLowerCase().match(criteria.toLowerCase())) {
-								document.getElementById(domain_names[x]).style.display = '';
-							}
-							else {
-								document.getElementById(domain_names[x]).style.display = 'none';
-							}
-						}
-					}
-				</script>
+		if (file_exists($_SERVER["DOCUMENT_ROOT"]."/app/domains/domains.php")) {
+			$href = '/app/domains/domains.php';
+		}
+		else {
+			$href = '/core/domain_settings/domains.php';
+		}
+		echo "<a href=\"".$href."\"><b style=\"color: #000;\">".$text['theme-title-domains']."</b></a> (".sizeof($_SESSION['domains']).")";
+
+		echo "			<br><br>\n";
+		echo "			<input type='text' id='domain_filter' class='formfld' style='margin-left: 0; min-width: 100%; width: 100%;' placeholder=\"".$text['theme-label-search']."\" onkeyup='domain_search(this.value)'>\n";
+		echo "		</div>\n";
+		echo "		<div id='domains_list'>\n";
+
+		$bgcolor1 = "#eaedf2";
+		$bgcolor2 = "#fff";
+		foreach($_SESSION['domains'] as $domain) {
+			$bgcolor = ($bgcolor == $bgcolor1) ? $bgcolor2 : $bgcolor1;
+			$bgcolor = ($domain['domain_uuid'] == $_SESSION['domain_uuid']) ? "#eeffee" : $bgcolor;
+			echo "<div id=\"".escape($domain['domain_name'])."\" class='domains_list_item' style='background-color: ".$bgcolor."' onclick=\"document.location.href='".PROJECT_PATH."/core/domain_settings/domains.php?domain_uuid=".escape($domain['domain_uuid'])."&domain_change=true';\">";
+			echo "<a href='".PROJECT_PATH."/core/domain_settings/domains.php?domain_uuid=".escape($domain['domain_uuid'])."&domain_change=true' ".(($domain['domain_uuid'] == $_SESSION['domain_uuid']) ? "style='font-weight: bold;'" : null).">".escape($domain['domain_name'])."</a>\n";
+			if ($domain['domain_description'] != '') {
+				echo "<span class=\"domain_list_item_description\"> - ".escape($domain['domain_description'])."</span>\n";
+			}
+			echo "</div>\n";
+			$ary_domain_names[] = escape($domain['domain_name']);
+			$ary_domain_descs[] = str_replace('"','\"',escape($domain['domain_description']));
+		}
 
 
-			</div>
-		</div>
-		<?php
-	}
+		echo "		</div>\n";
+
+		echo "		<script>\n";
+		echo "			var domain_names = new Array(\"".implode('","', $ary_domain_names)."\");\n";
+		echo "			var domain_descs = new Array(\"".implode('","', $ary_domain_descs)."\");\n";
+		echo "			function domain_search(criteria) {\n";
+		echo "				for (var x = 0; x < domain_names.length; x++) {\n";
+		echo "					if (domain_names[x].toLowerCase().match(criteria.toLowerCase()) || domain_descs[x].toLowerCase().match(criteria.toLowerCase())) {\n";
+		echo "						document.getElementById(domain_names[x]).style.display = '';\n";
+		echo "					}\n";
+		echo "					else {\n";
+		echo "						document.getElementById(domain_names[x]).style.display = 'none';\n";
+		echo "					}\n";
+		echo "				}\n";
+		echo "			}\n";
+		echo "		</script>\n";
+
+		echo "	</div>\n";
+		echo "</div>\n";
 
 
+	}
 
 
-	// qr code container for contacts
+// qr code container for contacts
 	echo "<div id='qr_code_container' style='display: none;' onclick='$(this).fadeOut(400);'>\n";
 	echo "<div id='qr_code_container' style='display: none;' onclick='$(this).fadeOut(400);'>\n";
 	echo "	<table cellpadding='0' cellspacing='0' border='0' width='100%' height='100%'><tr><td align='center' valign='middle'>\n";
 	echo "	<table cellpadding='0' cellspacing='0' border='0' width='100%' height='100%'><tr><td align='center' valign='middle'>\n";
 	echo "		<span id='qr_code' onclick=\"$('#qr_code_container').fadeOut(400);\"></span>\n";
 	echo "		<span id='qr_code' onclick=\"$('#qr_code_container').fadeOut(400);\"></span>\n";
@@ -434,313 +430,318 @@
 	echo "</div>\n";
 	echo "</div>\n";
 
 
 
 
-	if (!$default_login) {
-
-		//*************** BOOTSTRAP MENU ********************************
-		function show_menu($menu_array, $menu_style, $menu_position) {
-			global $text;
-
-			//determine menu behavior
-				switch ($menu_style) {
-					case 'inline':
-						$menu_type = 'default';
-						$menu_width = 'calc(100% - 20px)';
-						$menu_brand = false;
-						$menu_corners = null;
-						break;
-					case 'static':
-						$menu_type = 'static-top';
-						$menu_width = 'calc(100% - 40px)';
-						$menu_brand = true;
-						$menu_corners = "style='-webkit-border-radius: 0 0 4px 4px; -moz-border-radius: 0 0 4px 4px; border-radius: 0 0 4px 4px;'";
-						break;
-					case 'fixed':
-					default:
-						$menu_position = ($menu_position != '') ? $menu_position : 'top';
-						$menu_type = 'fixed-'.$menu_position;
-						$menu_width = 'calc(90% - 20px)';
-						$menu_brand = true;
-						$menu_corners = null;
+if (!$default_login) {
+
+	//top fixed, static or inline boostrap menu
+	function show_menu($menu_array, $menu_style, $menu_position) {
+		global $text;
+
+		//determine menu behavior
+			switch ($menu_style) {
+				case 'inline':
+					$menu_type = 'default';
+					$menu_width = 'calc(100% - 20px)';
+					$menu_brand = false;
+					$menu_corners = null;
+					break;
+				case 'static':
+					$menu_type = 'static-top';
+					$menu_width = 'calc(100% - 40px)';
+					$menu_brand = true;
+					$menu_corners = "style='-webkit-border-radius: 0 0 4px 4px; -moz-border-radius: 0 0 4px 4px; border-radius: 0 0 4px 4px;'";
+					break;
+				case 'fixed':
+				default:
+					$menu_position = ($menu_position != '') ? $menu_position : 'top';
+					$menu_type = 'fixed-'.$menu_position;
+					$menu_width = 'calc(90% - 20px)';
+					$menu_brand = true;
+					$menu_corners = null;
+			}
+
+		//begin navbar code
+			echo "<nav class='navbar navbar-inverse navbar-".$menu_type."' ".$menu_corners.">\n";
+			echo "	<div class='container-fluid' style='width: ".$menu_width."; padding: 0;'>\n";
+			echo "		<div class='navbar-header'>\n";
+			echo "			<button type='button' class='navbar-toggle collapsed' ".($menu_style == 'fixed' ? "style='margin-right: -2%;'" : null)." data-toggle='collapse' data-target='#main_navbar' aria-expanded='false' aria-controls='navbar'>\n";
+			echo "				<span class='sr-only'>Toggle navigation</span>\n";
+			echo "				<span class='icon-bar' style='margin-top: 1px;'></span>\n";
+			echo "				<span class='icon-bar'></span>\n";
+			echo "				<span class='icon-bar'></span>\n";
+			echo "			</button>\n";
+
+			if ($menu_brand) {
+				//define menu brand link
+					if (strlen(PROJECT_PATH) > 0) {
+						$menu_brand_link = PROJECT_PATH;
+					}
+					else if (!$default_login) {
+						$menu_brand_link = '/';
+					}
+				//define menu brand mark
+					$menu_brand_text = ($_SESSION['theme']['menu_brand_text']['text'] != '') ? escape($_SESSION['theme']['menu_brand_text']['text']) : "FusionPBX";
+					if ($_SESSION['theme']['menu_brand_type']['text'] == 'image' || $_SESSION['theme']['menu_brand_type']['text'] == '') {
+						$menu_brand_image = ($_SESSION['theme']['menu_brand_image']['text'] != '') ? escape($_SESSION['theme']['menu_brand_image']['text']) : PROJECT_PATH."/themes/default/images/logo.png";
+						echo "<a href='".$menu_brand_link."'>";
+						echo "<img id='menu_brand_image' class='navbar-logo' ".(($menu_style == 'fixed') ? "style='margin-right: -2%;'" : null)." src='".$menu_brand_image."' title=\"".escape($menu_brand_text)."\">";
+						if ($_SESSION['theme']['menu_brand_image_hover']['text'] != '') {
+							echo "<img id='menu_brand_image_hover' class='navbar-logo' style='display: none;' src='".$_SESSION['theme']['menu_brand_image_hover']['text']."' title=\"".escape($menu_brand_text)."\">";
+						}
+						echo "</a>";
+					}
+					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";
+					}
+			}
+			//domain name/selector (xs)
+				if ($_SESSION["username"] != '' && permission_exists("domain_select") && count($_SESSION['domains']) > 1) {
+					echo "<span class='pull-right visible-xs'><a href='#' class='domain_selector_domain' title='".escape($text['theme-label-open_selector'])."'>".escape($_SESSION['domain_name'])."</a></span>\n";
 				}
 				}
-			?>
 
 
-			<nav class="navbar navbar-inverse navbar-<?php echo $menu_type; ?>" <?php echo $menu_corners; ?>>
-				<div class="container-fluid" style='width: <?php echo $menu_width; ?>; padding: 0;'>
-					<div class="navbar-header">
-						<button type="button" class="navbar-toggle collapsed" <?php echo ($menu_style == 'fixed') ? "style='margin-right: -2%;'" : null; ?> data-toggle="collapse" data-target="#main_navbar" aria-expanded="false" aria-controls="navbar">
-							<span class="sr-only">Toggle navigation</span>
-							<span class="icon-bar" style='margin-top: 1px;'></span>
-							<span class="icon-bar"></span>
-							<span class="icon-bar"></span>
-						</button>
-						<?php
-						if ($menu_brand) {
-							//define menu brand link
-								if (strlen(PROJECT_PATH) > 0) {
-									$menu_brand_link = PROJECT_PATH;
-								}
-								else if (!$default_login) {
-									$menu_brand_link = '/';
-								}
-							//define menu brand mark
-								$menu_brand_text = ($_SESSION['theme']['menu_brand_text']['text'] != '') ? escape($_SESSION['theme']['menu_brand_text']['text']) : "FusionPBX";
-								if ($_SESSION['theme']['menu_brand_type']['text'] == 'image' || $_SESSION['theme']['menu_brand_type']['text'] == '') {
-									$menu_brand_image = ($_SESSION['theme']['menu_brand_image']['text'] != '') ? escape($_SESSION['theme']['menu_brand_image']['text']) : PROJECT_PATH."/themes/default/images/logo.png";
-									echo "<a href='".$menu_brand_link."'>";
-									echo "<img id='menu_brand_image' class='navbar-logo' ".(($menu_style == 'fixed') ? "style='margin-right: -2%;'" : null)." src='".$menu_brand_image."' title=\"".escape($menu_brand_text)."\">";
-									if ($_SESSION['theme']['menu_brand_image_hover']['text'] != '') {
-										echo "<img id='menu_brand_image_hover' class='navbar-logo' style='display: none;' src='".$_SESSION['theme']['menu_brand_image_hover']['text']."' title=\"".escape($menu_brand_text)."\">";
-									}
-									echo "</a>";
-								}
-								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";
-								}
+			echo "		</div>\n";
+			echo "		<div class='collapse navbar-collapse' id='main_navbar'>\n";
+			echo "			<ul class='nav navbar-nav'>\n";
+
+			foreach ($menu_array as $index_main => $menu_parent) {
+				$mod_li = "";
+				$mod_a_1 = "";
+				$submenu = false;
+				if (is_array($menu_parent['menu_items']) && sizeof($menu_parent['menu_items']) > 0) {
+					$mod_li = "class='dropdown' ";
+					$mod_a_1 = "class='dropdown-toggle text-left' data-toggle='dropdown' ";
+					$submenu = true;
+				}
+				$mod_a_2 = ($menu_parent['menu_item_link'] != '' && !$submenu) ? $menu_parent['menu_item_link'] : '#';
+				$mod_a_3 = ($menu_parent['menu_item_category'] == 'external') ? "target='_blank' " : null;
+				if ($_SESSION['theme']['menu_main_icons']['boolean'] != 'false') {
+					if ($menu_parent['menu_item_icon'] != '' && substr_count($menu_parent['menu_item_icon'], 'glyphicon-') > 0) {
+						$menu_main_icon = "<span class='glyphicon ".$menu_parent['menu_item_icon']."' title=\"".escape($menu_parent['menu_language_title'])."\"></span>";
+					}
+					else {
+						$menu_main_icon = null;
+					}
+					$menu_main_item = "<span class='hidden-sm' style='margin-left: 5px;'>".$menu_parent['menu_language_title']."</span>";
+				}
+				else {
+					$menu_main_item = $menu_parent['menu_language_title'];
+				}
+				echo "			<li ".$mod_li.">\n";
+				echo "				<a ".$mod_a_1." href='".$mod_a_2."' ".$mod_a_3.">".$menu_main_icon.$menu_main_item."</a>\n";
+				if ($submenu) {
+					echo "			<ul class='dropdown-menu'>\n";
+					foreach ($menu_parent['menu_items'] as $index_sub => $menu_sub) {
+						$mod_a_2 = $menu_sub['menu_item_link'];
+						if ($mod_a_2 == '') {
+							$mod_a_2 = '#';
 						}
 						}
-						//domain name/selector (xs)
-							if ($_SESSION["username"] != '' && permission_exists("domain_select") && count($_SESSION['domains']) > 1) {
-								echo "<span class='pull-right visible-xs'><a href='#' class='domain_selector_domain' title='".escape($text['theme-label-open_selector'])."'>".escape($_SESSION['domain_name'])."</a></span>\n";
-							}
-						?>
-					</div>
-					<div class="collapse navbar-collapse" id="main_navbar">
-						<ul class="nav navbar-nav">
-							<?php
-							foreach ($menu_array as $index_main => $menu_parent) {
-								$mod_li = "";
-								$mod_a_1 = "";
-								$submenu = false;
-								if (is_array($menu_parent['menu_items']) && sizeof($menu_parent['menu_items']) > 0) {
-									$mod_li = "class='dropdown' ";
-									$mod_a_1 = "class='dropdown-toggle text-left' data-toggle='dropdown' ";
-									$submenu = true;
-								}
-								$mod_a_2 = ($menu_parent['menu_item_link'] != '' && !$submenu) ? $menu_parent['menu_item_link'] : '#';
-								$mod_a_3 = ($menu_parent['menu_item_category'] == 'external') ? "target='_blank' " : null;
-								if ($_SESSION['theme']['menu_main_icons']['boolean'] != 'false') {
-									if ($menu_parent['menu_item_icon'] != '' && substr_count($menu_parent['menu_item_icon'], 'glyphicon-') > 0) {
-										$menu_main_icon = "<span class='glyphicon ".$menu_parent['menu_item_icon']."' title=\"".escape($menu_parent['menu_language_title'])."\"></span>";
-									}
-									else {
-										$menu_main_icon = null;
-									}
-									$menu_main_item = "<span class='hidden-sm' style='margin-left: 5px;'>".$menu_parent['menu_language_title']."</span>";
+						else if (($menu_sub['menu_item_category'] == 'internal') || (($menu_sub['menu_item_category'] == 'external') && substr($mod_a_2,0,1) == '/')) {
+							// accomodate adminer auto-login, if enabled
+								if (substr($mod_a_2,0,22) == '/app/adminer/index.php') {
+									global $db_type;
+									$mod_a_2 .= '?'.(($db_type == 'mysql') ? 'server' : $db_type).'&db=fusionpbx&ns=public';
+									$mod_a_2 .= ($_SESSION['adminer']['auto_login']['boolean'] == 'true') ? "&username=auto" : null;
 								}
 								}
-								else {
-									$menu_main_item = $menu_parent['menu_language_title'];
-								}
-								echo "<li ".$mod_li.">\n";
-								echo "<a ".$mod_a_1." href='".$mod_a_2."' ".$mod_a_3.">".$menu_main_icon.$menu_main_item."</a>\n";
-								if ($submenu) {
-									echo "<ul class='dropdown-menu'>\n";
-									foreach ($menu_parent['menu_items'] as $index_sub => $menu_sub) {
-										$mod_a_2 = $menu_sub['menu_item_link'];
-										if ($mod_a_2 == '') {
-											$mod_a_2 = '#';
-										}
-										else if (($menu_sub['menu_item_category'] == 'internal') || (($menu_sub['menu_item_category'] == 'external') && substr($mod_a_2,0,1) == '/')) {
-											// accomodate adminer auto-login, if enabled
-												if (substr($mod_a_2,0,22) == '/app/adminer/index.php') {
-													global $db_type;
-													$mod_a_2 .= '?'.(($db_type == 'mysql') ? 'server' : $db_type).'&db=fusionpbx&ns=public';
-													$mod_a_2 .= ($_SESSION['adminer']['auto_login']['boolean'] == 'true') ? "&username=auto" : null;
-												}
-											$mod_a_2 = PROJECT_PATH.$mod_a_2;
-										}
-										$mod_a_3 = ($menu_sub['menu_item_category'] == 'external') ? "target='_blank' " : null;
-										if ($_SESSION['theme']['menu_sub_icons']['boolean'] != 'false') {
-											if ($menu_sub['menu_item_icon'] != '' && substr_count($menu_sub['menu_item_icon'], 'glyphicon-') > 0) {
-												$menu_sub_icon = "<span class='glyphicon ".escape($menu_sub['menu_item_icon'])."'></span>";
-											}
-											else {
-												$menu_sub_icon = null;
-											}
-										}
-										echo "<li><a href='".$mod_a_2."' ".$mod_a_3.">".(($_SESSION['theme']['menu_sub_icons']) ? "<span class='glyphicon glyphicon-minus visible-xs pull-left' style='margin: 4px 10px 0 25px;'></span>" : null).escape($menu_sub['menu_language_title']).$menu_sub_icon."</a></li>\n";
-									}
-									echo "</ul>\n";
-								}
-								echo "</li>\n";
-							}
-							?>
-						</ul>
-						<?php
-						echo "<span class='pull-right hidden-xs' style='white-space: nowrap;'>";
-						//domain name/selector (sm+)
-							if ($_SESSION["username"] != '' && permission_exists("domain_select") && count($_SESSION['domains']) > 1 && $_SESSION['theme']['domain_visible']['text'] == 'true') {
-								echo "<a href='#' class='domain_selector_domain' title='".$text['theme-label-open_selector']."'>".escape($_SESSION['domain_name'])."</a>";
+							$mod_a_2 = PROJECT_PATH.$mod_a_2;
+						}
+						$mod_a_3 = ($menu_sub['menu_item_category'] == 'external') ? "target='_blank' " : null;
+						if ($_SESSION['theme']['menu_sub_icons']['boolean'] != 'false') {
+							if ($menu_sub['menu_item_icon'] != '' && substr_count($menu_sub['menu_item_icon'], 'glyphicon-') > 0) {
+								$menu_sub_icon = "<span class='glyphicon ".escape($menu_sub['menu_item_icon'])."'></span>";
 							}
 							}
-						//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' class='logout_icon' title=\"".$text['theme-label-logout']."\" onclick=\"return confirm('".$text['theme-confirm-logout']."')\"><span class='glyphicon glyphicon-log-out'></span></a>";
-								unset($username_full);
+							else {
+								$menu_sub_icon = null;
 							}
 							}
-						echo "</span>";
-						?>
-					</div>
-				</div>
-			</nav>
+						}
+						echo "			<li><a href='".$mod_a_2."' ".$mod_a_3.">".(($_SESSION['theme']['menu_sub_icons']) ? "<span class='glyphicon glyphicon-minus visible-xs pull-left' style='margin: 4px 10px 0 25px;'></span>" : null).escape($menu_sub['menu_language_title']).$menu_sub_icon."</a></li>\n";
+					}
+					echo "			</ul>\n";
+				}
+				echo "			</li>\n";
+			}
 
 
-			<?php
-		}
+			echo "			</ul>\n";
+			echo "			<span class='pull-right hidden-xs' style='white-space: nowrap;'>\n";
+			//domain name/selector (sm+)
+				if ($_SESSION["username"] != '' && permission_exists("domain_select") && count($_SESSION['domains']) > 1 && $_SESSION['theme']['domain_visible']['text'] == 'true') {
+					echo "		<a href='#' class='domain_selector_domain' title='".$text['theme-label-open_selector']."'>".escape($_SESSION['domain_name'])."</a>";
+				}
+			//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' class='logout_icon' title=\"".$text['theme-label-logout']."\" onclick=\"return confirm('".$text['theme-confirm-logout']."')\"><span class='glyphicon glyphicon-log-out'></span></a>";
+					unset($username_full);
+				}
+			echo "			</span>\n";
 
 
+			echo "		</div>\n";
+			echo "	</div>\n";
+			echo "</nav>\n";
+	}
 
 
-		//determine menu configuration
-			$menu = new menu;
-			$menu->db = $db;
-			$menu->menu_uuid = $_SESSION['domain']['menu']['uuid'];
-			$menu_array = $menu->menu_array();
-			unset($menu);
 
 
-			$menu_style = ($_SESSION['theme']['menu_style']['text'] != '') ? $_SESSION['theme']['menu_style']['text'] : 'fixed';
-			$menu_position = ($_SESSION['theme']['menu_position']['text']) ? $_SESSION['theme']['menu_position']['text'] : 'top';
+	//determine menu configuration
+		$menu = new menu;
+		$menu->db = $db;
+		$menu->menu_uuid = $_SESSION['domain']['menu']['uuid'];
+		$menu_array = $menu->menu_array();
+		unset($menu);
+
+		$menu_style = ($_SESSION['theme']['menu_style']['text'] != '') ? $_SESSION['theme']['menu_style']['text'] : 'fixed';
+		$menu_position = ($_SESSION['theme']['menu_position']['text']) ? $_SESSION['theme']['menu_position']['text'] : 'top';
+
+		switch ($menu_style) {
+			case 'inline':
+				$logo_align = ($_SESSION['theme']['logo_align']['text'] != '') ? $_SESSION['theme']['logo_align']['text'] : 'left';
+				$logo_style = ($_SESSION['theme']['logo_style']['text'] != '') ? $_SESSION['theme']['logo_style']['text'] : '';
+				echo "<div class='container-fluid' style='padding: 0;' align='".$logo_align."'>\n";
+				if ($_SERVER['PHP_SELF'] != PROJECT_PATH."/core/install/install.php") {
+					$logo = ($_SESSION['theme']['logo']['text'] != '') ? $_SESSION['theme']['logo']['text'] : PROJECT_PATH."/themes/default/images/logo.png";
+					echo "<a href='".((PROJECT_PATH != '') ? PROJECT_PATH : '/')."'><img src='".$logo."' style='padding: 15px 20px;$logo_style'></a>";
+				}
 
 
-			switch ($menu_style) {
-				case 'inline':
-					$logo_align = ($_SESSION['theme']['logo_align']['text'] != '') ? $_SESSION['theme']['logo_align']['text'] : 'left';
-					$logo_style = ($_SESSION['theme']['logo_style']['text'] != '') ? $_SESSION['theme']['logo_style']['text'] : '';
-					echo "<div class='container-fluid' style='padding: 0;' align='".$logo_align."'>\n";
-					if ($_SERVER['PHP_SELF'] != PROJECT_PATH."/core/install/install.php") {
-						$logo = ($_SESSION['theme']['logo']['text'] != '') ? $_SESSION['theme']['logo']['text'] : PROJECT_PATH."/themes/default/images/logo.png";
-						echo "<a href='".((PROJECT_PATH != '') ? PROJECT_PATH : '/')."'><img src='".$logo."' style='padding: 15px 20px;$logo_style'></a>";
+				show_menu($menu_array, $menu_style, $menu_position);
+				break;
+			case 'static':
+				echo "<div class='container-fluid' style='padding: 0;' align='center'>\n";
+				show_menu($menu_array, $menu_style, $menu_position);
+				break;
+			case 'fixed':
+				show_menu($menu_array, $menu_style, $menu_position);
+				echo "<div class='container-fluid' style='padding: 0;' align='center'>\n";
+				break;
+			case 'side':
+				echo "<div id='menu_side_container'>\n";
+				//menu brand image and/or text
+					if ($_SESSION['theme']['menu_brand_type']['text'] == 'none') {
+						echo "<div style='height: 75px;'>\n";
+						echo "<a class='menu_side_item_main menu_side_contract' onclick='menu_side_contract();' style='display: none;'><i class='glyphicon glyphicon-menu-hamburger' style='z-index: 99800; padding-right: 8px;'></i></a>";
+						echo "<a class='menu_side_item_main menu_side_expand' onclick='menu_side_expand();'><i class='glyphicon glyphicon-menu-hamburger' style='z-index: 99800; padding-right: 8px;'></i></a>";
+						echo "</div>\n";
+					}
+					else {
+						echo "<div id='menu_side_brand_container'>\n";
+						//menu toggle buttons
+							if ($_SESSION['theme']['menu_brand_type']['text'] != 'none') {
+								echo "<div style='float: right; margin-right: -20px; margin-top: -20px;'>\n";
+								echo "<a class='menu_side_item_main menu_side_contract' onclick='menu_side_contract();' style='display: none;'><i class='glyphicon glyphicon-menu-hamburger'></i></a>";
+								echo "</div>\n";
+							}
+						//define the menu brand link
+							if (strlen(PROJECT_PATH) > 0) {
+								$menu_brand_link = PROJECT_PATH;
+							}
+							else if (!$default_login) {
+								$menu_brand_link = '/';
+							}
+						//show the menu brand image and/or text
+							$menu_brand_image_contracted =  $_SESSION['theme']['menu_side_brand_image_contracted']['text'] != '' ? $_SESSION['theme']['menu_side_brand_image_contracted']['text'] : PROJECT_PATH."/themes/default/images/logo_side_contracted.png";
+							$menu_brand_image_expanded =  $_SESSION['theme']['menu_side_brand_image_expanded']['text'] != '' ? $_SESSION['theme']['menu_side_brand_image_expanded']['text'] : PROJECT_PATH."/themes/default/images/logo_side_expanded.png";
+							$menu_brand_text = ($_SESSION['theme']['menu_brand_text']['text'] != '') ? escape($_SESSION['theme']['menu_brand_text']['text']) : "FusionPBX";
+							if ($_SESSION['theme']['menu_brand_type']['text'] == 'image' || $_SESSION['theme']['menu_brand_type']['text'] == '') {
+								echo "<a href='".$menu_brand_link."' style='text-decoration: none;'>";
+								echo "<img id='menu_brand_image_contracted' style='width: 20px; margin-left: -2px; margin-top: -5px;' src='".escape($menu_brand_image_contracted)."' title=\"".escape($menu_brand_text)."\">";
+								echo "<img id='menu_brand_image_expanded' style='display: none;' src='".escape($menu_brand_image_expanded)."' title=\"".escape($menu_brand_text)."\">";
+								echo "</a>\n";
+							}
+							else if ($_SESSION['theme']['menu_brand_type']['text'] == 'image_text') {
+								echo "<a href='".$menu_brand_link."' style='text-decoration: none;'>";
+								echo "<img id='menu_brand_image_contracted' style='width: 20px; margin-left: -2px; margin-top: -5px;' src='".escape($menu_brand_image_contracted)."' title=\"".escape($menu_brand_text)."\">";
+								echo "<span class='menu_brand_text' style='display: none;'>".$menu_brand_text."</span>";
+								echo "</a>\n";
+							}
+							else if ($_SESSION['theme']['menu_brand_type']['text'] == 'text') {
+								echo "<a class='menu_brand_text' style='display: none;' href=\"".$menu_brand_link."\">".$menu_brand_text."</a>\n";
+							}
+						echo "</div>\n";
 					}
 					}
 
 
-					show_menu($menu_array, $menu_style, $menu_position);
-					break;
-				case 'static':
-					echo "<div class='container-fluid' style='padding: 0;' align='center'>\n";
-					show_menu($menu_array, $menu_style, $menu_position);
-					break;
-				case 'fixed':
-					show_menu($menu_array, $menu_style, $menu_position);
-					echo "<div class='container-fluid' style='padding: 0;' align='center'>\n";
-					break;
-				case 'side':
-					echo "<div id='menu_side_container'>\n";
-					//menu brand image and/or text
-						if ($_SESSION['theme']['menu_brand_type']['text'] == 'none') {
-							echo "<div style='height: 75px;'>\n";
-							echo "<a class='menu_side_item_main menu_side_contract' onclick='menu_side_contract();' style='display: none;'><i class='glyphicon glyphicon-menu-hamburger' style='z-index: 99800; padding-right: 8px;'></i></a>";
-							echo "<a class='menu_side_item_main menu_side_expand' onclick='menu_side_expand();'><i class='glyphicon glyphicon-menu-hamburger' style='z-index: 99800; padding-right: 8px;'></i></a>";
-							echo "</div>\n";
-						}
-						else {
-							echo "<div id='menu_side_brand_container'>\n";
-							//menu toggle buttons
-								if ($_SESSION['theme']['menu_brand_type']['text'] != 'none') {
-									echo "<div style='float: right; margin-right: -20px; margin-top: -20px;'>\n";
-									echo "<a class='menu_side_item_main menu_side_contract' onclick='menu_side_contract();' style='display: none;'><i class='glyphicon glyphicon-menu-hamburger'></i></a>";
-									echo "</div>\n";
+					//main menu items
+						if (is_array($menu_array) && sizeof($menu_array) != 0) {
+							foreach ($menu_array as $menu_index_main => $menu_item_main) {
+								echo "<a class='menu_side_item_main' ".($menu_item_main['menu_item_link'] != '' ? "href='".$menu_item_main['menu_item_link']."'" : "onclick=\"menu_side_expand(); $('#sub_".$menu_item_main['menu_item_uuid']."').slideToggle(180, function() { if (!$(this).is(':hidden')) { $('.menu_side_sub').not($(this)).slideUp(180); } });\"")." title=\"".$menu_item_main['menu_language_title']."\">";
+								if ($menu_item_main['menu_item_icon'] != '') {
+									echo "<i class='glyphicon ".$menu_item_main['menu_item_icon']."' style='z-index: 99800; padding-right: 8px;'></i>";
 								}
 								}
-							//define the menu brand link
-								if (strlen(PROJECT_PATH) > 0) {
-									$menu_brand_link = PROJECT_PATH;
-								}
-								else if (!$default_login) {
-									$menu_brand_link = '/';
-								}
-							//show the menu brand image and/or text
-								$menu_brand_image_contracted =  $_SESSION['theme']['menu_side_brand_image_contracted']['text'] != '' ? $_SESSION['theme']['menu_side_brand_image_contracted']['text'] : PROJECT_PATH."/themes/default/images/logo_side_contracted.png";
-								$menu_brand_image_expanded =  $_SESSION['theme']['menu_side_brand_image_expanded']['text'] != '' ? $_SESSION['theme']['menu_side_brand_image_expanded']['text'] : PROJECT_PATH."/themes/default/images/logo_side_expanded.png";
-								$menu_brand_text = ($_SESSION['theme']['menu_brand_text']['text'] != '') ? escape($_SESSION['theme']['menu_brand_text']['text']) : "FusionPBX";
-								if ($_SESSION['theme']['menu_brand_type']['text'] == 'image' || $_SESSION['theme']['menu_brand_type']['text'] == '') {
-									echo "<a href='".$menu_brand_link."' style='text-decoration: none;'>";
-									echo "<img id='menu_brand_image_contracted' style='width: 20px; margin-left: -2px; margin-top: -5px;' src='".escape($menu_brand_image_contracted)."' title=\"".escape($menu_brand_text)."\">";
-									echo "<img id='menu_brand_image_expanded' style='display: none;' src='".escape($menu_brand_image_expanded)."' title=\"".escape($menu_brand_text)."\">";
-									echo "</a>\n";
-								}
-								else if ($_SESSION['theme']['menu_brand_type']['text'] == 'image_text') {
-									echo "<a href='".$menu_brand_link."' style='text-decoration: none;'>";
-									echo "<img id='menu_brand_image_contracted' style='width: 20px; margin-left: -2px; margin-top: -5px;' src='".escape($menu_brand_image_contracted)."' title=\"".escape($menu_brand_text)."\">";
-									echo "<span class='menu_brand_text' style='display: none;'>".$menu_brand_text."</span>";
-									echo "</a>\n";
-								}
-								else if ($_SESSION['theme']['menu_brand_type']['text'] == 'text') {
-									echo "<a class='menu_brand_text' style='display: none;' href=\"".$menu_brand_link."\">".$menu_brand_text."</a>\n";
-								}
-							echo "</div>\n";
-						}
-
-						//main menu items
-							if (is_array($menu_array) && sizeof($menu_array) != 0) {
-								foreach ($menu_array as $menu_index_main => $menu_item_main) {
-									echo "<a class='menu_side_item_main' onclick=\"menu_side_expand(); $('#sub_".$menu_item_main['menu_item_uuid']."').slideToggle(180, function() { if (!$(this).is(':hidden')) { $('.menu_side_sub').not($(this)).slideUp(180); } });\" title=\"".$menu_item_main['menu_language_title']."\">";
-									if ($menu_item_main['menu_item_icon'] != '') {
-										echo "<i class='glyphicon ".$menu_item_main['menu_item_icon']."' style='z-index: 99800; padding-right: 8px;'></i>";
-									}
-									echo "<span class='menu_side_item_title' style='display: none;'>".$menu_item_main['menu_language_title']."</span>";
-									echo "</a>\n";
-									//sub menu items
-										if (is_array($menu_item_main['menu_items']) && sizeof($menu_item_main['menu_items']) != 0) {
-											echo "<div id='sub_".$menu_item_main['menu_item_uuid']."' class='menu_side_sub' style='display: none;'>\n";
-											foreach ($menu_item_main['menu_items'] as $menu_index_sub => $menu_item_sub) {
-												echo "<a class='menu_side_item_sub' ".($menu_item_sub['menu_item_category'] == 'external' ? "target='_blank'" : null)." href='".$menu_item_sub['menu_item_link']."'>";
-												echo "<span class='menu_side_item_title' style='display: none;'>".$menu_item_sub['menu_language_title']."</span>";
-												echo "</a>\n";
-											}
-											echo "</div>\n";
+								echo "<span class='menu_side_item_title' style='display: none;'>".$menu_item_main['menu_language_title']."</span>";
+								echo "</a>\n";
+								//sub menu items
+									if (is_array($menu_item_main['menu_items']) && sizeof($menu_item_main['menu_items']) != 0) {
+										echo "<div id='sub_".$menu_item_main['menu_item_uuid']."' class='menu_side_sub' style='display: none;'>\n";
+										foreach ($menu_item_main['menu_items'] as $menu_index_sub => $menu_item_sub) {
+											echo "<a class='menu_side_item_sub' ".($menu_item_sub['menu_item_category'] == 'external' ? "target='_blank'" : null)." href='".$menu_item_sub['menu_item_link']."'>";
+											echo "<span class='menu_side_item_title' style='display: none;'>".$menu_item_sub['menu_language_title']."</span>";
+											echo "</a>\n";
 										}
 										}
-								}
-								echo "<div style='height: 100px;'></div>\n";
+										echo "</div>\n";
+									}
 							}
 							}
+							echo "<div style='height: 100px;'></div>\n";
+						}
+				echo "</div>\n";
+				echo "<div id='content_container' style='padding: 0; width: calc(100% - ".(is_numeric($_SESSION['theme']['menu_side_width_contracted']['text']) ? $_SESSION['theme']['menu_side_width_contracted']['text'] : '55')."px); float: right; padding-top: 0px; text-align: center;'>\n";
+				echo "	<div id='content_header'>\n";
+				//header: left
+					echo "<div style='float: left;'>\n";
 					echo "</div>\n";
 					echo "</div>\n";
-					echo "<div id='content_container' style='padding: 0; width: calc(100% - ".(is_numeric($_SESSION['theme']['menu_side_width_contracted']['text']) ? $_SESSION['theme']['menu_side_width_contracted']['text'] : '55')."px); float: right; padding-top: 0px; text-align: center;'>\n";
-					echo "	<div id='content_header'>\n";
-					//header: left
-						echo "<div style='float: left;'>\n";
-						echo "</div>\n";
-					//header: right
-						echo "<span class='pull-right' style='white-space: nowrap;'>";
-						//current user
-							echo "<span style='display: inline-block; padding-right: 20px; font-size: 85%;'>\n";
-							echo "<strong>".$text['theme-label-user']."</strong>: ";
-							echo "<a href='".PROJECT_PATH."/core/users/user_edit.php?id=user'>".$_SESSION['username']."</a>";
+				//header: right
+					echo "<span class='pull-right' style='white-space: nowrap;'>";
+					//current user
+						echo "<span style='display: inline-block; padding-right: 20px; font-size: 85%;'>\n";
+						echo "<strong>".$text['theme-label-user']."</strong>: ";
+						echo "<a href='".PROJECT_PATH."/core/users/user_edit.php?id=user'>".$_SESSION['username']."</a>";
+						echo "</span>\n";
+					//domain name/selector (sm+)
+						if ($_SESSION["username"] != '' && permission_exists("domain_select") && count($_SESSION['domains']) > 1 && $_SESSION['theme']['domain_visible']['text'] == 'true') {
+							echo "<span style='display: inline-block; padding-right: 10px; font-size: 85%;'>\n";
+							echo "<strong>".$text['theme-label-domain']."</strong>: ";
+							echo "<a id='header_domain_selector_domain' title='".$text['theme-label-open_selector']."'>".escape($_SESSION['domain_name'])."</a>";
 							echo "</span>\n";
 							echo "</span>\n";
-						//domain name/selector (sm+)
-							if ($_SESSION["username"] != '' && permission_exists("domain_select") && count($_SESSION['domains']) > 1 && $_SESSION['theme']['domain_visible']['text'] == 'true') {
-								echo "<span style='display: inline-block; padding-right: 10px; font-size: 85%;'>\n";
-								echo "<strong>".$text['theme-label-domain']."</strong>: ";
-								echo "<a id='header_domain_selector_domain' title='".$text['theme-label-open_selector']."'>".escape($_SESSION['domain_name'])."</a>";
-								echo "</span>\n";
-							}
-						//logout icon
-							if ($_SESSION['username'] != '' && $_SESSION['theme']['logout_icon_visible']['text'] == "true") {
-								echo "<a id='header_logout_icon' href='".PROJECT_PATH."/logout.php' title=\"".$text['theme-label-logout']."\" onclick=\"return confirm('".$text['theme-confirm-logout']."')\"><span class='glyphicon glyphicon-log-out'></span></a>";
-							}
-						echo "</span>";
-					echo "	</div>\n";
-					break;
-			}
-			?>
+						}
+					//logout icon
+						if ($_SESSION['username'] != '' && $_SESSION['theme']['logout_icon_visible']['text'] == "true") {
+							echo "<a id='header_logout_icon' href='".PROJECT_PATH."/logout.php' title=\"".$text['theme-label-logout']."\" onclick=\"return confirm('".$text['theme-confirm-logout']."')\"><span class='glyphicon glyphicon-log-out'></span></a>";
+						}
+					echo "</span>";
+				echo "	</div>\n";
+				break;
+		}
 
 
-			<div id='main_content'>
-				<!--{body}-->
-			</div>
-			<div id='footer'>
-				<span class='footer'><?php echo (isset($_SESSION['theme']['footer']['text'])) ? $_SESSION['theme']['footer']['text'] : "&copy; ".$text['theme-label-copyright']." 2008 - ".date("Y")." <a href='http://www.fusionpbx.com' class='footer' target='_blank'>fusionpbx.com</a> ".$text['theme-label-all_rights_reserved']; ?></span>
-			</div>
-		</div>
+		echo "<div id='main_content'>\n";
+		echo "	<!--{body}-->\n";
+		echo "</div>\n";
+		echo "<div id='footer'>\n";
+		echo "	<span class='footer'>".($_SESSION['theme']['footer']['text'] != '' ? $_SESSION['theme']['footer']['text'] : "&copy; ".$text['theme-label-copyright']." 2008 - ".date("Y")." <a href='http://www.fusionpbx.com' class='footer' target='_blank'>fusionpbx.com</a> ".$text['theme-label-all_rights_reserved'])."</span>\n";
+		echo "</div>\n";
 
 
-		<?php
-		// note: div above matches $open_container
-	}
+		echo "</div>\n"; //initial div from switch statement above
+
+}
 
 
-	// default login being used
+// default login being used
+else {
+
+	if ($_SESSION['theme']['logo_login']['text'] != '') {
+		$logo = $_SESSION['theme']['logo_login']['text'];
+	}
+	else if ($_SESSION['theme']['logo']['text'] != '') {
+		$logo = $_SESSION['theme']['logo']['text'];
+	}
 	else {
 	else {
-		$logo = (isset($_SESSION['theme']['logo']['text'])) ? $_SESSION['theme']['logo']['text'] : PROJECT_PATH."/themes/default/images/logo.png";
-		?>
-		<div id='default_login'>
-			<a href='<?php echo PROJECT_PATH; ?>/'><img id='login_logo' src='<?php echo escape($logo); ?>'></a><br />
-			<!--{body}-->
-		</div>
-		<div id='footer_login'>
-			<span class='footer'><?php echo (isset($_SESSION['theme']['footer']['text'])) ? $_SESSION['theme']['footer']['text'] : "&copy; ".$text['theme-label-copyright']." 2008 - ".date("Y")." <a href='http://www.fusionpbx.com' class='footer' target='_blank'>fusionpbx.com</a> ".$text['theme-label-all_rights_reserved']; ?></span>
-		</div>
-		<?php
-		unset($_SESSION['background_image']);
+		$logo = PROJECT_PATH."/themes/default/images/logo_login.png";
 	}
 	}
-	?>
 
 
-</body>
-</html>
+	echo "<div id='default_login'>\n";
+	echo "	<a href='".PROJECT_PATH."/'><img id='login_logo' src='".escape($logo)."'></a><br />\n";
+	echo "	<!--{body}-->\n";
+	echo "</div>\n";
+	echo "<div id='footer_login'>\n";
+	echo "	<span class='footer'>".($_SESSION['theme']['footer']['text'] != '' ? $_SESSION['theme']['footer']['text'] : "&copy; ".$text['theme-label-copyright']." 2008 - ".date("Y")." <a href='http://www.fusionpbx.com' class='footer' target='_blank'>fusionpbx.com</a> ".$text['theme-label-all_rights_reserved'])."</span>\n";
+	echo "</div>\n";
+
+	unset($_SESSION['background_image']);
+
+}
+
+echo "</body>\n";
+echo "</html>\n";
+?>