diff --git a/frontend/assets/AppAsset.php b/frontend/assets/AppAsset.php index 4db897e..4a32720 100755 --- a/frontend/assets/AppAsset.php +++ b/frontend/assets/AppAsset.php @@ -20,8 +20,7 @@ "js/events.js", 'js/jquery.mask.min.js', "js/script.js", - "js/markerclusterer.js", - "js/map.js", + ]; public $depends = [ 'yii\web\YiiAsset', diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php index ca41432..b75fe06 100755 --- a/frontend/views/layouts/main.php +++ b/frontend/views/layouts/main.php @@ -21,6 +21,20 @@ use common\models\Settings; $seo=\Yii::$app->get('seo'); \frontend\assets\AppAsset::register($this); +$send="Отправить"; +$request1='Ваша заявка'; +if(strpos($_SERVER['REQUEST_URI'],"/ua")!==false) { + $send = "Вiдправити"; + + +} + +$settings = Settings::getInstance(); + +$module=\Yii::$app->getModule('contact'); + + + $settings = Settings::getInstance(); ?> @@ -169,16 +183,81 @@ height="0" width="0" style="display:none;visibility:hidden"> - - endBody() ?> - + + + + + + + + + + + + + + + + + + + endBody() ?> endPage() ?> \ No newline at end of file diff --git a/frontend/views/site/index.php b/frontend/views/site/index.php index a3b2cf1..201deed 100644 --- a/frontend/views/site/index.php +++ b/frontend/views/site/index.php @@ -24,10 +24,22 @@ $settings = Settings::getInstance(); $module=\Yii::$app->getModule('contact'); $moduleRequest=\Yii::$app->getModule('request_1'); +$this->registerJsFile("@web/js/markerclusterer", + [ + 'depends' => ["\\frontend\assets\AppAsset"] + ]); +$this->registerJsFile("@web/js/js/map", + [ + 'depends' => ["\\frontend\assets\AppAsset"] + ]); + + + + ?> - + @@ -303,69 +315,3 @@ $moduleRequest=\Yii::$app->getModule('request_1'); - - - - - - - - - - - - diff --git a/frontend/web/css/change.css b/frontend/web/css/change.css index 0eae99c..641cc56 100644 --- a/frontend/web/css/change.css +++ b/frontend/web/css/change.css @@ -39,3 +39,7 @@ input ,.form-control{ max-width: none; } +.required label::before +{ + content: ""; +} \ No newline at end of file -- libgit2 0.21.4