Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

MDL-31224 block_navigation: Fixed display of icons for node with an a…

…ction_link action
  • Loading branch information...
commit ac41de66971768b25ab97c29db7f53e21fda5918 1 parent 269c884
@samhemelryk samhemelryk authored
Showing with 5 additions and 2 deletions.
  1. +5 −2 blocks/navigation/renderer.php
View
7 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;
Please sign in to comment.
Something went wrong with that request. Please try again.