Merge branch 'MDL-61040-34' of git://github.com/junpataleta/moodle into MOODLE_34_STABLE
This commit is contained in:
@@ -93,7 +93,7 @@ class mod_choice_renderer extends plugin_renderer_base {
|
||||
if (!empty($options['allowupdate']) && ($options['allowupdate'])) {
|
||||
$url = new moodle_url('view.php',
|
||||
array('id' => $coursemoduleid, 'action' => 'delchoice', 'sesskey' => sesskey()));
|
||||
$html .= html_writer::link($url, get_string('removemychoice', 'choice'));
|
||||
$html .= html_writer::link($url, get_string('removemychoice', 'choice'), array('class' => 'm-l-1'));
|
||||
}
|
||||
} else {
|
||||
$html .= html_writer::tag('label', get_string('havetologin', 'choice'));
|
||||
|
||||
+2
-1
@@ -203,7 +203,8 @@ if (!$choiceformshown) {
|
||||
if (choice_can_view_results($choice, $current, $choiceopen)) {
|
||||
$results = prepare_choice_show_results($choice, $course, $cm, $allresponses);
|
||||
$renderer = $PAGE->get_renderer('mod_choice');
|
||||
echo $renderer->display_result($results);
|
||||
$resultstable = $renderer->display_result($results);
|
||||
echo $OUTPUT->box($resultstable);
|
||||
|
||||
} else if (!$choiceformshown) {
|
||||
echo $OUTPUT->box(get_string('noresultsviewable', 'choice'));
|
||||
|
||||
Reference in New Issue
Block a user