Merge remote-tracking branch 'origin/master'

common/components/LangRequest.php

@@ -22,7 +22,7 @@ class LangRequest extends Request
 	    	Languages::setCurrent($lang_url);
 
             if( $lang_url !== null && $lang_url === Languages::getCurrent()->url && 
-                strpos($this->_lang_url, Languages::getCurrent()->url) === 1 )
+                strpos($this->_lang_url, Languages::getCurrent()->url) === 1)
             {
                 $this->_lang_url = substr($this->_lang_url, strlen(Languages::getCurrent()->url) + 1);
             }

common/components/UrlManager.php

@@ -47,7 +47,7 @@ class UrlManager extends \yii\web\UrlManager {
         //Добавляем к URL префикс - буквенный идентификатор языка
         if($url == '/')
         {
-            return '/' . $lang->url;
+            return '/' . (!$lang->default?$lang->url:'');
         }
         // Делаем универсальный URL без языка для Eauth авторизации
         elseif (strpos($url, '/eauth') !== false) {
@@ -55,7 +55,7 @@ class UrlManager extends \yii\web\UrlManager {
         }
         else
         {
-            return '/' . $lang->url . $url;
+            return (!$lang->default?'/'.$lang->url:'') . $url;
         }
     }
 }

common/modules/languages/widgets/views/languages.php

@@ -6,14 +6,14 @@ use yii\helpers\Html;
     <div class="lang_check">
         <?= Html::a('<i class="icon-arrowDown"></i>' . $current->name, '#', ['class' => 'd_menu']) ?>
         <?php foreach ($langs as $i => $lang): ?>
-            <?= Html::a('<i class="icon-arrowRight"></i>' . $lang->name, '/' . $lang->url . Yii::$app->getRequest()->getLangUrl(), ['class' => 'd_menu_hide']) ?>
+            <?= Html::a('<i class="icon-arrowRight"></i>' . $lang->name, (!$lang->default?'/'.$lang->url:'') . (Yii::$app->getRequest()->getLangUrl()==''?'/':Yii::$app->getRequest()->getLangUrl()), ['class' => 'd_menu_hide']) ?>
         <?php endforeach;?>
     </div>
 <?php else : ?>
     <nav class="top_nav clearfix">
         <ul>
             <?php foreach ($langs as $lang):?>
-                <li><?= Html::a($lang->name, '/' . $lang->url . Yii::$app->getRequest()->getLangUrl()) ?></li>
+                <li><?= Html::a($lang->name, (!$lang->default?'/'.$lang->url:'') . (Yii::$app->getRequest()->getLangUrl()==''?'/':Yii::$app->getRequest()->getLangUrl())) ?></li>
             <?php endforeach;?>
         </ul>
     </nav>

frontend/web/css/custom.css

@@ -76,3 +76,6 @@ a.login_form_link, a.login_form_popup_link, a.reg_popup_link, a.reg_form_link{
 .txt_server:before {
     position: absolute;
 }
+.article_short_txt img {
+    width: auto !important;
+}
\ No newline at end of file