Merge branch 'master' of http://git.task-on.com:900/ktask/task-on.com

common/modules/cases/views/cases-admin/manage.php

@@ -11,7 +11,7 @@ use common\modules\content\models\CoContent;
  * @var yii\data\ActiveDataProvider $casesDataProvider
  * @var yii\data\ActiveDataProvider $projectsDataProvider
  */
-?>
+?> 
 <div class="col-md-12">
     <ul class="nav nav-pills">
         <li class="active"><a href="#nav-pills-tab-1" data-toggle="tab">Кейсы</a></li>
@@ -32,6 +32,7 @@ use common\modules\content\models\CoContent;
                     //'url:url',
                     [
                         'attribute' => 'position',
+                        'contentOptions' => ['style' => 'text-align:center']
                     ],
                     [
                         'attribute' => 'url',

frontend/web/.htaccess

@@ -8,4 +8,19 @@ RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R,L]
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteCond %{REQUEST_FILENAME} !-d
 
-RewriteRule . index.php
\ No newline at end of file
+RewriteRule . index.php
+
+<IfModule mod_expires.c>
+  <FilesMatch \.(gif|png|jpg|jpeg|ogg|mp4|mkv|flv|swf|wmv|asf|asx|wma|wax|wmx|wm)$>
+    ExpiresDefault "access plus 1 year"
+  </FilesMatch>
+  ExpiresActive on
+  ExpiresByType image/jpeg "access plus 7 day"
+  ExpiresByType image/gif "access plus 7 day"
+  ExpiresByType image/png "access plus 7 day"
+  <FilesMatch \.(css|js)$>
+    ExpiresDefault "access plus 1 year"
+  </FilesMatch>
+  ExpiresByType text/css "access plus 1 year"
+  ExpiresByType application/javascript "access plus 1 year"
+</IfModule>