Theme: Code cleanup, optimize CSS.

This commit is contained in:
reliberate
2016-05-20 19:08:10 -06:00
parent 79e32c6b06
commit 73eac17cac
2 changed files with 64 additions and 102 deletions

View File

@@ -202,9 +202,12 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false;
}
div#footer {
display: inline-block;
width: 100%;
background: <?php echo ($_SESSION['theme']['footer_background_color']['text'] != '') ? $_SESSION['theme']['footer_background_color']['text'] : 'rgba(0,0,0,0.2)'; ?>;
text-align: center;
vertical-align: middle;
margin-bottom: 60px;
padding: 8px;
<?php $br = format_border_radius($_SESSION['theme']['footer_border_radius']['text'], '0 0 4px 4px'); ?>
-moz-border-radius: <?php echo $br['tl']['n'].$br['tl']['u']; ?> <?php echo $br['tr']['n'].$br['tr']['u']; ?> <?php echo $br['br']['n'].$br['br']['u']; ?> <?php echo $br['bl']['n'].$br['bl']['u']; ?>;
@@ -261,7 +264,8 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false;
border: none;
height: 27px;
width: auto;
margin: 11px 13px 0 7px;
margin: 11px 0 0 7px;
padding-right: 13px;
cursor: pointer;
float: left;
display: inline;
@@ -295,14 +299,14 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false;
}
.navbar .navbar-nav > li > a > span.glyphicon {
margin: 1px 7px 0 0;
margin: 1px 2px 0 0;
}
@media(min-width: 768px) {
.dropdown:hover .dropdown-menu {
display: block;
}
}
}
/* xs menu toggle button */
.navbar-inverse .navbar-toggle {
@@ -680,7 +684,25 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false;
text-decoration: underline;
}
<?php
//determine body padding & margins (overides on main_content style below) based on menu selection
$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': $body_top_style = "margin-top: -8px;"; break;
case 'static': $body_top_style = "margin-top: -5px;"; break;
case 'fixed':
switch ($menu_position) {
case 'bottom': $body_top_style = "margin-top: 30px;"; break;
case 'top':
default: $body_top_style = "margin-top: 65px;"; break;
}
}
?>
#main_content {
display: inline-block;
width: 100%;
<?php
if (
(strlen($_SESSION["username"]) > 0 || !$default_login)
@@ -698,10 +720,14 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false;
-webkit-box-shadow: <?php echo ($_SESSION['theme']['body_shadow_color']['text'] != '') ? '0 1px 4px '.$_SESSION['theme']['body_shadow_color']['text'] : 'none';?>;
-moz-box-shadow: <?php echo ($_SESSION['theme']['body_shadow_color']['text'] != '') ? '0 1px 4px '.$_SESSION['theme']['body_shadow_color']['text'] : 'none';?>;
box-shadow: <?php echo ($_SESSION['theme']['body_shadow_color']['text'] != '') ? '0 1px 4px '.$_SESSION['theme']['body_shadow_color']['text'] : 'none';?>;
padding: 15px 20px 20px 20px;
<?php } else { ?>
padding: 5px 10px 10px 10px;
<?php } ?>
padding: 20px;
<?php
}
else {
?>padding: 5px 10px 10px 10px;<?php
}
echo $body_top_style;
?>
text-align: left;
}

View File

@@ -195,6 +195,22 @@
});
});
<?php if ($_SESSION['theme']['menu_brand_image']['text'] != '' && $_SESSION['theme']['menu_brand_image_hover']['text'] != '') { ?>
//crossfade menu brand images (if hover version set)
$(function(){
$('#menu_brand_image').mouseover(function(){
$(this).fadeOut('fast', function(){
$('#menu_brand_image_hover').fadeIn('fast');
});
});
$('#menu_brand_image_hover').mouseout(function(){
$(this).fadeOut('fast', function(){
$('#menu_brand_image').fadeIn('fast');
});
});
});
<?php } ?>
});
//audio playback functions
@@ -331,7 +347,7 @@
switch ($menu_style) {
case 'inline':
$menu_type = 'default';
$menu_width = 'calc(100% - 40px)';
$menu_width = 'calc(100% - 20px)';
$menu_brand = false;
break;
case 'static':
@@ -352,7 +368,7 @@
<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" data-toggle="collapse" data-target="#main_navbar" aria-expanded="false" aria-controls="navbar">
<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>
@@ -370,9 +386,13 @@
//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' || $_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;'>";
$menu_brand_image = ($_SESSION['theme']['menu_brand_image']['text'] != '') ? $_SESSION['theme']['menu_brand_image']['text'] : PROJECT_PATH."/themes/default/images/logo_header.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=\"".$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=\"".$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";
@@ -405,7 +425,7 @@
else {
unset($menu_main_icon);
}
$menu_main_item = "<span class='hidden-sm'>".$menu_parent['menu_language_title']."</span>";
$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'];
@@ -484,111 +504,27 @@
}
show_menu($menu_array, $menu_style, $menu_position);
$body_top_style = "style='padding-top: 0px; margin-top: -8px;'";
break;
case 'static':
echo $open_container;
show_menu($menu_array, $menu_style, $menu_position);
$body_top_style = "style='padding: 0; margin-top: -5px;'";
break;
case 'fixed':
show_menu($menu_array, $menu_style, $menu_position);
echo $open_container;
switch ($menu_position) {
case 'bottom': $body_top_style = "style='margin-top: 30px;'"; break;
case 'top': $body_top_style = "style='margin-top: 65px;'"; break;
}
}
?>
<table width='100%' border='0' cellpadding='0' cellspacing='0' <?php echo $body_top_style; ?>>
<tr>
<td align='left' valign='top'>
<table border='0' cellpadding='0' cellspacing='0' width='100%'>
<tr>
<td width='100%' style='padding-right: 15px;' align='right' valign='middle'>
<?php
// login form
if ($_SERVER['PHP_SELF'] != PROJECT_PATH."/core/install/install.php" && !$default_login) {
/*
if (strlen($_SESSION["username"]) == 0) {
//add multi-lingual support
require_once "core/user_settings/app_languages.php";
foreach($text as $key => $value) {
$text[$key] = $value[$_SESSION['domain']['language']['code']];
}
//set a default login destination
if (strlen($_SESSION['login']['destination']['url']) == 0) {
$_SESSION['login']['destination']['url'] = PROJECT_PATH."/core/user_settings/user_dashboard.php";
}
//login form
echo "<div align='right'>\n";
echo " <form name='login' METHOD=\"POST\" action=\"".$_SESSION['login']['destination']['url']."\">\n";
echo " <input type='hidden' name='path' value='".$_GET['path']."'>\n";
echo " <table width='200' border='0'>\n";
echo " <tr>\n";
echo " <td>\n";
echo " <input type='text' class='txt login' style='min-width: 150px; width: 105px; text-align: center;' name='username' placeholder=\"".$text['label-username']."\">\n";
echo " </td>\n";
echo " <td align='left'>\n";
echo " <input type='password' class='txt login' style='min-width: 150px; width: 105px; text-align: center;' name='password' placeholder=\"".$text['label-password']."\">\n";
echo " </td>\n";
if ($_SESSION['login']['domain_name_visible']['boolean'] == "true") {
echo " <td align='left'>\n";
echo " <strong>".$text['label-domain'].":</strong>\n";
echo " </td>\n";
echo " <td>\n";
if (count($_SESSION['login']['domain_name']) > 0) {
echo " <select name='domain_name' class='txt login' style='color: #999999; width: 150px; text-align: center; text-align-last: center;' onclick=\"this.style.color='#000000';\" onchange=\"this.style.color='#000000';\">\n";
echo " <option value='' disabled selected hidden>".$text['label-domain']."</option>\n";
sort($_SESSION['login']['domain_name']);
foreach ($_SESSION['login']['domain_name'] as &$row) {
echo " <option value='$row'>$row</option>\n";
}
echo " </select>\n";
}
else {
echo " <input type='text' name='domain_name' class='txt login' style='text-align: center; min-width: 150px; width: 150px;' placeholder=\"".$text['label-domain']."\">\n";
}
echo " </td>\n";
}
echo " <td align='right'>\n";
echo " <input type='submit' class='btn' style='margin-left: 5px;' value=\"".$text['button-login']."\">\n";
echo " </td>\n";
echo " </tr>\n";
echo " </table>\n";
echo " </form>";
echo "</div>";
}
*/
}
?>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td valign='top' align='center'>
<table cellpadding='0' cellspacing='0' border='0' align='center' width='100%'>
<tr>
<td id='main_content' valign='top' align='center'>
<!--{body}-->
</td>
</tr>
</table>
</td>
</tr>
</table>
<div id='footer' style='width: 100%; margin-bottom: 60px;'>
<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>
<?php
// note: div above matches $open_container
}
// default login being used