Refactor to new ActionBox

hiqdev · Aug 4, 2015 · 7c7ed71 · 7c7ed71
1 parent 024ee18
commit 7c7ed71
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 64 deletions.
diff --git a/src/views/server/_search.php b/src/views/server/_search.php
@@ -1,38 +1,28 @@
 <?php
 
 use hipanel\modules\client\widgets\combo\ClientCombo;
-use hipanel\widgets\AdvancedSearch;
 use hiqdev\combo\StaticCombo;
 use kartik\widgets\DatePicker;
 use yii\helpers\Html;
-
 ?>
+<div class="col-md-4">
+    <?= $search->field('name_like') ?>
+    <?= $search->field('note') ?>
+</div>
 
-<?php $form = AdvancedSearch::begin(compact('model')) ?>
-    <div class="col-md-4">
-        <?= $form->field('name_like') ?>
-        <?= $form->field('note') ?>
-    </div>
-
-    <div class="col-md-4">
-        <?= $form->field('client_id')->widget(ClientCombo::classname()) ?>
-        <?= $form->field('seller_id')->widget(ClientCombo::classname()) ?>
-    </div>
-
-    <div class="col-md-4">
-        <?= $form->field('state')->widget(StaticCombo::classname(), [
-            'data' => $state_data,
-            'hasId' => true,
-            'pluginOptions' => [
-                'select2Options' => [
-                    'multiple' => true,
-                ]
-            ],
-        ]) ?>
-    </div>
-
-    <div class="col-md-12">
-        <?= Html::submitButton(Yii::t('app', 'Search'), ['class' => 'btn btn-primary']) ?>
-    </div>
+<div class="col-md-4">
+    <?= $search->field('client_id')->widget(ClientCombo::classname()) ?>
+    <?= $search->field('seller_id')->widget(ClientCombo::classname()) ?>
+</div>
 
-<?php $form::end() ?>
+<div class="col-md-4">
+    <?= $search->field('state')->widget(StaticCombo::classname(), [
+        'data' => $states,
+        'hasId' => true,
+        'pluginOptions' => [
+            'select2Options' => [
+                'multiple' => true,
+            ]
+        ],
+    ]) ?>
+</div>
diff --git a/src/views/server/index.php b/src/views/server/index.php
@@ -17,7 +17,6 @@
 /**
  * @var View $this
  */
-
 $this->title    = Yii::t('app', 'Servers');
 $this->subtitle = Yii::t('app', Yii::$app->request->queryParams ? 'filtered list' : 'full list');
 $this->breadcrumbs->setItems([
@@ -29,7 +28,7 @@
 
 <?php $box = ActionBox::begin(['model' => $model, 'bulk' => true, 'options' => ['class' => 'box-info']]) ?>
 <?php $box->beginActions() ?>
-<?= Html::a(Yii::t('app', 'Advanced search'), '#', ['class' => 'btn btn-info search-button']) ?>
+<?= $box->renderSearchButton() ?>
 <?= LinkSorter::widget([
     'show'       => true,
     'sort'       => $dataProvider->getSort(),
@@ -40,43 +39,37 @@
 ]) ?>
 <?php $box->endActions() ?>
 
-<?php $box->beginBulkActions() ?>
-<?= BulkButtons::widget([
-    'model' => Yii::$app->controller->newModel(),
-    'items' => [
-        ButtonDropdown::widget([
-            'label'    => Yii::t('app', 'Lock'),
-            'dropdown' => [
-                'options' => ['class' => 'pull-right'],
-                'items' => [
-                    [
-                        'label'       => Yii::t('app', 'Enable lock'),
-                        'url'         => '#',
-                        'linkOptions' => [
-                            'class'          => 'bulk-action',
-                            'data-attribute' => 'is_secured',
-                            'data-value'     => '1',
-                            'data-url'       => 'set-lock'
-                        ]
-                    ],
-                    [
-                        'label'       => Yii::t('app', 'Disable lock'),
-                        'url'         => '#',
-                        'linkOptions' => [
-                            'class'          => 'bulk-action',
-                            'data-attribute' => 'is_secured',
-                            'data-value'     => '0',
-                            'data-url'       => 'set-lock'
-                        ]
+<?php $box->renderBulkActions([
+    'items' => ButtonDropdown::widget([
+        'label'    => Yii::t('app', 'Lock'),
+        'dropdown' => [
+            'options' => ['class' => 'pull-right'],
+            'items' => [
+                [
+                    'label'       => Yii::t('app', 'Enable lock'),
+                    'url'         => '#',
+                    'linkOptions' => [
+                        'class'          => 'bulk-action',
+                        'data-attribute' => 'is_secured',
+                        'data-value'     => '1',
+                        'data-url'       => 'set-lock'
+                    ]
+                ],
+                [
+                    'label'       => Yii::t('app', 'Disable lock'),
+                    'url'         => '#',
+                    'linkOptions' => [
+                        'class'          => 'bulk-action',
+                        'data-attribute' => 'is_secured',
+                        'data-value'     => '0',
+                        'data-url'       => 'set-lock'
                     ]
                 ]
             ]
-        ]),
-    ],
+        ]
+    ]),
 ]) ?>
-
-<?php $box->endBulkActions() ?>
-<?= $this->render('_search', compact('model')) ?>
+<?= $box->renderSearchForm(compact('states')) ?>
 <?php $box::end() ?>
 
 <?= ServerGridView::widget([