Skip to content

T
taskonsite-архив-перенесен
Commit b3bd75eb authored by Ruslan Karimov's avatar Ruslan Karimov
Browse files
Options

#304. Правки Блога по списку задач.

parent 5d555cc7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 149 additions and 54 deletions
common/modules/blog/assets/src/js/generator.js
View file @ b3bd75eb
......@@ -5,7 +5,8 @@ $('.checkbox_btn').on('change', function(e) {
var $this = $(this);
var action = $this.attr("action");
var preloader = $('.js-category-preloader');
preloader.show();
$.ajax({
type: "get",
url: action,
......@@ -21,11 +22,18 @@ $('.checkbox_btn').on('change', function(e) {
$('section.blog article').detach();
$('section.blog h1').after(msg.posts);
$('section.blog .loaded').html('');
preloader.hide();
},
error: function () {
preloader.hide();
}
});
},
error: function () {
preloader.hide();
}
});
})
});
$('#posttag-name').on("keyup", function(){
......
common/modules/blog/controllers/PostController.php
View file @ b3bd75eb
......@@ -6,6 +6,7 @@ use common\modules\blog\models\SearchPost;
use common\modules\languages\models\Languages;
use Yii;
use common\components\BaseController;
use yii\db\ActiveQuery;
use yii\web\NotFoundHttpException;
use yii\web\Response;
use yii\widgets\ActiveForm;
......@@ -72,6 +73,16 @@ class PostController extends BaseController
{
$query = Post::find()->where('posts.active=1')->limit(Post::PAGE_SIZE)->orderBy(Post::tableName().'.created_at DESC');
}
$lang = Languages::getCurrent();
$query->joinWith(['langs' => function($query) use ($lang) {
/** @var ActiveQuery $query */
$query->alias('lng')
->andWhere(['lng.lang_id' => $lang->id])
->andWhere(['<>', 'lng.title', ''])
->andWhere(['<>', 'lng.text', ''])
->andWhere(['IS NOT', 'lng.title', null])
->andWhere(['IS NOT', 'lng.text', null]);
}]);
return $this->render('index', [
'models' => $query->all(),
......@@ -138,8 +149,16 @@ class PostController extends BaseController
$tag = $this->getCookie();
Yii::$app->response->format = Response::FORMAT_JSON;
$query = Post::find()->where(['active' => 1])->orderBy(Post::tableName().'.created_at DESC');
$lang = Languages::getCurrent();
$query = Post::find()->where(['active' => 1])->joinWith(['langs' => function($query) use ($lang) {
/** @var ActiveQuery $query */
$query->alias('lng')
->andWhere(['lng.lang_id' => $lang->id])
->andWhere(['<>', 'lng.title', ''])
->andWhere(['<>', 'lng.text', ''])
->andWhere(['IS NOT', 'lng.title', null])
->andWhere(['IS NOT', 'lng.text', null]);
}])->orderBy(Post::tableName().'.created_at DESC');
if(count($tag))
{
......
common/modules/blog/views/post/_load.php
View file @ b3bd75eb
......@@ -9,7 +9,7 @@ use yii\helpers\Url;
?>
<?php foreach ($models as $model) : ?>
<?php var_dump($model->lang->id) ?>
<article class="article_short">
<a href="<?=Url::to(['/blog/'.$model->url])?>" class="article_short_title"><?=$model->lang->title?></a>
<div class="article_short_head">
......@@ -18,7 +18,6 @@ use yii\helpers\Url;
<?=$model->getViews()->count()?>
<div class="blog_toltip_left">Количество просмотров</div>
</span>
<?=$this->render('_social', ['link' => Url::to(['/blog/'.$model->url], true), 'title' => $model->lang->title])?>
</div>
<div class="article_short_tags">
......@@ -32,9 +31,11 @@ use yii\helpers\Url;
<div class="article_short_txt">
<div class="preview-image">
<?php if($model->preview) :
echo Html::img($model->preview);
endif; ?>
<?php if($model->preview) : ?>
<a href="<?=Url::to(['/blog/'.$model->url])?>" class="article_short_title" title="<?=$model->lang->title?>">
<?= Html::img($model->preview) ?>
</a>
<?php endif; ?>
</div>
<?=$model->lang->cutText(650)?>
......
common/modules/blog/views/post/_sidebar.php
View file @ b3bd75eb
......@@ -27,7 +27,7 @@ use common\modules\languages\models\Languages;
<div class="sidebar_module">
<!-- add 22.05.16 -->
<? if(Yii::$app->controller->action->id != 'view'): ?>
<h2><?=\Yii::t('blog', 'Categories');?></h2>
<h2><?=\Yii::t('blog', 'Categories');?> <img class="js-category-preloader category-preloader" src="/images/post-loader.gif"></h2>
<div class="categories_form">
<form action="/blog/post/tag-index">
<? $cookie = \Yii::$app->controller->getCookie() ?>
......@@ -70,10 +70,11 @@ use common\modules\languages\models\Languages;
<?php foreach ($posts as $post) : ?>
<div class="article_itm">
<a href="<?=Url::to(['/blog/'.$post->url])?>" class="article_itm_link">
<?php if($post->preview) : ?>
<img src="<?=$post->getThumbnailUrl()?>" alt="">
<?php endif; ?>
<a href="<?=Url::to(['/blog/'.$post->url])?>" class="article_itm_link"><?=$post->lang->title?></a>
<?=$post->lang->title?></a>
</div>
<?php endforeach; ?>
......@@ -82,7 +83,7 @@ use common\modules\languages\models\Languages;
</div>
<?php endif; ?>
<div class="sidebar_module">
<div class="sidebar_module sidebar_module--margin-bottom">
<h2><?=\Yii::t('blog', 'Follow us!')?></h2>
<div class="sidebar_module_body">
<!-- add 22.05.16 -->
......
common/modules/blog/views/post/index.php
View file @ b3bd75eb
......@@ -21,7 +21,7 @@ $this->registerJs("initScrollPager()", yii\web\View::POS_END);
<div class="col-md-8 col-xs-8 col-sm-12">
<section class="blog">
<h1><?=Yii::t('menu', 'Blog')?></h1>
<h1><?=Yii::t('blog', 'Blog')?></h1>
<?=$this->render('_load', ['models' => $models])?>
......
common/modules/blog/views/post/view.php
View file @ b3bd75eb
<?php
use frontend\assets\LikelyAsset;
use yii\helpers\Html;
use yii\helpers\Url;
use common\modules\blog\assets\GeneratorAsset;
......@@ -8,6 +9,7 @@ use common\modules\blog\assets\GeneratorAsset;
/* @var $model common\modules\blog\models\Post */
GeneratorAsset::register($this);
LikelyAsset::register($this);
$this->registerJs("
$('.article_short_txt').find('img').click(function() {
......@@ -24,55 +26,67 @@ $('.article_short_txt').find('img').click(function() {
?>
<div class="blog_container">
<div class="container">
<div class="row">
<div class="col-md-8 col-xs-8 col-sm-12">
<section class="blog">
<h1><?=$model->lang->title?></h1>
<article class="article_short">
<div class="article_short_head">
<span class="article_short_date"><?=date('d.m.Y', $model->created_at)?></span>
<span class="article_short_view">
<?=$model->getViews()->count()?>
<div class="blog_toltip_left">Количество просмотров</div>
<div class="blog_container">
<div class="container">
<div class="row">
<div class="col-md-8 col-xs-8 col-sm-12">
<section class="blog">
<h1><?= $model->lang->title ?></h1>
<article class="article_short">
<div class="article_short_head">
<span class="article_short_date"><?= date('d.m.Y', $model->created_at) ?></span>
<span class="article_short_view">
<?= $model->getViews()->count() ?>
<div class="blog_toltip_left">Количество просмотров</div>
</span>
<?=$this->render('_social', ['link' => Url::to(['/blog/'.$model->url], true), 'title' => $model->lang->title])?>
<div class="article_short_social">
<div class="likely">
<div class="twitter"></div>
<div class="facebook"></div>
<div class="gplus"></div>
<div class="vkontakte"></div>
<div class="telegram"></div>
<div class="odnoklassniki"></div>
<div class="linkedin"></div>
<div class="whatsapp"></div>
<div class="pinterest" data-media="i/pinnable.jpg"></div>
</div>
</div>
</div>
<div class="article_short_tags">
</div>
<div class="article_short_tags">
<?php foreach ($model->postTags as $tag) : ?>
<?php foreach ($model->postTags as $tag) : ?>
<a href="<?=$tag->url;?>">#<?=$tag->name?></a>
<a href="<?= $tag->url; ?>">#<?= $tag->name ?></a>
<?php endforeach; ?>
</div>
<div class="article_short_txt">
<?php endforeach; ?>
<div class="preview-image">
<?php if($model->preview) :
echo Html::img($model->preview);
endif; ?>
</div>
<div class="article_short_txt">
<?=$model->lang->text?>
</div>
</article>
<?=$this->render('_subscribe', ['title' => 'Запись в блоге: ' . $model->lang->title])?>
<div class="preview-image">
<?php if ($model->preview) :
echo Html::img($model->preview);
endif; ?>
</div>
</section>
</div>
<?=$this->render('_sidebar', ['model' => $model])?>
<?= $model->lang->text ?>
</div>
</article>
<?= $this->render('_subscribe', ['title' => 'Запись в блоге: ' . $model->lang->title]) ?>
</section>
</div>
<?= $this->render('_sidebar', ['model' => $model]) ?>
</div>
</div>
</div>
</div>
<?=$this->render('_modals')?>
<?= $this->render('_modals') ?>
<?=$this->render('@app/views/layouts/footer');?>
\ No newline at end of file
<?= $this->render('@app/views/layouts/footer'); ?>
\ No newline at end of file
frontend/assets/LikelyAsset.php 0 → 100644
View file @ b3bd75eb
<?php
namespace frontend\assets;
use yii\web\AssetBundle;
class LikelyAsset extends AssetBundle
{
public $basePath = '@webroot';
public $baseUrl = '@web';
public $css = [
'css/likely.css',
];
public $js = [
'js/likely.js',
];
public $depends = [
];
}
frontend/messages/ru-RU/blog.php
View file @ b3bd75eb
<?php
return [
'Blog' => 'Блог компании Арт Проект',
'Categories' => 'Категории',
'Offer a subject' => 'Предложить тему',
'Suggest an article for the blog' => 'Предложить статью для блога',
'Send an article' => 'Предложите статью',
'Most popular' => 'Популярные',
'You can offer an article for publication or write to us about what is interesting to read.' => 'Вы можете предложить статью для публикации или написать нам о том, что бы было интересно почитать.',
'We are happy to share our experience and write an interesting article.' => 'Мы с радостью поделимся своим опытом и напишем интересную статью.',
'You can offer an article for publication or write to us about what is interesting to read.' => 'Вы можете прислать нам свою статью и мы опубликуем ее в блоге. Требований не много:',
'We are happy to share our experience and write an interesting article.' => '<ul class="list"><li>Статья должна быть полезной для пользователей;</li><li>Статья должна быть уникальной на 95%;</li><li>Фотографии и дополнительный материал вы можете направить на info@task-on.com.</li></ul>',
'Submit' => 'Предложить статью',
' Submit ' => 'Предложить тему',
"We are ready to share our experience, let us know what a topic you're interested in." => 'Мы готовы бесплатно поделиться накопленным опытом, если вы сообщите тему которая вас интересует',
......@@ -16,8 +17,8 @@ For example: write about CRM" => "Что хочу почитать?
Про то как выставляются ставки.",
'Art Project Blog' => 'Блог',
'Load more' => 'Загрузить еще',
'Read more...' => 'Читать...',
'Follow us!' => 'Все секреты в наших соц сетях!',
'Read more...' => 'Читать',
'Follow us!' => 'Подписывайся на нас в соцсетях',
'Offer a subject and we will publish about it' => 'Предложите свою тему и мы напишем',
'Close' => 'Закрыть',
'Please enter your e-mail' => 'Необходимо заполнить «Email»',
......
frontend/web/css/custom.css
View file @ b3bd75eb
......@@ -3496,4 +3496,20 @@ section#step-plan-is img.alignleft {
em
{
font-style: italic;
}
ul.list {
list-style: disc;
padding-left: 40px;
}
.category-preloader {
display: none;
float: right;
margin-right: 10px;
margin-top: -5px;
}
.sidebar_module--margin-bottom {
margin-bottom: 15px;
}
\ No newline at end of file
frontend/web/css/likely.css 0 → 100644
View file @ b3bd75eb
.likely,.likely__widget{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;display:inline-block;margin:0;padding:0;text-indent:0!important;list-style:none!important;font-weight:400;font-family:Helvetica Neue,Arial,sans-serif;font-size:inherit}.likely{opacity:0;font-size:0!important}.likely_visible{opacity:1;transition:opacity .1s ease-in}.likely>*{display:inline-block;visibility:hidden}.likely_visible>*{visibility:inherit}.likely__widget{display:inline-block;position:relative;white-space:nowrap}.likely__button,.likely__counter{text-decoration:none;text-rendering:optimizeLegibility;display:inline-block;margin:0;outline:0}.likely__button{position:relative;cursor:pointer;user-select:none}.likely__counter{display:none;position:relative;font-weight:400}.likely_ready .likely__counter{display:inline-block}.likely_ready .likely__counter_empty{display:none}.likely__button,.likely__counter,.likely__icon,.likely__widget{vertical-align:top}.likely__widget{transition:background .33s ease-out,color .33s ease-out,fill .33s ease-out}.likely__widget:active,.likely__widget:focus,.likely__widget:hover{transition:none;cursor:pointer}@media (hover:none){.likely__widget:active,.likely__widget:focus,.likely__widget:hover{transition:background .33s ease-out,color .33s ease-out,fill .33s ease-out;cursor:unset}}.likely__icon{position:relative;text-align:left;display:inline-block}.likely svg{position:absolute}.likely__button,.likely__counter{line-height:inherit;cursor:inherit}.likely__button:empty{display:none}.likely__counter{text-align:center}.likely .likely__widget{color:#000;background:hsla(0,0%,91%,.8)}.likely .likely__counter{background-size:1px 1px;background-repeat:repeat-y;background-image:linear-gradient(90deg,rgba(0,0,0,.2) 0,transparent .5px,transparent)}.likely-light .likely__widget{color:#fff;fill:#fff;background:hsla(0,0%,93%,.16);text-shadow:rgba(0,0,0,.2) 0 0 .33em}.likely-light .likely__counter{background-image:linear-gradient(90deg,hsla(0,0%,100%,.4) 0,hsla(0,0%,100%,0) .5px,hsla(0,0%,100%,0))}.likely__widget_facebook{fill:#425497}.likely__widget_facebook:active,.likely__widget_facebook:focus,.likely__widget_facebook:hover{background:rgba(207,212,229,.8)}@media (hover:none){.likely__widget_facebook:active,.likely__widget_facebook:focus,.likely__widget_facebook:hover{background:hsla(0,0%,91%,.8)}}.likely-light .likely__widget_facebook:active,.likely-light .likely__widget_facebook:focus,.likely-light .likely__widget_facebook:hover{text-shadow:#425497 0 0 .25em;background:rgba(66,84,151,.7)}@media (hover:none){.likely-light .likely__widget_facebook:active,.likely-light .likely__widget_facebook:focus,.likely-light .likely__widget_facebook:hover{text-shadow:rgba(0,0,0,.2) 0 0 .33em;background:hsla(0,0%,93%,.16)}}.likely__widget_gplus{fill:#dd4241}.likely__widget_gplus:active,.likely__widget_gplus:focus,.likely__widget_gplus:hover{background:hsla(0,68%,89%,.8)}@media (hover:none){.likely__widget_gplus:active,.likely__widget_gplus:focus,.likely__widget_gplus:hover{background:hsla(0,0%,91%,.8)}}.likely-light .likely__widget_gplus:active,.likely-light .likely__widget_gplus:focus,.likely-light .likely__widget_gplus:hover{text-shadow:#dd4241 0 0 .25em;background:rgba(221,66,65,.7)}@media (hover:none){.likely-light .likely__widget_gplus:active,.likely-light .likely__widget_gplus:focus,.likely-light .likely__widget_gplus:hover{text-shadow:rgba(0,0,0,.2) 0 0 .33em;background:hsla(0,0%,93%,.16)}}.likely__widget_linkedin{fill:#0077b5}.likely__widget_linkedin:active,.likely__widget_linkedin:focus,.likely__widget_linkedin:hover{background:rgba(191,221,236,.8)}@media (hover:none){.likely__widget_linkedin:active,.likely__widget_linkedin:focus,.likely__widget_linkedin:hover{background:hsla(0,0%,91%,.8)}}.likely-light .likely__widget_linkedin:active,.likely-light .likely__widget_linkedin:focus,.likely-light .likely__widget_linkedin:hover{text-shadow:#0077b5 0 0 .25em;background:rgba(0,119,181,.7)}@media (hover:none){.likely-light .likely__widget_linkedin:active,.likely-light .likely__widget_linkedin:focus,.likely-light .likely__widget_linkedin:hover{text-shadow:rgba(0,0,0,.2) 0 0 .33em;background:hsla(0,0%,93%,.16)}}.likely__widget_odnoklassniki{fill:#f6903b}.likely__widget_odnoklassniki:active,.likely__widget_odnoklassniki:focus,.likely__widget_odnoklassniki:hover{background:hsla(27,88%,90%,.8)}@media (hover:none){.likely__widget_odnoklassniki:active,.likely__widget_odnoklassniki:focus,.likely__widget_odnoklassniki:hover{background:hsla(0,0%,91%,.8)}}.likely-light .likely__widget_odnoklassniki:active,.likely-light .likely__widget_odnoklassniki:focus,.likely-light .likely__widget_odnoklassniki:hover{text-shadow:#f6903b 0 0 .25em;background:rgba(246,144,59,.7)}@media (hover:none){.likely-light .likely__widget_odnoklassniki:active,.likely-light .likely__widget_odnoklassniki:focus,.likely-light .likely__widget_odnoklassniki:hover{text-shadow:rgba(0,0,0,.2) 0 0 .33em;background:hsla(0,0%,93%,.16)}}.likely__widget_pinterest{fill:#bd081c}.likely__widget_pinterest:active,.likely__widget_pinterest:focus,.likely__widget_pinterest:hover{background:rgba(238,193,198,.8)}@media (hover:none){.likely__widget_pinterest:active,.likely__widget_pinterest:focus,.likely__widget_pinterest:hover{background:hsla(0,0%,91%,.8)}}.likely-light .likely__widget_pinterest:active,.likely-light .likely__widget_pinterest:focus,.likely-light .likely__widget_pinterest:hover{text-shadow:#bd081c 0 0 .25em;background:rgba(189,8,28,.7)}@media (hover:none){.likely-light .likely__widget_pinterest:active,.likely-light .likely__widget_pinterest:focus,.likely-light .likely__widget_pinterest:hover{text-shadow:rgba(0,0,0,.2) 0 0 .33em;background:hsla(0,0%,93%,.16)}}.likely__widget_telegram{fill:#34abde}.likely__widget_telegram:active,.likely__widget_telegram:focus,.likely__widget_telegram:hover{background:rgba(204,234,246,.8)}@media (hover:none){.likely__widget_telegram:active,.likely__widget_telegram:focus,.likely__widget_telegram:hover{background:hsla(0,0%,91%,.8)}}.likely-light .likely__widget_telegram:active,.likely-light .likely__widget_telegram:focus,.likely-light .likely__widget_telegram:hover{text-shadow:#34abde 0 0 .25em;background:rgba(52,171,222,.7)}@media (hover:none){.likely-light .likely__widget_telegram:active,.likely-light .likely__widget_telegram:focus,.likely-light .likely__widget_telegram:hover{text-shadow:rgba(0,0,0,.2) 0 0 .33em;background:hsla(0,0%,93%,.16)}}.likely__widget_twitter{fill:#00b7ec}.likely__widget_twitter:active,.likely__widget_twitter:focus,.likely__widget_twitter:hover{background:rgba(191,237,250,.8)}@media (hover:none){.likely__widget_twitter:active,.likely__widget_twitter:focus,.likely__widget_twitter:hover{background:hsla(0,0%,91%,.8)}}.likely-light .likely__widget_twitter:active,.likely-light .likely__widget_twitter:focus,.likely-light .likely__widget_twitter:hover{text-shadow:#00b7ec 0 0 .25em;background:rgba(0,183,236,.7)}@media (hover:none){.likely-light .likely__widget_twitter:active,.likely-light .likely__widget_twitter:focus,.likely-light .likely__widget_twitter:hover{text-shadow:rgba(0,0,0,.2) 0 0 .33em;background:hsla(0,0%,93%,.16)}}.likely__widget_vkontakte{fill:#526e8f}.likely__widget_vkontakte:active,.likely__widget_vkontakte:focus,.likely__widget_vkontakte:hover{background:rgba(211,218,227,.8)}@media (hover:none){.likely__widget_vkontakte:active,.likely__widget_vkontakte:focus,.likely__widget_vkontakte:hover{background:hsla(0,0%,91%,.8)}}.likely-light .likely__widget_vkontakte:active,.likely-light .likely__widget_vkontakte:focus,.likely-light .likely__widget_vkontakte:hover{text-shadow:#526e8f 0 0 .25em;background:rgba(82,110,143,.7)}@media (hover:none){.likely-light .likely__widget_vkontakte:active,.likely-light .likely__widget_vkontakte:focus,.likely-light .likely__widget_vkontakte:hover{text-shadow:rgba(0,0,0,.2) 0 0 .33em;background:hsla(0,0%,93%,.16)}}.likely__widget_whatsapp{fill:#25d366}.likely__widget_whatsapp:active,.likely__widget_whatsapp:focus,.likely__widget_whatsapp:hover{background:rgba(200,244,216,.8)}@media (hover:none){.likely__widget_whatsapp:active,.likely__widget_whatsapp:focus,.likely__widget_whatsapp:hover{background:hsla(0,0%,91%,.8)}}.likely-light .likely__widget_whatsapp:active,.likely-light .likely__widget_whatsapp:focus,.likely-light .likely__widget_whatsapp:hover{text-shadow:#25d366 0 0 .25em;background:rgba(37,211,102,.7)}@media (hover:none){.likely-light .likely__widget_whatsapp:active,.likely-light .likely__widget_whatsapp:focus,.likely-light .likely__widget_whatsapp:hover{text-shadow:rgba(0,0,0,.2) 0 0 .33em;background:hsla(0,0%,93%,.16)}}.likely{margin:0 -5px -10px}.likely .likely__widget{line-height:20px;font-size:14px;border-radius:3px;height:22px;margin:0 5px 10px}.likely .likely__icon{width:22px;height:22px}.likely .likely__button{padding:1px 4px 1px 0}.likely .likely__counter{padding:1px 4px}.likely svg{left:3px;top:3px;width:16px;height:16px}.likely-big{margin:0 -6px -12px}.likely-big .likely__widget{line-height:28px;font-size:18px;border-radius:4px;height:32px;margin:0 6px 12px}.likely-big .likely__icon{width:32px;height:32px}.likely-big .likely__button{padding:2px 6px 2px 0}.likely-big .likely__counter{padding:2px 6px}.likely-big svg{left:4px;top:4px;width:24px;height:24px}.likely-small{margin:0 -4px -8px}.likely-small .likely__widget{line-height:14px;font-size:12px;border-radius:2px;height:18px;margin:0 4px 8px}.likely-small .likely__icon{width:18px;height:18px}.likely-small .likely__button{padding:2px 3px 2px 0}.likely-small .likely__counter{padding:2px 3px}.likely-small svg{left:3px;top:3px;width:12px;height:12px}
\ No newline at end of file
frontend/web/js/likely-commonjs.js 0 → 100644
View file @ b3bd75eb
This diff is collapsed.
frontend/web/js/likely.js 0 → 100644
View file @ b3bd75eb
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

task-on.com - ООО "Арт Проект"