diff --git a/common/models/Gallery.php b/common/models/Gallery.php index 6aed550..ec1ed87 100644 --- a/common/models/Gallery.php +++ b/common/models/Gallery.php @@ -61,7 +61,7 @@ { return [ [ - [ 'name' ], + [ 'name', 'cover' ], 'required', ], [ diff --git a/common/models/PortfolioUser.php b/common/models/PortfolioUser.php index d6a54de..1cdff07 100644 --- a/common/models/PortfolioUser.php +++ b/common/models/PortfolioUser.php @@ -136,6 +136,7 @@ $gallery = new Gallery([ 'user_id' => $this->user_id, 'name' => $this->portfolio->name, + 'cover' => '/images/imageNotFound.jpg', ]); if($gallery->save()) { $portfolioGallery = new PortfolioGallery([ diff --git a/common/modules/file/widgets/views/image_sizer.php b/common/modules/file/widgets/views/image_sizer.php index a1a4847..7c85c6e 100755 --- a/common/modules/file/widgets/views/image_sizer.php +++ b/common/modules/file/widgets/views/image_sizer.php @@ -4,7 +4,6 @@ $field_name = mb_strtolower($model->formName()) . "-" . $field; $id = $model->tableSchema->primaryKey[ 0 ]; - ?>
@@ -40,7 +39,6 @@ $( function() { - $("#").fileupload( { dataType : 'json', formData : {size : ''}, @@ -66,7 +64,7 @@ block.append(img); block.parents('.file-uploader-block').parent() .addClass('success_download'); - $("#").val(data.result.link); + $("#").val(data.result.link).trigger('change'); $("#_new_img").val(data.result.link); } } @@ -90,7 +88,7 @@ { } ); - $("#").val(new_url); + $("#").val(new_url).trigger('change'); } ); @@ -101,7 +99,9 @@ .removeClass('success_download'); $("#_img_block").parent().parent().find('.admin-ava-wr') .remove(); - + if($(this).hasClass('remover_image')) { + $('#_new_img').val(''); + } $("#_buttons_block").remove(); var old_url = $('#_old_img').val(); var new_url = $('#_new_img').val(); @@ -112,10 +112,16 @@ ); '); + $('#{$field}_img_block').find('.admin-avatar-pattern').append(''); + }"; } else { - echo "$(\"#$field_name\").val(old_url); + echo "$(\"#$field_name\").val(old_url).trigger('change'); if(old_url.length<=1){ $('#{$field}_img_block').find('img').remove() } diff --git a/frontend/controllers/AjaxController.php b/frontend/controllers/AjaxController.php index 3526ee5..3d9431b 100644 --- a/frontend/controllers/AjaxController.php +++ b/frontend/controllers/AjaxController.php @@ -27,6 +27,9 @@ public function actionProjectUser() { $ids = json_decode(\Yii::$app->request->get('ids')); + if(!empty(\Yii::$app->user->id)) { + array_push($ids, \Yii::$app->user->id); + } $model = new UserSearch(); $dataProvider = $model->search(\Yii::$app->request->queryParams); $dataProvider->query->andFilterWhere([ diff --git a/frontend/controllers/PerformerController.php b/frontend/controllers/PerformerController.php index 99df52d..b19016c 100755 --- a/frontend/controllers/PerformerController.php +++ b/frontend/controllers/PerformerController.php @@ -335,7 +335,7 @@ } $gallery = new ActiveDataProvider([ - 'query' => $user->getGalleries(), + 'query' => $user->getGalleries()->andWhere(['not', ['photo' => '']])->andWhere(['not', ['photo' => NULL]]), 'pagination' => [ 'pageSize' => 5, ], diff --git a/frontend/views/accounts/_gallery_form.php b/frontend/views/accounts/_gallery_form.php index 80d04a8..14018bc 100644 --- a/frontend/views/accounts/_gallery_form.php +++ b/frontend/views/accounts/_gallery_form.php @@ -1,7 +1,7 @@
field($gallery, 'name') - ->textInput (['class'=> 'custom-input-2']) ?> + ->textInput([ 'class' => 'custom-input-2' ]) ?>
@@ -32,27 +32,47 @@ $gallery, 'field' => 'cover', - 'size' => [ + 'size' => [ [ - 'width' => 210, - 'height' => 150, - ] + 'width' => 210, + 'height' => 150, + ], ], - + 'remover' => true, 'multi' => false, 'gallery' => $gallery->cover, 'name' => 'Загрузить главное фото', ]); ?> +
+ getActiveValidators('cover') as $validator) { + $client .= $validator->clientValidateAttribute($gallery, 'cover', $this); + } + $js = " + $('#".$form->id."').yiiActiveForm( + 'add', { + container : '.admin-avatar', + error : '.help-block', + id : 'gallery-cover', + input : '#gallery-cover', + name : 'Gallery[cover]', + validate: function(attribute, value, messages, deferred) { ".$client." } + } + ); + "; + $this->registerJs($js, $this::POS_LOAD); + ?>
$gallery, 'field' => 'photo', - 'size' => [ + 'size' => [ [ - 'width' => 152, - 'height' => 108, - ] + 'width' => 152, + 'height' => 108, + ], ], 'multi' => true, 'gallery' => $gallery->photo, @@ -61,29 +81,28 @@
-
- isNewRecord? Yii::t('app', 'add'):'Обновить', [ 'class' => 'input-blocks-wrapper button' ]) ?> + isNewRecord ? Yii::t('app', 'add') : 'Обновить', [ 'class' => 'input-blocks-wrapper button' ]) ?>
isNewRecord) { - echo Html::a(Yii::t('app', 'delete'), [ - 'accounts/gallery-delete', - 'id' => $gallery->gallery_id, - ], [ - 'title' => Yii::t('app', 'delete'), - 'aria-label' => Yii::t('app', 'delete'), - 'data-confirm' => Yii::t('app', 'delete_confirm'), - 'data-method' => 'post', - 'data-pjax' => 0, - ]); - } + if(!$gallery->isNewRecord) { + echo Html::a(Yii::t('app', 'delete'), [ + 'accounts/gallery-delete', + 'id' => $gallery->gallery_id, + ], [ + 'title' => Yii::t('app', 'delete'), + 'aria-label' => Yii::t('app', 'delete'), + 'data-confirm' => Yii::t('app', 'delete_confirm'), + 'data-method' => 'post', + 'data-pjax' => 0, + ]); + } ?>
- request->referrer)?\Yii::$app->request->referrer:['accounts/gallery' ]) ?> + request->referrer) ? \Yii::$app->request->referrer : [ 'accounts/gallery' ]) ?>
diff --git a/frontend/views/company/gallery.php b/frontend/views/company/gallery.php index c88eb2f..a3d8572 100755 --- a/frontend/views/company/gallery.php +++ b/frontend/views/company/gallery.php @@ -52,7 +52,9 @@ { $('#demo5').scrollbox( { - direction : 'h', distance : 220, autoPlay : false + direction : 'h', + distance : 220, + autoPlay : false } ); $('#demo5-backward').click( diff --git a/frontend/views/layouts/gallery.php b/frontend/views/layouts/gallery.php index 3fe888f..3607f4d 100755 --- a/frontend/views/layouts/gallery.php +++ b/frontend/views/layouts/gallery.php @@ -74,6 +74,7 @@ 'performer_id' => $this->params[ 'user' ]->id, 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL, ], + 'visible' => ( empty( $this->params[ 'type' ] ) || $this->params[ 'type' ] == 'implementer' ) ? true : false, ], [ 'label' => 'Заказанные работы', @@ -82,6 +83,7 @@ 'performer_id' => $this->params[ 'user' ]->id, 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL, ], + 'visible' => ( !empty( $this->params[ 'type' ] ) && $this->params[ 'type' ] == 'customer' ) ? true : false, ], [ 'label' => 'Блог', diff --git a/frontend/views/performer/gallery.php b/frontend/views/performer/gallery.php index 6b4ed30..b1655d0 100755 --- a/frontend/views/performer/gallery.php +++ b/frontend/views/performer/gallery.php @@ -9,31 +9,35 @@ $this->params[ 'user' ] = $user; $this->title = 'My Yii Application'; ?> -
-
Видео:
-
-
-
    - -
  • -
    - -
    + +
    +
    Видео:
    +
    +
    +
      + +
    • +
      + +
      - -
      • - + + + -
    -
    -
    - - +
+
+
+ + +
+
- - - - +
title = 'My Yii Application'; ?>
diff --git a/frontend/web/css/style.css b/frontend/web/css/style.css index 50818c6..404a72a 100755 --- a/frontend/web/css/style.css +++ b/frontend/web/css/style.css @@ -7838,7 +7838,7 @@ input.disabled.admin-check:checked + label, input.disabled.admin-check:checked + background: #fff } -.field_list .help-block { +.field_list .help-block, .admin-avatar .help-block { float: left; } -- libgit2 0.21.4