Commit d36b72011b27b48428b49a60460afbb637a69a74
1 parent
929c9486
Поредактировал формы, сообщения при корректном/некорректном заполнении , вывод дат formatter-а
Showing
5 changed files
with
13 additions
and
12 deletions
Show diff stats
frontend/assets/AppAsset.php
| @@ -32,7 +32,7 @@ | @@ -32,7 +32,7 @@ | ||
| 32 | 'js/owl.carousel.min.js', | 32 | 'js/owl.carousel.min.js', |
| 33 | 'js/script.js', | 33 | 'js/script.js', |
| 34 | 'js/modal.js', | 34 | 'js/modal.js', |
| 35 | - 'js/jquery.mask.min.js', | 35 | + 'js/jquery.mask.min.js', |
| 36 | ]; | 36 | ]; |
| 37 | public $depends = [ | 37 | public $depends = [ |
| 38 | 'yii\web\YiiAsset', | 38 | 'yii\web\YiiAsset', |
frontend/config/main.php
| @@ -79,9 +79,9 @@ | @@ -79,9 +79,9 @@ | ||
| 79 | ], | 79 | ], |
| 80 | 'modules' => [ | 80 | 'modules' => [ |
| 81 | 'feedback' => [ | 81 | 'feedback' => [ |
| 82 | - 'class' => 'artbox\core\forms\Module', | ||
| 83 | - 'activeRecord' => "artbox\core\models\Feedback", | ||
| 84 | - 'attributes' => [ | 82 | + 'class' => 'artbox\core\forms\Module', |
| 83 | + 'activeRecord' => "frontend\models\Feedback", | ||
| 84 | + 'attributes' => [ | ||
| 85 | 'name', | 85 | 'name', |
| 86 | 'email', | 86 | 'email', |
| 87 | 'message', | 87 | 'message', |
| @@ -127,16 +127,16 @@ | @@ -127,16 +127,16 @@ | ||
| 127 | }', | 127 | }', |
| 128 | ], | 128 | ], |
| 129 | 'contact' => [ | 129 | 'contact' => [ |
| 130 | - 'class' => 'artbox\core\forms\Module', | ||
| 131 | - 'activeRecord' => "artbox\core\models\Feedback", | 130 | + 'class' => 'artbox\core\forms\Module', |
| 131 | + 'activeRecord' => "frontend\models\Feedback", | ||
| 132 | 'templateForm' => '<div class="row">{form}</div>', | 132 | 'templateForm' => '<div class="row">{form}</div>', |
| 133 | - 'attributes' => [ | 133 | + 'attributes' => [ |
| 134 | 'name', | 134 | 'name', |
| 135 | 'email', | 135 | 'email', |
| 136 | 'phone', | 136 | 'phone', |
| 137 | 'message', | 137 | 'message', |
| 138 | ], | 138 | ], |
| 139 | - 'rules' => [ | 139 | + 'rules' => [ |
| 140 | [ | 140 | [ |
| 141 | [ 'email' ], | 141 | [ 'email' ], |
| 142 | 'email', | 142 | 'email', |
frontend/controllers/SiteController.php
| 1 | <?php | 1 | <?php |
| 2 | namespace frontend\controllers; | 2 | namespace frontend\controllers; |
| 3 | 3 | ||
| 4 | - use frontend\models\FeedBack; | 4 | + use frontend\models\Feedback; |
| 5 | use common\models\blog\Article; | 5 | use common\models\blog\Article; |
| 6 | use common\models\Settings; | 6 | use common\models\Settings; |
| 7 | use common\models\slider\Slide; | 7 | use common\models\slider\Slide; |
frontend/models/FeedBack.php renamed to frontend/models/Feedback.php
| @@ -9,7 +9,7 @@ namespace frontend\models; | @@ -9,7 +9,7 @@ namespace frontend\models; | ||
| 9 | 9 | ||
| 10 | use artbox\core\models\Feedback as ArtboxCoreFeedback; | 10 | use artbox\core\models\Feedback as ArtboxCoreFeedback; |
| 11 | 11 | ||
| 12 | -class FeedBack extends ArtboxCoreFeedback | 12 | +class Feedback extends ArtboxCoreFeedback |
| 13 | { | 13 | { |
| 14 | public function rules() | 14 | public function rules() |
| 15 | { | 15 | { |
| @@ -40,11 +40,12 @@ class FeedBack extends ArtboxCoreFeedback | @@ -40,11 +40,12 @@ class FeedBack extends ArtboxCoreFeedback | ||
| 40 | ], | 40 | ], |
| 41 | 'required', | 41 | 'required', |
| 42 | 'on' => self::SCENARIO_CALLBACK, | 42 | 'on' => self::SCENARIO_CALLBACK, |
| 43 | + | ||
| 43 | ], | 44 | ], |
| 44 | [ | 45 | [ |
| 45 | [ 'email' ], | 46 | [ 'email' ], |
| 46 | 'email', | 47 | 'email', |
| 47 | - 'message' => 'Wrong email', | 48 | + 'message' => \Yii::t('app', 'Wrong email'), |
| 48 | ], | 49 | ], |
| 49 | 50 | ||
| 50 | [ | 51 | [ |
frontend/web/js/script.js
| @@ -6,7 +6,7 @@ $( | @@ -6,7 +6,7 @@ $( | ||
| 6 | // */ | 6 | // */ |
| 7 | // $(document) | 7 | // $(document) |
| 8 | // .on( | 8 | // .on( |
| 9 | - // 'beforeSubmit', '#feedback-form', function(e) { | 9 | + // 'beforeSubmit', '#feedback-form', function(e) { |
| 10 | // var f = this; | 10 | // var f = this; |
| 11 | // var form = $(this); | 11 | // var form = $(this); |
| 12 | // var formData = form.serialize(); | 12 | // var formData = form.serialize(); |