mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-17 21:49:15 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'wip-MDL-43398-master' of git://github.com/marinaglancy/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2014-04-02 02:47:59 +02:00
commit b224448ac6
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mod/wiki/pagelib.php
View File

@ -1425,14 +1425,11 @@ class page_wiki_map extends page_wiki {
echo $this->wikioutput->menu_map($this->page->id, $this->view);
$this->print_index_content();
break;
case 5:
echo $this->wikioutput->menu_map($this->page->id, $this->view);
$this->print_page_list_content();
break;
case 6:
echo $this->wikioutput->menu_map($this->page->id, $this->view);
$this->print_updated_content();
break;
case 5:
default:
echo $this->wikioutput->menu_map($this->page->id, $this->view);
$this->print_page_list_content();

14
mod/wiki/renderer.php
View File

@ -344,7 +344,7 @@ 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);
echo $this->output->single_select($baseurl, $name, $options, $selected, null);
echo $this->output->container_end();
}
return;
@ -404,7 +404,7 @@ 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);
echo $this->output->single_select($baseurl, $name, $options, $selected, null);
echo $this->output->container_end();
return;
@ -451,7 +451,7 @@ 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);
echo $this->output->single_select($baseurl, $name, $options, $selected, null);
echo $this->output->container_end();
return;
@ -469,6 +469,10 @@ class mod_wiki_renderer extends plugin_renderer_base {
}
function menu_map($pageid, $currentselect) {
if (empty($currentselect)) {
// The wiki uses digit number to match the options and 5 is the default one.
$currentselect = 5;
}
$options = array('contributions', 'links', 'orphaned', 'pageindex', 'pagelist', 'updatedpages');
$items = array();
foreach ($options as $opt) {
@ -478,7 +482,7 @@ class mod_wiki_renderer extends plugin_renderer_base {
foreach ($items as $key => $item) {
$selectoptions[$key + 1] = $item;
}
$select = new single_select(new moodle_url('/mod/wiki/map.php', array('pageid' => $pageid)), 'option', $selectoptions, $currentselect);
$select = new single_select(new moodle_url('/mod/wiki/map.php', array('pageid' => $pageid)), 'option', $selectoptions, $currentselect, null);
$select->label = get_string('mapmenu', 'wiki') . ': ';
return $this->output->container($this->output->render($select), 'midpad');
}
@ -509,7 +513,7 @@ class mod_wiki_renderer extends plugin_renderer_base {
foreach ($items as $key => $item) {
$selectoptions[$key + 1] = $item;
}
$select = new single_select(new moodle_url('/mod/wiki/admin.php', array('pageid' => $pageid)), 'option', $selectoptions, $currentselect);
$select = new single_select(new moodle_url('/mod/wiki/admin.php', array('pageid' => $pageid)), 'option', $selectoptions, $currentselect, null);
$select->label = get_string('adminmenu', 'wiki') . ': ';
return $this->output->container($this->output->render($select), 'midpad');
}