Merge branch 'MDL-40732' of git://github.com/rwijaya/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 27 Aug 2013 07:06:38 +0000 (15:06 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 27 Aug 2013 07:06:38 +0000 (15:06 +0800)
mod/choice/lib.php
mod/choice/renderer.php
mod/choice/report.php
mod/choice/view.php

index 48368cf..a1772e8 100644 (file)
@@ -374,7 +374,7 @@ function prepare_choice_show_results($choice, $course, $cm, $allresponses, $forc
     $display->fullnamecapability = has_capability('moodle/site:viewfullnames', $context);
 
     if (empty($allresponses)) {
-        echo $OUTPUT->heading(get_string("nousersyet"));
+        echo $OUTPUT->heading(get_string("nousersyet"), 3, null);
         return false;
     }
 
index ccbb949..d3c5af0 100644 (file)
@@ -123,7 +123,7 @@ class mod_choice_renderer extends plugin_renderer_base {
     public function display_publish_name_vertical($choices) {
         global $PAGE;
         $html ='';
-        $html .= html_writer::tag('h2',format_string(get_string("responses", "choice")), array('class'=>'main'));
+        $html .= html_writer::tag('h3',format_string(get_string("responses", "choice")));
 
         $attributes = array('method'=>'POST');
         $attributes['action'] = new moodle_url($PAGE->url);
@@ -364,7 +364,7 @@ class mod_choice_renderer extends plugin_renderer_base {
         $truserpercentage = new html_table_row($rows['userpercentage']);
         $table->data = array($trgraph, $trusernumber, $truserpercentage);
 
-        $header = html_writer::tag('h2',format_string(get_string("responses", "choice")));
+        $header = html_writer::tag('h3',format_string(get_string("responses", "choice")));
         $html .= html_writer::tag('div', $header, array('class'=>'responseheader'));
         $html .= html_writer::tag('a', get_string('skipresultgraph', 'choice'), array('href'=>'#skipresultgraph', 'class'=>'skip-block'));
         $html .= html_writer::tag('div', html_writer::table($table), array('class'=>'response'));
@@ -460,7 +460,7 @@ class mod_choice_renderer extends plugin_renderer_base {
         $table->data = $rows;
 
         $html = '';
-        $header = html_writer::tag('h2',format_string(get_string("responses", "choice")));
+        $header = html_writer::tag('h3',format_string(get_string("responses", "choice")));
         $html .= html_writer::tag('div', $header, array('class'=>'responseheader'));
         $html .= html_writer::table($table);
 
index bd9ac97..3b470e6 100644 (file)
@@ -55,6 +55,7 @@
         $PAGE->set_title(format_string($choice->name).": $strresponses");
         $PAGE->set_heading($course->fullname);
         echo $OUTPUT->header();
+        echo $OUTPUT->heading($choice->name, 2, null);
         /// Check to see if groups are being used in this choice
         $groupmode = groups_get_activity_groupmode($cm);
         if ($groupmode) {
index 7999f8a..98ac22c 100644 (file)
             choice_user_submit_response($answer, $choice, $USER->id, $course, $cm);
         }
         echo $OUTPUT->header();
+        echo $OUTPUT->heading($choice->name, 2, null);
         echo $OUTPUT->notification(get_string('choicesaved', 'choice'),'notifysuccess');
     } else {
         echo $OUTPUT->header();
+        echo $OUTPUT->heading($choice->name, 2, null);
     }