Merge branch 'MDL-56846-master' of git://github.com/damyon/moodle

This commit is contained in:
Andrew Nicols 2016-11-15 08:05:54 +08:00 committed by Dan Poltawski
commit 2fd423721f
4 changed files with 5 additions and 12 deletions

View File

@ -627,11 +627,11 @@ function survey_print_single($question) {
if ($question->type == 0) { // Plain text field
echo "<textarea rows=\"3\" cols=\"30\" name=\"q$question->id\" id=\"q$question->id\">$question->options</textarea>";
echo "<textarea rows=\"3\" cols=\"30\" class=\"form-control\" name=\"q$question->id\" id=\"q$question->id\">$question->options</textarea>";
} else if ($question->type > 0) { // Choose one of a number
$strchoose = get_string("choose");
echo "<select name=\"q$question->id\" id=\"q$question->id\">";
echo "<select name=\"q$question->id\" id=\"q$question->id\" class=\"custom-select\">";
echo "<option value=\"0\" selected=\"selected\">$strchoose...</option>";
$options = explode( ",", $question->options);
foreach ($options as $key => $val) {

View File

@ -472,14 +472,14 @@
echo "<form action=\"report.php\" method=\"post\">";
echo "<h3>$strnotes:</h3>";
echo "<blockquote>";
echo "<textarea name=\"notes\" rows=\"10\" cols=\"60\">";
echo "<textarea class=\"form-control\" name=\"notes\" rows=\"10\" cols=\"60\">";
p($notes);
echo "</textarea><br />";
echo "<input type=\"hidden\" name=\"action\" value=\"student\" />";
echo "<input type=\"hidden\" name=\"sesskey\" value=\"".sesskey()."\" />";
echo "<input type=\"hidden\" name=\"student\" value=\"$student\" />";
echo "<input type=\"hidden\" name=\"id\" value=\"$cm->id\" />";
echo "<input type=\"submit\" value=\"".get_string("savechanges")."\" />";
echo "<input type=\"submit\" class=\"btn btn-primary\" value=\"".get_string("savechanges")."\" />";
echo "</blockquote>";
echo "</form>";
echo "</div>";

View File

@ -191,7 +191,7 @@ $PAGE->requires->string_for_js('questionsnotanswered', 'survey');
$PAGE->requires->js_init_call('M.mod_survey.init', $checkarray, true, $module);
echo '<br />';
echo '<input type="submit" value="'.get_string("clicktocontinue", "survey").'" />';
echo '<input type="submit" class="btn btn-primary" value="'.get_string("clicktocontinue", "survey").'" />';
echo '</div>';
echo "</form>";

View File

@ -266,13 +266,6 @@ div#dock {
}
}
.resultgraph,
.reportsummary,
.studentreport,
.reportbuttons,
.centerpara {
text-align: center;
}
}
.nav .caret {