Merge pull request #1168 from aragonc/1.10.x

1.10.x fix question review and actions bar add class

app/Resources/public/css/base.css

@@ -2111,17 +2111,29 @@ div.admin_section h4 {
 .ribbon .success {
     color: green;
 }
-
 .exercise_save_now_button img {
     position: relative;
     top: 4px;
 }
-
 .exercise_save_now_button {
-    margin-top:10px;
+    padding-left: 25px;
 }
-.exercise_save_now_button, .exercise_button{
-    /* padding:5px; */
+.exercise_save_now_button .checkbox input[type="checkbox"]{
+    margin-left: -25px;
+}
+.question-check-test{
+    padding-left: 35px;
+    margin-bottom: 35px;
+}
+.question-check-test label{
+    font-weight: normal;
+}
+.question-check-test .checkbox input[type="checkbox"]{
+    margin-left: -25px;
+}
+.form-actions{
+  margin-top: 20px;
+  margin-bottom: 25px;
 }
 /* Exercise clock*/
 .count_down{
@@ -4144,6 +4156,9 @@ i.size-32.icon-new-work{
     display:block;
     width: 100%;
 }
+.actions #groups .bootstrap-select{
+    width: 300px;
+}
 ul.holder{
   list-style: none;
   margin: 0;

main/exercice/exercise_reminder.php

@@ -236,7 +236,7 @@ foreach ($question_list as $questionId) {
     $table            .= Display::div($question_title, array('class'=>'exercise_reminder_item'));
 } // end foreach() block that loops over all questions
 
-echo Display::div($table, array('class'=>'span10'));
+echo Display::div($table, array('class'=>'question-check-test'));
 
 $exercise_actions = Display::url(get_lang('EndTest'), 'javascript://', array('onclick'=>'final_submit();', 'class'=>'btn btn-warning'));
 $exercise_actions .=  ' '.Display::url(get_lang('ReviewQuestions'), 'javascript://', array('onclick'=>'review_questions();','class'=>'btn btn-success'));

main/user/class.php

@@ -37,15 +37,16 @@ $(document).ready( function() {
 });
 </script>';
 
-$actions = '';
+$actionsLeft = '';
+$actionsRight = '';
 $usergroup = new UserGroup();
 if (api_is_allowed_to_edit()) {
-    $actions .= '<div class="actions">';
+    
     if ($type == 'registered') {
-        $actions .= '<a href="class.php?'.api_get_cidreq().'&type=not_registered">'.
+        $actionsLeft .= '<a href="class.php?'.api_get_cidreq().'&type=not_registered">'.
             Display::return_icon('add-class.png', get_lang("AddClassesToACourse"), array(), ICON_SIZE_MEDIUM).'</a>';
     } else {
-        $actions .= '<a href="class.php?'.api_get_cidreq().'&type=registered">'.
+        $actionsLeft .= '<a href="class.php?'.api_get_cidreq().'&type=registered">'.
             Display::return_icon('back.png', get_lang("Classes"), array(), ICON_SIZE_MEDIUM).'</a>';
 
         $form = new FormValidator('groups', 'post', api_get_self(), '', '', FormValidator::LAYOUT_INLINE);
@@ -56,9 +57,11 @@ if (api_is_allowed_to_edit()) {
         ];
         $form->addSelect('group_filter', get_lang('Groups'), $options, ['id' => 'group_filter']);
         $form->setDefaults(['group_filter' => $groupFilter]);
-        $actions .= $form->returnForm();
+        $actionsRight = $form->returnForm();
     }
-    $actions .= '</div>';
+    
+    
+    $actions .= Display::toolbarAction('actions-class', array(0=>$actionsLeft, 1=> $actionsRight));
 }
 
 if (api_is_allowed_to_edit()) {