Commit 9fdba9c2ce360a29fa1d4029d6ec30fbf14f073d
1 parent
cb53ee00
15.02.16
Showing
3 changed files
with
48 additions
and
23 deletions
Show diff stats
frontend/controllers/AccountsController.php
| @@ -355,7 +355,7 @@ | @@ -355,7 +355,7 @@ | ||
| 355 | { | 355 | { |
| 356 | $searchModel = new PortfolioSearch(); | 356 | $searchModel = new PortfolioSearch(); |
| 357 | $dataProvider = $searchModel->search(Yii::$app->request->queryParams); | 357 | $dataProvider = $searchModel->search(Yii::$app->request->queryParams); |
| 358 | - | 358 | + $dataProvider->pagination->pageSize=5; |
| 359 | return $this->render('portfolio', [ | 359 | return $this->render('portfolio', [ |
| 360 | 'searchModel' => $searchModel, | 360 | 'searchModel' => $searchModel, |
| 361 | 'dataProvider' => $dataProvider, | 361 | 'dataProvider' => $dataProvider, |
| @@ -365,14 +365,7 @@ | @@ -365,14 +365,7 @@ | ||
| 365 | public function actionPortfolioCreate() | 365 | public function actionPortfolioCreate() |
| 366 | { | 366 | { |
| 367 | $portfolio = new Portfolio(); | 367 | $portfolio = new Portfolio(); |
| 368 | - $specialization = Specialization::find() | ||
| 369 | - ->select([ | ||
| 370 | - 'specialization_name', | ||
| 371 | - 'specialization_id', | ||
| 372 | - ]) | ||
| 373 | - ->indexBy('specialization_id') | ||
| 374 | - ->asArray() | ||
| 375 | - ->column(); | 368 | + $specializations = Specialization::find()->orderBy('specialization_id')->all(); |
| 376 | $post = \Yii::$app->request->post(); | 369 | $post = \Yii::$app->request->post(); |
| 377 | if(!empty( $post )) { | 370 | if(!empty( $post )) { |
| 378 | $portfolio->load($post); | 371 | $portfolio->load($post); |
| @@ -388,21 +381,14 @@ | @@ -388,21 +381,14 @@ | ||
| 388 | } | 381 | } |
| 389 | return $this->render('_portfolio_form', [ | 382 | return $this->render('_portfolio_form', [ |
| 390 | 'portfolio' => $portfolio, | 383 | 'portfolio' => $portfolio, |
| 391 | - 'specialization' => $specialization, | 384 | + 'specializations' => $specializations, |
| 392 | ]); | 385 | ]); |
| 393 | } | 386 | } |
| 394 | 387 | ||
| 395 | public function actionPortfolioUpdate($id) | 388 | public function actionPortfolioUpdate($id) |
| 396 | { | 389 | { |
| 397 | $portfolio = Portfolio::findOne($id); | 390 | $portfolio = Portfolio::findOne($id); |
| 398 | - $specialization = Specialization::find() | ||
| 399 | - ->select([ | ||
| 400 | - 'specialization_name', | ||
| 401 | - 'specialization_id', | ||
| 402 | - ]) | ||
| 403 | - ->indexBy('specialization_id') | ||
| 404 | - ->asArray() | ||
| 405 | - ->column(); | 391 | + $specializations = Specialization::find()->orderBy('specialization_id')->all(); |
| 406 | $post = \Yii::$app->request->post(); | 392 | $post = \Yii::$app->request->post(); |
| 407 | if(!empty( $post )) { | 393 | if(!empty( $post )) { |
| 408 | $portfolio->load($post); | 394 | $portfolio->load($post); |
| @@ -418,7 +404,7 @@ | @@ -418,7 +404,7 @@ | ||
| 418 | } | 404 | } |
| 419 | return $this->render('_portfolio_form', [ | 405 | return $this->render('_portfolio_form', [ |
| 420 | 'portfolio' => $portfolio, | 406 | 'portfolio' => $portfolio, |
| 421 | - 'specialization' => $specialization, | 407 | + 'specializations' => $specializations, |
| 422 | ]); | 408 | ]); |
| 423 | } | 409 | } |
| 424 | 410 |
frontend/views/accounts/_portfolio_form.php
| @@ -4,7 +4,8 @@ | @@ -4,7 +4,8 @@ | ||
| 4 | */ | 4 | */ |
| 5 | use common\models\Option; | 5 | use common\models\Option; |
| 6 | use common\models\Portfolio; | 6 | use common\models\Portfolio; |
| 7 | - use common\widgets\ImageUploader; | 7 | +use common\models\Specialization; |
| 8 | +use common\widgets\ImageUploader; | ||
| 8 | use mihaildev\ckeditor\CKEditor; | 9 | use mihaildev\ckeditor\CKEditor; |
| 9 | use yii\helpers\Html; | 10 | use yii\helpers\Html; |
| 10 | use yii\widgets\ActiveForm; | 11 | use yii\widgets\ActiveForm; |
| @@ -42,8 +43,31 @@ use yii\web\JsExpression; | @@ -42,8 +43,31 @@ use yii\web\JsExpression; | ||
| 42 | 43 | ||
| 43 | 44 | ||
| 44 | <div class="input-blocks-wrapper"> | 45 | <div class="input-blocks-wrapper"> |
| 45 | - <?= $form->field($portfolio, 'specializationInput') | ||
| 46 | - ->checkboxList($specialization) ?> | 46 | + <ul class="content-menu-first"> |
| 47 | + <?php foreach($specializations as $specialization):?> | ||
| 48 | + <li data-img="<?= $specialization->image?>"> | ||
| 49 | + <span data-menu-bg="<?= $specialization->background ?>" style="background: <?= $specialization->background ?>"></span><a href="#"><?= $specialization->specialization_name?></a> | ||
| 50 | + <ul> | ||
| 51 | + <?php foreach($specialization->children as $child_first):?> | ||
| 52 | + | ||
| 53 | + <?php if($child_first instanceof Specialization):?> | ||
| 54 | + <li> | ||
| 55 | + <a href="#"><?= $child_first->specialization_name?></a> | ||
| 56 | + <ul> | ||
| 57 | + <?php foreach($child_first->children as $child_second):?> | ||
| 58 | + <?php if($child_first instanceof Specialization): ?> | ||
| 59 | + <li><a href="#"><?= $child_second->specialization_name?></a></li> | ||
| 60 | + <?php endif;?> | ||
| 61 | + <?php endforeach; ?> | ||
| 62 | + </ul> | ||
| 63 | + </li> | ||
| 64 | + <?php endif; ?> | ||
| 65 | + <?php endforeach; ?> | ||
| 66 | + | ||
| 67 | + </ul> | ||
| 68 | + </li> | ||
| 69 | + <?php endforeach; ?> | ||
| 70 | + </ul> | ||
| 47 | </div> | 71 | </div> |
| 48 | 72 | ||
| 49 | 73 |
frontend/views/performer/gallery.php
| @@ -54,4 +54,19 @@ $this->title = 'My Yii Application'; | @@ -54,4 +54,19 @@ $this->title = 'My Yii Application'; | ||
| 54 | ?> | 54 | ?> |
| 55 | </div> | 55 | </div> |
| 56 | 56 | ||
| 57 | -</div> | ||
| 58 | \ No newline at end of file | 57 | \ No newline at end of file |
| 58 | +</div> | ||
| 59 | +<script> | ||
| 60 | + $(function () { | ||
| 61 | + $('#demo5').scrollbox({ | ||
| 62 | + direction: 'h', | ||
| 63 | + distance: 220, | ||
| 64 | + autoPlay: false | ||
| 65 | + }); | ||
| 66 | + $('#demo5-backward').click(function () { | ||
| 67 | + $('#demo5').trigger('backward'); | ||
| 68 | + }); | ||
| 69 | + $('#demo5-forward').click(function () { | ||
| 70 | + $('#demo5').trigger('forward'); | ||
| 71 | + }); | ||
| 72 | + }); | ||
| 73 | +</script> | ||
| 59 | \ No newline at end of file | 74 | \ No newline at end of file |