better render method and remove 'data-method' => 'post' from delete

docs/layouts.md

@@ -37,15 +37,15 @@ class ExampleLayout extends \cornernote\dashboard\Layout
         ];
     }
 
-    public function getRegionOpts()
+    public function getRegions()
     {
         return [
             'column-1' => 'Column 1',
             'column-2' => 'Column 2',
         ];
     }
 
-    public function regionPanels($dashboardPanels)
+    public function regionPanels($dashboardPanels, $view = 'view')
     {
         $regionPanels = [
             'column-1' => [],
@@ -58,32 +58,16 @@ class ExampleLayout extends \cornernote\dashboard\Layout
                     'id' => 'dashboard-panel-' . $dashboardPanel->id,
                     'class' => 'dashboard-panel',
                 ],
-                'content' => $dashboardPanel->panel->renderView(),
+                'content' => $dashboardPanel->panel->render($view),
             ];
         }
         return $regionPanels;
     }
 
-    public function renderView()
+    public function render($view, $params = [])
     {
-        return \Yii::$app->view->render($this->viewPath . '/view', [
-            'layout' => $this,
-        ]);
-    }
-
-    public function renderUpdate()
-    {
-        return \Yii::$app->view->render($this->viewPath . '/update', [
-            'layout' => $this,
-        ]);
-    }
-
-    public function renderForm($form)
-    {
-        return \Yii::$app->view->render($this->viewPath . '/form', [
-            'layout' => $this,
-            'form' => $form,
-        ]);
+        $params['layout'] = $this;
+        return \Yii::$app->view->render($this->viewPath . '/view', $params);
     }
 
 }
@@ -131,7 +115,7 @@ Place the following code into `app/views/dashboard/layouts/example/update.php`:
  * @var $this \yii\web\View
  */
 
-$regionPanels = $layout->regionPanels($layout->dashboard->getDashboardPanels()->all());
+$regionPanels = $layout->regionPanels($layout->dashboard->getDashboardPanels()->all(), 'update');
 
 echo '<div class="row">';
 foreach ($regionPanels as $region => $items) {

docs/panels.md

@@ -37,26 +37,10 @@ class ExamplePanel extends \cornernote\dashboard\Panel
         ];
     }
 
-    public function renderView()
+    public function render($view, $params = [])
     {
-        return \Yii::$app->view->render($this->viewPath . '/view', [
-            'panel' => $this,
-        ]);
-    }
-
-    public function renderUpdate()
-    {
-        return \Yii::$app->view->render($this->viewPath . '/update', [
-            'panel' => $this,
-        ]);
-    }
-
-    public function renderForm($form)
-    {
-        return \Yii::$app->view->render($this->viewPath . '/form', [
-            'panel' => $this,
-            'form' => $form,
-        ]);
+        $params['panel'] = $this;
+        return \Yii::$app->view->render($this->viewPath . '/view', $params);
     }
 
 }
@@ -92,7 +76,6 @@ Place the following code into `app/views/dashboard/panels/example/view.php`:
         ['dashboard-panel/delete', 'id' => $panel->dashboardPanel->id],
         [
             'data-confirm' => 'Are you sure to delete this dashboard panel?',
-            'data-method' => 'post',
             'data-toggle' => 'tooltip',
             'title' => 'Delete Dashboard Panel',
         ]
@@ -126,7 +109,6 @@ Place the following code into `app/views/dashboard/panels/example/update.php`:
     ]) ?>
     <?= \yii\helpers\Html::a('<span class="glyphicon glyphicon-trash small"></span>', ['dashboard-panel/delete', 'id' => $panel->dashboardPanel->id], [
         'data-confirm' => Yii::t('dashboard', 'Are you sure to delete this dashboard panel?'),
-        'data-method' => 'post',
         'data-toggle' => 'tooltip',
         'title' => Yii::t('dashboard', 'Delete Dashboard Panel'),
     ]) ?>

src/Layout.php

@@ -55,41 +55,27 @@ public function getOptions()
     /**
      * @return array
      */
-    public function getRegionOpts()
+    public function getRegions()
     {
         return [];
     }
 
     /**
      * @param DashboardPanel[] $dashboardPanels
+     * @param string $view
      * @return array
      */
-    public function regionPanels($dashboardPanels)
+    public function regionPanels($dashboardPanels, $view)
     {
         return [];
     }
 
     /**
+     * @param string $view
+     * @param array $params
      * @return string
      */
-    public function renderView()
-    {
-        return '';
-    }
-
-    /**
-     * @return string
-     */
-    public function renderUpdate()
-    {
-        return '';
-    }
-
-    /**
-     * @param ActiveForm $form
-     * @return string
-     */
-    public function renderForm($form)
+    public function render($view, $params = [])
     {
         return '';
     }

src/Panel.php

@@ -52,26 +52,11 @@ public function getOptions()
     }
 
     /**
+     * @param string $view
+     * @param array $params
      * @return string
      */
-    public function renderView()
-    {
-        return '';
-    }
-
-    /**
-     * @return string
-     */
-    public function renderUpdate()
-    {
-        return '';
-    }
-
-    /**
-     * @param ActiveForm $form
-     * @return string
-     */
-    public function renderForm($form)
+    public function render($view, $params = [])
     {
         return '';
     }

src/layouts/DefaultLayout.php

@@ -52,7 +52,7 @@ public static function getColumnOpts()
     /**
      * @return array
      */
-    public function getRegionOpts()
+    public function getRegions()
     {
         $regions = [];
         for ($i = 1; $i <= $this->columns; $i++) {
@@ -64,32 +64,10 @@ public function getRegionOpts()
     /**
      * @inheritdoc
      */
-    public function renderView()
+    public function render($view = 'view', $params = [])
     {
-        return Yii::$app->view->render($this->viewPath . '/view', [
-            'layout' => $this,
-        ]);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function renderUpdate()
-    {
-        return Yii::$app->view->render($this->viewPath . '/update', [
-            'layout' => $this,
-        ]);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function renderForm($form)
-    {
-        return Yii::$app->view->render($this->viewPath . '/form', [
-            'layout' => $this,
-            'form' => $form,
-        ]);
+        $params['layout'] = $this;
+        return Yii::$app->view->render($this->viewPath . '/' . $view, $params);
     }
 
     /**
@@ -105,7 +83,7 @@ public function getOptions()
     /**
      * @inheritdoc
      */
-    public function regionPanels($dashboardPanels)
+    public function regionPanels($dashboardPanels, $view)
     {
         $regionPanels = [];
         for ($column = 1; $column <= $this->columns; $column++) {
@@ -119,7 +97,7 @@ public function regionPanels($dashboardPanels)
                     'id' => 'dashboard-panel-' . $dashboardPanel->id,
                     'class' => 'dashboard-panel',
                 ],
-                'content' => $dashboardPanel->panel->renderView(),
+                'content' => $dashboardPanel->panel->render($view),
             ];
         }
         return $regionPanels;

src/panels/TextPanel.php

@@ -45,32 +45,10 @@ public function getOptions()
     /**
      * @inheritdoc
      */
-    public function renderView()
+    public function render($view, $params = [])
     {
-        return Yii::$app->view->render($this->viewPath . '/view', [
-            'panel' => $this,
-        ]);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function renderUpdate()
-    {
-        return Yii::$app->view->render($this->viewPath . '/update', [
-            'panel' => $this,
-        ]);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function renderForm($form)
-    {
-        return Yii::$app->view->render($this->viewPath . '/form', [
-            'panel' => $this,
-            'form' => $form,
-        ]);
+        $params['panel'] = $this;
+        return Yii::$app->view->render($this->viewPath . '/' . $view, $params);
     }
 
 }

src/views/dashboard-panel/create.php

@@ -30,7 +30,7 @@
 
     <?= $form->field($model, 'panel_class')->dropDownList(array_flip(Module::getInstance()->panels), ['prompt' => '']) ?>
 
-    <?= $form->field($model, 'region')->dropDownList($model->dashboard->layout->getRegionOpts(), ['prompt' => '']) ?>
+    <?= $form->field($model, 'region')->dropDownList($model->dashboard->layout->getRegions(), ['prompt' => '']) ?>
 
     <?= $form->field($model, 'sort')->textInput(['maxlength' => true]) ?>
 

src/views/dashboard-panel/update.php

@@ -28,7 +28,7 @@
 
     <?= $form->field($model, 'enabled')->checkbox() ?>
 
-    <?= $model->panel->renderForm($form); ?>
+    <?= $model->panel->render('form', ['form' => $form]); ?>
 
     <?= Html::submitButton('<span class="fa fa-check"></span> ' . Yii::t('dashboard', 'Save'), [
         'id' => 'save-' . $model->formName(),

src/views/dashboard/layouts/default/update.php

@@ -15,7 +15,7 @@
 if (!in_array($columns, array(1, 2, 3, 4, 6))) $columns = 1;
 $span = round(12 / $columns);
 
-$regionPanels = $layout->regionPanels($layout->dashboard->getDashboardPanels()->all());
+$regionPanels = $layout->regionPanels($layout->dashboard->getDashboardPanels()->all(), 'update');
 
 if (isset($regionPanels['overflow'])) {
     $overflow = $regionPanels['overflow'];

src/views/dashboard/layouts/default/view.php

@@ -14,7 +14,7 @@
 if (!in_array($columns, array(1, 2, 3, 4, 6))) $columns = 1;
 $span = round(12 / $columns);
 
-$regionPanels = $layout->regionPanels($layout->dashboard->getDashboardPanels()->enabled()->all());
+$regionPanels = $layout->regionPanels($layout->dashboard->getDashboardPanels()->enabled()->all(), 'view');
 
 if (isset($regionPanels['overflow'])) {
     $overflow = $regionPanels['overflow'];

src/views/dashboard/panels/text/update.php

@@ -19,7 +19,7 @@
     ]) ?>
     <?= Html::a('<span class="glyphicon glyphicon-trash small"></span>', ['dashboard-panel/delete', 'id' => $panel->dashboardPanel->id], [
         'data-confirm' => Yii::t('dashboard', 'Are you sure to delete this dashboard panel?'),
-        'data-method' => 'post',
+        //'data-method' => 'post',
         'data-toggle' => 'tooltip',
         'title' => Yii::t('dashboard', 'Delete Dashboard Panel'),
     ]) ?>

src/views/dashboard/panels/text/view.php

@@ -18,7 +18,7 @@
     ]) ?>
     <?= Html::a('<span class="glyphicon glyphicon-trash small"></span>', ['dashboard-panel/delete', 'id' => $panel->dashboardPanel->id], [
         'data-confirm' => Yii::t('dashboard', 'Are you sure to delete this dashboard panel?'),
-        'data-method' => 'post',
+        //'data-method' => 'post',
         'data-toggle' => 'tooltip',
         'title' => Yii::t('dashboard', 'Delete Dashboard Panel'),
     ]) ?>

src/views/dashboard/update.php

@@ -34,9 +34,9 @@
 
     <?= $form->field($model, 'enabled')->checkbox() ?>
 
-    <?= $model->layout->renderForm($form); ?>
+    <?= $model->layout->render('form', ['form' => $form]); ?>
 
-    <?= $model->layout->renderUpdate(); ?>
+    <?= $model->layout->render('update'); ?>
 
     <div class="form-group">
         <?= Html::submitButton('<span class="fa fa-check"></span> ' . Yii::t('dashboard', 'Save'), [

src/views/dashboard/view.php

@@ -38,6 +38,6 @@
         ]); ?>
     </h1>
 
-    <?= $model->layout->renderView(); ?>
+    <?= $model->layout->render('view'); ?>
 
 </div>