Merge branch 'task-on.com/faq' into 'master'

новая верстка блога



See merge request !38

common/modules/blog/views/post/_load.php

@@ -17,7 +17,8 @@ use yii\helpers\Url;
             <span class="article_short_view">
                 <?=$model->getViews()->count()?>
                 <div class="blog_toltip_left">Количество просмотров</div>
-            </span>            
+            </span>
+            <?=$this->render('_social', ['link' => Url::to(['/blog/'.$model->url], true), 'title' => $model->lang->title])?>
         </div>
         <div class="article_short_tags">
 

common/modules/blog/views/post/_social.php

+<?
+use common\models\Settings;
+?>
 <ul class="article_short_social">
     <li>
+        <?/*
         <a href="#" onclick="window.open('http://vkontakte.ru/share.php?url=<?=$link?>&title=<?=$title?>', 'Soc', 'screenX=100,screenY=100,height=500,width=500,location=no,toolbar=no,directories=no,menubar=no,status=no'); return false;"><img src="/images/icon/sh_social_vk.png" height="30" width="30" alt=""></a>
         <a href="#" onclick="window.open('http://www.facebook.com/share.php?u=<?=$title?>', 'Soc', 'screenX=100,screenY=100,height=500,width=500,location=no,toolbar=no,directories=no,menubar=no,status=no'); return false;"><img src="/images/icon/sh_social_fb.png" height="30" width="30" alt=""></a>
         <a href="#" onclick="window.open('http://twitter.com/timeline/home?status=<?=$title?>%20<?=$link?>', 'Soc', 'screenX=100,screenY=100,height=500,width=500,location=no,toolbar=no,directories=no,menubar=no,status=no'); return false;"><img src="/images/icon/sh_social_tw.png" height="30" width="30" alt=""></a>
         <a href="#" onclick="window.open('https://plus.google.com/share?url=<?=$link?>', 'Soc', 'screenX=100,screenY=100,height=500,width=500,location=no,toolbar=no,directories=no,menubar=no,status=no'); return false;"><img src="/images/icon/sh_social_gp.png" height="30" width="30" alt=""></a>
         <!-- <a href="#"><img src="/images/icon/sh_social_t.png" height="30" width="30" alt=""></a> -->
+*/?>
+        <?php $s = Settings::getValue('social-link-google'); if($s): ?><a onclick="window.open('https://plus.google.com/share?url=<?=$link?>', 'Soc', 'screenX=100,screenY=100,height=500,width=500,location=no,toolbar=no,directories=no,menubar=no,status=no'); return false;" class="icon_social_btn icon_social_g" href="<?= $s ?>"></a><? endif ?>
+        <?php $s = Settings::getValue('social-link-twitter'); if($s): ?><a onclick="window.open('https://plus.google.com/share?url=<?=$link?>', 'Soc', 'screenX=100,screenY=100,height=500,width=500,location=no,toolbar=no,directories=no,menubar=no,status=no'); return false;" class="icon_social_btn icon_social_tw" href="<?= $s ?>"></a><? endif ?>
+        <?php $s = Settings::getValue('social-link-fb'); if($s): ?><a onclick="window.open('https://plus.google.com/share?url=<?=$link?>', 'Soc', 'screenX=100,screenY=100,height=500,width=500,location=no,toolbar=no,directories=no,menubar=no,status=no'); return false;" class="icon_social_btn icon_social_f" href="<?= $s ?>"></a><? endif ?>
+        <?php $s = Settings::getValue('social-link-vk'); if($s): ?><a onclick="window.open('https://plus.google.com/share?url=<?=$link?>', 'Soc', 'screenX=100,screenY=100,height=500,width=500,location=no,toolbar=no,directories=no,menubar=no,status=no'); return false;" class="icon_social_btn icon_social_b" href="<?= $s ?>"></a><? endif ?>
+        <?php $s = Settings::getValue('social-link-instagram'); if($s): ?><a onclick="window.open('https://plus.google.com/share?url=<?=$link?>', 'Soc', 'screenX=100,screenY=100,height=500,width=500,location=no,toolbar=no,directories=no,menubar=no,status=no'); return false;" class="icon_social_btn icon_social_inst" href="<?= $s ?>"></a><? endif ?>
+        <?php $s = Settings::getValue('social-link-youtube'); if($s): ?><a onclick="window.open('https://plus.google.com/share?url=<?=$link?>', 'Soc', 'screenX=100,screenY=100,height=500,width=500,location=no,toolbar=no,directories=no,menubar=no,status=no'); return false;" class="icon_social_btn icon_social_yt" href="<?= $s ?>"></a><? endif ?>
     </li>
 </ul>
\ No newline at end of file

common/modules/blog/views/post/index.php

@@ -30,11 +30,6 @@ $this->registerJs("initScrollPager()", yii\web\View::POS_END);
                         <div class="loaded">
                             
                         </div>
-<!--                        <div class="load-box">-->
-<!--                            <a href="--><?//=Url::to(['/blog/post/load']);?><!--" class="sidebar_btn" id="load-post" data-offset="--><?//=Post::PAGE_SIZE?><!--" style="display:block; margin: 0 auto;">--><?//=\Yii::t('blog', 'Load more')?><!--</a>-->
-<!--                            <div class="loading-post"></div>-->
-<!--                        </div>-->
-
                         <div class="btn_show_more_wr">
                             <a href="<?= Url::to(['/blog/post/load']) ?>" class="btn_show_more" id="load-post" data-offset="<?=Post::PAGE_SIZE?>"><span><img src="images_new_22.05.16/btn_show_more_arrow.png" height="18" width="18" alt=""></span><?= \Yii::t('blog', 'Load more') ?></a>
                             <div class="loading-post"></div>