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-30843_b' of git://github.com/rwijaya/moodle

Browse source
This commit is contained in:
Sam Hemelryk 2012-04-10 12:34:37 +12:00
commit 5bfeb5ffd3
108 changed files with 390 additions and 216 deletions
Download patch file Download diff file Expand all files Collapse all files

3
mod/wiki/editors/wikieditor.php
View file

@ -120,7 +120,8 @@ class MoodleQuickForm_wikieditor extends MoodleQuickForm_textarea {
$html .= html_writer::empty_tag('img', array('alt' => $button[1], 'src' => $CFG->wwwroot . '/mod/wiki/editors/wiki/images/' . $button[0]));
$html .= "</a>";
}
$html .= "<select onchange=\"insertTags('{$imagetag[0]}', '{$imagetag[1]}', this.value)\">";
$html .= "<label class='accesshide' for='addtags'>" . get_string('add') . ' ' . get_string('tags') . "</label>";
$html .= "<select id='addtags' onchange=\"insertTags('{$imagetag[0]}', '{$imagetag[1]}', this.value)\">";
$html .= "<option value='" . s(get_string('wikiimage', 'wiki')) . "'>" . get_string('insertimage', 'wiki') . '</option>';
foreach ($this->files as $filename) {
$html .= "<option value='".s($filename)."'>";

9
mod/wiki/renderer.php
View file

@ -346,7 +346,8 @@ class mod_wiki_renderer extends plugin_renderer_base {
$baseurl->params($params);
$name = 'uid';
$selected = $subwiki->userid;
echo $this->output->single_select($baseurl, $name, $options, $selected);
$label = get_accesshide(get_string('user'));
echo $this->output->single_select($baseurl, $name, $options, $selected, $label);
echo $this->output->container_end();
}
return;
@ -403,7 +404,8 @@ class mod_wiki_renderer extends plugin_renderer_base {
$baseurl->params($params);
$name = 'groupanduser';
$selected = $subwiki->groupid . '-' . $subwiki->userid;
echo $this->output->single_select($baseurl, $name, $options, $selected);
$label = get_accesshide(get_string('group'));
echo $this->output->single_select($baseurl, $name, $options, $selected, $label);
echo $this->output->container_end();
return;
@ -450,7 +452,8 @@ class mod_wiki_renderer extends plugin_renderer_base {
$baseurl->params($params);
$name = 'groupanduser';
$selected = $subwiki->groupid . '-' . $subwiki->userid;
echo $this->output->single_select($baseurl, $name, $options, $selected);
$label = get_accesshide(get_string('user'));
echo $this->output->single_select($baseurl, $name, $options, $selected, $label);
echo $this->output->container_end();
return;