| @@ -17,15 +17,15 @@ | ||
| 17 | 17 | |
| 18 | 18 | $output = ''; |
| 19 | 19 | if (trim($scontent) != '' || count($_oscitas_accordion[$id]['details'])) { |
| 20 | 20 | $scontent = isset($_oscitas_accordion[$id]['details']) && is_array($_oscitas_accordion[$id]['details']) ? implode('', $_oscitas_accordion[$id]['details']) : ''; |
| 21 | - $output .= '<div class="panel-group ' . $class .EBS_CONTAINER_CLASS. '" id="oscitas-accordion-' . $id . '">' . $scontent; | |
| 21 | + $output .= '<div class="panel-group ' . $class . '" id="oscitas-accordion-' . $id . '">' . $scontent; | |
| 22 | 22 | $output .= '</div>'; |
| 23 | 23 | } |
| 24 | 24 | return $output; |
| 25 | 25 | } |
| 26 | 26 | |
| 27 | -ebs_backward_compatibility_callback('toggles', 'osc_theme_toggles'); | |
| 27 | +add_shortcode('toggles', 'osc_theme_toggles'); | |
| 28 | 28 | |
| 29 | 29 | function osc_theme_toggle($params, $content = null) { |
| 30 | 30 | global $_oscitas_accordion; |
| 31 | 31 | extract(shortcode_atts(array( |
| @@ -33,15 +33,14 @@ | ||
| 33 | 33 | 'class' => '' |
| 34 | 34 | ), $params)); |
| 35 | 35 | $con = do_shortcode($content); |
| 36 | 36 | $index = count($_oscitas_accordion) - 1; |
| 37 | - $id = isset($_oscitas_accordion[$index]['details'])?'details-' . $index . '-' . count($_oscitas_accordion[$index]['details']):'details-' . $index . '-0'; | |
| 38 | - $const = get_defined_constants(); | |
| 37 | + $id = 'details-' . $index . '-' . count($_oscitas_accordion[$index]['details']); | |
| 39 | 38 | $_oscitas_accordion[$index]['details'][] = <<<EOS |
| 40 | - <div class="panel panel-default{$const['EBS_CONTAINER_CLASS']}"> | |
| 41 | - <div class="panel-heading{$const['EBS_CONTAINER_CLASS']}"> | |
| 42 | - <h4 class="panel-title{$const['EBS_CONTAINER_CLASS']}"> | |
| 43 | - <a class="accordion-toggle{$const['EBS_CONTAINER_CLASS']}" data-toggle="collapse" | |
| 39 | + <div class="panel panel-default"> | |
| 40 | + <div class="panel-heading"> | |
| 41 | + <h4 class="panel-title"> | |
| 42 | + <a class="accordion-toggle" data-toggle="collapse" | |
| 44 | 43 | data-parent="#oscitas-accordion-{$index}" |
| 45 | 44 | href="#{$id}"> |
| 46 | 45 | {$title} |
| 47 | 46 | </a> |
| @@ -46,12 +45,12 @@ | ||
| 46 | 45 | {$title} |
| 47 | 46 | </a> |
| 48 | 47 | </h4> |
| 49 | 48 | </div> |
| 50 | - <div id="{$id}" class="panel-collapse collapse {$class}{$const['EBS_CONTAINER_CLASS']}"> | |
| 51 | - <div class="panel-body{$const['EBS_CONTAINER_CLASS']}">{$con}</div> | |
| 49 | + <div id="{$id}" class="panel-collapse collapse {$class}"> | |
| 50 | + <div class="panel-body">{$con}</div> | |
| 52 | 51 | </div> |
| 53 | 52 | </div> |
| 54 | 53 | EOS; |
| 55 | 54 | } |
| 56 | 55 | |
| 57 | -ebs_backward_compatibility_callback('toggle', 'osc_theme_toggle'); | |
| 56 | +add_shortcode('toggle', 'osc_theme_toggle'); | |
