redone breadcrumbs to original Yii style

hiqdev · Aug 23, 2016 · 0bee983 · 0bee983
1 parent e7e2814
commit 0bee983
Show file tree

Hide file tree

Showing 9 changed files with 107 additions and 111 deletions.
diff --git a/src/views/order/index.php b/src/views/order/index.php
@@ -1,11 +1,11 @@
 <?php
+
 use hipanel\modules\server\assets\ServerAsset;
 use yii\helpers\Html;
 
 $this->title = Yii::t('hipanel/server/order', 'Buy server');
-$this->breadcrumbs->setItems([
-    $this->title
-]);
+$this->params['breadcrumbs'][] = $this->title;
+
 ServerAsset::register($this);
 
 ?>
@@ -17,7 +17,7 @@
                 <h3 class="box-title">
                     <?= Html::img(Yii::$app->assetManager->getPublishedUrl('@vendor/hiqdev/hipanel-module-server/src/assets') . '/img/openvz-logo.png', ['style' => 'height: 15px; line-height: 1;']) ?>
                     &nbsp;
-                    <?= Yii::t('hipanel/server/order', 'OpenVZ'); ?>
+                    <?= Yii::t('hipanel/server/order', 'OpenVZ') ?>
                 </h3>
             </div>
             <div class="box-body">
@@ -35,7 +35,7 @@
                 <h3 class="box-title">
                     <?= Html::img(Yii::$app->assetManager->getPublishedUrl('@vendor/hiqdev/hipanel-module-server/src/assets') . '/img/xen-logo.png', ['style' => 'height: 15px; line-height: 1;']) ?>
                     &nbsp;
-                    <?= Yii::t('hipanel/server/order', 'XEN SSD'); ?>
+                    <?= Yii::t('hipanel/server/order', 'XEN SSD') ?>
                 </h3>
             </div>
             <div class="box-body">
@@ -49,4 +49,4 @@
             </div>
         </div>
     </div>
-</div>
+</div>
diff --git a/src/views/order/open_vz.php b/src/views/order/open_vz.php
@@ -1,8 +1,9 @@
 <?php
+
 $this->title = Yii::t('hipanel/server/order', 'Open VZ');
-$this->breadcrumbs->setItems([
-    ['label' => Yii::t('hipanel/server/order', 'Buy server'), 'url' => ['index']],
-    $this->title
-]);
+$this->params['breadcrumbs'][] = ['label' => Yii::t('hipanel/server/order', 'Buy server'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+
 echo $this->render('_priceBox', compact('packages', 'tariffTypes', 'testVDSPurchased'));
-?>
+
+?>
diff --git a/src/views/order/order.php b/src/views/order/order.php
@@ -14,10 +14,9 @@
 use yii\helpers\Json;
 
 $this->title = Yii::t('hipanel/server/order', 'Order creating');
-$this->breadcrumbs->setItems([
-    ['label' => Yii::t('hipanel/server/order', 'Buy server'), 'url' => ['index']],
-    $this->title
-]);
+$this->params['breadcrumbs'][] = ['label' => Yii::t('hipanel/server/order', 'Buy server'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+
 OsSelectionAsset::register($this);
 $this->registerCss("
 .order-price {
@@ -43,7 +42,7 @@
                         <?php foreach (['cpu', 'ram', 'hdd', 'ip', 'traffic'] as $item) : ?>
                             <dt><?= $package->getResourceTitle($item) ?></dt>
                             <dd><?= $package->getResourceValue($item) ?></dd>
-                        <?php endforeach; ?>
+                        <?php endforeach ?>
                         <dt><?= Yii::t('hipanel/server/order', 'Traffic overuse') ?></dt>
                         <dd><?= Yii::t('hipanel/server/order', '{price}/{unit}', $package->getOverusePrice('traffic')) ?></dd>
                     </dl>
@@ -59,7 +58,7 @@
                     <div class="order-boxes">
 
 
-                        <?php $form = ActiveForm::begin(['action' => ['add-to-cart']]); ?>
+                        <?php $form = ActiveForm::begin(['action' => ['add-to-cart']]) ?>
                         <?= Html::activeHiddenInput($product, 'tariff_id', ['name' => 'tariff_id']) ?>
                         <?= Html::hiddenInput('osimage', null, ['class' => 'reinstall-osimage']) ?>
                         <?= Html::hiddenInput('panel', null, ['class' => 'reinstall-panel']) ?>
@@ -161,7 +160,7 @@
                                 </div>
                             </div>
                         </div>
-                        <?php $form->end(); ?>
+                        <?php $form->end() ?>
                     </div>
                 </div>
             </div>

diff --git a/src/views/order/xen_ssd.php b/src/views/order/xen_ssd.php
@@ -1,11 +1,7 @@
 <?php
 
 $this->title = Yii::t('hipanel/server/order', 'XEN SSD');
-$this->breadcrumbs->setItems([
-    ['label' => Yii::t('hipanel/server/order', 'Buy server'), 'url' => ['index']],
-    $this->title
-]);
-
-echo $this->render('_priceBox', compact('packages', 'tariffTypes', 'testVDSPurchased')); ?>
-
+$this->params['breadcrumbs'][] = ['label' => Yii::t('hipanel/server/order', 'Buy server'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
 
+<?= $this->render('_priceBox', compact('packages', 'tariffTypes', 'testVDSPurchased')) ?>
diff --git a/src/views/pre-order/index.php b/src/views/pre-order/index.php
@@ -18,9 +18,12 @@
 
 $this->title = Yii::t('hipanel/server', 'Pending confirmation servers');
 $this->subtitle = array_filter(Yii::$app->request->get($model->formName(), [])) ? Yii::t('hipanel', 'filtered list') : Yii::t('hipanel', 'full list');
-$this->breadcrumbs->setItems([Yii::t('hipanel/server', 'Servers'), $this->title]); ?>
+$this->params['breadcrumbs'][] = ['label' => Yii::t('hipanel/server', 'Servers'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
 
-<?php Pjax::begin(array_merge(Yii::$app->params['pjax'], ['enablePushState' => true])); ?>
+?>
+
+<?php Pjax::begin(array_merge(Yii::$app->params['pjax'], ['enablePushState' => true])) ?>
 <?php $page = IndexPage::begin(compact('model', 'dataProvider')) ?>
     <?= $page->setSearchFormData(compact(['states'])) ?>
     <?php $page->beginContent('main-actions') ?>
@@ -37,7 +40,7 @@
 
         <?= $page->renderPerPage() ?>
     <?php $page->endContent() ?>
-    <?php $page->beginContent('bulk-actions'); ?>
+    <?php $page->beginContent('bulk-actions') ?>
         <?php if ($model->state === $model::STATE_NEW) { ?>
             <div>
                 <?= AjaxModal::widget([
@@ -68,12 +71,14 @@
                 ]) ?>
             </div>
         <?php } ?>
-        <?php if (Yii::$app->user->can('delete-bills')) print $page->renderBulkButton(Yii::t('hipanel', 'Delete'), 'delete', 'danger'); ?>
+        <?php if (Yii::$app->user->can('delete-bills')) : ?>
+            <?= $page->renderBulkButton(Yii::t('hipanel', 'Delete'), 'delete', 'danger') ?>
+        <?php endif ?>
     <?php $page->endContent() ?>
 
 
     <?php $page->beginContent('table') ?>
-        <?php $page->beginBulkForm(); ?>
+        <?php $page->beginBulkForm() ?>
             <?= \hipanel\modules\server\grid\PreOrderGridView::widget([
                 'dataProvider' => $dataProvider,
                 'boxed' => false,
@@ -85,9 +90,9 @@
                     'tech_comment',
                     'time',
                 ]
-            ]); ?>
-        <?php $page->endBulkForm(); ?>
+            ]) ?>
+        <?php $page->endBulkForm() ?>
     <?php $page->endContent() ?>
 <?php $page->end() ?>
 
-<?php Pjax::end(); ?>
+<?php Pjax::end() ?>
diff --git a/src/views/refuse/index.php b/src/views/refuse/index.php
@@ -19,9 +19,12 @@
 
 $this->title = Yii::t('hipanel/server', 'Refuses');
 $this->subtitle = array_filter(Yii::$app->request->get($model->formName(), [])) ? Yii::t('hipanel', 'filtered list') : Yii::t('hipanel', 'full list');
-$this->breadcrumbs->setItems([Yii::t('hipanel/server', 'Servers'), $this->title]); ?>
+$this->params['breadcrumbs'][] = Html::a(Yii::t('hipanel/server', 'Servers'), ['@server']);
+$this->params['breadcrumbs'][] = $this->title;
 
-<?php Pjax::begin(array_merge(Yii::$app->params['pjax'], ['enablePushState' => true])); ?>
+?>
+
+<?php Pjax::begin(array_merge(Yii::$app->params['pjax'], ['enablePushState' => true])) ?>
 <?php $page = IndexPage::begin(compact('model', 'dataProvider')) ?>
     <?= $page->setSearchFormData(compact(['states'])) ?>
     <?php $page->beginContent('main-actions') ?>
@@ -38,7 +41,7 @@
 
         <?= $page->renderPerPage() ?>
     <?php $page->endContent() ?>
-    <?php $page->beginContent('bulk-actions'); ?>
+    <?php $page->beginContent('bulk-actions') ?>
         <?php if ($model->state === $model::STATE_NEW) { ?>
             <div>
                 <?= AjaxModal::widget([
@@ -73,7 +76,7 @@
 
 
     <?php $page->beginContent('table') ?>
-        <?php $page->beginBulkForm(); ?>
+        <?php $page->beginBulkForm() ?>
             <?= RefuseGridView::widget([
                 'dataProvider' => $dataProvider,
                 'boxed' => false,
@@ -85,9 +88,9 @@
                     'user_comment',
                     'time',
                 ]
-            ]); ?>
-        <?php $page->endBulkForm(); ?>
+            ]) ?>
+        <?php $page->endBulkForm() ?>
     <?php $page->endContent() ?>
 <?php $page->end() ?>
 
-<?php Pjax::end(); ?>
+<?php Pjax::end() ?>
diff --git a/src/views/rrd/view.php b/src/views/rrd/view.php
@@ -19,11 +19,9 @@
 $model = reset($models);
 
 $this->title = Yii::t('hipanel/server', '{server} - RRD', ['server' => $model->server->name]);
-$this->breadcrumbs->setItems([
-    Html::a(Yii::t('hipanel/server', 'Servers'), ['@server']),
-    Html::a($model->server->name, ['@server/view', 'id' => $model->server->id]),
-    Yii::t('hipanel/server', 'RRD')
-]);
+$this->params['breadcrumbs'][] = Html::a(Yii::t('hipanel/server', 'Servers'), ['@server']);
+$this->params['breadcrumbs'][] = Html::a($model->server->name, ['@server/view', 'id' => $model->server->id]);
+$this->params['breadcrumbs'][] = Yii::t('hipanel/server', 'RRD');
 
 ?>
 
@@ -70,7 +68,7 @@
                         }
                     ]
                 ]
-            ]); ?>
+            ]) ?>
         <?php $page->endBulkForm() ?>
         <?php $page->endContent() ?>
     <?php $page->end() ?>

diff --git a/src/views/server/view.php b/src/views/server/view.php
@@ -16,12 +16,10 @@
  * @var $model Server
  */
 
-$this->title    = $model->name;
+$this->title = $model->name;
 $this->subtitle = Yii::t('hipanel/server', 'Server detailed information') . ' #' . $model->id;
-$this->breadcrumbs->setItems([
-    ['label' => Yii::t('hipanel/server', 'Servers'), 'url' => ['index']],
-    $this->title,
-]);
+$this->params['breadcrumbs'][] = ['label' => Yii::t('hipanel/server', 'Servers'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
 
 list($chartsLabels, $chartsData) = $model->groupUsesForCharts();
 
@@ -35,7 +33,7 @@
             'bodyOptions' => [
                 'class' => 'no-padding'
             ]
-        ]); ?>
+        ]) ?>
             <div class="profile-user-img text-center">
                 <i class="fa fa-server fa-5x"></i>
             </div>
@@ -48,7 +46,7 @@
             <div class="profile-usermenu">
                 <ul class="nav">
                     <li>
-                        <?= Html::a('<i class="fa fa-fw fa-forward"></i>' . Yii::t('hipanel/server', 'Renew server'), ['add-to-cart-renewal', 'model_id' => $model->id], ['data-pjax' => 0]); ?>
+                        <?= Html::a('<i class="fa fa-fw fa-forward"></i>' . Yii::t('hipanel/server', 'Renew server'), ['add-to-cart-renewal', 'model_id' => $model->id], ['data-pjax' => 0]) ?>
                     </li>
                 <?php if ($model->isPwChangeSupported()) { ?>
                     <li>
@@ -63,7 +61,7 @@
                     </li>
                 <?php if (Yii::$app->user->can('support')  && Yii::$app->user->not($model->client_id)) : ?>
                     <li>
-                        <?= $this->render('_block', compact(['model', 'blockReasons'])); ?>
+                        <?= $this->render('_block', compact(['model', 'blockReasons'])) ?>
                     </li>
                 <?php endif ?>
                 <?php if (Yii::$app->user->can('support')) : ?>
@@ -74,7 +72,7 @@
                 </ul>
             </div>
             <?php Pjax::end() ?>
-        <?php Box::end(); ?>
+        <?php Box::end() ?>
 
         <?php if ($model->isVNCSupported()) { ?>
             <div class="row">
@@ -99,7 +97,7 @@
                 $box->beginHeader();
                     echo $box->renderTitle(Yii::t('hipanel/server', 'System management'));
                 $box->endHeader();
-                $box->beginBody(); ?>
+                $box->beginBody() ?>
                 <div class="row">
                     <div class="col-lg-6 col-md-12 col-sm-12 col-xs-12">
                         <?= $this->render('_reboot', compact(['model'])) ?>
@@ -111,7 +109,7 @@
                         <div class="col-lg-6 col-md-12 col-sm-12 col-xs-12">
                             <?= $this->render('_boot-live', compact(['model', 'osimageslivecd'])) ?>
                         </div>
-                    <?php endif; ?>
+                    <?php endif ?>
                     <div class="col-lg-6 col-md-12 col-sm-12 col-xs-12">
                         <?= $this->render('_reinstall', compact(['model', 'groupedOsimages', 'panels'])) ?>
                     </div>
@@ -132,13 +130,13 @@
                     $box->beginBody(); ?>
                         <div class="row">
                             <div class="col-lg-4 col-md-12 col-sm-12 col-xs-12">
-                                <?= $this->render('_power-on', compact(['model'])); ?>
+                                <?= $this->render('_power-on', compact(['model'])) ?>
                             </div>
                             <div class="col-lg-4 col-md-12 col-sm-12 col-xs-12">
-                                <?= $this->render('_power-off', compact(['model'])); ?>
+                                <?= $this->render('_power-off', compact(['model'])) ?>
                             </div>
                             <div class="col-lg-4 col-md-12 col-sm-12 col-xs-12">
-                                <?= $this->render('_reset', compact(['model'])); ?>
+                                <?= $this->render('_reset', compact(['model'])) ?>
                             </div>
                         </div>