Commit 65571785 authored by Riccardo Padovani's avatar Riccardo Padovani

Updated valencia functions to manage breadcrumb due change in Drupal API - Fixed issue #5

parent af036d8c
...@@ -170,7 +170,7 @@ function valencia_links__system_main_menu($vars) { ...@@ -170,7 +170,7 @@ function valencia_links__system_main_menu($vars) {
case 'subheader': case 'subheader':
return valencia_subheader_menu($vars); return valencia_subheader_menu($vars);
case 'breadcrumb': case 'breadcrumb':
return valencia_breadcrumb($vars); return valencia_breadcrumb_menu($vars);
case 'footer': case 'footer':
return valencia_footer_menu($vars); return valencia_footer_menu($vars);
} }
...@@ -235,7 +235,7 @@ function valencia_subheader_menu($vars) { ...@@ -235,7 +235,7 @@ function valencia_subheader_menu($vars) {
* Breadcrumb is printed only on page with deep level > 1 * Breadcrumb is printed only on page with deep level > 1
* Also, if there is, we print third level menu * Also, if there is, we print third level menu
*/ */
function valencia_breadcrumb($vars) { function valencia_breadcrumb_menu($vars) {
// Var with all HTML // Var with all HTML
$html = ''; $html = '';
...@@ -305,7 +305,7 @@ function valencia_breadcrumb($vars) { ...@@ -305,7 +305,7 @@ function valencia_breadcrumb($vars) {
* Create third level menu html * Create third level menu html
* Follows http://design.ubuntu.com/web-style-guide/scaffolding#navigation * Follows http://design.ubuntu.com/web-style-guide/scaffolding#navigation
* *
* Don't call this function directly, is only for valencia_breadcrumb() * Don't call this function directly, is only for valencia_breadcrumb_menu()
* *
* Return an array: the first element is a bool that indicate if there is an * Return an array: the first element is a bool that indicate if there is an
* active link, the second element is the html of third level menu * active link, the second element is the html of third level menu
......
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
* site, if they have been configured. * site, if they have been configured.
* - $secondary_menu (array): An array containing the Secondary menu links for * - $secondary_menu (array): An array containing the Secondary menu links for
* the site, if they have been configured. * the site, if they have been configured.
* - $breadcrumb: The breadcrumb trail for the current page.
* *
* Page content (in order of occurrence in the default page.tpl.php): * Page content (in order of occurrence in the default page.tpl.php):
* - $title_prefix (array): An array containing additional output populated by * - $title_prefix (array): An array containing additional output populated by
...@@ -116,15 +115,12 @@ ...@@ -116,15 +115,12 @@
<?php print $messages; // Error messages ?> <?php print $messages; // Error messages ?>
<?php if ($breadcrumb): ?> <nav role="navigation" class="nav-secondary clearfix">
<nav role="navigation" class="nav-secondary clearfix"> <?php print theme('links__system_main_menu', array(
<?php print theme('links__system_main_menu', array( 'links' => $valencia_menu,
'links' => $valencia_menu, 'id' => 'breadcrumb'
'id' => 'breadcrumb' ));?>
));?> </nav>
</nav>
<?php endif; ?>
<div id="main-wrapper"><div id="main" class="clearfix"> <div id="main-wrapper"><div id="main" class="clearfix">
......
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