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

This commit is contained in:
Andrew Nicols
2016-11-02 15:34:06 +08:00
3 changed files with 5 additions and 14 deletions
-1
View File
@@ -111,7 +111,6 @@ class mod_feedback_complete_form extends moodleform {
array('class' => 'form-submit'));
$buttonarray[] = &$mform->createElement('submit', 'savevalues', get_string('save_entries', 'feedback'),
array('class' => 'form-submit'));
$buttonarray[] = &$mform->createElement('static', 'buttonsseparator', '', '<br>');
$buttonarray[] = &$mform->createElement('cancel');
$mform->addGroup($buttonarray, 'buttonar', '', array(' '), false);
$mform->closeHeaderBefore('buttonar');
+1 -2
View File
@@ -120,8 +120,7 @@ class feedback_edit_create_template_form extends moodleform {
if (has_capability('mod/feedback:createpublictemplate', context_system::instance())) {
$elementgroup[] = $mform->createElement('checkbox',
'ispublic',
get_string('public', 'feedback'),
'ispublic', '',
get_string('public', 'feedback'));
}
+4 -11
View File
@@ -10,20 +10,13 @@ select {
}
// Feedback module
.path-mod-feedback .feedback_form .col-md-9,
.path-mod-feedback .feedback_form .col-md-3,
.path-mod-feedback .feedback_form .col-md-3 label {
width: 100%;
}
.path-mod-feedback .feedback_form .col-md-9 {
margin-left: 1rem;
margin-bottom: -2rem;
}
.path-mod-feedback .itemactions {
float: right;
}
.path-mod-feedback .itemhandle {
position: absolute;
right: 1rem;
}
// Forum module