Merge remote-tracking branch 'origin/master'

Alexey Boroda
2 parents 6a89b063 a3c00620
Showing 3 changed files with 70 additions and 6 deletions Show diff stats
.htaccess
frontend/views/layouts/main.php
frontend/widgets/AssetWidget.php
@@ -222,6 +222,11 @@ RewriteRule ^(.*)$ $1.gz [QSA,L]
     </filesMatch>
 </ifModule>
+# сжатие text, html, javascript, css, xml:
+<ifModule mod_deflate.c>
+AddOutputFilterByType DEFLATE text/html text/plain text/xml application/xml application/xhtml+xml text/css text/javascript application/javascript application/x-javascript
+</ifModule>
+
 #Запрет отдачи HTTP-заголовков Vary браузерам семейства MSIE
 <IfModule mod_setenvif.c>
 BrowserMatch "MSIE" force-no-vary
@@ -12,6 +12,7 @@
     use yii\widgets\Breadcrumbs;
     use frontend\widgets\Seo;
     use common\models\Event;
+    use frontend\widgets\AssetWidget;
     AppAsset::register($this);
 ?>
@@ -249,20 +250,25 @@
                             foreach($links as $index => $link) {
                                 if(is_array($link)) {
                                     $links[$index]['itemprop'] = 'url';
-                                    $links[$index]['label'] = '<span itemprop="title">'.$links[$index]['label'].'</span>';
+                                    $links[$index]['label'] = '<span itemprop="name">'.$links[$index]['label'].'</span>';
                                 }
                             }
                         }
                         echo Breadcrumbs::widget([
+                            'options' => [
+                                'class' => 'breadcrumb',
+                                'itemscope' => "",
+                                'itemtype' => " http://schema.org/BreadcrumbList"
+                            ],
                             'encodeLabels' => false,
-                            'itemTemplate' => "<li><span itemscope itemtype=\"http://data-vocabulary.org/Breadcrumb\">{link}</span></li>\n",
+                            'itemTemplate' => "<li itemprop=\"itemListElement\" itemscope itemtype=\"http://schema.org/ListItem\">{link}</li>\n",
                             'links'        => isset($links) ? $links : [],
                             'homeLink'     => [
-                                'label' => '<span itemprop="title">Интернет-магазин светильников</span>',
+                                'label' => '<span itemprop="name">Интернет-магазин светильников</span>',
                                 'url' => Url::to([ '/' ]),
                                 'itemprop' => 'url',
                             ],
-                            'activeItemTemplate' => '<li class="active"><span itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><span itemprop="title">{link}</span></span></li>',
+                            'activeItemTemplate' => '<li class="active" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><span itemprop="item">{link}</span></li>',
                         ])
                     ?>
@@ -610,8 +616,6 @@
         </div>
     </noscript>
-
-
     <?php $this->endBody() ?>
     </body>
     </html>
+<?php
+    /**
+     * Created by PhpStorm.
+     * User: timur
+     * Date: 19.06.17
+     * Time: 14:20
+     */
+    
+    namespace frontend\widgets;
+
+    use yii\base\InvalidConfigException;
+    use yii\base\Widget;
+    use yii\helpers\Html;
+    use yii\web\AssetBundle;
+
+    class AssetWidget extends Widget
+    {
+        public $assets = [];
+    
+        public function init()
+        {
+            parent::init();
+            if(!empty($this->assets) && !is_array($this->assets)) {
+                throw new InvalidConfigException('Assets must be an array');
+            }
+        }
+    
+        public function run()
+        {
+            if(!empty($this->assets)) {
+                $assets = $this->assets;
+                $bundles = $this->view->assetBundles;
+                foreach ($assets as $asset) {
+                    if(array_key_exists($asset, $bundles)) {
+                        /**
+                         * @var AssetBundle $bundle
+                         */
+                        $bundle = $bundles[$asset];
+                        foreach ($bundle->css as $item) {
+                            if(isset((new $asset)->sourcePath)){
+                                $QQQ = \Yii::$app->assetManager->publish(
+                                    (new $asset)->sourcePath."/".$item,
+                                    []
+                                );
+                                $item = $QQQ[1]; // [0] - full path, [1] - /assets/...
+                            }
+                            echo Html::cssFile($item);
+                        }
+                        $bundle->css = [];
+                    }
+                }
+            }
+        }
+    }
+    
 \ No newline at end of file