From adce180c5740d05d526823f5e0cdd3368ede0944 Mon Sep 17 00:00:00 2001 From: Egorka Date: Thu, 5 Jul 2018 13:30:29 +0300 Subject: [PATCH] Using zertex/yii2-avatar-generator Updated dashboard avatars --- .gitignore | 1 + backend/messages/ru/main.php | 1 + backend/views/layouts/header.php | 6 +- backend/views/layouts/left.php | 4 +- common/config/main.php | 9 + common/modules/blog/entities/BlogPost.php | 2 +- common/modules/blog/entities/BlogTagAssignment.php | 8 + common/modules/blog/forms/BlogPostForm.php | 5 +- common/modules/blog/forms/BlogTagForm.php | 3 +- common/modules/blog/messages/ru/blog.php | 3 + common/modules/blog/views/manage/post/_form.php | 212 +++++++++++---------- common/modules/blog/views/manage/post/view.php | 3 +- composer.json | 3 +- 13 files changed, 154 insertions(+), 106 deletions(-) diff --git a/.gitignore b/.gitignore index 09933d3..4ffd823 100644 --- a/.gitignore +++ b/.gitignore @@ -33,5 +33,6 @@ phpunit.phar # vagrant runtime /.vagrant +/zertex composer.lock todo.txt diff --git a/backend/messages/ru/main.php b/backend/messages/ru/main.php index f5e1cd7..bf7bb3a 100644 --- a/backend/messages/ru/main.php +++ b/backend/messages/ru/main.php @@ -24,4 +24,5 @@ return [ 'Updating Setting' => 'Редактирование параметра', 'Editing' => 'Редактирование', 'Change at your own risk' => 'Редактируйте на свой страх и риск', + 'Online' => 'В сети', ]; \ No newline at end of file diff --git a/backend/views/layouts/header.php b/backend/views/layouts/header.php index 24c9ab3..50bc064 100644 --- a/backend/views/layouts/header.php +++ b/backend/views/layouts/header.php @@ -5,7 +5,7 @@ use core\components\avatar_generator\AvatarGenerator; /* @var $this \yii\web\View */ /* @var $content string */ -$avatar = new AvatarGenerator(); +//$avatar = new AvatarGenerator(); ?>
@@ -232,13 +232,13 @@ $avatar = new AvatarGenerator();
  • - User Image + User Image
    • - User Image

      diff --git a/backend/views/layouts/left.php b/backend/views/layouts/left.php index 98f8eeb..0211685 100644 --- a/backend/views/layouts/left.php +++ b/backend/views/layouts/left.php @@ -5,12 +5,12 @@

      - User Image + <?= Yii::$app->user->identity->user->username ?>

      user->identity->user->username ?>

      - Online +
      diff --git a/common/config/main.php b/common/config/main.php index 81b965b..2fee663 100644 --- a/common/config/main.php +++ b/common/config/main.php @@ -24,5 +24,14 @@ return [ //'path' => '@runtime/queue', 'path' => '@common/runtime/queue', ], + 'avatar' => [ + 'class' => \zertex\avatar_generator\AvatarGenerator::class, + 'images_folder' => '@staticRoot/images/avatars', + 'images_url' => '@static/images/avatars', + 'size_width' => 300, // default: 300 + 'font_size' => 200, // default: 200 + 'salt' => 'my_cms_salt', // salt for image file names + 'texture' => ['sun', 'rain'], // texture name + ], ], ]; diff --git a/common/modules/blog/entities/BlogPost.php b/common/modules/blog/entities/BlogPost.php index 0a79193..ba28bd6 100644 --- a/common/modules/blog/entities/BlogPost.php +++ b/common/modules/blog/entities/BlogPost.php @@ -283,7 +283,7 @@ class BlogPost extends ActiveRecord public function getTags(): ActiveQuery { - return $this->hasMany(BlogTag::className(), ['id' => 'tag_id'])->viaTable('post_tag_assignments', ['post_id' => 'id']); + return $this->hasMany(BlogTag::className(), ['id' => 'tag_id'])->viaTable('blog_tag_assignments', ['post_id' => 'id']); } public function getCategory(): ActiveQuery diff --git a/common/modules/blog/entities/BlogTagAssignment.php b/common/modules/blog/entities/BlogTagAssignment.php index 3aee1a3..bb9b4a1 100644 --- a/common/modules/blog/entities/BlogTagAssignment.php +++ b/common/modules/blog/entities/BlogTagAssignment.php @@ -3,10 +3,13 @@ namespace common\modules\blog\entities; use yii\db\ActiveRecord; +use yii\db\ActiveQuery; /** * @property integer $post_id; * @property integer $tag_id; + * + * @property BlogTag $tag */ class BlogTagAssignment extends ActiveRecord { @@ -26,4 +29,9 @@ class BlogTagAssignment extends ActiveRecord { return '{{%blog_tag_assignments}}'; } + + public function getTag(): ActiveQuery + { + return $this->hasOne(BlogTag::className(), ['id' => 'tag_id']); + } } \ No newline at end of file diff --git a/common/modules/blog/forms/BlogPostForm.php b/common/modules/blog/forms/BlogPostForm.php index 38ed042..cf148c3 100644 --- a/common/modules/blog/forms/BlogPostForm.php +++ b/common/modules/blog/forms/BlogPostForm.php @@ -26,6 +26,7 @@ class BlogPostForm extends CompositeForm public $published_at; public $slug; public $reset_image; + public $status; public $_post; @@ -41,10 +42,12 @@ class BlogPostForm extends CompositeForm $this->slug = $post->slug; $this->meta = new MetaForm($post->meta); $this->tags = new BlogTagForm($post); + $this->status = $post->status; $this->_post = $post; } else { $this->meta = new MetaForm(); $this->tags = new BlogTagForm(); + $this->status = 0; } parent::__construct($config); } @@ -54,7 +57,7 @@ class BlogPostForm extends CompositeForm return [ [['category_id', 'title'], 'required'], [['title', 'video'], 'string', 'max' => 255], - [['category_id'], 'integer'], + [['category_id', 'status'], 'integer'], [['description', 'content'], 'string'], [['image'], 'image'], ['reset_image', 'boolean'], diff --git a/common/modules/blog/forms/BlogTagForm.php b/common/modules/blog/forms/BlogTagForm.php index 2c2325b..245fcbc 100644 --- a/common/modules/blog/forms/BlogTagForm.php +++ b/common/modules/blog/forms/BlogTagForm.php @@ -4,6 +4,7 @@ namespace common\modules\blog\forms; use common\modules\blog\entities\BlogPost; use common\modules\blog\entities\BlogTag; +use common\modules\blog\entities\BlogTagAssignment; use yii\base\Model; use yii\helpers\ArrayHelper; @@ -19,7 +20,7 @@ class BlogTagForm extends Model public function __construct(BlogPost $post = null, $config = []) { if ($post) { - $this->existing = ArrayHelper::getColumn($post->blogTagAssignments, 'tag_id'); + $this->new_tags = ArrayHelper::map($post->blogTagAssignments, 'tag_id', 'tag.name'); } parent::__construct($config); } diff --git a/common/modules/blog/messages/ru/blog.php b/common/modules/blog/messages/ru/blog.php index 48ce8da..efd455b 100644 --- a/common/modules/blog/messages/ru/blog.php +++ b/common/modules/blog/messages/ru/blog.php @@ -58,4 +58,7 @@ return [ 'Video' => 'Видео', 'If a video link is specified, the image will be used as a preview image' => 'Если указана ссылка на видео, то изображение будет рассматриваться как картинка для предварительного просмотра', 'Reset Image' => 'Сбросить изображение', + 'Set tags...' => 'Укажите теги...', + 'Publish' => 'Публикация', + 'Preview on site' => 'Просмотр на сайте', ]; \ No newline at end of file diff --git a/common/modules/blog/views/manage/post/_form.php b/common/modules/blog/views/manage/post/_form.php index eacfa42..27274a8 100644 --- a/common/modules/blog/views/manage/post/_form.php +++ b/common/modules/blog/views/manage/post/_form.php @@ -10,6 +10,7 @@ use yii\helpers\Json; use yii\helpers\ArrayHelper; use kartik\widgets\DateTimePicker; use kartik\widgets\Select2; +use common\modules\blog\helpers\BlogPostHelper; /* @var $this yii\web\View */ /* @var $model \common\modules\blog\forms\BlogPostForm */ @@ -37,108 +38,127 @@ JS; 'options' => ['enctype'=>'multipart/form-data'] ]); ?> -
      -
      -
      -
      -
      - field($model, 'category_id')->dropDownList($model->categoriesList(), ['prompt' => '']) ?> - field($model, 'published_at')->widget(DateTimePicker::classname(), [ - 'options' => [], - 'pluginOptions' => [ - 'autoclose' => true, - 'format' => 'dd.mm.yyyy hh:ii:ss', - ] - ]); ?> -
      -
      -
      -
      -
      -
      -
      - field($model->tags, 'new_tags')->widget(Select2::classname(), [ - 'options' => [ - 'placeholder' => Yii::t('blog','Set tags...'), - 'multiple' => true, - ], - 'pluginOptions' => [ - 'tags' => true, - 'tokenSeparators' => [',', ' '], - 'maximumInputLength' => 12, - 'ajax' => [ - 'url' => $fetchUrl, - 'dataType' => 'json', - 'data' => new JsExpression('function(params) { return {q:params.term}; }') - ], - 'escapeMarkup' => new JsExpression('function (markup) { return markup; }'), - 'templateResult' => new JsExpression('function(tag) { return tag.text; }'), - 'templateSelection' => new JsExpression('function (tag) { return tag.text; }'), - ], - ])->label(false); ?> -
      -
      -
      -
      - -
      -
      - field($model, 'title')->textInput(['maxlength' => true]) ?> - field($model, 'slug')->textInput(['maxlength' => true]) ?> - field($model, 'description')->textarea(['rows' => 5]) ?> - field($model, 'content')->widget(CKEditor::className()) ?> -
      -
      - -
      -
      - -
        -
        • -
        • -
      - -
      -
      - field($model, 'image')->label(false)->widget(FileInput::class, [ - 'options' => [ - 'accept' => 'image/*', - ], - 'pluginOptions' => [ - 'showUpload' => false, - ], - ]) ?> - - _post) && $model->_post->image): ?> - _post->getThumbFileUrl('image', 'thumb_gallery_view'), [ - 'class' => 'thumbnail', - 'width' => 300, - ]) ?> - - field($model, 'reset_image')->checkbox() ?> - -
      -
      - field($model, 'video')->textInput()->label(Yii::t('blog', 'YouTube URL'))->hint(Yii::t('blog', 'If a video link is specified, the image will be used as a preview image')) ?> + +
      +
      + + +
      +
      +
      +
      +
      + field($model, 'category_id')->dropDownList($model->categoriesList(), ['prompt' => '']) ?> + field($model, 'published_at')->widget(DateTimePicker::classname(), [ + 'options' => [], + 'pluginOptions' => [ + 'autoclose' => true, + 'format' => 'dd.mm.yyyy hh:ii:ss', + ] + ]); ?> +
      +
      +
      +
      +
      +
      +
      + field($model->tags, 'new_tags')->widget(Select2::classname(), [ + 'options' => [ + 'placeholder' => Yii::t('blog','Set tags...'), + 'multiple' => true, + ], + 'pluginOptions' => [ + 'tags' => true, + 'tokenSeparators' => [',', ' '], + 'maximumInputLength' => 12, + 'ajax' => [ + 'url' => $fetchUrl, + 'dataType' => 'json', + 'data' => new JsExpression('function(params) { return {q:params.term}; }') + ], + 'escapeMarkup' => new JsExpression('function (markup) { return markup; }'), + 'templateResult' => new JsExpression('function(tag) { return tag.text; }'), + 'templateSelection' => new JsExpression('function (tag) { return tag.text; }'), + ], + ])->label(false); ?> +
      +
      +
      +
      + +
      +
      + field($model, 'title')->textInput(['maxlength' => true]) ?> + field($model, 'slug')->textInput(['maxlength' => true]) ?> + field($model, 'description')->textarea(['rows' => 5]) ?> + field($model, 'content')->widget(CKEditor::className()) ?> +
      +
      + +
      +
      + +
        +
        • +
        • +
      + +
      +
      + field($model, 'image')->label(false)->widget(FileInput::class, [ + 'options' => [ + 'accept' => 'image/*', + ], + 'pluginOptions' => [ + 'showUpload' => false, + ], + ]) ?> + + _post) && $model->_post->image): ?> + _post->getThumbFileUrl('image', 'thumb_gallery_view'), [ + 'class' => 'thumbnail', + 'width' => 300, + ]) ?> + + field($model, 'reset_image')->checkbox() ?> + +
      +
      + field($model, 'video')->textInput()->label(Yii::t('blog', 'YouTube URL'))->hint(Yii::t('blog', 'If a video link is specified, the image will be used as a preview image')) ?> +
      +
      +
      +
      +
      +
      + field($model->meta, 'title')->textInput() ?> + field($model->meta, 'description')->textarea(['rows' => 2]) ?> + field($model->meta, 'keywords')->textInput() ?> +
      +
      + +
      + 'btn btn-success']) ?> +
      + + +
      +
      +
      +
      +
      + +
      + field($model, 'status')->radioList(BlogPostHelper::statusList()) ?> +
      +
      -
      -
      -
      - field($model->meta, 'title')->textInput() ?> - field($model->meta, 'description')->textarea(['rows' => 2]) ?> - field($model->meta, 'keywords')->textInput() ?> -
      -
      - -
      - 'btn btn-success']) ?> -
      -
      diff --git a/common/modules/blog/views/manage/post/view.php b/common/modules/blog/views/manage/post/view.php index f784c75..c1fb1f3 100644 --- a/common/modules/blog/views/manage/post/view.php +++ b/common/modules/blog/views/manage/post/view.php @@ -52,7 +52,8 @@ $this->params['breadcrumbs'][] = $title; ], [ 'label' => Yii::t('post', 'Tags'), - 'value' => implode(', ', ArrayHelper::getColumn($post->tags, 'name')), + 'format' => 'raw', + 'value' => ' ' . implode(' ', ArrayHelper::getColumn($post->tags, 'name')), ], ], ]) ?> diff --git a/composer.json b/composer.json index b2196b8..8046e2b 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,8 @@ "bower-asset/jquery-migrate": "^3.0", "bower-asset/jquery-cookie": "^1.4", "drewm/mailchimp-api": "^2.4", - "yiisoft/yii2-imagine": "^2.1" + "yiisoft/yii2-imagine": "^2.1", + "zertex/yii2-avatar-generator": "*" }, "require-dev": { "yiisoft/yii2-debug": "~2.0.0",