Merge remote-tracking branch 'origin/master'

alex
2 parents faff05f3 df9b1c30
Showing 3 changed files with 43 additions and 2 deletions Show diff stats
frontend/config/main.php
frontend/helpers/Url.php
frontend/views/layouts/main.php
@@ -130,6 +130,8 @@
                               setTimeout(function(){$(".success_").animate({opacity: 0, top: \'0\'}, 200,function(){
                                   $(this).removeClass("done_");
                               })}, 4000);
+                              var data = $("#feedback-form").data(\'yiiActiveForm\');
+                              data.validated = false;
                               }
                     }',
+<?php
+    
+    namespace frontend\helpers;
+    
+    
+    class Url extends \artbox\core\helpers\Url
+    {
+        /**
+         * @param bool   $scheme
+         * @param string $languagesClass
+         *
+         * @return string
+         * @throws \yii\base\InvalidConfigException
+         * @throws \yii\di\NotInstantiableException
+         */
+        public static function home($scheme = false, $languagesClass = 'artbox\core\services\Languages')
+        {
+            /**
+             * @var \artbox\core\services\Languages $languages
+             * @var \artbox\core\seo\UrlManager     $urlManager
+             */
+            $languages = \Yii::$container->get($languagesClass);
+            
+            $url = '/' . $languages->getCurrent()->url;
+            
+            $urlManager = \Yii::$app->urlManager;
+            
+            if (( $languages->getCurrent()->id === $languages->getDefault(
+                    )->id ) && $urlManager->hideDefaultLanguagePrefix) {
+                $url = '/';
+            }
+            
+            if ($scheme !== false) {
+                $url = $urlManager->getHostInfo() . $url;
+            }
+            
+            return $url;
+        }
+    }
 \ No newline at end of file
@@ -23,7 +23,7 @@
     use yii\bootstrap\Nav;
     use yii\bootstrap\Html;
     use yii\db\ActiveQuery;
-    use artbox\core\helpers\Url;
+    use frontend\helpers\Url;
     use yii\web\View;
     use yii\widgets\Breadcrumbs;
@@ -422,7 +422,7 @@ _________________________________________________________ --&gt;
                                   'homeLink'=>
                                 [
                                    'label'=>\Yii::t('app','Home'),
-                                   'url'=>\Yii::$app->homeUrl
+                                   'url'=> Url::home()
                                 ]
                               ]
                           ) ?>