Kaynağa Gözat

style css for select question - refs BT#12685

Conflicts:
	main/exercise/exercise_submit.php
Alex Aragon 7 yıl önce
ebeveyn
işleme
58bbfe7ec3

+ 27 - 2
app/Resources/public/css/themes/rainbow/default.css

@@ -739,14 +739,27 @@ legend{
     padding-bottom: 10px;
     color: #162a83;
 }
-.btn-exercise{
+.btn-exercise,
+.form-actions .btn-warning{
     background-color: #84bd00;
     border-color: #84bd00;
     border-radius: 0;
     font-weight: bold;
     font-size: 12px;
 }
-.btn-exercise:hover{
+.btn-exercise:hover,
+.form-actions .btn-warning:hover{
+    background-color: #772583;
+    border-color: #772583;
+}
+.form-actions .btn-info{
+    background-color: #162A83;
+    border-color: #162A83;
+    border-radius: 0;
+    font-weight: bold;
+    font-size: 12px;
+}
+.form-actions .btn-info:hover{
     background-color: #772583;
     border-color: #772583;
 }
@@ -773,6 +786,18 @@ legend{
 .mejs-container.mejs-audio .mejs-controls{
     background: rgba(255,255,255,0.45)
 }
+#exercise-description.panel-default{
+    color: #162A83;
+}
+#exercise-description.panel-default{
+    border: none;
+}
+#exercise-description.panel-default .panel-heading{
+    background: none;
+}
+.bootstrap-select:not([class*=col-]):not([class*=form-control]):not(.input-group-btn){
+    width: 350px;
+}
 /* Large desktop */
 @media (min-width: 1200px) {
 

+ 14 - 13
main/exercise/exercise_submit.php

@@ -1284,7 +1284,7 @@ if (!empty($error)) {
             $remind_highlight = 'no_remind_highlight';
         }
 
-        $exercise_actions = '';
+        $btnExercise = '';
         $is_remind_on = false;
 
         $attributes = array('id' =>'remind_list['.$questionId.']');
@@ -1297,7 +1297,7 @@ if (!empty($error)) {
 
         // Showing the exercise description
         if (!empty($objExercise->description)) {
-            if ($objExercise->type == ONE_PER_PAGE || ($objExercise->type != ONE_PER_PAGE && $i == 1)) {
+            if ($objExercise->type == ONE_PER_PAGE || ($objExercise->type != ONE_PER_PAGE && $i == 1)) {               
                 echo Display::panelCollapse('<span>'.
                     get_lang('ExerciseDescriptionLabel').'</span>',
                     $objExercise->description,
@@ -1305,7 +1305,7 @@ if (!empty($error)) {
                     [],
                     'description',
                     'exercise-collapse',
-                    false,
+                    true,
                     true
                 );
             }
@@ -1331,7 +1331,7 @@ if (!empty($error)) {
         // Button save and continue
         switch ($objExercise->type) {
             case ONE_PER_PAGE:
-                $exercise_actions .= $objExercise->show_button($questionId, $current_question);
+                $btnExercise .= $objExercise->show_button($questionId, $current_question);
                 break;
             case ALL_ON_ONE_PAGE :
                 $button = [
@@ -1342,10 +1342,7 @@ if (!empty($error)) {
                     ),
                     '<span id="save_for_now_'.$questionId.'"></span>&nbsp;'
                 ];
-                $exercise_actions .= Display::div(
-                    implode(PHP_EOL, $button),
-                    array('class'=>'exercise_save_now_button')
-                );
+                $btnExercise .= implode(PHP_EOL, $button);
                 break;
         }
 
@@ -1364,9 +1361,9 @@ if (!empty($error)) {
                     'for' => 'remind_list['.$questionId.']'
                 )
             );
-            $exercise_actions .= Display::div($remind_question_div, array('class'=>'exercise_save_now_button'));
+            $btnExercise .= Display::div($remind_question_div, array('class'=>'exercise_save_now_button'));
         }
-        echo Display::div($exercise_actions, array('class'=>'form-actions'));
+        //echo $exercise_actions;
         echo '</div>';
 
         $i++;
@@ -1377,10 +1374,14 @@ if (!empty($error)) {
         }
     }
     // end foreach()
+    $endExercise = '';
     if ($objExercise->type == ALL_ON_ONE_PAGE) {
-        $exercise_actions = $objExercise->show_button($questionId, $current_question);
-        echo Display::div($exercise_actions, array('class'=>'exercise_actions'));
-        echo '<br>';
+// modifier dans 1.11.x et non conservé pour OFAJ
+//        $exercise_actions = $objExercise->show_button($questionId, $current_question);
+//        echo Display::div($exercise_actions, array('class'=>'exercise_actions'));
+//        echo '<br>';
+    	$endExercise = $objExercise->show_button($questionId, $current_question);
+        echo '<div class="form-actions">'.$endExercise.$btnExercise.'</div>';
     }
     echo '</form>';