Alexey Boroda / openeurope

Commit d36b72011b27b48428b49a60460afbb637a69a74

Authored by alex
1 parent 929c9486

Поредактировал формы, сообщения при корректном/некорректном заполнении , вывод дат formatter-а

Showing 5 changed files with 13 additions and 12 deletions   Show diff stats
Inline Side-by-side
frontend/assets/AppAsset.php
  Show/Hide comments   View file @d36b720
... ... @@ -32,7 +32,7 @@
32 32 'js/owl.carousel.min.js',
33 33 'js/script.js',
34 34 'js/modal.js',
35   - 'js/jquery.mask.min.js',
  35 + 'js/jquery.mask.min.js',
36 36 ];
37 37 public $depends = [
38 38 'yii\web\YiiAsset',
... ...
frontend/config/main.php
  Show/Hide comments   View file @d36b720
... ... @@ -79,9 +79,9 @@
79 79 ],
80 80 'modules' => [
81 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 85 'name',
86 86 'email',
87 87 'message',
... ... @@ -127,16 +127,16 @@
127 127 }',
128 128 ],
129 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 132 'templateForm' => '<div class="row">{form}</div>',
133   - 'attributes' => [
  133 + 'attributes' => [
134 134 'name',
135 135 'email',
136 136 'phone',
137 137 'message',
138 138 ],
139   - 'rules' => [
  139 + 'rules' => [
140 140 [
141 141 [ 'email' ],
142 142 'email',
... ...
frontend/controllers/SiteController.php
  Show/Hide comments   View file @d36b720
1 1 <?php
2 2 namespace frontend\controllers;
3 3  
4   - use frontend\models\FeedBack;
  4 + use frontend\models\Feedback;
5 5 use common\models\blog\Article;
6 6 use common\models\Settings;
7 7 use common\models\slider\Slide;
... ...
frontend/models/FeedBack.php renamed to frontend/models/Feedback.php
  Show/Hide comments   View file @d36b720
... ... @@ -9,7 +9,7 @@ namespace frontend\models;
9 9  
10 10 use artbox\core\models\Feedback as ArtboxCoreFeedback;
11 11  
12   -class FeedBack extends ArtboxCoreFeedback
  12 +class Feedback extends ArtboxCoreFeedback
13 13 {
14 14 public function rules()
15 15 {
... ... @@ -40,11 +40,12 @@ class FeedBack extends ArtboxCoreFeedback
40 40 ],
41 41 'required',
42 42 'on' => self::SCENARIO_CALLBACK,
  43 +
43 44 ],
44 45 [
45 46 [ 'email' ],
46 47 'email',
47   - 'message' => 'Wrong email',
  48 + 'message' => \Yii::t('app', 'Wrong email'),
48 49 ],
49 50  
50 51 [
... ...
frontend/web/js/script.js
  Show/Hide comments   View file @d36b720
... ... @@ -6,7 +6,7 @@ $(
6 6 // */
7 7 // $(document)
8 8 // .on(
9   - // 'beforeSubmit', '#feedback-form', function(e) {
  9 + // 'beforeSubmit', '#feedback-form', function(e) {
10 10 // var f = this;
11 11 // var form = $(this);
12 12 // var formData = form.serialize();
... ...