Commit aad5c84f by Alexander Kochetov

jQuery UI accordion rework

parent 9d46f8e4
...@@ -40,23 +40,20 @@ use yii\helpers\Html; ...@@ -40,23 +40,20 @@ use yii\helpers\Html;
class Accordion extends Widget class Accordion extends Widget
{ {
/** /**
* @var array list of sections in the accordion widget. Each array element represents a single * @var array.
* section with the following structure: * @todo comments.
*
* ```php
* array(
* // required, the header (HTML) of the section
* 'header' => 'Section label',
* // required, the content (HTML) of the section
* 'content' => 'Mauris mauris ante, blandit et, ultrices a, suscipit eget...',
* // optional the HTML attributes of the section content container
* 'options'=> array(...),
* // optional the HTML attributes of the section header container
* 'headerOptions'=> array(...),
* )
* ```
*/ */
public $items = array(); public $items = array();
/**
* @var array.
* @todo comments.
*/
public $itemOptions = array();
/**
* @var array.
* @todo comments.
*/
public $headerOptions = array();
/** /**
...@@ -64,9 +61,11 @@ class Accordion extends Widget ...@@ -64,9 +61,11 @@ class Accordion extends Widget
*/ */
public function run() public function run()
{ {
echo Html::beginTag('div', $this->options) . "\n"; $options = $this->options;
echo $this->renderSections() . "\n"; $tag = ArrayHelper::remove($options, 'tag', 'div');
echo Html::endTag('div') . "\n"; echo Html::beginTag($tag, $options) . "\n";
echo $this->renderItems() . "\n";
echo Html::endTag($tag) . "\n";
$this->registerWidget('accordion'); $this->registerWidget('accordion');
} }
...@@ -75,9 +74,9 @@ class Accordion extends Widget ...@@ -75,9 +74,9 @@ class Accordion extends Widget
* @return string the rendering result. * @return string the rendering result.
* @throws InvalidConfigException. * @throws InvalidConfigException.
*/ */
protected function renderSections() protected function renderItems()
{ {
$sections = array(); $items = array();
foreach ($this->items as $item) { foreach ($this->items as $item) {
if (!isset($item['header'])) { if (!isset($item['header'])) {
throw new InvalidConfigException("The 'header' option is required."); throw new InvalidConfigException("The 'header' option is required.");
...@@ -85,12 +84,14 @@ class Accordion extends Widget ...@@ -85,12 +84,14 @@ class Accordion extends Widget
if (!isset($item['content'])) { if (!isset($item['content'])) {
throw new InvalidConfigException("The 'content' option is required."); throw new InvalidConfigException("The 'content' option is required.");
} }
$headerOptions = ArrayHelper::getValue($item, 'headerOptions', array()); $headerOptions = array_merge($this->headerOptions, ArrayHelper::getValue($item, 'headerOptions', array()));
$sections[] = Html::tag('h3', $item['header'], $headerOptions); $headerTag = ArrayHelper::remove($headerOptions, 'tag', ArrayHelper::remove($headerOptions, 'tag', 'h3'));
$options = ArrayHelper::getValue($item, 'options', array()); $items[] = Html::tag($headerTag, $item['header'], $headerOptions);
$sections[] = Html::tag('div', $item['content'], $options);; $options = array_merge($this->itemOptions, ArrayHelper::getValue($item, 'options', array()));
$tag = ArrayHelper::remove($options, 'tag', ArrayHelper::remove($options, 'tag', 'div'));
$items[] = Html::tag($tag, $item['content'], $options);;
} }
return implode("\n", $sections); return implode("\n", $items);
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment