moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 01:16:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-48542-master' of git://github.com/jethac/moodle

Browse source
This commit is contained in:
Andrew Nicols 2015-01-28 12:02:28 +08:00
commit 0977d3d404
4 changed files with 127 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

58
lib/outputrenderers.php
View file

@ -3067,28 +3067,44 @@ EOD;
$navitemcount = count($opts->navitems);
$idx = 0;
foreach ($opts->navitems as $key => $value) {
$pix = null;
if (isset($value->pix) && !empty($value->pix)) {
$pix = new pix_icon($value->pix, $value->title, null, array('class' => 'iconsmall'));
} else if (isset($value->imgsrc) && !empty($value->imgsrc)) {
$value->title = html_writer::img(
$value->imgsrc,
$value->title,
array('class' => 'iconsmall')
) . $value->title;
}
$al = new action_menu_link_secondary(
$value->url,
$pix,
$value->title,
array('class' => 'icon')
);
$am->add($al);
// Add dividers after the first item and before the
// last item.
if ($idx == 0 || $idx == $navitemcount - 2) {
$am->add($divider);
switch ($value->itemtype) {
case 'divider':
// If the nav item is a divider, add one and skip link processing.
$am->add($divider);
$idx++;
break;
case 'invalid':
// Silently skip invalid entries (should we post a notification?).
break;
case 'link':
// Process this as a link item.
$pix = null;
if (isset($value->pix) && !empty($value->pix)) {
$pix = new pix_icon($value->pix, $value->title, null, array('class' => 'iconsmall'));
} else if (isset($value->imgsrc) && !empty($value->imgsrc)) {
$value->title = html_writer::img(
$value->imgsrc,
$value->title,
array('class' => 'iconsmall')
) . $value->title;
}
$al = new action_menu_link_secondary(
$value->url,
$pix,
$value->title,
array('class' => 'icon')
);
$am->add($al);
// Add dividers after the first item and before the
// last item.
if ($idx == 0 || $idx == $navitemcount - 2) {
$am->add($divider);
}
break;
}
$idx++;

69
lib/tests/user_menu_test.php Normal file
View file

@ -0,0 +1,69 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Tests user menu functionality.
*
* @package core
* @copyright 2015 Jetha Chan <jetha@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class core_user_menu_testcase extends advanced_testcase {
public function test_custom_user_menu() {
global $CFG, $OUTPUT, $USER, $PAGE;
$this->resetAfterTest(true);
$this->expectOutputString('');
// Test using an admin user at the root of Moodle; this way we
// don't have to create a test user with avatar.
$this->setAdminUser();
$PAGE->set_url('/');
// Build a test string for the custom user menu items setting.
$usermenuitems = 'messages,message|/message/index.php|message
myfiles,moodle|/user/files.php|download
###
mybadges,badges|/badges/mybadges.php|award
-|-|-
test
-
#####
#f234|2';
set_config('customusermenuitems', $usermenuitems);
// Fail the test and dump output if an exception is thrown
// during user menu creation.
$valid = true;
try {
$usermenu = $OUTPUT->user_menu($USER);
} catch (moodle_exception $me) {
$valid = false;
printf(
"[%s] %s: %s\n%s\n",
$me->module,
$me->errorcode,
$me->message,
$me->debuginfo
);
}
$this->assertTrue($valid);
}
}