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

diff --git a/mod/feedback/classes/complete_form.php b/mod/feedback/classes/complete_form.php
index 48a0b6a..aef9e21 100644 (file)
--- a/mod/feedback/classes/complete_form.php
+++ b/mod/feedback/classes/complete_form.php
@@ -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');

diff --git a/mod/feedback/edit_form.php b/mod/feedback/edit_form.php
index 4d81cb8..586d266 100644 (file)
--- a/mod/feedback/edit_form.php
+++ b/mod/feedback/edit_form.php
@@ -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'));
         }
 

diff --git a/theme/boost/scss/moodle/modules.scss b/theme/boost/scss/moodle/modules.scss
index 37e93f0..bc59ec3 100644 (file)
--- a/theme/boost/scss/moodle/modules.scss
+++ b/theme/boost/scss/moodle/modules.scss
@@ -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