diff --git a/themes/default/app_config.php b/themes/default/app_config.php index aa0adc4ba3..177223e257 100644 --- a/themes/default/app_config.php +++ b/themes/default/app_config.php @@ -1576,9 +1576,17 @@ $y++; $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "ac2a4991-5aab-4eca-b26e-7608c098cd90"; $apps[$x]['default_settings'][$y]['default_setting_category'] = "theme"; - $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "menu_side_brand_image"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "menu_side_brand_image_contracted"; $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; - $apps[$x]['default_settings'][$y]['default_setting_value'] = "/themes/default/images/logo_side_white.png"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "/themes/default/images/logo_side_contacted.png"; $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; - $apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the brand image path for the Side menu."; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the contracted brand image path for the Side menu."; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "a3d0fe4f-015a-4577-90f6-088a389c3997"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "theme"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "menu_side_brand_image_expanded"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "/themes/default/images/logo_side_expanded.png"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the expanded brand image path for the Side menu."; ?> \ No newline at end of file diff --git a/themes/default/css.php b/themes/default/css.php index 792bc049ee..fbd0ae3501 100644 --- a/themes/default/css.php +++ b/themes/default/css.php @@ -480,7 +480,7 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false; z-index: 99901; top: 0; padding: 20px; - margin-bottom: 10px; + min-height: 75px; text-align: left; background-image: url(""); @@ -501,14 +501,23 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false; } /* menu side logo */ - img#menu_brand_image { + img#menu_brand_image_contracted { border: none; width: auto; max-height: 30px; - max-width: 185px; + max-width: 30px; margin-right: 5px; } + img#menu_brand_image_expanded { + border: none; + height: auto; + max-width: 145px; + max-height: 35px; + margin-top: -3px; + margin-left: -6px; + } + /* menu brand text */ .menu_brand_text { color: ; diff --git a/themes/default/images/logo_side_contracted.png b/themes/default/images/logo_side_contracted.png new file mode 100755 index 0000000000..2ccc9ed6a1 Binary files /dev/null and b/themes/default/images/logo_side_contracted.png differ diff --git a/themes/default/images/logo_side_expanded.png b/themes/default/images/logo_side_expanded.png new file mode 100755 index 0000000000..819d78a095 Binary files /dev/null and b/themes/default/images/logo_side_expanded.png differ diff --git a/themes/default/template.php b/themes/default/template.php index 6449acaa03..334ed6475b 100644 --- a/themes/default/template.php +++ b/themes/default/template.php @@ -93,31 +93,48 @@ var menu_side_state = 'contracted'; function menu_side_contract() { $('.menu_side_sub').slideUp(180); - - $('.menu_brand_text').hide(); - $('.menu_side_item_title').hide(); - $('#menu_brand_image').animate({ width: '20px', 'margin-left': '-2px' }, 250); + + $('#menu_brand_image_expanded').fadeOut(180, function() { + $('#menu_brand_image_contracted').fadeIn(180); + }); + + $('.menu_brand_text').hide(); + $('#menu_brand_image_contracted').animate({ width: '20px', 'margin-left': '-2px' }, 250); + + $('.menu_brand_text').fadeOut(180); + $('#menu_side_container').animate({ width: 'px' }, 250); $('#content_container').animate({ width: $(window).width() - }, 250, function() { menu_side_state = 'contracted'; }); + $('.menu_side_contract').hide(); $('.menu_side_expand').show(); } function menu_side_expand() { - $('#menu_brand_image').animate({ width: '30px', 'margin-left': '0' }, 250); - $('#menu_side_container').animate({ width: 'px' }, 250); + + $('#menu_brand_image_contracted').animate({ width: '30px', 'margin-left': '0' }, 250); + + $('#menu_brand_image_contracted').fadeOut(180); + + $('#menu_side_container').animate({ width: 'px' }, 250); $('#content_container').animate({ width: $(window).width() - }, 250, function() { - - $('.menu_brand_text').fadeIn(180); - + $('.menu_brand_text').fadeIn(180); $('.menu_side_item_title').fadeIn(180); + + $('.menu_side_contract').fadeIn(180); + + + $('#menu_brand_image_expanded').fadeIn(180); + menu_side_state = 'expanded'; }); + + $('.menu_side_contract').show(); + $('.menu_side_expand').hide(); - $('.menu_side_contract').show(); } @@ -603,13 +620,19 @@ echo "