mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

navigation MDL-14632 Added title tags for navigation items that are trimmed but do not have an action

Browse Source
This commit is contained in:
samhemelryk 2009-09-09 06:16:09 +00:00
parent 4ba3169d21
commit 0a8e8b6fd8
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/navigationlib.php
View File

@ -371,26 +371,34 @@ class navigation_node {
return '';
}
if ($shorttext && $this->shorttext!==null) {
$content = s($this->shorttext);
$content = clean_text($this->shorttext);
} else {
$content = s($this->text);
$content = clean_text($this->text);
}
$title = '';
if ($this->forcetitle || ($this->shorttext!==null && $this->title !== $this->shorttext) || $this->title !== $this->text) {
$title = $this->title;
}
if ($content != '' && ((is_object($this->action) && $this->action instanceof moodle_url) || is_string($this->action))) {
$link = new html_link();
if ($this->forcetitle || ($this->shorttext!==null && $this->title !== $this->shorttext) || $this->title !== $this->text) {
$link->title = $this->title;
if ($title !== '') {
$link->title = $title;
}
if ($this->hidden) {
$link->add_class('dimmed');
}
$link->url = $this->action;
$link->text = $content;
$link->text = clean_text($content);
$content = $OUTPUT->link($link);
} else {
if ($title !== '') {
$title = ' title="'.s($title).'"';
}
if ($this->hidden) {
$content = sprintf('<span class="dimmed_text">%s</span>', $content);
$content = sprintf('<span class="dimmed_text"%s>%s</span>', $title, clean_text($content));
} else {
$content = sprintf('<span>%s</span>', $content);
$content = sprintf('<span%s>%s</span>', $title, clean_text($content));
}
}
if ($this->icon!==null) {
@ -947,7 +955,7 @@ class global_navigation extends navigation_node {
$this->add_to_path($keys, $module->id, $module->name, $module->name, $type, $url, $icon);
$child = $this->find_child($module->id, $type);
if ($child != false) {
$child->title(get_string($module->modname, $module->modname));
$child->title(get_string('modulename', $module->modname));
if ($type==navigation_node::TYPE_ACTIVITY && $this->module_extends_navigation($module->modname)) {
$child->nodetype = self::NODETYPE_BRANCH;
}
@ -1011,7 +1019,7 @@ class global_navigation extends navigation_node {
$this->add_to_path($path, $module->id, $module->name, $module->name, $type, $url, $icon);
$child = $this->find_child($module->id, $type);
if ($child != false) {
$child->title(get_string($module->modname, $module->modname));
$child->title(get_string('modulename', $module->modname));
if (!$module->visible) {
$child->hidden = true;
}
@ -1721,7 +1729,7 @@ class limited_global_navigation extends global_navigation {
$this->add_to_path($keys, $module->id, $module->name, $module->name, $type, $url, $icon);
$child = $this->find_child($module->id, $type);
if ($child != false) {
$child->title(get_string($module->modname, $module->modname));
$child->title(get_string('modulename', $module->modname));
if (!$module->visible) {
$child->hidden = true;
}