diff --git a/at_core/inc/forms/at_core.submit.menutoggle.inc b/at_core/inc/forms/at_core.submit.menutoggle.inc index 604dd910e42e205e6589f4c88148f4aaeaa48aab..2549a96bd492502e9224f112c6a7c3b9db1cabf4 100755 --- a/at_core/inc/forms/at_core.submit.menutoggle.inc +++ b/at_core/inc/forms/at_core.submit.menutoggle.inc @@ -19,12 +19,12 @@ function at_core_submit_menu_toggle($values, $theme_name, $path) { } $menu_toggle_css = array(); - $menu_toggle_css_active = '.at-mt .at-menu-toggle h2{position:static;top:0}.at-mt #menu-toggle{display:none}.at-mt #menu-toggle ul li,.at-mt #menu-toggle ul li a{display:block;float:none}'; - $menu_toggle_css_inactive = '.at-mt .at-menu-toggle h2{position:absolute;top:-999999em}.at-mt #menu-toggle{display:block !important}'; + $menu_toggle_css_active = '.at-mt .at-menu-toggle-button {position:static;top:0} .at-mt .menu-toggle{display:none} .at-mt .menu-toggle ul li,.at-mt .menu-toggle ul li a{display:block;float:none}'; + $menu_toggle_css_inactive = '.at-mt .at-menu-toggle-button {position:absolute;top:-99999em} .at-mt .menu-toggle {display:block !important}'; // We need extra overrides for superfish if the module is active if (module_exists('superfish')) { - $menu_toggle_superfish_css = '.at-mt #menu-toggle .sf-menu{float:none;margin:0;height:auto}.at-mt #menu-toggle .sf-menu ul,.at-mt #menu-toggle .sf-menu li {margin:0;position:relative;top:0;display:block;float:none;clear:both;width:100%!important;left:0!important}'; + $menu_toggle_superfish_css = '.at-mt #menu-toggle .sf-menu {float:none;margin:0;height:auto} .at-mt #menu-toggle .sf-menu ul,.at-mt #menu-toggle .sf-menu li {margin:0;position:relative;top:0;display:block;float:none;clear:both;width:100%!important;left:0!important}'; } else { $menu_toggle_superfish_css = ''; diff --git a/at_core/inc/forms/settings.menutoggle.inc b/at_core/inc/forms/settings.menutoggle.inc index 2480be8685e1b254c800c8b78bf8fd2877392a1d..355dee5a90cf8b35fab1d1813bb5349312dffb20 100755 --- a/at_core/inc/forms/settings.menutoggle.inc +++ b/at_core/inc/forms/settings.menutoggle.inc @@ -16,7 +16,7 @@ function at_core_menu_toggle_form(&$form) { $form['at']['menu-toggle']['breakpoints'] = array( '#type' => 'fieldset', '#title' => t('Breakpoints'), - '#description' => t('Select additional devices/breakpoints you want to use the toggle menu for.'), + '#description' => t('
These apply to the Drupal core main and secondary menus (printed in page.tpl.php). If you are using a block in a region you need to change the block title for your menu block (even if it\'s the Main menu block).
'), ); - $form['at']['menu-toggle']['main-menu-title']['menu_button_link_text'] = array( + // Main menu title + $form['at']['menu-toggle']['titles']['menu_toggle_main_menu_title'] = array( '#type' => 'textfield', - '#title' => t('Link Text'), - '#description' => t('This applies if you are using the standard Drupal main menu. If you are using a block in the Menu Bar region you need to change the block title for your menu block (even if it\'s the Main menu block).'), - '#default_value' => at_get_setting('menu_button_link_text') ? at_get_setting('menu_button_link_text') : t('Main menu'), + '#title' => t('Main menu title'), + '#default_value' => at_get_setting('menu_toggle_main_menu_title') ? at_get_setting('menu_toggle_main_menu_title') : t('Main menu'), + ); + // Secondary menu title + $form['at']['menu-toggle']['titles']['menu_toggle_secondary_menu_title'] = array( + '#type' => 'textfield', + '#title' => t('Secondary menu title'), + '#default_value' => at_get_setting('menu_toggle_secondary_menu_title') ? at_get_setting('menu_toggle_secondary_menu_title') : t('User menu'), ); } + + + + + + + + + + + + + + + + + + + + + + + diff --git a/at_core/inc/preprocess.inc b/at_core/inc/preprocess.inc index 14c1869897a436333785bdd5692fc4e76ec50948..cce40abb1aa2a9ee75fb48bd030915402c662ab4 100755 --- a/at_core/inc/preprocess.inc +++ b/at_core/inc/preprocess.inc @@ -406,7 +406,8 @@ function adaptivetheme_preprocess_block(&$vars) { $vars['tag'] = 'nav'; array_unshift($vars['theme_hook_suggestions'], 'block__menu'); } - $nav_modules = array('superfish', 'nice_menus', 'menu_block'); + + $nav_modules = array('superfish', 'nice_menus', 'menu_block', 'menu'); if (in_array($vars['block']->module, $nav_modules)) { $vars['tag'] = 'nav'; array_unshift($vars['theme_hook_suggestions'], 'block__menu'); @@ -414,19 +415,29 @@ function adaptivetheme_preprocess_block(&$vars) { // The menu bar region gets special treatment for the block template if ($vars['block']->region === 'menu_bar') { - // They are always menu blocks, right? - $vars['tag'] = 'nav'; + $vars['classes_array'][] = 'menu-wrapper'; + $vars['classes_array'][] = 'menu-bar-wrapper'; + $vars['classes_array'][] = 'clearfix'; + $vars['title_attributes_array']['class'][] = 'element-invisible'; } // The menu bar region gets special treatment for the block template - if ($vars['block']->region === 'menu_bar') { - // Hide title with element invisible unless the menu toggle is active - if (at_get_setting('enable_menu_toggle', $theme_name) === 0) { - $vars['title_attributes_array']['class'][] = 'element-invisible'; + if (at_get_setting('enable_menu_toggle', $theme_name) === 1) { + if (at_get_setting('menu_toggle_menu_bar', $theme_name) === 1) { + if ($vars['block']->region === 'menu_bar') { + $vars['classes_array'][] = 'at-menu-toggle'; + } + } + + if (at_get_setting('menu_toggle_leaderboard', $theme_name) === 1 && $vars['block']->region === 'leaderboard') { + $vars['classes_array'][] = 'at-menu-toggle'; + $vars['classes_array'][] = 'clearfix'; + } + + if (at_get_setting('menu_toggle_header', $theme_name) === 1 && $vars['block']->region === 'header') { + $vars['classes_array'][] = 'at-menu-toggle'; + $vars['classes_array'][] = 'clearfix'; } - $vars['classes_array'][] = 'menu-wrapper'; - $vars['classes_array'][] = 'menu-bar-wrapper'; - $vars['classes_array'][] = 'clearfix'; } // Add extra classes if required @@ -468,8 +479,7 @@ function adaptivetheme_preprocess_block(&$vars) { // Give our block titles and content some additional class $vars['title_attributes_array']['class'][] = 'block-title'; - $vars['content_attributes_array']['class'][] = 'block-content'; - $vars['content_attributes_array']['class'][] = 'content'; + $vars['content_attributes_array']['class'] = array('block-content', 'content'); // Add Aria Roles via attributes switch ($vars['block']->module) { @@ -832,13 +842,30 @@ function adaptivetheme_preprocess_aggregator_item(&$vars) { * Preprocess variables for adaptivtheme_menubar() */ function adaptivetheme_preprocess_menubar(&$vars) { + global $theme_key; + $theme_name = $theme_key; + $type = $vars['type']; + // menu bar id $vars['menubar_id'] = $type . '-menu-bar'; // Add classes to the main wrapper $vars['classes_array'] = array('nav', 'clearfix'); + + // Classes for toggle menus + if (at_get_setting('enable_menu_toggle', $theme_name) === 1) { + if (at_get_setting('menu_toggle_main_menu', $theme_name) === 1 && $type === 'primary') { + $vars['classes_array'][] = 'at-menu-toggle'; + } + if (at_get_setting('menu_toggle_secondary_menu', $theme_name) === 1 && $type === 'secondary') { + $vars['classes_array'][] = 'at-menu-toggle'; + } + } + // Add classes to the inner wrapper - $vars['content_attributes_array']['class'] = array($type . '-menu-wrapper', 'menu-wrapper', 'clearfix'); + $vars['content_attributes_array']['class'][] = $type . '-menu-wrapper'; + $vars['content_attributes_array']['class'][] = 'menu-wrapper'; + $vars['content_attributes_array']['class'][] = 'clearfix'; // Set aria role $vars['content_attributes_array']['role'][] = 'navigation'; // Add suggstions per menu type diff --git a/at_core/inc/process.inc b/at_core/inc/process.inc index 4376c4dc0d60cd5a8fee75a67d6b7e55d95c2a3e..3f1c95e17080d264ec83131811d5786a1c7ef89f 100755 --- a/at_core/inc/process.inc +++ b/at_core/inc/process.inc @@ -158,6 +158,12 @@ function adaptivetheme_process_block(&$vars) { $vars['inner_suffix'] = ''; $vars['content_processed'] = $vars['content']; // remove the default wrapper } + // Navigation or menu blocks get special treatment in these regions + if ($vars['block']->region === 'leaderboard' || $vars['block']->region === 'header') { + if ($vars['tag'] == 'nav') { + $vars['content_processed'] = $vars['content']; // remove the default wrapper + } + } // Some blocks look bad with wrappers so we strip them if ($vars['block']->region === 'content') { @@ -170,6 +176,8 @@ function adaptivetheme_process_block(&$vars) { $vars['inner_suffix'] = ''; } + //dsm($vars); + // Provide additional suggestions so the block__menu suggestion can be overridden easily $vars['theme_hook_suggestions'][] = 'block__' . $vars['block']->region . '__' . $vars['block']->module; $vars['theme_hook_suggestions'][] = 'block__' . $vars['block']->region . '__' . $vars['block']->delta; diff --git a/at_core/inc/theme.inc b/at_core/inc/theme.inc index 93f8a0bf43219e1ea8bf0bfe7daa7cd567ddbb00..8ccc2701717381dabe5ee10609f83f2968179a70 100755 --- a/at_core/inc/theme.inc +++ b/at_core/inc/theme.inc @@ -43,7 +43,7 @@ function adaptivetheme_theme($existing, $type, $theme, $path) { */ function adaptivetheme_menubar($vars) { - dsm($vars); + //dsm($vars); $output = ''; $output .= '