Display: Exercise: fix panels for question list - refs BT#22276

chamilo · Feb 12, 2025 · df25d3a · df25d3a
1 parent 887bdf7
commit df25d3a
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 27 deletions.
diff --git a/public/main/admin/questions.php b/public/main/admin/questions.php
@@ -255,7 +255,7 @@
         $exerciseId = 0;
         if (!empty($questionObject->exerciseList)) {
             // Question exists in a valid exercise
-            $exerciseData .= get_lang('Tests').'<br />';
+            $exerciseData .= '<p><strong>'.get_lang('Tests').'</strong></p>';
             foreach ($questionObject->exerciseList as $exerciseId) {
                 $exercise = new Exercise($courseId);
                 $exercise->course_id = $courseId;
@@ -283,7 +283,7 @@
             if ($questionObject->getCountExercise() > 0) {
                 $exerciseList = $questionObject->getExerciseListWhereQuestionExists();
                 if (!empty($exerciseList)) {
-                    $question->questionData .= '<br />'.get_lang('Tests').'<br />';
+                    $question->questionData .= '<p><strong>'.get_lang('Tests').'</strong></p>';
                     /** @var CQuiz $exercise */
                     foreach ($exerciseList as $exercise) {
                         $question->questionData .= $exercise->getTitle();
@@ -311,7 +311,7 @@
                 ['target' => '_blank']
             );
         }
-        $question->questionData .= '<div class="pull-right">'.Display::url(
+        $question->questionData .= '<div class="float-right">'.Display::url(
             get_lang('Delete'),
             $deleteUrl,
             [

diff --git a/src/CoreBundle/Resources/views/Macros/box.html.twig b/src/CoreBundle/Resources/views/Macros/box.html.twig
@@ -1,45 +1,42 @@
 {% macro collapse(name, title, content, list = false, expanded = 'true', title_right = '', title_icons = '') %}
     {% autoescape false %}
-    <div class="panel-group" id="{{ name }}" role="tablist" aria-multiselectable="true">
-        <div class="panel panel-default" id="{{ name }}_block">
-            <div class="panel-heading" role="tab">
+    <div class="p-card p-component mb-4" id="{{ name }}" role="tablist" aria-multiselectable="true">
+        <div class="p-card-body" id="{{ name }}_block">
+            <div class="p-card-caption" role="tab">
                 {% if title_icons %}
                     {{ title_icons }}
                 {% endif %}
-                <h4 class="panel-title">
-                    <a role="button"
-                       data-toggle="collapse"
-                       data-parent="#{{ name }}"
-                       href="#{{ name }}Collapse"
-                       aria-expanded="{{ expanded }}"
-                       aria-controls="{{ name }}Collapse">
-                        {{ title }}
-                    </a>
+                <h4 class="p-card-title">
+                    <a role="button" id="toggle-{{ name }}Collapse" href="#{{ name }}Collapse">{{ title }}</a>
                 </h4>
 
                 {% if title_right %}
-                    <div class="pull-right">
+                    <div class="float-right">
                         {{ title_right }}
                     </div>
                 {% endif %}
             </div>
             <div
-                aria-expanded="{{ expanded }}"
                 id="{{ name }}Collapse"
-                class="panel-collapse collapse {{  expanded == 'true' ? 'in' : '' }}"
-                role="tabpanel">
-                <div class="panel-body">
-                    {% if list %}
-                        <ul class="nav nav-pills nav-stacked">
-                            {{ content }}
-                        </ul>
-                    {% else %}
+                class="p-card-content {{  expanded == 'true' ? '' : 'collapse' }}">
+                {% if list %}
+                    <ul class="nav nav-pills nav-stacked">
                         {{ content }}
-                    {% endif %}
-                </div>
+                    </ul>
+                {% else %}
+                    {{ content }}
+                {% endif %}
             </div>
         </div>
     </div>
+    <script>
+        $(function () {
+          $("#toggle-{{ name }}Collapse").on("click", (e) => {
+            e.preventDefault();
+            $("#{{ name }}Collapse").toggleClass("collapse");
+          })
+        })
+    </script>
     {% endautoescape %}
 {% endmacro %}