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

This commit is contained in:
Nate
2019-03-27 13:21:25 -06:00
parent e175a931a3
commit 0516f63c43
3 changed files with 382 additions and 382 deletions

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

View File

@@ -21,19 +21,19 @@
if (strlen(PROJECT_PATH) > 0) {
$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
if ($_SESSION['theme']['custom_css']['text'] != '') {
echo "<link rel='stylesheet' type='text/css' href='".escape($_SESSION['theme']['custom_css']['text'])."'>\n\n";
@@ -42,18 +42,17 @@
//set fav icon
$favicon = (isset($_SESSION['theme']['favicon']['text'])) ? escape($_SESSION['theme']['favicon']['text']) : '<!--{project_path}-->/themes/default/favicon.ico';
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
if ($_SESSION['theme']['font_loader']['text'] == 'true') {
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";
}
?>
<script language="JavaScript" type="text/javascript">
//display message bar via js
@@ -350,30 +350,28 @@
</script>
<!--{head}-->
</head>
<?php
echo "<!--{head}-->\n";
echo "</head>\n";
//add multilingual support
$language = new text;
$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) {
?>
<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
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";
if (file_exists($_SERVER["DOCUMENT_ROOT"]."/app/domains/domains.php")) {
$href = '/app/domains/domains.php';
}
@@ -381,12 +379,12 @@
$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
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) {
@@ -401,30 +399,28 @@
$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>\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>
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";
</div>
</div>
<?php
}
echo " </div>\n";
echo "</div>\n";
}
// qr code container for contacts
echo "<div id='qr_code_container' style='display: none;' onclick='$(this).fadeOut(400);'>\n";
@@ -436,7 +432,7 @@
if (!$default_login) {
//*************** BOOTSTRAP MENU ********************************
//top fixed, static or inline boostrap menu
function show_menu($menu_array, $menu_style, $menu_position) {
global $text;
@@ -462,18 +458,18 @@
$menu_brand = true;
$menu_corners = null;
}
?>
<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
//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) {
@@ -501,11 +497,11 @@
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
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 = "";
@@ -562,10 +558,9 @@
}
echo " </li>\n";
}
?>
</ul>
<?php
echo "<span class='pull-right hidden-xs' style='white-space: nowrap;'>";
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>";
@@ -576,13 +571,11 @@
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>";
?>
</div>
</div>
</nav>
echo " </span>\n";
<?php
echo " </div>\n";
echo " </div>\n";
echo "</nav>\n";
}
@@ -665,7 +658,7 @@
//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']."\">";
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>";
}
@@ -712,35 +705,43 @@
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";
echo "</div>\n"; //initial div from switch statement above
<?php
// note: div above matches $open_container
}
// default login being used
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']);
}
?>
</body>
</html>
if ($_SESSION['theme']['logo_login']['text'] != '') {
$logo = $_SESSION['theme']['logo_login']['text'];
}
else if ($_SESSION['theme']['logo']['text'] != '') {
$logo = $_SESSION['theme']['logo']['text'];
}
else {
$logo = PROJECT_PATH."/themes/default/images/logo_login.png";
}
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";
?>