redone Menus: widget instead of create+render

hiqdev · Dec 21, 2016 · e15b87e · e15b87e
1 parent 230674a
commit e15b87e
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 20 deletions.
diff --git a/src/menus/CheckDomainMenu.php b/src/menus/CheckDomainMenu.php
@@ -19,7 +19,7 @@ public function items()
     {
         return [
             'check-domain' => [
-                'label' => $this->renderView('checkDomain'),
+                'label' => $this->render('checkDomain'),
                 'encode' => false,
             ],
         ];

diff --git a/src/menus/DomainBulkActionsMenu.php b/src/menus/DomainBulkActionsMenu.php
@@ -20,7 +20,7 @@ public function items()
                             ' . Yii::t('hipanel', 'Basic actions') . '
                             <span class="caret"></span>
                         </button>
-                        ' . DomainBulkBasicActionsMenu::create()->render([
+                        ' . DomainBulkBasicActionsMenu::widget([], [
                             'class' => Dropdown::class,
                             'encodeLabels' => false,
                         ]) . '

diff --git a/src/menus/DomainDetailMenu.php b/src/menus/DomainDetailMenu.php
@@ -8,7 +8,7 @@
 use yii\bootstrap\Modal;
 use yii\helpers\Html;
 
-class DomainDetailMenu extends \hiqdev\menumanager\Menu
+class DomainDetailMenu extends \hipanel\menus\AbstractDetailMenu
 {
     public $model;
 

diff --git a/src/menus/HostDetailMenu.php b/src/menus/HostDetailMenu.php
@@ -2,9 +2,7 @@
 
 namespace hipanel\modules\domain\menus;
 
-use hiqdev\menumanager\Menu;
-
-class HostDetailMenu extends Menu
+class HostDetailMenu extends \hipanel\menus\AbstractDetailMenu
 {
     public $model;
 

diff --git a/src/views/domain/index.php b/src/views/domain/index.php
@@ -34,7 +34,7 @@
     <?php $page->endContent() ?>
 
     <?php $page->beginContent('bulk-actions') ?>
-        <?= DomainBulkActionsMenu::create()->render([
+        <?= DomainBulkActionsMenu::widget([], [
             'encodeLabels' => false,
             'itemOptions' => [
                 'tag' => false,
@@ -51,12 +51,8 @@
                 'columns'      => [
                     'checkbox',
                     'domain', 'actions', 'client', 'seller',
-                    'state',
-                    'whois_protected',
-                    'is_secured',
-                    'created_date',
-                    'expires',
-                    'autorenewal',
+                    'state', 'whois_protected', 'is_secured',
+                    'created_date', 'expires', 'autorenewal',
                 ],
             ]) ?>
         <?php $page->endBulkForm() ?>

diff --git a/src/views/domain/view.php b/src/views/domain/view.php
@@ -7,7 +7,6 @@
 use hipanel\modules\dns\widgets\DnsZoneEditWidget;
 use hipanel\modules\domain\grid\DomainGridView;
 use hipanel\modules\domain\menus\DomainDetailMenu;
-use hiqdev\menumanager\widgets\DetailMenu;
 use hipanel\modules\domain\widgets\AuthCode;
 use hipanel\modules\domain\widgets\NsWidget;
 use hipanel\widgets\Box;
@@ -64,11 +63,11 @@
         <p class="text-center">
             <span class="profile-user-role"><?= $this->title ?></span>
             <br>
-            <span class="profile-user-name"><?= ClientSellerLink::widget(compact('model')) ?></span>
+            <span class="profile-user-name"><?= ClientSellerLink::widget(['model' => $model]) ?></span>
         </p>
 
         <div class="profile-usermenu">
-            <?= DomainDetailMenu::create(['model' => $model])->render(DetailMenu::class) ?>
+            <?= DomainDetailMenu::widget(['model' => $model]) ?>
         </div>
         <?php Box::end() ?>
     </div>

diff --git a/src/views/host/view.php b/src/views/host/view.php
@@ -5,10 +5,9 @@
 use hipanel\widgets\Box;
 use hipanel\widgets\ClientSellerLink;
 use hipanel\widgets\Pjax;
-use hiqdev\menumanager\widgets\DetailMenu;
 use yii\helpers\Html;
 
-$this->title    = Html::encode($model->host);
+$this->title = Html::encode($model->host);
 $this->params['subtitle'] = Yii::t('hipanel:domain', 'Name server detailed information') . ' #' . $model->id;
 $this->params['breadcrumbs'][] = ['label' => Yii::t('hipanel:domain', 'Name Servers'), 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
@@ -32,10 +31,10 @@
                 <p class="text-center">
                     <span class="profile-user-role"><?= $this->title ?></span>
                     <br>
-                    <span class="profile-user-name"><?= ClientSellerLink::widget(compact('model')) ?></span>
+                    <span class="profile-user-name"><?= ClientSellerLink::widget(['model' => $model]) ?></span>
                 </p>
                 <div class="profile-usermenu">
-                    <?= HostDetailMenu::create(['model' => $model])->render(DetailMenu::class) ?>
+                    <?= HostDetailMenu::widget(['model' => $model]) ?>
                 </div>
             <?php Box::end() ?>
         </div>