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

Merge branch 'MDL-32294-master' of git://github.com/FMCorz/moodle

Browse source
This commit is contained in:
Dan Poltawski 2012-10-16 10:41:24 +08:00
commit 0651778e95
2 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
course/lib.php
View file

@ -1766,6 +1766,9 @@ function print_section_add_menus($course, $section, $modnames = null, $vertical=
$straddactivity = get_string('addactivity');
$straddresource = get_string('addresource');
$sectionname = get_section_name($course, $section);
$strresourcelabel = get_string('addresourcetosection', null, $sectionname);
$stractivitylabel = get_string('addactivitytosection', null, $sectionname);
$output = html_writer::start_tag('div', array('class' => 'section_add_menus', 'id' => 'add_menus-section-' . $section));
@ -1776,12 +1779,14 @@ function print_section_add_menus($course, $section, $modnames = null, $vertical=
if (!empty($resources)) {
$select = new url_select($resources, '', array(''=>$straddresource), "ressection$section");
$select->set_help_icon('resources');
$select->set_label($strresourcelabel, array('class' => 'accesshide'));
$output .= $OUTPUT->render($select);
}
if (!empty($activities)) {
$select = new url_select($activities, '', array(''=>$straddactivity), "section$section");
$select->set_help_icon('activities');
$select->set_label($stractivitylabel, array('class' => 'accesshide'));
$output .= $OUTPUT->render($select);
}

2
lang/en/moodle.php
View file

@ -43,6 +43,7 @@ $string['activitysince'] = 'Activity since {$a}';
$string['activityweighted'] = 'Activity per user';
$string['add'] = 'Add';
$string['addactivity'] = 'Add an activity...';
$string['addactivitytosection'] = 'Add an activity to section \'{$a}\'';
$string['addadmin'] = 'Add admin';
$string['addblock'] = 'Add a block';
$string['addcomment'] = 'Add a comment...';
@ -67,6 +68,7 @@ $string['addnousersrecip'] = 'Add users who haven\'t accessed this {$a} to recip
$string['addpagehere'] = 'Add page here';
$string['addresource'] = 'Add a resource...';
$string['addresourceoractivity'] = 'Add an activity or resource';
$string['addresourcetosection'] = 'Add a resource to section \'{$a}\'';
$string['address'] = 'Address';
$string['addstudent'] = 'Add student';
$string['addsubcategory'] = 'Add a sub-category';