mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-02-13 12:34:28 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Aparup Banerjee 2012-01-24 22:57:24 +08:00
commit f37b3defb1
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
blocks/navigation/renderer.php
View File

@ -30,12 +30,14 @@ class block_navigation_renderer extends plugin_renderer_base {
$isexpandable = (empty($expansionlimit) || ($item->type > navigation_node::TYPE_ACTIVITY || $item->type < $expansionlimit) || ($item->contains_active_node() && $item->children->count() > 0)); $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))); $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) { if ($hasicon) {
$icon = $this->output->render($item->icon); $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) { if ($item->helpbutton !== null) {
$content = trim($item->helpbutton).html_writer::tag('span', $content, array('class'=>'clearhelpbutton')); $content = trim($item->helpbutton).html_writer::tag('span', $content, array('class'=>'clearhelpbutton'));
} }
@ -57,6 +59,7 @@ class block_navigation_renderer extends plugin_renderer_base {
} else if ($item->action instanceof action_link) { } else if ($item->action instanceof action_link) {
//TODO: to be replaced with something else //TODO: to be replaced with something else
$link = $item->action; $link = $item->action;
$link->text = $icon.$link->text;
$link->attributes = array_merge($link->attributes, $attributes); $link->attributes = array_merge($link->attributes, $attributes);
$content = $this->output->render($link); $content = $this->output->render($link);
$linkrendered = true; $linkrendered = true;