Allow use params in Display::panelCollapse - refs BT#16742

5 years ago · 272cf00623
parent 462c472e01
commit 272cf00623
1 changed files with 15 additions and 4 deletions
--- a/main/inc/lib/display.lib.php
+++ b/main/inc/lib/display.lib.php
@ -2704,9 +2704,22 @@ class Display
            $headerClass .= $fullClickable ? 'center-block ' : '';
            $headerClass .= $open ? '' : 'collapsed';
            $contentClass = 'panel-collapse collapse ';
-            $contentClass .= $open ? 'in' : '';
+            $contentClass .= $open ? 'in ' : '';
+            $contentClass .= $params['class'] ?? '';
            $ariaExpanded = $open ? 'true' : 'false';

+            $collapseDiv = self::div(
+                '<div class="panel-body">'.$content.'</div>',
+                array_merge(
+                    $params,
+                    [
+                        'id' => $idCollapse,
+                        'class' => $contentClass,
+                        'role' => 'tabpanel',
+                    ]
+                )
+            );
+
            $html = <<<HTML
                <div class="panel-group" id="$idAccordion" role="tablist" aria-multiselectable="true">
                    <div class="panel panel-default" id="$id">
@ -2715,9 +2728,7 @@ class Display
                                <a class="$headerClass" role="button" data-toggle="collapse" data-parent="#$idAccordion" href="#$idCollapse" aria-expanded="$ariaExpanded" aria-controls="$idCollapse">$title</a>
                            </h4>
                        </div>
-                        <div id="$idCollapse" class="$contentClass" role="tabpanel">
-                            <div class="panel-body">$content</div>
-                        </div>
+                        $collapseDiv
                    </div>
                </div>
 HTML;