Skip to content

Menu fix #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

Menu fix #61

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
da934ac
Remove custom menu functions, replace with smarter megatron_menu_link
occupant Jun 16, 2019
9ad7040
Fix incorrect secondary nav conditional
occupant Jun 16, 2019
fca72e8
Update template.php
occupant Jun 17, 2019
17a53ad
Fix bad variable formatting
occupant Jun 17, 2019
ca3c9b9
Update templates to use https for clf assets, fix missing language at…
occupant Jun 17, 2019
b070a2b
Allow secondary nav to be adjusted in menu settings
occupant Jun 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions template.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,14 +307,14 @@ function megatron_preprocess_page(&$variables) {

$variables['primary_nav'] = FALSE;
if ($variables['main_menu']) {
$menu_tree = menu_tree_page_data('main-menu');
$menu_tree = menu_tree_page_data(variable_get('menu_primary_links_source', 'main-menu');
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use the menu setting instead of hard coding the menu

$tree_output_prepare = menu_tree_output($menu_tree);
$variables['primary_nav'] = drupal_render($tree_output_prepare);
}

$variables['mobile_nav'] = FALSE;
if ($variables['main_menu']) {
$menu_tree = menu_tree_page_data('main-menu');
$menu_tree = menu_tree_page_data(variable_get('menu_primary_links_source', 'main-menu');
$tree_output_prepare = menu_tree_output($menu_tree);
$variables['mobile_nav']['attributes']['id'] = 'mobile-menu';
$variables['mobile_nav'] = drupal_render($tree_output_prepare);
Expand All @@ -323,7 +323,7 @@ function megatron_preprocess_page(&$variables) {
$showSecondary = theme_get_setting('clf_secondarynavoption');
$variables['secondary_nav'] = FALSE;
if ($showSecondary) {
$menu_tree = menu_tree_page_data('user-menu');
$menu_tree = menu_tree_page_data(variable_get('menu_secondary_links_source', 'user-menu');
$tree_output_prepare = menu_tree_output($menu_tree);
$variables['secondary_nav']['attributes']['id'] = 'secondary-menu';
$variables['secondary_nav'] = drupal_render($tree_output_prepare);
Expand All @@ -340,8 +340,7 @@ function megatron_preprocess_page(&$variables) {
$drawer_enabled = $variables['drawer_region'] != 'default' && $variables['drawer_region'] != 'double' && $variables['drawer_region'] != 'higher';
$variables['drawer_enabled'] = $drawer_enabled;
if ($variables['main_menu'] && theme_get_setting('clf_use_primary_menu_in_drawer')) {

$menu_tree = menu_tree_page_data('main-menu');
$menu_tree = menu_tree_page_data(variable_get('menu_primary_links_source', 'main-menu');
$tree_output_prepare = menu_tree_output($menu_tree);
$variables['drawer']['attributes']['id'] = 'drawer-menu';
$variables['drawer'] = drupal_render($tree_output_prepare);
Expand Down