Skip to content
Permalink
Browse files

Merge branch 'wip-MDL-31224-m23' of git://github.com/samhemelryk/moodle

  • Loading branch information...
Aparup Banerjee
Aparup Banerjee committed Jan 24, 2012
2 parents 3dd00d7 + 13915f8 commit f37b3defb187774b1d29553331765495870ecb7a
Showing with 5 additions and 2 deletions.
  1. +5 −2 blocks/navigation/renderer.php
@@ -30,12 +30,14 @@ protected function navigation_node($items, $attrs=array(), $expansionlimit=null,
$isexpandable = (empty($expansionlimit) || ($item->type > navigation_node::TYPE_ACTIVITY || $item->type < $expansionlimit) || ($item->contains_active_node() && $item->children->count() > 0));
$isbranch = $isexpandable && ($item->children->count() > 0 || ($item->has_children() && (isloggedin() || $item->type <= navigation_node::TYPE_CATEGORY)));
$hasicon = ((!$isbranch || $item->type == navigation_node::TYPE_ACTIVITY )&& $item->icon instanceof renderable);
$hasicon = ((!$isbranch || $item->type == navigation_node::TYPE_ACTIVITY || $item->type == navigation_node::TYPE_RESOURCE) && $item->icon instanceof renderable);
if ($hasicon) {
$icon = $this->output->render($item->icon);
$content = $icon.$content; // use CSS for spacing of icons
} else {
$icon = '';
}
$content = $icon.$content; // use CSS for spacing of icons
if ($item->helpbutton !== null) {
$content = trim($item->helpbutton).html_writer::tag('span', $content, array('class'=>'clearhelpbutton'));
}
@@ -57,6 +59,7 @@ protected function navigation_node($items, $attrs=array(), $expansionlimit=null,
} else if ($item->action instanceof action_link) {
//TODO: to be replaced with something else
$link = $item->action;
$link->text = $icon.$link->text;
$link->attributes = array_merge($link->attributes, $attributes);
$content = $this->output->render($link);
$linkrendered = true;

0 comments on commit f37b3de

Please sign in to comment.
You can’t perform that action at this time.