Theme: Side Menu updates.

This commit is contained in:
Nate
2020-05-23 18:57:17 -06:00
parent f18e2423ed
commit 6f829ea6cf
12 changed files with 199 additions and 62 deletions

View File

@@ -1711,13 +1711,13 @@
$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the default state of the Side Menu: expanded (pinned) or contracted (unpinned).";
$y++;
$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "05e0318f-4344-4d40-9690-fb5cbcf20a2d";
$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "eaab943f-34d9-44f5-854a-c2288d88dfd0";
$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "menu_side_state_user";
$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "menu_side_pin";
$apps[$x]['default_settings'][$y]['default_setting_name'] = "boolean";
$apps[$x]['default_settings'][$y]['default_setting_value'] = "true";
$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
$apps[$x]['default_settings'][$y]['default_setting_description'] = "Enable Side Menu toggle icon allowing users to choose their own state preference (contracted or expanded).";
$apps[$x]['default_settings'][$y]['default_setting_description'] = "Enable Side Menu toggle icon allowing users to choose their own preferred menu state (contracted or expanded).";
$y++;
$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "8ee8012a-da8c-483a-996d-d81b30a8bbea";
$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";

View File

@@ -369,4 +369,27 @@ $text['theme-message-menu_contracted']['sv-se'] = "Menu Unpinned";
$text['theme-message-menu_contracted']['uk-ua'] = "Menu Unpinned";
$text['theme-message-menu_contracted']['tr-tr'] = "Menu Unpinned";
$text['theme-message-menu_reset']['en-us'] = "Menu State Reset";
$text['theme-message-menu_reset']['en-gb'] = "Menu State Reset";
$text['theme-message-menu_reset']['ar-eg'] = "Menu State Reset";
$text['theme-message-menu_reset']['de-at'] = "Menu State Reset";
$text['theme-message-menu_reset']['de-ch'] = "Menu State Reset";
$text['theme-message-menu_reset']['de-de'] = "Menu State Reset";
$text['theme-message-menu_reset']['el-gr'] = "Menu State Reset";
$text['theme-message-menu_reset']['es-cl'] = "Menu State Reset";
$text['theme-message-menu_reset']['es-mx'] = "Menu State Reset";
$text['theme-message-menu_reset']['fr-ca'] = "Menu State Reset";
$text['theme-message-menu_reset']['fr-fr'] = "Menu State Reset";
$text['theme-message-menu_reset']['he-il'] = "Menu State Reset";
$text['theme-message-menu_reset']['it-it'] = "Menu State Reset";
$text['theme-message-menu_reset']['nl-nl'] = "Menu State Reset";
$text['theme-message-menu_reset']['pl-pl'] = "Menu State Reset";
$text['theme-message-menu_reset']['pt-br'] = "Menu State Reset";
$text['theme-message-menu_reset']['pt-pt'] = "Menu State Reset";
$text['theme-message-menu_reset']['ro-ro'] = "Menu State Reset";
$text['theme-message-menu_reset']['ru-ru'] = "Menu State Reset";
$text['theme-message-menu_reset']['sv-se'] = "Menu State Reset";
$text['theme-message-menu_reset']['uk-ua'] = "Menu State Reset";
$text['theme-message-menu_reset']['tr-tr'] = "Menu State Reset";
?>

View File

@@ -122,39 +122,37 @@
}
function menu_side_expand() {
if (menu_side_state_current == 'contracted') {
{/literal}
{if $settings.theme.menu_brand_type == 'image_text'}
{literal}
$('#menu_brand_image_contracted').animate({ width: '30px', 'margin-left': '0' }, 250);
{/literal}
{if $settings.theme.menu_brand_type == 'image_text'}
{elseif $settings.theme.menu_brand_type == 'image' || $settings.theme.menu_brand_type == ''}
{literal}
$('#menu_brand_image_contracted').fadeOut(180);
{/literal}
{/if}
{literal}
$('.menu_side_expand').hide();
$('.menu_side_contract').show();
$('#menu_side_container').show();
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 == ''}
{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 == ''}
{literal}
$('#menu_brand_image_contracted').fadeOut(180);
$('#menu_brand_image_expanded').fadeIn(180);
{/literal}
{/if}
{literal}
$('.menu_side_expand').hide();
$('.menu_side_contract').show();
$('#menu_side_container').show();
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 == ''}
{literal}
$('#menu_brand_image_expanded').fadeIn(180);
{/literal}
{/if}
{literal}
$('.menu_side_control_state').fadeIn(180);
$('.menu_brand_text').fadeIn(180);
$('.menu_side_item_title').fadeIn(180, function() {
menu_side_state_current = 'expanded';
});
$('.menu_side_control_state').fadeIn(180);
$('.menu_brand_text').fadeIn(180);
$('.menu_side_item_title').fadeIn(180, function() {
menu_side_state_current = 'expanded';
});
if ($(window).width() >= 576) {
$('#content_container').animate({ width: $(window).width() - {/literal}{$settings.theme.menu_side_width_expanded}{literal} }, 250);
}
});
if ($(window).width() >= 576) {
$('#content_container').animate({ width: $(window).width() - {/literal}{$settings.theme.menu_side_width_expanded}{literal} }, 250);
}
}
@@ -180,6 +178,10 @@
display_message("{/literal}{$text.theme_message_menu_contracted}{literal}", 'positive', 1000);
}
}
else if (setting_modified == 'deleted') {
display_message("{/literal}{$text.theme_message_menu_reset}{literal}", 'positive', 1000);
document.location.reload();
}
}
}
}