Merge branch 'blog-hashtag-filtr' into 'master'

#1255 п2



See merge request !56
parents e0ca19ee 2d3ce9eb
...@@ -25,8 +25,9 @@ use common\modules\languages\models\Languages; ...@@ -25,8 +25,9 @@ use common\modules\languages\models\Languages;
?> ?>
<?php if($tags) : ?> <?php if($tags) : ?>
<div class="sidebar_module"> <div class="sidebar_module">
<h2><?=\Yii::t('blog', 'Categories');?></h2>
<!-- add 22.05.16 --> <!-- add 22.05.16 -->
<? if(Yii::$app->controller->action->id != 'view'): ?>
<h2><?=\Yii::t('blog', 'Categories');?></h2>
<div class="categories_form"> <div class="categories_form">
<form action="/blog/post/tag-index"> <form action="/blog/post/tag-index">
<? $cookie = \Yii::$app->controller->getCookie() ?> <? $cookie = \Yii::$app->controller->getCookie() ?>
...@@ -36,10 +37,11 @@ use common\modules\languages\models\Languages; ...@@ -36,10 +37,11 @@ use common\modules\languages\models\Languages;
<?php endforeach; ?> <?php endforeach; ?>
</form> </form>
</div> </div>
<? endif ?>
<!-- add 22.05.16 --> <!-- add 22.05.16 -->
</div> </div>
<?php endif; ?> <?php endif; ?>
<? if(Yii::$app->controller->action->id != 'view'): ?>
<br/><br/> <br/><br/>
<div class="sidebar_module"> <div class="sidebar_module">
<div class="sidebar_module_body"> <div class="sidebar_module_body">
...@@ -53,7 +55,7 @@ use common\modules\languages\models\Languages; ...@@ -53,7 +55,7 @@ use common\modules\languages\models\Languages;
</div> </div>
</div> </div>
<? endif ?>
<?php $posts = Post::find(); <?php $posts = Post::find();
if($model) if($model)
{ {
......
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