Commit a05cae62 authored by Riccardo Padovani's avatar Riccardo Padovani

Removed annonying warnings

parent 8f436be1
This diff is collapsed.
...@@ -157,13 +157,20 @@ function valencia_preprocess_html( &$variables ) { ...@@ -157,13 +157,20 @@ function valencia_preprocess_html( &$variables ) {
* *
*/ */
function valencia_preprocess_page( &$vars ) { function valencia_preprocess_page( &$vars ) {
// Get the entire main menu tree // Remove the title from all pages but news
$main_menu_tree = menu_tree_all_data('main-menu'); if (isset($vars['node'])) {
// and add the active trail if ($vars['node']->type !== 'blog') {
menu_tree_add_active_path($main_menu_tree); $vars['title'] = '';
}
// Add the rendered output to menu }
$vars['valencia_menu'] = menu_tree_output($main_menu_tree);
// Get the entire main menu tree
$main_menu_tree = menu_tree_page_data('main-menu');
// and add the active trail
menu_tree_add_active_path($main_menu_tree);
// Add the rendered output to menu
$vars['valencia_menu'] = menu_tree_output($main_menu_tree);
} }
/** /**
......
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
<div id="content" class="column"><div class="section"> <div id="content" class="column"><div class="section">
<a id="main-content"></a> <a id="main-content"></a>
<?php if ($title && $node->type === 'blog'): ?><h1 class="row" id="page-title"><?php print $title; ?></h1><?php endif; ?> <?php if ($title): ?><h1 class="row" id="page-title"><?php print $title; ?></h1><?php endif; ?>
<?php if ($tabs): ?><div class="tabs"><?php print render($tabs); ?></div><?php endif; ?> <?php if ($tabs): ?><div class="tabs"><?php print render($tabs); ?></div><?php endif; ?>
<?php print render($page['help']); ?> <?php print render($page['help']); ?>
<?php if ($action_links): ?><ul class="action-links"><?php print render($action_links); ?></ul><?php endif; ?> <?php if ($action_links): ?><ul class="action-links"><?php print render($action_links); ?></ul><?php endif; ?>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment