Theme: Side Menu updates.

This commit is contained in:
Nate
2020-05-25 18:38:52 -06:00
parent 3016992638
commit 4a986730eb
12 changed files with 163 additions and 65 deletions

View File

@@ -319,6 +319,14 @@
$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set then body background color (and opacity) of the content.";
$y++;
$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "9011e469-f94b-4c45-9b08-8991c243292b";
$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "body_header_background_color";
$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
$apps[$x]['default_settings'][$y]['default_setting_value'] = "#eeeeee";
$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the background color for the body (content) header bar (Side Menu only).";
$y++;
$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "ce3a2e85-472e-4375-a447-d7937cb6dbb7";
$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "body_shadow_color";
@@ -1743,6 +1751,14 @@
$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set whether the Side Menu opens and closes with a 'Click' or with a mouse over/out ('Hover').";
$y++;
$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "e7e11d18-0b06-4347-9305-f8f38284730f";
$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "menu_side_toggle_body_width";
$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
$apps[$x]['default_settings'][$y]['default_setting_value'] = "shrink";
$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the behavior of the body content when the Side Menu is expanded and contracted.";
$y++;
$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "902e6d1b-d019-4d7f-9d83-38bab5db112e";
$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "menu_side_toggle_hover_delay_expand";

View File

@@ -488,33 +488,6 @@ header('Expires: '.gmdate('D, d M Y H:i:s',time()+3600).' GMT');
border-radius: <?php echo ($_SESSION['theme']['menu_main_border_radius']['text'] != '') ? $_SESSION['theme']['menu_main_border_radius']['text'] : '0'; ?>;
}
/* menu side brand container */
div#menu_side_brand_container {
position: -webkit-sticky;
position: sticky;
z-index: 99901;
top: 0;
padding: 20px;
min-height: 75px;
text-align: left;
<?php if ($_SESSION['theme']['menu_main_background_image']['text'] != '') { ?>
background-image: url("<?php echo $_SESSION['theme']['menu_main_background_image']['text']; ?>");
background-position: 0px 0px;
background-repeat: repeat-y;
<?php } else {?>
background: <?php echo ($_SESSION['theme']['menu_main_background_color']['text'] != '') ? $_SESSION['theme']['menu_main_background_color']['text'] : 'rgba(0,0,0,0.90)'; ?>;
<?php } ?>
<?php
echo ($_SESSION['theme']['menu_main_border_color']['text'] == '' && $_SESSION['theme']['menu_main_border_size']['text'] == '') ? "border: 0;\n" : null;
echo ($_SESSION['theme']['menu_main_border_color']['text'] != '') ? 'border-color: '.$_SESSION['theme']['menu_main_border_color']['text'].";\n" : null;
echo ($_SESSION['theme']['menu_main_border_size']['text'] != '') ? 'border-width: '.$_SESSION['theme']['menu_main_border_size']['text'].";\n" : null;
?>
-moz-border-radius: <?php echo ($_SESSION['theme']['menu_main_border_radius']['text'] != '') ? $_SESSION['theme']['menu_main_border_radius']['text'] : '0'; ?>;
-webkit-border-radius: <?php echo ($_SESSION['theme']['menu_main_border_radius']['text'] != '') ? $_SESSION['theme']['menu_main_border_radius']['text'] : '0'; ?>;
-khtml-border-radius: <?php echo ($_SESSION['theme']['menu_main_border_radius']['text'] != '') ? $_SESSION['theme']['menu_main_border_radius']['text'] : '0'; ?>;
border-radius: <?php echo ($_SESSION['theme']['menu_main_border_radius']['text'] != '') ? $_SESSION['theme']['menu_main_border_radius']['text'] : '0'; ?>;
}
/* menu side logo */
a.menu_brand_image {
display: inline-block;
@@ -546,7 +519,7 @@ header('Expires: '.gmdate('D, d M Y H:i:s',time()+3600).' GMT');
a.menu_brand_text {
display: inline-block;
padding: 10px 20px;
color: <?php echo ($_SESSION['theme']['menu_brand_text_color']['text'] != '') ? $_SESSION['theme']['menu_brand_text_color']['text'] : 'rgba(255,255,255,0.80)'; ?>;
color: <?php echo ($_SESSION['theme']['menu_brand_text_color']['text'] != '') ? $_SESSION['theme']['menu_brand_text_color']['text'] : 'rgba(255,255,255,0.90)'; ?>;
font-weight: 600;
white-space: nowrap;
}
@@ -556,6 +529,23 @@ header('Expires: '.gmdate('D, d M Y H:i:s',time()+3600).' GMT');
text-decoration: none;
}
div#body_header_brand_text {
display: inline-block;
margin: 3px 0 0 10px;
}
div#body_header_brand_text > a {
color: <?php echo ($_SESSION['theme']['body_header_brand_text_color']['text'] != '') ? $_SESSION['theme']['body_header_brand_text_color']['text'] : 'rgba(0,0,0,0.90)'; ?>;
font-size: <?php echo ($_SESSION['theme']['body_header_brand_text_size']['text'] != '') ? $_SESSION['theme']['body_header_brand_text_size']['text'] : '16px'; ?>;
font-weight: 600;
text-decoration: none;
}
div#body_header_brand_text > a:hover {
color: <?php echo ($_SESSION['theme']['body_header_brand_text_color_hover']['text'] != '') ? $_SESSION['theme']['body_header_brand_text_color_hover']['text'] : 'rgba(0,0,0,1.0)'; ?>;
text-decoration: none;
}
/* menu side control container */
div#menu_side_control_container {
position: -webkit-sticky;
@@ -1225,11 +1215,19 @@ header('Expires: '.gmdate('D, d M Y H:i:s',time()+3600).' GMT');
}
}
div#content_header {
padding: 10px;
margin-top: 5px;
height: 40px;
}
<?php if ($_SESSION['theme']['menu_style']['text'] == 'side') { ?>
div#content_header {
padding: 10px 10px 15px 10px;
height: 50px;
<?php echo $_SESSION['theme']['body_header_background_color']['text'] != '' ? 'background-color: '.$_SESSION['theme']['body_header_background_color']['text'].';' : null; ?>
}
<?php } else { ?>
div#content_header {
padding: 10px;
margin-top: 5px;
height: 40px;
}
<?php } ?>
/* GENERAL ELEMENTS *****************************************************************/

View File

@@ -98,17 +98,12 @@
$('.menu_side_sub').slideUp(180);
$('.menu_side_item_title').hide();
{/literal}
{if $settings.theme.menu_brand_type == 'image' || $settings.theme.menu_brand_type == ''}
{if $settings.theme.menu_brand_type == 'image' || $settings.theme.menu_brand_type == 'image_text' || $settings.theme.menu_brand_type == ''}
{literal}
$('#menu_brand_image_expanded').fadeOut(180, function() {
$('#menu_brand_image_contracted').fadeIn(180);
});
{/literal}
{elseif $settings.theme.menu_brand_type == 'image_text'}
{literal}
$('.menu_brand_text').hide();
$('#menu_brand_image_contracted').animate({ width: '20px', 'margin-left': '-2px' }, 250);
{/literal}
{else if $settings.theme.menu_brand_type == 'text'}
{literal}
$('.menu_brand_text').hide();
@@ -121,9 +116,15 @@
$('#menu_side_container').animate({ width: '{/literal}{$settings.theme.menu_side_width_contracted}{literal}px' }, 180, function() {
menu_side_state_current = 'contracted';
});
if ($(window).width() >= 576) {
$('#content_container').animate({ width: $(window).width() - {/literal}{$settings.theme.menu_side_width_contracted}{literal} }, 250);
}
{/literal}
{if $settings.theme.menu_side_toggle_body_width == 'shrink' || ($settings.theme.menu_side_state == 'expanded' && $settings.theme.menu_side_toggle_body_width == 'fixed')}
{literal}
if ($(window).width() >= 576) {
$('#content_container').animate({ width: $(window).width() - {/literal}{$settings.theme.menu_side_width_contracted}{literal} }, 250);
}
{/literal}
{/if}
{literal}
$('.menu_side_contract').hide();
$('.menu_side_expand').show();
if ($(window).width() < 576) {
@@ -140,11 +141,7 @@
function menu_side_expand() {
{/literal}
{if $settings.theme.menu_brand_type == 'image_text'}
{literal}
$('#menu_brand_image_contracted').animate({ width: '30px', 'margin-left': '0' }, 250);
{/literal}
{elseif $settings.theme.menu_brand_type == 'image' || $settings.theme.menu_brand_type == ''}
{if $settings.theme.menu_brand_type == 'image' || $settings.theme.menu_brand_type == 'image_text' ||$settings.theme.menu_brand_type == ''}
{literal}
$('#menu_brand_image_contracted').fadeOut(180);
{/literal}
@@ -156,7 +153,7 @@
var menu_side_container_width = $(window).width() < 576 ? $(window).width() : '{/literal}{$settings.theme.menu_side_width_expanded}{literal}px';
$('#menu_side_container').animate({ width: menu_side_container_width }, 180, function() {
{/literal}
{if $settings.theme.menu_brand_type == 'image' || $settings.theme.menu_brand_type == ''}
{if $settings.theme.menu_brand_type == 'image' || $settings.theme.menu_brand_type == 'image_text' || $settings.theme.menu_brand_type == ''}
{literal}
$('#menu_brand_image_expanded').fadeIn(180);
{/literal}
@@ -169,9 +166,15 @@
menu_side_state_current = 'expanded';
});
});
if ($(window).width() >= 576) {
$('#content_container').animate({ width: $(window).width() - {/literal}{$settings.theme.menu_side_width_expanded}{literal} }, 250);
}
{/literal}
{if $settings.theme.menu_side_toggle_body_width == 'shrink' || ($settings.theme.menu_side_state == 'expanded' && $settings.theme.menu_side_toggle_body_width == 'fixed')}
{literal}
if ($(window).width() >= 576) {
$('#content_container').animate({ width: $(window).width() - {/literal}{$settings.theme.menu_side_width_expanded}{literal} }, 250);
}
{/literal}
{/if}
{literal}
}
function menu_side_item_toggle(item_id) {
@@ -198,10 +201,16 @@
document.getElementById('menu_side_state_set_expanded').style.display = state == 'expanded' ? 'none' : 'block';
document.getElementById('menu_side_state_set_contracted').style.display = state == 'contracted' ? 'none' : 'block';
if (state == 'expanded') {
if ($(window).width() >= 576) {
$('#content_container').animate({ width: $(window).width() - {/literal}{$settings.theme.menu_side_width_expanded}{literal} }, 250);
}
document.getElementById('menu_side_state_current').value = 'expanded';
display_message("{/literal}{$text.theme_message_menu_expanded}{literal}", 'positive', 1000);
}
else {
if ($(window).width() >= 576) {
$('#content_container').animate({ width: $(window).width() - {/literal}{$settings.theme.menu_side_width_contracted}{literal} }, 250);
}
document.getElementById('menu_side_state_current').value = 'contracted';
display_message("{/literal}{$text.theme_message_menu_contracted}{literal}", 'positive', 1000);
}