Commit 06ec2844f6a81a28bfbf328c6f99ed1f641c406b
1 parent
42931736
28.03.16
Showing
68 changed files
with
635 additions
and
441 deletions
Show diff stats
backend/controllers/CurrencyController.php
@@ -4,23 +4,37 @@ namespace backend\controllers; | @@ -4,23 +4,37 @@ namespace backend\controllers; | ||
4 | 4 | ||
5 | use yii\base\Controller; | 5 | use yii\base\Controller; |
6 | use yii\filters\VerbFilter; | 6 | use yii\filters\VerbFilter; |
7 | +use yii\filters\AccessControl; | ||
7 | 8 | ||
8 | class CurrencyController extends Controller{ | 9 | class CurrencyController extends Controller{ |
10 | + | ||
9 | /** | 11 | /** |
10 | * @inheritdoc | 12 | * @inheritdoc |
11 | */ | 13 | */ |
12 | public function behaviors() | 14 | public function behaviors() |
13 | { | 15 | { |
14 | return [ | 16 | return [ |
17 | + 'access' => [ | ||
18 | + 'class' => AccessControl::className(), | ||
19 | + 'except' => ['login', 'error'], | ||
20 | + 'rules' => [ | ||
21 | + [ | ||
22 | + 'allow' => true, | ||
23 | + 'roles' => ['@'] | ||
24 | + ], | ||
25 | + ], | ||
26 | + ], | ||
15 | 'verbs' => [ | 27 | 'verbs' => [ |
16 | 'class' => VerbFilter::className(), | 28 | 'class' => VerbFilter::className(), |
17 | 'actions' => [ | 29 | 'actions' => [ |
18 | - 'delete' => ['POST'], | 30 | + 'logout' => ['post'], |
31 | + 'delete-req' => ['post'] | ||
19 | ], | 32 | ], |
20 | ], | 33 | ], |
21 | ]; | 34 | ]; |
22 | } | 35 | } |
23 | 36 | ||
37 | + | ||
24 | /** | 38 | /** |
25 | * Lists all Specialization models. | 39 | * Lists all Specialization models. |
26 | * @return mixed | 40 | * @return mixed |
backend/views/specialization/_form.php
@@ -30,8 +30,12 @@ use \kartik\color\ColorInput; | @@ -30,8 +30,12 @@ use \kartik\color\ColorInput; | ||
30 | echo common\modules\file\widgets\ImageUploader::widget([ | 30 | echo common\modules\file\widgets\ImageUploader::widget([ |
31 | 'model'=> $model, | 31 | 'model'=> $model, |
32 | 'field'=>'image', | 32 | 'field'=>'image', |
33 | - 'width'=>940, | ||
34 | - 'height'=>324, | 33 | + 'size' => [ |
34 | + [ | ||
35 | + 'width'=>940, | ||
36 | + 'height'=>324, | ||
37 | + ] | ||
38 | + ], | ||
35 | 'multi'=>false, | 39 | 'multi'=>false, |
36 | 'gallery' =>$model->image, | 40 | 'gallery' =>$model->image, |
37 | 'name' => 'Загрузить картинку' | 41 | 'name' => 'Загрузить картинку' |
common/config/main.php
@@ -90,7 +90,18 @@ | @@ -90,7 +90,18 @@ | ||
90 | 'options', | 90 | 'options', |
91 | ], | 91 | ], |
92 | 'components' => [ | 92 | 'components' => [ |
93 | - | 93 | + 'i18n' => [ |
94 | + 'translations' => [ | ||
95 | + 'frontend' => [ | ||
96 | + 'class' => 'yii\i18n\PhpMessageSource', | ||
97 | + 'basePath' => '@frontend/messages', | ||
98 | + 'sourceLanguage' => 'en-US', | ||
99 | + 'fileMap' => [ | ||
100 | + 'app' => 'app.php' | ||
101 | + ], | ||
102 | + ], | ||
103 | + ], | ||
104 | + ], | ||
94 | 'cache' => [ | 105 | 'cache' => [ |
95 | 'class' => 'yii\caching\FileCache', | 106 | 'class' => 'yii\caching\FileCache', |
96 | ], | 107 | ], |
@@ -108,26 +119,26 @@ | @@ -108,26 +119,26 @@ | ||
108 | ], | 119 | ], |
109 | ], | 120 | ], |
110 | 121 | ||
111 | - 'i18n' => [ | ||
112 | - 'translations' => [ | ||
113 | - '*' => [ | ||
114 | - 'class' => 'yii\i18n\PhpMessageSource', | ||
115 | - 'basePath' => '@common/translation', | ||
116 | - 'fileMap' => [ | ||
117 | - 'app' => 'app.php', | ||
118 | - 'app/error' => 'error.php', | ||
119 | - ], | ||
120 | - ], | ||
121 | - 'app' => [ | ||
122 | - 'class' => 'yii\i18n\PhpMessageSource', | ||
123 | - 'basePath' => '@common/translation', | ||
124 | - 'fileMap' => [ | ||
125 | - 'app' => 'app.php', | ||
126 | - 'app/error' => 'error.php', | ||
127 | - ], | ||
128 | - ] | ||
129 | - ], | ||
130 | - ], | 122 | +// 'i18n' => [ |
123 | +// 'translations' => [ | ||
124 | +// '*' => [ | ||
125 | +// 'class' => 'yii\i18n\PhpMessageSource', | ||
126 | +// 'basePath' => '@common/translation', | ||
127 | +// 'fileMap' => [ | ||
128 | +// 'app' => 'app.php', | ||
129 | +// 'app/error' => 'error.php', | ||
130 | +// ], | ||
131 | +// ], | ||
132 | +// 'app' => [ | ||
133 | +// 'class' => 'yii\i18n\PhpMessageSource', | ||
134 | +// 'basePath' => '@common/translation', | ||
135 | +// 'fileMap' => [ | ||
136 | +// 'app' => 'app.php', | ||
137 | +// 'app/error' => 'error.php', | ||
138 | +// ], | ||
139 | +// ] | ||
140 | +// ], | ||
141 | +// ], | ||
131 | 'authManager' => [ | 142 | 'authManager' => [ |
132 | 'class' => 'yii\rbac\DbManager', | 143 | 'class' => 'yii\rbac\DbManager', |
133 | ], | 144 | ], |
common/models/Blog.php
@@ -97,15 +97,15 @@ | @@ -97,15 +97,15 @@ | ||
97 | public function attributeLabels() | 97 | public function attributeLabels() |
98 | { | 98 | { |
99 | return [ | 99 | return [ |
100 | - 'blog_id' => Yii::t('app', 'Blog ID'), | ||
101 | - 'user_id' => Yii::t('app', 'User ID'), | ||
102 | - 'name' => Yii::t('app', 'Название'), | ||
103 | - 'link' => Yii::t('app', 'URL'), | ||
104 | - 'date_add' => Yii::t('app', 'Дата добавления'), | ||
105 | - 'user_add_id' => Yii::t('app', 'User Add ID'), | ||
106 | - 'view_count' => Yii::t('app', 'Количество просмотров'), | ||
107 | - 'description' => Yii::t('app', 'Описание'), | ||
108 | - 'cover' => Yii::t('app', 'Фото главное'), | 100 | + 'blog_id' => Yii::t('app', 'blog_id'), |
101 | + 'user_id' => Yii::t('app', 'user_id'), | ||
102 | + 'name' => Yii::t('app', 'name'), | ||
103 | + 'link' => Yii::t('app', 'link'), | ||
104 | + 'date_add' => Yii::t('app', 'date_add'), | ||
105 | + 'user_add_id' => Yii::t('app', 'user_add_id'), | ||
106 | + 'view_count' => Yii::t('app', 'view_count'), | ||
107 | + 'description' => Yii::t('app', 'description'), | ||
108 | + 'cover' => Yii::t('app', 'cover'), | ||
109 | ]; | 109 | ]; |
110 | } | 110 | } |
111 | 111 |
common/models/Chat.php
@@ -48,11 +48,11 @@ class Chat extends \yii\db\ActiveRecord | @@ -48,11 +48,11 @@ class Chat extends \yii\db\ActiveRecord | ||
48 | public function attributeLabels() | 48 | public function attributeLabels() |
49 | { | 49 | { |
50 | return [ | 50 | return [ |
51 | - 'chat_id' => 'Chat ID', | ||
52 | - 'status' => 'Status', | ||
53 | - 'comment' => 'Comment', | ||
54 | - 'from_user' => 'From User', | ||
55 | - 'to_user' => 'To User', | 51 | + 'chat_id' => Yii::t('app', 'chat_id'), |
52 | + 'status' => Yii::t('app', 'status'), | ||
53 | + 'comment' => Yii::t('app', 'comment'), | ||
54 | + 'from_user' => Yii::t('app', 'from_user'), | ||
55 | + 'to_user' => Yii::t('app', 'to_user'), | ||
56 | ]; | 56 | ]; |
57 | } | 57 | } |
58 | 58 | ||
@@ -96,7 +96,7 @@ class Chat extends \yii\db\ActiveRecord | @@ -96,7 +96,7 @@ class Chat extends \yii\db\ActiveRecord | ||
96 | if($this->from_user == \Yii::$app->user->id){ | 96 | if($this->from_user == \Yii::$app->user->id){ |
97 | return UserInfo::findOne(['user_id'=>$this->to_user]); | 97 | return UserInfo::findOne(['user_id'=>$this->to_user]); |
98 | } else { | 98 | } else { |
99 | - return UserInfo::find(['user_id'=>$this->from_user]); | 99 | + return UserInfo::findOne(['user_id'=>$this->from_user]); |
100 | } | 100 | } |
101 | } | 101 | } |
102 | 102 |
common/models/Cities.php
@@ -39,10 +39,10 @@ class Cities extends \yii\db\ActiveRecord | @@ -39,10 +39,10 @@ class Cities extends \yii\db\ActiveRecord | ||
39 | public function attributeLabels() | 39 | public function attributeLabels() |
40 | { | 40 | { |
41 | return [ | 41 | return [ |
42 | - 'id' => 'ID', | ||
43 | - 'name' => 'Name', | ||
44 | - 'is_active' => 'Is Active', | ||
45 | - 'parent' => 'Parent', | 42 | + 'id' => Yii::t('app','ID'), |
43 | + 'name' => Yii::t('app','name'), | ||
44 | + 'is_active' => Yii::t('app','is_active'), | ||
45 | + 'parent' => Yii::t('app','parent'), | ||
46 | ]; | 46 | ]; |
47 | } | 47 | } |
48 | } | 48 | } |
common/models/CompanyInfo.php
@@ -62,11 +62,11 @@ | @@ -62,11 +62,11 @@ | ||
62 | public function attributeLabels() | 62 | public function attributeLabels() |
63 | { | 63 | { |
64 | return [ | 64 | return [ |
65 | - 'company_info_id' => Yii::t('app', 'Company Info ID'), | ||
66 | - 'name' => Yii::t('app', 'Название компании'), | ||
67 | - 'staff' => Yii::t('app', 'Количество сотрудников'), | ||
68 | - 'street' => Yii::t('app', 'Улица'), | ||
69 | - 'house' => Yii::t('app', 'Дом'), | 65 | + 'company_info_id' => Yii::t('app', 'company_info_id'), |
66 | + 'name' => Yii::t('app', 'name_company'), | ||
67 | + 'staff' => Yii::t('app', 'staff'), | ||
68 | + 'street' => Yii::t('app', 'street'), | ||
69 | + 'house' => Yii::t('app', 'house'), | ||
70 | ]; | 70 | ]; |
71 | } | 71 | } |
72 | } | 72 | } |
common/models/Country.php
1 | -<?php | 1 | +<?php |
2 | 2 | ||
3 | namespace common\models; | 3 | namespace common\models; |
4 | 4 | ||
@@ -7,12 +7,12 @@ use Yii; | @@ -7,12 +7,12 @@ use Yii; | ||
7 | /** | 7 | /** |
8 | * This is the model class for table "country". | 8 | * This is the model class for table "country". |
9 | * | 9 | * |
10 | - * @property integer $country_id | ||
11 | - * @property integer $oid | ||
12 | - * @property string $country_name | ||
13 | - * @property string $country_name_en | 10 | + * @property integer $country_id |
11 | + * @property integer $oid | ||
12 | + * @property string $country_name | ||
13 | + * @property string $country_name_en | ||
14 | */ | 14 | */ |
15 | -class Country extends \yii\db\ActiveRecord | 15 | +class Country extends \yii\db\ActiveRecord |
16 | { | 16 | { |
17 | /** | 17 | /** |
18 | * @inheritdoc | 18 | * @inheritdoc |
@@ -27,9 +27,9 @@ class Country extends \yii\db\ActiveRecord | @@ -27,9 +27,9 @@ class Country extends \yii\db\ActiveRecord | ||
27 | */ | 27 | */ |
28 | public function rules() | 28 | public function rules() |
29 | { | 29 | { |
30 | - return [ | ||
31 | - [['oid'], 'integer'], | ||
32 | - [['country_name', 'country_name_en'], 'string', 'max' => 255], | 30 | + return [ |
31 | + [['oid'], 'integer'], | ||
32 | + [['country_name', 'country_name_en'], 'string', 'max' => 255], | ||
33 | ]; | 33 | ]; |
34 | } | 34 | } |
35 | 35 | ||
@@ -39,10 +39,10 @@ class Country extends \yii\db\ActiveRecord | @@ -39,10 +39,10 @@ class Country extends \yii\db\ActiveRecord | ||
39 | public function attributeLabels() | 39 | public function attributeLabels() |
40 | { | 40 | { |
41 | return [ | 41 | return [ |
42 | - 'country_id' => Yii::t('app', 'Country ID'), | ||
43 | - 'oid' => Yii::t('app', 'Oid'), | ||
44 | - 'country_name' => Yii::t('app', 'Country Name'), | ||
45 | - 'country_name_en' => Yii::t('app', 'Country Name En'), | 42 | + 'country_id' => Yii::t('app', 'country_id'), |
43 | + 'oid' => Yii::t('app', 'oid'), | ||
44 | + 'country_name' => Yii::t('app', 'country_name'), | ||
45 | + 'country_name_en' => Yii::t('app', 'country_name_en'), | ||
46 | ]; | 46 | ]; |
47 | } | 47 | } |
48 | } | 48 | } |
common/models/Currency.php
@@ -45,13 +45,13 @@ class Currency extends \yii\db\ActiveRecord | @@ -45,13 +45,13 @@ class Currency extends \yii\db\ActiveRecord | ||
45 | public function attributeLabels() | 45 | public function attributeLabels() |
46 | { | 46 | { |
47 | return [ | 47 | return [ |
48 | - 'currency_id' => Yii::t('app', 'Currency ID'), | ||
49 | - 'name' => Yii::t('app', 'Name'), | ||
50 | - 'symbol' => Yii::t('app', 'Symbol'), | ||
51 | - 'code' => Yii::t('app', 'Code'), | ||
52 | - 'rate' => Yii::t('app', 'Rate'), | ||
53 | - 'date_update' => Yii::t('app', 'Date Update'), | ||
54 | - 'is_default' => Yii::t('app', 'Is Default'), | 48 | + 'currency_id' => Yii::t('app', 'currency_id'), |
49 | + 'name' => Yii::t('app', 'name'), | ||
50 | + 'symbol' => Yii::t('app', 'symbol'), | ||
51 | + 'code' => Yii::t('app', 'code'), | ||
52 | + 'rate' => Yii::t('app', 'rate'), | ||
53 | + 'date_update' => Yii::t('app', 'date_update'), | ||
54 | + 'is_default' => Yii::t('app', 'is_default'), | ||
55 | ]; | 55 | ]; |
56 | } | 56 | } |
57 | 57 |
common/models/CustomerSearch.php
@@ -63,11 +63,11 @@ | @@ -63,11 +63,11 @@ | ||
63 | public function attributeLabels() | 63 | public function attributeLabels() |
64 | { | 64 | { |
65 | return [ | 65 | return [ |
66 | - 'type' => Yii::t('app', 'Тип заказчика'), | ||
67 | - 'rating' => Yii::t('app', 'Рейтинг'), | ||
68 | - 'online' => Yii::t('app', 'Статус'), | ||
69 | - 'city' => Yii::t('app', 'Город'), | ||
70 | - 'info' => Yii::t('app', 'Любая информация о заказчике'), | 66 | + 'type' => Yii::t('app', 'type'), |
67 | + 'rating' => Yii::t('app', 'rating'), | ||
68 | + 'online' => Yii::t('app', 'online'), | ||
69 | + 'city' => Yii::t('app', 'city'), | ||
70 | + 'info' => Yii::t('app', 'info'), | ||
71 | ]; | 71 | ]; |
72 | } | 72 | } |
73 | 73 |
common/models/Department.php
1 | -<?php | 1 | +<?php |
2 | 2 | ||
3 | namespace common\models; | 3 | namespace common\models; |
4 | 4 | ||
@@ -7,12 +7,12 @@ use Yii; | @@ -7,12 +7,12 @@ use Yii; | ||
7 | /** | 7 | /** |
8 | * This is the model class for table "department". | 8 | * This is the model class for table "department". |
9 | * | 9 | * |
10 | - * @property integer $department_id | ||
11 | - * @property string $name | 10 | + * @property integer $department_id |
11 | + * @property string $name | ||
12 | * | 12 | * |
13 | - * @property Team[] $teams | 13 | + * @property Team[] $teams |
14 | */ | 14 | */ |
15 | -class Department extends \yii\db\ActiveRecord | 15 | +class Department extends \yii\db\ActiveRecord |
16 | { | 16 | { |
17 | /** | 17 | /** |
18 | * @inheritdoc | 18 | * @inheritdoc |
@@ -27,8 +27,8 @@ class Department extends \yii\db\ActiveRecord | @@ -27,8 +27,8 @@ class Department extends \yii\db\ActiveRecord | ||
27 | */ | 27 | */ |
28 | public function rules() | 28 | public function rules() |
29 | { | 29 | { |
30 | - return [ | ||
31 | - [['name'], 'string', 'max' => 255], | 30 | + return [ |
31 | + [['name'], 'string', 'max' => 255], | ||
32 | ]; | 32 | ]; |
33 | } | 33 | } |
34 | 34 | ||
@@ -38,8 +38,8 @@ class Department extends \yii\db\ActiveRecord | @@ -38,8 +38,8 @@ class Department extends \yii\db\ActiveRecord | ||
38 | public function attributeLabels() | 38 | public function attributeLabels() |
39 | { | 39 | { |
40 | return [ | 40 | return [ |
41 | - 'department_id' => Yii::t('app', 'Department ID'), | ||
42 | - 'name' => Yii::t('app', 'Name'), | 41 | + 'department_id' => Yii::t('app', 'department_id'), |
42 | + 'name' => Yii::t('app', 'name'), | ||
43 | ]; | 43 | ]; |
44 | } | 44 | } |
45 | 45 | ||
@@ -48,6 +48,6 @@ class Department extends \yii\db\ActiveRecord | @@ -48,6 +48,6 @@ class Department extends \yii\db\ActiveRecord | ||
48 | */ | 48 | */ |
49 | public function getTeams() | 49 | public function getTeams() |
50 | { | 50 | { |
51 | - return $this->hasMany(Team::className(), ['department_id' => 'department_id']); | 51 | + return $this->hasMany(Team::className(), ['department_id' => 'department_id']); |
52 | } | 52 | } |
53 | } | 53 | } |
common/models/Employment.php
1 | -<?php | 1 | +<?php |
2 | 2 | ||
3 | namespace common\models; | 3 | namespace common\models; |
4 | 4 | ||
@@ -7,12 +7,12 @@ use Yii; | @@ -7,12 +7,12 @@ use Yii; | ||
7 | /** | 7 | /** |
8 | * This is the model class for table "employment". | 8 | * This is the model class for table "employment". |
9 | * | 9 | * |
10 | - * @property integer $employment_id | ||
11 | - * @property string $name | 10 | + * @property integer $employment_id |
11 | + * @property string $name | ||
12 | * | 12 | * |
13 | - * @property VacancyEmployment[] $vacancyEmployments | 13 | + * @property VacancyEmployment[] $vacancyEmployments |
14 | */ | 14 | */ |
15 | -class Employment extends \yii\db\ActiveRecord | 15 | +class Employment extends \yii\db\ActiveRecord |
16 | { | 16 | { |
17 | /** | 17 | /** |
18 | * @inheritdoc | 18 | * @inheritdoc |
@@ -27,8 +27,8 @@ class Employment extends \yii\db\ActiveRecord | @@ -27,8 +27,8 @@ class Employment extends \yii\db\ActiveRecord | ||
27 | */ | 27 | */ |
28 | public function rules() | 28 | public function rules() |
29 | { | 29 | { |
30 | - return [ | ||
31 | - [['name'], 'string', 'max' => 255], | 30 | + return [ |
31 | + [['name'], 'string', 'max' => 255], | ||
32 | ]; | 32 | ]; |
33 | } | 33 | } |
34 | 34 | ||
@@ -38,8 +38,8 @@ class Employment extends \yii\db\ActiveRecord | @@ -38,8 +38,8 @@ class Employment extends \yii\db\ActiveRecord | ||
38 | public function attributeLabels() | 38 | public function attributeLabels() |
39 | { | 39 | { |
40 | return [ | 40 | return [ |
41 | - 'employment_id' => Yii::t('app', 'Employment ID'), | ||
42 | - 'name' => Yii::t('app', 'Name'), | 41 | + 'employment_id' => Yii::t('app', 'employment_id'), |
42 | + 'name' => Yii::t('app', 'name'), | ||
43 | ]; | 43 | ]; |
44 | } | 44 | } |
45 | 45 | ||
@@ -48,6 +48,6 @@ class Employment extends \yii\db\ActiveRecord | @@ -48,6 +48,6 @@ class Employment extends \yii\db\ActiveRecord | ||
48 | */ | 48 | */ |
49 | public function getVacancyEmployments() | 49 | public function getVacancyEmployments() |
50 | { | 50 | { |
51 | - return $this->hasMany(VacancyEmployment::className(), ['employment_id' => 'employment_id']); | 51 | + return $this->hasMany(VacancyEmployment::className(), ['employment_id' => 'employment_id']); |
52 | } | 52 | } |
53 | } | 53 | } |
common/models/Fields.php
@@ -63,20 +63,20 @@ | @@ -63,20 +63,20 @@ | ||
63 | ]; | 63 | ]; |
64 | } | 64 | } |
65 | 65 | ||
66 | - /** | ||
67 | - * @inheritdoc | ||
68 | - */ | ||
69 | - public function attributeLabels() | ||
70 | - { | ||
71 | - return [ | ||
72 | - 'id' => 'ID', | ||
73 | - 'table_name' => 'Model Name', | ||
74 | - 'table_id' => 'Model ID', | ||
75 | - 'value' => 'Value', | ||
76 | - 'field_name' => 'Field Name', | ||
77 | - 'language' => 'Language', | ||
78 | - ]; | ||
79 | - } | 66 | + /** |
67 | + * @inheritdoc | ||
68 | + */ | ||
69 | + public function attributeLabels() | ||
70 | + { | ||
71 | + return [ | ||
72 | + 'id' => Yii::t('app', 'id'), | ||
73 | + 'table_name' => Yii::t('app', 'table_name'), | ||
74 | + 'table_id' => Yii::t('app', 'table_id'), | ||
75 | + 'value' => Yii::t('app', 'value'), | ||
76 | + 'field_name' => Yii::t('app', 'field_name'), | ||
77 | + 'language' => Yii::t('app', 'language'), | ||
78 | + ]; | ||
79 | + } | ||
80 | 80 | ||
81 | public static function getData($id, $model, $type) | 81 | public static function getData($id, $model, $type) |
82 | { | 82 | { |
common/models/File.php
@@ -41,10 +41,10 @@ class File extends \yii\db\ActiveRecord | @@ -41,10 +41,10 @@ class File extends \yii\db\ActiveRecord | ||
41 | public function attributeLabels() | 41 | public function attributeLabels() |
42 | { | 42 | { |
43 | return [ | 43 | return [ |
44 | - 'file_id' => 'File ID', | ||
45 | - 'status' => 'Status', | ||
46 | - 'name' => 'Name', | ||
47 | - 'dir' => 'Dir', | 44 | + 'file_id' => Yii::t('app','file_id'), |
45 | + 'status' => Yii::t('app','status'), | ||
46 | + 'name' => Yii::t('app','name'), | ||
47 | + 'dir' => Yii::t('app','dir'), | ||
48 | ]; | 48 | ]; |
49 | } | 49 | } |
50 | 50 |
common/models/Gallery.php
@@ -87,14 +87,14 @@ | @@ -87,14 +87,14 @@ | ||
87 | public function attributeLabels() | 87 | public function attributeLabels() |
88 | { | 88 | { |
89 | return [ | 89 | return [ |
90 | - 'gallery_id' => Yii::t('app', 'Gallery ID'), | ||
91 | - 'user_id' => Yii::t('app', 'User ID'), | ||
92 | - 'name' => Yii::t('app', 'Название'), | ||
93 | - 'date_add' => Yii::t('app', 'Дата добавления'), | ||
94 | - 'user_add_id' => Yii::t('app', 'User Add ID'), | ||
95 | - 'cover' => Yii::t('app', 'Фото главное'), | ||
96 | - 'type' => Yii::t('app', 'Вид галереи'), | ||
97 | - 'photo' => Yii::t('app', 'Фото галереи'), | 90 | + 'gallery_id' => Yii::t('app', 'gallery_id'), |
91 | + 'user_id' => Yii::t('app', 'user_id'), | ||
92 | + 'name' => Yii::t('app', 'name'), | ||
93 | + 'date_add' => Yii::t('app', 'date_add'), | ||
94 | + 'user_add_id' => Yii::t('app', 'user_add_id'), | ||
95 | + 'cover' => Yii::t('app', 'cover_g'), | ||
96 | + 'type' => Yii::t('app', 'type_g'), | ||
97 | + 'photo' => Yii::t('app', 'photo_g'), | ||
98 | ]; | 98 | ]; |
99 | } | 99 | } |
100 | } | 100 | } |
common/models/Job.php
@@ -184,22 +184,23 @@ | @@ -184,22 +184,23 @@ | ||
184 | // } | 184 | // } |
185 | } | 185 | } |
186 | 186 | ||
187 | - /** | ||
188 | - * @inheritdoc | ||
189 | - */ | ||
190 | - public function attributeLabels() | ||
191 | - { | ||
192 | - return [ | ||
193 | - 'job_id' => Yii::t('app', 'Job ID'), | ||
194 | - 'name' => Yii::t('app', 'Name'), | ||
195 | - 'link' => Yii::t('app', 'Link'), | ||
196 | - 'date_start' => Yii::t('app', 'Date Start'), | ||
197 | - 'date_end' => Yii::t('app', 'Date End'), | ||
198 | - 'position' => Yii::t('app', 'Position'), | ||
199 | - 'user_id' => Yii::t('app', 'User ID'), | ||
200 | - 'total_count' => Yii::t('app', 'Total Count'), | ||
201 | - 'complete_count' => Yii::t('app', 'Complete Count'), | ||
202 | - 'current' => Yii::t('app', 'Current'), | ||
203 | - ]; | ||
204 | - } | 187 | + |
188 | + /** | ||
189 | + * @inheritdoc | ||
190 | + */ | ||
191 | + public function attributeLabels() | ||
192 | + { | ||
193 | + return [ | ||
194 | + 'job_id' => Yii::t('app', 'job_id'), | ||
195 | + 'name' => Yii::t('app', 'name'), | ||
196 | + 'link' => Yii::t('app', 'link'), | ||
197 | + 'date_start' => Yii::t('app', 'date_start'), | ||
198 | + 'date_end' => Yii::t('app', 'date_end'), | ||
199 | + 'position' => Yii::t('app', 'position'), | ||
200 | + 'user_id' => Yii::t('app', 'user_id'), | ||
201 | + 'total_count' => Yii::t('app', 'total_count'), | ||
202 | + 'complete_count' => Yii::t('app', 'complete_count'), | ||
203 | + 'current' => Yii::t('app', 'current'), | ||
204 | + ]; | ||
205 | } | 205 | } |
206 | +} |
common/models/Media.php
@@ -49,12 +49,12 @@ class Media extends ActiveRecord | @@ -49,12 +49,12 @@ class Media extends ActiveRecord | ||
49 | /** | 49 | /** |
50 | * @inheritdoc | 50 | * @inheritdoc |
51 | */ | 51 | */ |
52 | - public function attributeLabels() | 52 | + public function attributeLabels() |
53 | { | 53 | { |
54 | return [ | 54 | return [ |
55 | - 'media_id' => Yii::t('app', 'ID'), | ||
56 | - 'hash' => Yii::t('app', 'Hash'), | ||
57 | - 'extension' => Yii::t('app', 'Extension'), | 55 | + 'media_id' => Yii::t('app', 'media_id'), |
56 | + 'hash' => Yii::t('app', 'hash'), | ||
57 | + 'extension' => Yii::t('app', 'extension'), | ||
58 | ]; | 58 | ]; |
59 | } | 59 | } |
60 | 60 |
common/models/Message.php
@@ -55,13 +55,13 @@ class Message extends \yii\db\ActiveRecord | @@ -55,13 +55,13 @@ class Message extends \yii\db\ActiveRecord | ||
55 | public function attributeLabels() | 55 | public function attributeLabels() |
56 | { | 56 | { |
57 | return [ | 57 | return [ |
58 | - 'message_id' => 'Message ID', | ||
59 | - 'chat_id' => 'Chat ID', | ||
60 | - 'user_id' => 'User ID', | ||
61 | - 'status' => 'Status', | ||
62 | - 'text' => 'Сообщение', | ||
63 | - 'files' => 'Files', | ||
64 | - 'date' => 'Date', | 58 | + 'message_id' => Yii::t('app', 'message_id'), |
59 | + 'chat_id' => Yii::t('app', 'chat_id'), | ||
60 | + 'user_id' => Yii::t('app', 'user_id'), | ||
61 | + 'status' => Yii::t('app', 'status'), | ||
62 | + 'text' => Yii::t('app', 'text'), | ||
63 | + 'files' => Yii::t('app', 'files'), | ||
64 | + 'date' => Yii::t('app', 'date'), | ||
65 | ]; | 65 | ]; |
66 | } | 66 | } |
67 | 67 |
common/models/Option.php
@@ -47,13 +47,13 @@ class Option extends \yii\db\ActiveRecord | @@ -47,13 +47,13 @@ class Option extends \yii\db\ActiveRecord | ||
47 | public function attributeLabels() | 47 | public function attributeLabels() |
48 | { | 48 | { |
49 | return [ | 49 | return [ |
50 | - 'model' => Yii::t('app', 'Model'), | ||
51 | - 'option_id' => Yii::t('app', 'Option ID'), | ||
52 | - 'model_id' => Yii::t('app', 'Model ID'), | ||
53 | - 'name' => Yii::t('app', 'Name'), | ||
54 | - 'template' => Yii::t('app', 'Template'), | ||
55 | - 'option_pid' => Yii::t('app', 'Option Pid'), | ||
56 | - 'date_add' => Yii::t('app', 'Date Add'), | 50 | + 'model' => Yii::t('app', 'model'), |
51 | + 'option_id' => Yii::t('app', 'option_id'), | ||
52 | + 'model_id' => Yii::t('app', 'model_id'), | ||
53 | + 'name' => Yii::t('app', 'name'), | ||
54 | + 'template' => Yii::t('app', 'template'), | ||
55 | + 'option_pid' => Yii::t('app', 'option_pid'), | ||
56 | + 'date_add' => Yii::t('app', 'date_add'), | ||
57 | ]; | 57 | ]; |
58 | } | 58 | } |
59 | 59 |
common/models/OptionLang.php
@@ -42,10 +42,10 @@ class OptionLang extends \yii\db\ActiveRecord | @@ -42,10 +42,10 @@ class OptionLang extends \yii\db\ActiveRecord | ||
42 | public function attributeLabels() | 42 | public function attributeLabels() |
43 | { | 43 | { |
44 | return [ | 44 | return [ |
45 | - 'option_lang_id' => Yii::t('app', 'Option Lang ID'), | ||
46 | - 'option_id' => Yii::t('app', 'Option ID'), | ||
47 | - 'language_id' => Yii::t('app', 'Language ID'), | ||
48 | - 'value' => Yii::t('app', 'Value'), | 45 | + 'option_lang_id' => Yii::t('app', 'option_lang_id'), |
46 | + 'option_id' => Yii::t('app', 'option_id'), | ||
47 | + 'language_id' => Yii::t('app', 'language_id'), | ||
48 | + 'value' => Yii::t('app', 'value'), | ||
49 | ]; | 49 | ]; |
50 | } | 50 | } |
51 | 51 |
common/models/Payment.php
1 | -<?php | 1 | +<?php |
2 | 2 | ||
3 | namespace common\models; | 3 | namespace common\models; |
4 | 4 | ||
@@ -7,13 +7,13 @@ use Yii; | @@ -7,13 +7,13 @@ use Yii; | ||
7 | /** | 7 | /** |
8 | * This is the model class for table "payment". | 8 | * This is the model class for table "payment". |
9 | * | 9 | * |
10 | - * @property integer $payment_id | ||
11 | - * @property string $name | ||
12 | - * @property integer $status | 10 | + * @property integer $payment_id |
11 | + * @property string $name | ||
12 | + * @property integer $status | ||
13 | * | 13 | * |
14 | - * @property UserPayment[] $userPayments | 14 | + * @property UserPayment[] $userPayments |
15 | */ | 15 | */ |
16 | -class Payment extends \yii\db\ActiveRecord | 16 | +class Payment extends \yii\db\ActiveRecord |
17 | { | 17 | { |
18 | /** | 18 | /** |
19 | * @inheritdoc | 19 | * @inheritdoc |
@@ -28,10 +28,10 @@ class Payment extends \yii\db\ActiveRecord | @@ -28,10 +28,10 @@ class Payment extends \yii\db\ActiveRecord | ||
28 | */ | 28 | */ |
29 | public function rules() | 29 | public function rules() |
30 | { | 30 | { |
31 | - return [ | ||
32 | - [['name'], 'required'], | ||
33 | - [['status'], 'integer'], | ||
34 | - [['name'], 'string', 'max' => 255], | 31 | + return [ |
32 | + [['name'], 'required'], | ||
33 | + [['status'], 'integer'], | ||
34 | + [['name'], 'string', 'max' => 255], | ||
35 | ]; | 35 | ]; |
36 | } | 36 | } |
37 | 37 | ||
@@ -41,9 +41,9 @@ class Payment extends \yii\db\ActiveRecord | @@ -41,9 +41,9 @@ class Payment extends \yii\db\ActiveRecord | ||
41 | public function attributeLabels() | 41 | public function attributeLabels() |
42 | { | 42 | { |
43 | return [ | 43 | return [ |
44 | - 'payment_id' => Yii::t('app', 'Payment ID'), | ||
45 | - 'name' => Yii::t('app', 'Name'), | ||
46 | - 'status' => Yii::t('app', 'Status'), | 44 | + 'payment_id' => Yii::t('app', 'payment_id'), |
45 | + 'name' => Yii::t('app', 'name'), | ||
46 | + 'status' => Yii::t('app', 'status'), | ||
47 | ]; | 47 | ]; |
48 | } | 48 | } |
49 | 49 | ||
@@ -52,6 +52,6 @@ class Payment extends \yii\db\ActiveRecord | @@ -52,6 +52,6 @@ class Payment extends \yii\db\ActiveRecord | ||
52 | */ | 52 | */ |
53 | public function getUserPayments() | 53 | public function getUserPayments() |
54 | { | 54 | { |
55 | - return $this->hasMany(UserPayment::className(), ['payment_id' => 'payment_id']); | 55 | + return $this->hasMany(UserPayment::className(), ['payment_id' => 'payment_id']); |
56 | } | 56 | } |
57 | } | 57 | } |
common/models/Portfolio.php
@@ -121,21 +121,21 @@ | @@ -121,21 +121,21 @@ | ||
121 | public function attributeLabels() | 121 | public function attributeLabels() |
122 | { | 122 | { |
123 | return [ | 123 | return [ |
124 | - 'portfolio_id' => Yii::t('app', 'Portfolio ID'), | ||
125 | - 'user_id' => Yii::t('app', 'User ID'), | ||
126 | - 'name' => Yii::t('app', 'Название'), | ||
127 | - 'link' => Yii::t('app', 'URL'), | ||
128 | - 'date_add' => Yii::t('app', 'Дата добавления'), | ||
129 | - 'user_add_id' => Yii::t('app', 'User Add ID'), | ||
130 | - 'view_count' => Yii::t('app', 'Количество просмотров'), | ||
131 | - 'city' => Yii::t('app', 'Город'), | ||
132 | - 'street' => Yii::t('app', 'Улица'), | ||
133 | - 'house' => Yii::t('app', 'Дом'), | ||
134 | - 'description' => Yii::t('app', 'Описание'), | ||
135 | - 'cover' => Yii::t('app', 'Фото главное'), | ||
136 | - 'gallery_id' => Yii::t('app', 'Фото галерея'), | ||
137 | - 'specializationString' => Yii::t('app', 'Специализации'), | ||
138 | - 'preview' => Yii::t('app', 'Описание кратко'), | 124 | + 'portfolio_id' => Yii::t('app', 'portfolio_id'), |
125 | + 'user_id' => Yii::t('app', 'user_id'), | ||
126 | + 'name' => Yii::t('app', 'name'), | ||
127 | + 'link' => Yii::t('app', 'link'), | ||
128 | + 'date_add' => Yii::t('app', 'date_add'), | ||
129 | + 'user_add_id' => Yii::t('app', 'user_add_id'), | ||
130 | + 'view_count' => Yii::t('app', 'view_count'), | ||
131 | + 'city' => Yii::t('app', 'city'), | ||
132 | + 'street' => Yii::t('app', 'street'), | ||
133 | + 'house' => Yii::t('app', 'house'), | ||
134 | + 'description' => Yii::t('app', 'description'), | ||
135 | + 'cover' => Yii::t('app', 'cover_m'), | ||
136 | + 'gallery_id' => Yii::t('app', 'gallery_id'), | ||
137 | + 'specializationString' => Yii::t('app', 'specializationString'), | ||
138 | + 'preview' => Yii::t('app', 'preview'), | ||
139 | ]; | 139 | ]; |
140 | } | 140 | } |
141 | 141 |
common/models/PortfolioSpecialization.php
@@ -44,9 +44,9 @@ class PortfolioSpecialization extends \yii\db\ActiveRecord | @@ -44,9 +44,9 @@ class PortfolioSpecialization extends \yii\db\ActiveRecord | ||
44 | public function attributeLabels() | 44 | public function attributeLabels() |
45 | { | 45 | { |
46 | return [ | 46 | return [ |
47 | - 'portfolio_specialization_id' => Yii::t('app', 'Portfolio Specialization ID'), | ||
48 | - 'portfolio_id' => Yii::t('app', 'Portfolio ID'), | ||
49 | - 'specialization_id' => Yii::t('app', 'Specialization ID'), | 47 | + 'portfolio_specialization_id' => Yii::t('app', 'portfolio_specialization_id'), |
48 | + 'portfolio_id' => Yii::t('app', 'portfolio_id'), | ||
49 | + 'specialization_id' => Yii::t('app', 'specialization_id'), | ||
50 | ]; | 50 | ]; |
51 | } | 51 | } |
52 | 52 |
common/models/Project.php
@@ -178,28 +178,27 @@ | @@ -178,28 +178,27 @@ | ||
178 | public function attributeLabels() | 178 | public function attributeLabels() |
179 | { | 179 | { |
180 | return [ | 180 | return [ |
181 | - 'project_id' => Yii::t('app', 'Project ID'), | ||
182 | - 'user_id' => Yii::t('app', 'User ID'), | ||
183 | - 'name' => Yii::t('app', 'Название'), | ||
184 | - 'link' => Yii::t('app', 'URL'), | ||
185 | - 'project_pid' => Yii::t('app', 'Родительский проект'), | ||
186 | - 'date_add' => Yii::t('app', 'Дата добавления'), | ||
187 | - 'date_end' => Yii::t('app', 'Дата окончания'), | ||
188 | - 'user_add_id' => Yii::t('app', 'User Add ID'), | ||
189 | - 'view_count' => Yii::t('app', 'Количество просмотров'), | ||
190 | - 'budget' => Yii::t('app', 'Бюджет'), | ||
191 | - 'city' => Yii::t('app', 'Город'), | ||
192 | - 'street' => Yii::t('app', 'Улица'), | ||
193 | - 'house' => Yii::t('app', 'Дом'), | ||
194 | - 'payment_variant' => Yii::t('app', 'Варианты оплаты'), | ||
195 | - 'deadline' => Yii::t('app', 'Срок выполнения'), | ||
196 | - 'description' => Yii::t('app', 'Описание'), | ||
197 | - 'contractual' => Yii::t('app', 'Договорной'), | ||
198 | - 'file' => Yii::t('app', 'Присоединить файл'), | ||
199 | - 'specializationInput' => Yii::t('app', 'Специализации'), | ||
200 | - 'paymentInput' => Yii::t('app', 'Способ оплаты'), | ||
201 | - 'specializationString' => Yii::t('app', 'Специализации'), | ||
202 | - 'hidden' => Yii::t('app', 'Снять проект с тендера'), | 181 | + 'project_id' => Yii::t('app', 'project_id'), |
182 | + 'user_id' => Yii::t('app', 'user_id'), | ||
183 | + 'name' => Yii::t('app', 'name'), | ||
184 | + 'link' => Yii::t('app', 'link'), | ||
185 | + 'project_pid' => Yii::t('app', 'project_pid'), | ||
186 | + 'date_add' => Yii::t('app', 'date_add'), | ||
187 | + 'date_end' => Yii::t('app', 'date_end'), | ||
188 | + 'user_add_id' => Yii::t('app', 'user_add_id'), | ||
189 | + 'view_count' => Yii::t('app', 'view_count'), | ||
190 | + 'budget' => Yii::t('app', 'budget'), | ||
191 | + 'city' => Yii::t('app', 'city'), | ||
192 | + 'street' => Yii::t('app', 'street'), | ||
193 | + 'house' => Yii::t('app', 'house'), | ||
194 | + 'payment_variant' => Yii::t('app', 'payment_variant'), | ||
195 | + 'deadline' => Yii::t('app', 'deadline'), | ||
196 | + 'description' => Yii::t('app', 'description'), | ||
197 | + 'contractual' => Yii::t('app', 'contractual'), | ||
198 | + 'file' => Yii::t('app', 'file'), | ||
199 | + 'specializationInput' => Yii::t('app', 'specializationInput'), | ||
200 | + 'paymentInput' => Yii::t('app', 'paymentInput'), | ||
201 | + 'specializationString' => Yii::t('app', 'specializationString'), | ||
203 | ]; | 202 | ]; |
204 | } | 203 | } |
205 | 204 |
common/models/ProjectPayment.php
1 | -<?php | 1 | +<?php |
2 | 2 | ||
3 | namespace common\models; | 3 | namespace common\models; |
4 | 4 | ||
@@ -7,14 +7,14 @@ use Yii; | @@ -7,14 +7,14 @@ use Yii; | ||
7 | /** | 7 | /** |
8 | * This is the model class for table "project_payment". | 8 | * This is the model class for table "project_payment". |
9 | * | 9 | * |
10 | - * @property integer $project_payment_id | ||
11 | - * @property integer $project_id | ||
12 | - * @property integer $payment_id | 10 | + * @property integer $project_payment_id |
11 | + * @property integer $project_id | ||
12 | + * @property integer $payment_id | ||
13 | * | 13 | * |
14 | - * @property Payment $payment | ||
15 | - * @property Project $project | 14 | + * @property Payment $payment |
15 | + * @property Project $project | ||
16 | */ | 16 | */ |
17 | -class ProjectPayment extends \yii\db\ActiveRecord | 17 | +class ProjectPayment extends \yii\db\ActiveRecord |
18 | { | 18 | { |
19 | /** | 19 | /** |
20 | * @inheritdoc | 20 | * @inheritdoc |
@@ -29,10 +29,10 @@ class ProjectPayment extends \yii\db\ActiveRecord | @@ -29,10 +29,10 @@ class ProjectPayment extends \yii\db\ActiveRecord | ||
29 | */ | 29 | */ |
30 | public function rules() | 30 | public function rules() |
31 | { | 31 | { |
32 | - return [ | ||
33 | - [['project_id', 'payment_id'], 'integer'], | ||
34 | - [['payment_id'], 'exist', 'skipOnError' => true, 'targetClass' => Payment::className(), 'targetAttribute' => ['payment_id' => 'payment_id']], | ||
35 | - [['project_id'], 'exist', 'skipOnError' => true, 'targetClass' => Project::className(), 'targetAttribute' => ['project_id' => 'project_id']], | 32 | + return [ |
33 | + [['project_id', 'payment_id'], 'integer'], | ||
34 | + [['payment_id'], 'exist', 'skipOnError' => true, 'targetClass' => Payment::className(), 'targetAttribute' => ['payment_id' => 'payment_id']], | ||
35 | + [['project_id'], 'exist', 'skipOnError' => true, 'targetClass' => Project::className(), 'targetAttribute' => ['project_id' => 'project_id']], | ||
36 | ]; | 36 | ]; |
37 | } | 37 | } |
38 | 38 | ||
@@ -42,9 +42,9 @@ class ProjectPayment extends \yii\db\ActiveRecord | @@ -42,9 +42,9 @@ class ProjectPayment extends \yii\db\ActiveRecord | ||
42 | public function attributeLabels() | 42 | public function attributeLabels() |
43 | { | 43 | { |
44 | return [ | 44 | return [ |
45 | - 'project_payment_id' => Yii::t('app', 'Project Payment ID'), | ||
46 | - 'project_id' => Yii::t('app', 'Project ID'), | ||
47 | - 'payment_id' => Yii::t('app', 'Payment ID'), | 45 | + 'project_payment_id' => Yii::t('app', 'project_payment_id'), |
46 | + 'project_id' => Yii::t('app', 'project_id'), | ||
47 | + 'payment_id' => Yii::t('app', 'payment_id'), | ||
48 | ]; | 48 | ]; |
49 | } | 49 | } |
50 | 50 | ||
@@ -53,7 +53,7 @@ class ProjectPayment extends \yii\db\ActiveRecord | @@ -53,7 +53,7 @@ class ProjectPayment extends \yii\db\ActiveRecord | ||
53 | */ | 53 | */ |
54 | public function getPayment() | 54 | public function getPayment() |
55 | { | 55 | { |
56 | - return $this->hasOne(Payment::className(), ['payment_id' => 'payment_id']); | 56 | + return $this->hasOne(Payment::className(), ['payment_id' => 'payment_id']); |
57 | } | 57 | } |
58 | 58 | ||
59 | /** | 59 | /** |
@@ -61,6 +61,6 @@ class ProjectPayment extends \yii\db\ActiveRecord | @@ -61,6 +61,6 @@ class ProjectPayment extends \yii\db\ActiveRecord | ||
61 | */ | 61 | */ |
62 | public function getProject() | 62 | public function getProject() |
63 | { | 63 | { |
64 | - return $this->hasOne(Project::className(), ['project_id' => 'project_id']); | 64 | + return $this->hasOne(Project::className(), ['project_id' => 'project_id']); |
65 | } | 65 | } |
66 | } | 66 | } |
common/models/ProjectSpecialization.php
1 | -<?php | 1 | +<?php |
2 | 2 | ||
3 | namespace common\models; | 3 | namespace common\models; |
4 | 4 | ||
@@ -7,14 +7,14 @@ use Yii; | @@ -7,14 +7,14 @@ use Yii; | ||
7 | /** | 7 | /** |
8 | * This is the model class for table "project_specialization". | 8 | * This is the model class for table "project_specialization". |
9 | * | 9 | * |
10 | - * @property integer $project_specialization_id | ||
11 | - * @property integer $project_id | ||
12 | - * @property integer $specialization_id | 10 | + * @property integer $project_specialization_id |
11 | + * @property integer $project_id | ||
12 | + * @property integer $specialization_id | ||
13 | * | 13 | * |
14 | - * @property Project $project | ||
15 | - * @property Specialization $specialization | 14 | + * @property Project $project |
15 | + * @property Specialization $specialization | ||
16 | */ | 16 | */ |
17 | -class ProjectSpecialization extends \yii\db\ActiveRecord | 17 | +class ProjectSpecialization extends \yii\db\ActiveRecord |
18 | { | 18 | { |
19 | /** | 19 | /** |
20 | * @inheritdoc | 20 | * @inheritdoc |
@@ -29,10 +29,10 @@ class ProjectSpecialization extends \yii\db\ActiveRecord | @@ -29,10 +29,10 @@ class ProjectSpecialization extends \yii\db\ActiveRecord | ||
29 | */ | 29 | */ |
30 | public function rules() | 30 | public function rules() |
31 | { | 31 | { |
32 | - return [ | ||
33 | - [['project_id', 'specialization_id'], 'integer'], | ||
34 | - [['project_id'], 'exist', 'skipOnError' => true, 'targetClass' => Project::className(), 'targetAttribute' => ['project_id' => 'project_id']], | ||
35 | - [['specialization_id'], 'exist', 'skipOnError' => true, 'targetClass' => Specialization::className(), 'targetAttribute' => ['specialization_id' => 'specialization_id']], | 32 | + return [ |
33 | + [['project_id', 'specialization_id'], 'integer'], | ||
34 | + [['project_id'], 'exist', 'skipOnError' => true, 'targetClass' => Project::className(), 'targetAttribute' => ['project_id' => 'project_id']], | ||
35 | + [['specialization_id'], 'exist', 'skipOnError' => true, 'targetClass' => Specialization::className(), 'targetAttribute' => ['specialization_id' => 'specialization_id']], | ||
36 | ]; | 36 | ]; |
37 | } | 37 | } |
38 | 38 | ||
@@ -42,9 +42,9 @@ class ProjectSpecialization extends \yii\db\ActiveRecord | @@ -42,9 +42,9 @@ class ProjectSpecialization extends \yii\db\ActiveRecord | ||
42 | public function attributeLabels() | 42 | public function attributeLabels() |
43 | { | 43 | { |
44 | return [ | 44 | return [ |
45 | - 'project_specialization_id' => Yii::t('app', 'Project Specialization ID'), | ||
46 | - 'project_id' => Yii::t('app', 'Project ID'), | ||
47 | - 'specialization_id' => Yii::t('app', 'Specialization ID'), | 45 | + 'project_specialization_id' => Yii::t('app', 'project_specialization_id'), |
46 | + 'project_id' => Yii::t('app', 'project_id'), | ||
47 | + 'specialization_id' => Yii::t('app', 'specialization_id'), | ||
48 | ]; | 48 | ]; |
49 | } | 49 | } |
50 | 50 | ||
@@ -53,7 +53,7 @@ class ProjectSpecialization extends \yii\db\ActiveRecord | @@ -53,7 +53,7 @@ class ProjectSpecialization extends \yii\db\ActiveRecord | ||
53 | */ | 53 | */ |
54 | public function getProject() | 54 | public function getProject() |
55 | { | 55 | { |
56 | - return $this->hasOne(Project::className(), ['project_id' => 'project_id']); | 56 | + return $this->hasOne(Project::className(), ['project_id' => 'project_id']); |
57 | } | 57 | } |
58 | 58 | ||
59 | /** | 59 | /** |
@@ -61,6 +61,6 @@ class ProjectSpecialization extends \yii\db\ActiveRecord | @@ -61,6 +61,6 @@ class ProjectSpecialization extends \yii\db\ActiveRecord | ||
61 | */ | 61 | */ |
62 | public function getSpecialization() | 62 | public function getSpecialization() |
63 | { | 63 | { |
64 | - return $this->hasOne(Specialization::className(), ['specialization_id' => 'specialization_id']); | 64 | + return $this->hasOne(Specialization::className(), ['specialization_id' => 'specialization_id']); |
65 | } | 65 | } |
66 | } | 66 | } |
common/models/Social.php
@@ -39,10 +39,10 @@ class Social extends \yii\db\ActiveRecord | @@ -39,10 +39,10 @@ class Social extends \yii\db\ActiveRecord | ||
39 | public function attributeLabels() | 39 | public function attributeLabels() |
40 | { | 40 | { |
41 | return [ | 41 | return [ |
42 | - 'social_id' => Yii::t('app', 'Social ID'), | ||
43 | - 'social_name' => Yii::t('app', 'Social Name'), | ||
44 | - 'social_user_id' => Yii::t('app', 'Social User ID'), | ||
45 | - 'user_id' => Yii::t('app', 'User ID'), | 42 | + 'social_id' => Yii::t('app', 'social_id'), |
43 | + 'social_name' => Yii::t('app', 'social_name'), | ||
44 | + 'social_user_id' => Yii::t('app', 'social_user_id'), | ||
45 | + 'user_id' => Yii::t('app', 'user_id'), | ||
46 | ]; | 46 | ]; |
47 | } | 47 | } |
48 | } | 48 | } |
common/models/Specialization.php
@@ -43,13 +43,13 @@ class Specialization extends \yii\db\ActiveRecord | @@ -43,13 +43,13 @@ class Specialization extends \yii\db\ActiveRecord | ||
43 | public function attributeLabels() | 43 | public function attributeLabels() |
44 | { | 44 | { |
45 | return [ | 45 | return [ |
46 | - 'specialization_id' => 'Specialization ID', | ||
47 | - 'specialization_pid' => 'Specialization Pid', | ||
48 | - 'specialization_name' => 'Specialization Name', | ||
49 | - 'specialization_parent_name' => 'Specialization Parent Name', | ||
50 | - 'image' => 'Картинка', | ||
51 | - 'background' => 'Background', | ||
52 | - 'status' => 'Status', | 46 | + 'specialization_id' => Yii::t('app', 'specialization_id'), |
47 | + 'specialization_pid' => Yii::t('app', 'specialization_pid'), | ||
48 | + 'specialization_name' => Yii::t('app', 'specialization_name'), | ||
49 | + 'specialization_parent_name' => Yii::t('app', 'specialization_parent_name'), | ||
50 | + 'image' => Yii::t('app', 'image'), | ||
51 | + 'background' => Yii::t('app', 'background'), | ||
52 | + 'status' => Yii::t('app', 'status'), | ||
53 | ]; | 53 | ]; |
54 | } | 54 | } |
55 | 55 |
common/models/Team.php
@@ -121,19 +121,19 @@ | @@ -121,19 +121,19 @@ | ||
121 | public function attributeLabels() | 121 | public function attributeLabels() |
122 | { | 122 | { |
123 | return [ | 123 | return [ |
124 | - 'team_id' => Yii::t('app', 'Team ID'), | ||
125 | - 'user_id' => Yii::t('app', 'User ID'), | ||
126 | - 'firstname' => Yii::t('app', 'Имя'), | ||
127 | - 'lastname' => Yii::t('app', 'Фамилия'), | ||
128 | - 'middlename' => Yii::t('app', 'Отчество'), | ||
129 | - 'link' => Yii::t('app', 'Ссылка на профиль МФП'), | ||
130 | - 'position' => Yii::t('app', 'Должность'), | ||
131 | - 'department_id' => Yii::t('app', 'Отдел компании'), | ||
132 | - 'experience_from' => Yii::t('app', 'Опыт'), | ||
133 | - 'date_add' => Yii::t('app', 'дата добавления'), | ||
134 | - 'user_add_id' => Yii::t('app', 'User Add ID'), | ||
135 | - 'photo' => Yii::t('app', 'Фото'), | ||
136 | - 'country_id' => Yii::t('app', 'Страна'), | 124 | + 'team_id' => Yii::t('app', 'team_id'), |
125 | + 'user_id' => Yii::t('app', 'user_id'), | ||
126 | + 'firstname' => Yii::t('app', 'firstname'), | ||
127 | + 'lastname' => Yii::t('app', 'lastname'), | ||
128 | + 'middlename' => Yii::t('app', 'middlename'), | ||
129 | + 'link' => Yii::t('app', 'link_profile'), | ||
130 | + 'position' => Yii::t('app', 'position'), | ||
131 | + 'department_id' => Yii::t('app', 'department_id'), | ||
132 | + 'experience_from' => Yii::t('app', 'experience_from'), | ||
133 | + 'date_add' => Yii::t('app', 'date_add'), | ||
134 | + 'user_add_id' => Yii::t('app', 'user_add_id'), | ||
135 | + 'photo' => Yii::t('app', 'photo'), | ||
136 | + 'country_id' => Yii::t('app', 'country_id'), | ||
137 | ]; | 137 | ]; |
138 | } | 138 | } |
139 | 139 |
common/models/TenderSearch.php
@@ -87,13 +87,13 @@ | @@ -87,13 +87,13 @@ | ||
87 | public function attributeLabels() | 87 | public function attributeLabels() |
88 | { | 88 | { |
89 | return [ | 89 | return [ |
90 | - 'specialization' => Yii::t('app', 'Специализация'), | ||
91 | - 'budget_currency' => Yii::t('app', 'Валюта'), | ||
92 | - 'contractual' => Yii::t('app', 'Договорной'), | ||
93 | - 'city' => Yii::t('app', 'Город'), | ||
94 | - 'payment' => Yii::t('app', 'Способ оплаты'), | ||
95 | - 'budget_from' => Yii::t('app', 'от'), | ||
96 | - 'budget_to' => Yii::t('app', 'до'), | 90 | + 'specialization' => Yii::t('app', 'specialization'), |
91 | + 'budget_currency' => Yii::t('app', 'budget_currency'), | ||
92 | + 'contractual' => Yii::t('app', 'contractual'), | ||
93 | + 'city' => Yii::t('app', 'city'), | ||
94 | + 'payment' => Yii::t('app', 'payment'), | ||
95 | + 'budget_from' => Yii::t('app', 'budget_from'), | ||
96 | + 'budget_to' => Yii::t('app', 'budget_to'), | ||
97 | ]; | 97 | ]; |
98 | } | 98 | } |
99 | 99 |
common/models/User.php
@@ -151,9 +151,9 @@ | @@ -151,9 +151,9 @@ | ||
151 | public function attributeLabels() | 151 | public function attributeLabels() |
152 | { | 152 | { |
153 | return [ | 153 | return [ |
154 | - 'firstname' => Yii::t('app', 'Имя'), | ||
155 | - 'lastname' => Yii::t('app', 'Фамилия'), | ||
156 | - 'email' => Yii::t('app', 'Email'), | 154 | + 'firstname' => Yii::t('app', 'firstname'), |
155 | + 'lastname' => Yii::t('app', 'lastname'), | ||
156 | + 'email' => Yii::t('app', 'email'), | ||
157 | ]; | 157 | ]; |
158 | } | 158 | } |
159 | 159 |
common/models/UserInfo.php
@@ -279,41 +279,41 @@ | @@ -279,41 +279,41 @@ | ||
279 | public function attributeLabels() | 279 | public function attributeLabels() |
280 | { | 280 | { |
281 | return [ | 281 | return [ |
282 | - 'user_id' => Yii::t('app', 'User ID'), | ||
283 | - 'view_count' => Yii::t('app', 'Количество просмотров'), | ||
284 | - 'busy' => Yii::t('app', 'Статус'), | ||
285 | - 'date_visit' => Yii::t('app', 'Дата визита'), | ||
286 | - 'experience' => Yii::t('app', 'Опыт работы'), | ||
287 | - 'rank' => Yii::t('app', 'Rank'), | ||
288 | - 'salary' => Yii::t('app', 'Зарплата'), | ||
289 | - 'job' => Yii::t('app', 'Место работы'), | ||
290 | - 'location' => Yii::t('app', 'Место расположения'), | ||
291 | - 'soft' => Yii::t('app', 'Работа с программами'), | ||
292 | - 'user_info_id' => Yii::t('app', 'User Info ID'), | ||
293 | - 'guarantee' => Yii::t('app', 'Гарантия качества работ'), | ||
294 | - 'contract' => Yii::t('app', 'Работа по договору'), | ||
295 | - 'estimate' => Yii::t('app', 'Предоставляете смету'), | ||
296 | - 'purchase' => Yii::t('app', 'Делаете сами закупку материалов'), | ||
297 | - 'delivery' => Yii::t('app', 'Занимаетесь сами доставкой материалов'), | ||
298 | - 'prepayment' => Yii::t('app', 'Минимальная предоплата за работы'), | ||
299 | - 'about' => Yii::t('app', 'О себе'), | ||
300 | - 'type' => Yii::t('app', 'Is Default'), | ||
301 | - 'member' => Yii::t('app', 'Членство в МФП'), | ||
302 | - 'alt_location' => 'Город не в списке', | ||
303 | - 'country' => Yii::t('app', 'Страна'), | ||
304 | - 'city' => Yii::t('app', 'Город'), | ||
305 | - 'image' => Yii::t('app', 'Аватар'), | ||
306 | - 'poster' => Yii::t('app', 'Подложка'), | ||
307 | - 'social_vk' => Yii::t('app', 'Vk.com'), | ||
308 | - 'social_fb' => Yii::t('app', 'FaceBook.com'), | ||
309 | - 'social_in' => Yii::t('app', 'LinkedIn.com'), | ||
310 | - 'social_t' => Yii::t('app', 'Twitter.com'), | ||
311 | - 'geography' => Yii::t('app', 'География работ'), | ||
312 | - 'geographies' => Yii::t('app', 'География работ'), | ||
313 | - 'salary_currency' => Yii::t('app', 'Валюта'), | 282 | + 'user_id' => Yii::t('app', 'user_id'), |
283 | + 'view_count' => Yii::t('app', 'view_count'), | ||
284 | + 'busy' => Yii::t('app', 'busy'), | ||
285 | + 'date_visit' => Yii::t('app', 'date_visit'), | ||
286 | + 'experience' => Yii::t('app', 'experience'), | ||
287 | + 'rank' => Yii::t('app', 'rank'), | ||
288 | + 'salary' => Yii::t('app', 'salary'), | ||
289 | + 'job' => Yii::t('app', 'job'), | ||
290 | + 'location' => Yii::t('app', 'location'), | ||
291 | + 'soft' => Yii::t('app', 'soft'), | ||
292 | + 'user_info_id' => Yii::t('app', 'user_info_id'), | ||
293 | + 'guarantee' => Yii::t('app', 'guarantee'), | ||
294 | + 'contract' => Yii::t('app', 'contract'), | ||
295 | + 'estimate' => Yii::t('app', 'estimate'), | ||
296 | + 'purchase' => Yii::t('app', 'purchase'), | ||
297 | + 'delivery' => Yii::t('app', 'delivery'), | ||
298 | + 'prepayment' => Yii::t('app', 'prepayment'), | ||
299 | + 'about' => Yii::t('app', 'about'), | ||
300 | + 'type' => Yii::t('app', 'type'), | ||
301 | + 'member' => Yii::t('app', 'member'), | ||
302 | + 'alt_location' => Yii::t('app', 'alt_location'), | ||
303 | + 'country' => Yii::t('app', 'country'), | ||
304 | + 'city' => Yii::t('app', 'city'), | ||
305 | + 'image' => Yii::t('app', 'image_ui'), | ||
306 | + 'poster' => Yii::t('app', 'poster'), | ||
307 | + 'social_vk' => Yii::t('app', 'social_vk'), | ||
308 | + 'social_fb' => Yii::t('app', 'social_fb'), | ||
309 | + 'social_in' => Yii::t('app', 'social_in'), | ||
310 | + 'social_t' => Yii::t('app', 'social_t'), | ||
311 | + 'geography' => Yii::t('app', 'geography'), | ||
312 | + 'geographies' => Yii::t('app', 'geographies'), | ||
313 | + 'salary_currency' => Yii::t('app', 'salary_currency'), | ||
314 | 'is_customer' => '', | 314 | 'is_customer' => '', |
315 | 'is_freelancer' => '', | 315 | 'is_freelancer' => '', |
316 | - 'hide_mail' => Yii::t('app', 'не публиковать Email'), | 316 | + 'hide_mail' => Yii::t('app', 'hide_mail'), |
317 | 317 | ||
318 | ]; | 318 | ]; |
319 | } | 319 | } |
common/models/UserPayment.php
1 | -<?php | 1 | +<?php |
2 | 2 | ||
3 | namespace common\models; | 3 | namespace common\models; |
4 | 4 | ||
@@ -7,13 +7,13 @@ use Yii; | @@ -7,13 +7,13 @@ use Yii; | ||
7 | /** | 7 | /** |
8 | * This is the model class for table "user_payment". | 8 | * This is the model class for table "user_payment". |
9 | * | 9 | * |
10 | - * @property integer $user_payment_id | ||
11 | - * @property integer $user_id | ||
12 | - * @property integer $payment_id | 10 | + * @property integer $user_payment_id |
11 | + * @property integer $user_id | ||
12 | + * @property integer $payment_id | ||
13 | * | 13 | * |
14 | - * @property Payment $payment | 14 | + * @property Payment $payment |
15 | */ | 15 | */ |
16 | -class UserPayment extends \yii\db\ActiveRecord | 16 | +class UserPayment extends \yii\db\ActiveRecord |
17 | { | 17 | { |
18 | /** | 18 | /** |
19 | * @inheritdoc | 19 | * @inheritdoc |
@@ -28,9 +28,9 @@ class UserPayment extends \yii\db\ActiveRecord | @@ -28,9 +28,9 @@ class UserPayment extends \yii\db\ActiveRecord | ||
28 | */ | 28 | */ |
29 | public function rules() | 29 | public function rules() |
30 | { | 30 | { |
31 | - return [ | ||
32 | - [['user_id', 'payment_id'], 'integer'], | ||
33 | - [['payment_id'], 'exist', 'skipOnError' => true, 'targetClass' => Payment::className(), 'targetAttribute' => ['payment_id' => 'payment_id']], | 31 | + return [ |
32 | + [['user_id', 'payment_id'], 'integer'], | ||
33 | + [['payment_id'], 'exist', 'skipOnError' => true, 'targetClass' => Payment::className(), 'targetAttribute' => ['payment_id' => 'payment_id']], | ||
34 | ]; | 34 | ]; |
35 | } | 35 | } |
36 | 36 | ||
@@ -40,9 +40,9 @@ class UserPayment extends \yii\db\ActiveRecord | @@ -40,9 +40,9 @@ class UserPayment extends \yii\db\ActiveRecord | ||
40 | public function attributeLabels() | 40 | public function attributeLabels() |
41 | { | 41 | { |
42 | return [ | 42 | return [ |
43 | - 'user_payment_id' => Yii::t('app', 'User Payment ID'), | ||
44 | - 'user_id' => Yii::t('app', 'User ID'), | ||
45 | - 'payment_id' => Yii::t('app', 'Payment ID'), | 43 | + 'user_payment_id' => Yii::t('app', 'user_payment_id'), |
44 | + 'user_id' => Yii::t('app', 'user_id'), | ||
45 | + 'payment_id' => Yii::t('app', 'payment_id'), | ||
46 | ]; | 46 | ]; |
47 | } | 47 | } |
48 | 48 | ||
@@ -51,6 +51,6 @@ class UserPayment extends \yii\db\ActiveRecord | @@ -51,6 +51,6 @@ class UserPayment extends \yii\db\ActiveRecord | ||
51 | */ | 51 | */ |
52 | public function getPayment() | 52 | public function getPayment() |
53 | { | 53 | { |
54 | - return $this->hasOne(Payment::className(), ['payment_id' => 'payment_id']); | 54 | + return $this->hasOne(Payment::className(), ['payment_id' => 'payment_id']); |
55 | } | 55 | } |
56 | } | 56 | } |
common/models/UserSpecialization.php
1 | -<?php | 1 | +<?php |
2 | 2 | ||
3 | namespace common\models; | 3 | namespace common\models; |
4 | 4 | ||
@@ -7,13 +7,13 @@ use Yii; | @@ -7,13 +7,13 @@ use Yii; | ||
7 | /** | 7 | /** |
8 | * This is the model class for table "user_specialization". | 8 | * This is the model class for table "user_specialization". |
9 | * | 9 | * |
10 | - * @property integer $user_specialization_id | ||
11 | - * @property integer $user_id | ||
12 | - * @property integer $specialization_id | 10 | + * @property integer $user_specialization_id |
11 | + * @property integer $user_id | ||
12 | + * @property integer $specialization_id | ||
13 | * | 13 | * |
14 | - * @property Specialization $specialization | 14 | + * @property Specialization $specialization |
15 | */ | 15 | */ |
16 | -class UserSpecialization extends \yii\db\ActiveRecord | 16 | +class UserSpecialization extends \yii\db\ActiveRecord |
17 | { | 17 | { |
18 | /** | 18 | /** |
19 | * @inheritdoc | 19 | * @inheritdoc |
@@ -28,9 +28,9 @@ class UserSpecialization extends \yii\db\ActiveRecord | @@ -28,9 +28,9 @@ class UserSpecialization extends \yii\db\ActiveRecord | ||
28 | */ | 28 | */ |
29 | public function rules() | 29 | public function rules() |
30 | { | 30 | { |
31 | - return [ | ||
32 | - [['user_id', 'specialization_id'], 'integer'], | ||
33 | - [['specialization_id'], 'exist', 'skipOnError' => true, 'targetClass' => Specialization::className(), 'targetAttribute' => ['specialization_id' => 'specialization_id']], | 31 | + return [ |
32 | + [['user_id', 'specialization_id'], 'integer'], | ||
33 | + [['specialization_id'], 'exist', 'skipOnError' => true, 'targetClass' => Specialization::className(), 'targetAttribute' => ['specialization_id' => 'specialization_id']], | ||
34 | ]; | 34 | ]; |
35 | } | 35 | } |
36 | 36 | ||
@@ -40,9 +40,9 @@ class UserSpecialization extends \yii\db\ActiveRecord | @@ -40,9 +40,9 @@ class UserSpecialization extends \yii\db\ActiveRecord | ||
40 | public function attributeLabels() | 40 | public function attributeLabels() |
41 | { | 41 | { |
42 | return [ | 42 | return [ |
43 | - 'user_specialization_id' => Yii::t('app', 'User Specialization ID'), | ||
44 | - 'user_id' => Yii::t('app', 'User ID'), | ||
45 | - 'specialization_id' => Yii::t('app', 'Specialization ID'), | 43 | + 'user_specialization_id' => Yii::t('app', 'user_specialization_id'), |
44 | + 'user_id' => Yii::t('app', 'user_id'), | ||
45 | + 'specialization_id' => Yii::t('app', 'specialization_id'), | ||
46 | ]; | 46 | ]; |
47 | } | 47 | } |
48 | 48 | ||
@@ -51,6 +51,6 @@ class UserSpecialization extends \yii\db\ActiveRecord | @@ -51,6 +51,6 @@ class UserSpecialization extends \yii\db\ActiveRecord | ||
51 | */ | 51 | */ |
52 | public function getSpecialization() | 52 | public function getSpecialization() |
53 | { | 53 | { |
54 | - return $this->hasOne(Specialization::className(), ['specialization_id' => 'specialization_id']); | 54 | + return $this->hasOne(Specialization::className(), ['specialization_id' => 'specialization_id']); |
55 | } | 55 | } |
56 | } | 56 | } |
common/models/Vacancy.php
@@ -147,20 +147,20 @@ | @@ -147,20 +147,20 @@ | ||
147 | public function attributeLabels() | 147 | public function attributeLabels() |
148 | { | 148 | { |
149 | return [ | 149 | return [ |
150 | - 'vacancy_id' => Yii::t('app', 'Vacancy ID'), | ||
151 | - 'user_id' => Yii::t('app', 'User ID'), | ||
152 | - 'name' => Yii::t('app', 'Название'), | ||
153 | - 'link' => Yii::t('app', 'URL'), | ||
154 | - 'date_add' => Yii::t('app', 'Дата добавления'), | ||
155 | - 'user_add_id' => Yii::t('app', 'User Add ID'), | ||
156 | - 'view_count' => Yii::t('app', 'Количество просмотров'), | ||
157 | - 'user_name' => Yii::t('app', 'Контактное лицо'), | ||
158 | - 'city' => Yii::t('app', 'Город'), | ||
159 | - 'description' => Yii::t('app', 'Описание'), | ||
160 | - 'employmentInput' => Yii::t('app', 'Вид занятости'), | ||
161 | - 'phone' => Yii::t('app', 'Телефон'), | ||
162 | - 'salary' => Yii::t('app', 'Заработная плата'), | ||
163 | - 'salary_currency' => Yii::t('app', 'Валюта'), | 150 | + 'vacancy_id' => Yii::t('app', 'vacancy_id'), |
151 | + 'user_id' => Yii::t('app', 'user_id'), | ||
152 | + 'name' => Yii::t('app', 'name'), | ||
153 | + 'link' => Yii::t('app', 'link'), | ||
154 | + 'date_add' => Yii::t('app', 'date_add'), | ||
155 | + 'user_add_id' => Yii::t('app', 'user_add_id'), | ||
156 | + 'view_count' => Yii::t('app', 'view_count'), | ||
157 | + 'user_name' => Yii::t('app', 'user_name'), | ||
158 | + 'city' => Yii::t('app', 'city'), | ||
159 | + 'description' => Yii::t('app', 'description'), | ||
160 | + 'employmentInput' => Yii::t('app', 'employmentInput'), | ||
161 | + 'phone' => Yii::t('app', 'phone'), | ||
162 | + 'salary' => Yii::t('app', 'salary'), | ||
163 | + 'salary_currency' => Yii::t('app', 'salary_currency'), | ||
164 | ]; | 164 | ]; |
165 | } | 165 | } |
166 | 166 |
common/models/VacancyEmployment.php
@@ -42,9 +42,9 @@ class VacancyEmployment extends \yii\db\ActiveRecord | @@ -42,9 +42,9 @@ class VacancyEmployment extends \yii\db\ActiveRecord | ||
42 | public function attributeLabels() | 42 | public function attributeLabels() |
43 | { | 43 | { |
44 | return [ | 44 | return [ |
45 | - 'vacancy_employment' => Yii::t('app', 'Vacancy Employment'), | ||
46 | - 'vacancy_id' => Yii::t('app', 'Vacancy ID'), | ||
47 | - 'employment_id' => Yii::t('app', 'Employment ID'), | 45 | + 'vacancy_employment' => Yii::t('app', 'vacancy_employment'), |
46 | + 'vacancy_id' => Yii::t('app', 'vacancy_id'), | ||
47 | + 'employment_id' => Yii::t('app', 'employment_id'), | ||
48 | ]; | 48 | ]; |
49 | } | 49 | } |
50 | 50 |
common/models/VacancySpecialization.php
@@ -42,9 +42,9 @@ class VacancySpecialization extends \yii\db\ActiveRecord | @@ -42,9 +42,9 @@ class VacancySpecialization extends \yii\db\ActiveRecord | ||
42 | public function attributeLabels() | 42 | public function attributeLabels() |
43 | { | 43 | { |
44 | return [ | 44 | return [ |
45 | - 'vacancy_specialization_id' => 'Vacancy Specialization ID', | ||
46 | - 'vacancy_id' => 'Vacancy ID', | ||
47 | - 'specialization_id' => 'Specialization ID', | 45 | + 'vacancy_specialization_id' => Yii::t('app', 'vacancy_specialization_id'), |
46 | + 'vacancy_id' => Yii::t('app', 'vacancy_id'), | ||
47 | + 'specialization_id' => Yii::t('app', 'specialization_id'), | ||
48 | ]; | 48 | ]; |
49 | } | 49 | } |
50 | 50 |
common/modules/comment/widgets/views/form-project-comment.php
@@ -14,7 +14,7 @@ | @@ -14,7 +14,7 @@ | ||
14 | <div class="new-portf-add-comm style"> | 14 | <div class="new-portf-add-comm style"> |
15 | <div class="box-wr"> | 15 | <div class="box-wr"> |
16 | <div class="box-all"> | 16 | <div class="box-all"> |
17 | - <div class="tender-add-answer-title">Добавить ответ</div> | 17 | + <div class="tender-add-answer-title"><?= Yii::t('add', 'add_answer') ?></div> |
18 | <div class="form-tender-answer style"> | 18 | <div class="form-tender-answer style"> |
19 | <?php | 19 | <?php |
20 | $form = ActiveForm::begin([ 'options' => [ 'class' => 'resformsfile MultiFile-intercepted', 'enctype' => 'multipart/form-data' ] ]); | 20 | $form = ActiveForm::begin([ 'options' => [ 'class' => 'resformsfile MultiFile-intercepted', 'enctype' => 'multipart/form-data' ] ]); |
common/modules/file/widgets/views/_gallery_item.php
@@ -5,5 +5,5 @@ use yii\helpers\Html; | @@ -5,5 +5,5 @@ use yii\helpers\Html; | ||
5 | 5 | ||
6 | <div class="gallery_image"> | 6 | <div class="gallery_image"> |
7 | <?= Html::img($item['image'])?> | 7 | <?= Html::img($item['image'])?> |
8 | - <span data-url="<?=$item['image']?>" title="удалить изображение" class="glyphicon glyphicon-trash delete-gallery-item"></span> | 8 | + <span data-url="<?=$item['image']?>" title="" class="glyphicon glyphicon-trash delete-gallery-item"></span> |
9 | </div> | 9 | </div> |
10 | \ No newline at end of file | 10 | \ No newline at end of file |
common/widgets/views/_gallery_item.php
@@ -5,5 +5,5 @@ use yii\helpers\Html; | @@ -5,5 +5,5 @@ use yii\helpers\Html; | ||
5 | 5 | ||
6 | <div class="gallery_image"> | 6 | <div class="gallery_image"> |
7 | <?= Html::img($item['image'])?> | 7 | <?= Html::img($item['image'])?> |
8 | - <span data-url="<?=$item['image']?>" title="удалить изображение" class="glyphicon glyphicon-trash delete-gallery-item"></span> | 8 | + <span data-url="<?=$item['image']?>" title="<?= Yii::t('app', 'delete_img')?>" class="glyphicon glyphicon-trash delete-gallery-item"></span> |
9 | </div> | 9 | </div> |
10 | \ No newline at end of file | 10 | \ No newline at end of file |
common/widgets/views/courses_field.php
@@ -28,12 +28,12 @@ | @@ -28,12 +28,12 @@ | ||
28 | <input id="cours-year-<?= ++$label ?>" type="number" class="form-control custom-input-2 custom-input-2-date" value="<?= isset( $model[ ++$t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[courses][<?= $row ?>][1][year]" min="1950" max="<?=date('Y')?>" /> | 28 | <input id="cours-year-<?= ++$label ?>" type="number" class="form-control custom-input-2 custom-input-2-date" value="<?= isset( $model[ ++$t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[courses][<?= $row ?>][1][year]" min="1950" max="<?=date('Y')?>" /> |
29 | <label for="cours-year-<?= $label ?>">год</label> | 29 | <label for="cours-year-<?= $label ?>">год</label> |
30 | </div> | 30 | </div> |
31 | - <span data-id="<?= isset( $model[ $i ][ 'parent_key' ] ) ? $model[ $i ][ 'parent_key' ] : 0 ?>" title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span> | 31 | + <span data-id="<?= isset( $model[ $i ][ 'parent_key' ] ) ? $model[ $i ][ 'parent_key' ] : 0 ?>" title="<?= Yii::t('app','add') ?>" class="glyphicon glyphicon-trash delete-field-item"></span> |
32 | <?= Html::endTag('div') ?> | 32 | <?= Html::endTag('div') ?> |
33 | <?php $i = ++$t; ?> | 33 | <?php $i = ++$t; ?> |
34 | <?php endfor; ?> | 34 | <?php endfor; ?> |
35 | </div> | 35 | </div> |
36 | - <p class="btn btn-success add_field_<?= $this->context->id ?>">Добавить поле</p> | 36 | + <p class="btn btn-success add_field_<?= $this->context->id ?>"><?= Yii::t('add', 'add_field') ?></p> |
37 | </fieldset> | 37 | </fieldset> |
38 | <script> | 38 | <script> |
39 | var start_i_<?=$this->context->id?> = <?=$i?>; | 39 | var start_i_<?=$this->context->id?> = <?=$i?>; |
@@ -59,7 +59,7 @@ | @@ -59,7 +59,7 @@ | ||
59 | '<input id="cours-year-' + ++start_label_<?=$this->context->id?> +'" type="number" class="form-control custom-input-2 custom-input-2-date" value="" name="Fields[courses][' + start_i_<?=$this->context->id?>++ + '][1][year]" min="1950" max="<?=date('Y')?>" />' + | 59 | '<input id="cours-year-' + ++start_label_<?=$this->context->id?> +'" type="number" class="form-control custom-input-2 custom-input-2-date" value="" name="Fields[courses][' + start_i_<?=$this->context->id?>++ + '][1][year]" min="1950" max="<?=date('Y')?>" />' + |
60 | '<label for="cours-year-' + start_label_<?=$this->context->id?> +'">год</label>'+ | 60 | '<label for="cours-year-' + start_label_<?=$this->context->id?> +'">год</label>'+ |
61 | '</div>'+ | 61 | '</div>'+ |
62 | - '<span title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>' + | 62 | + '<span title="<?= Yii::t('app','add') ?>" class="glyphicon glyphicon-trash delete-field-item"></span>' + |
63 | '<div>'; | 63 | '<div>'; |
64 | block.append (sub_block); | 64 | block.append (sub_block); |
65 | } | 65 | } |
common/widgets/views/development_field.php
@@ -26,13 +26,13 @@ | @@ -26,13 +26,13 @@ | ||
26 | <input id="dev-year-<?= ++$label ?>" type="number" class="form-control custom-input-2 custom-input-2-date" value="<?= isset( $model[ ++$t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[development][<?= $row ?>][1][year]" min="1950" max="<?=date('Y')?>" /> | 26 | <input id="dev-year-<?= ++$label ?>" type="number" class="form-control custom-input-2 custom-input-2-date" value="<?= isset( $model[ ++$t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[development][<?= $row ?>][1][year]" min="1950" max="<?=date('Y')?>" /> |
27 | <label for="dev-year-<?= $label ?>">год</label> | 27 | <label for="dev-year-<?= $label ?>">год</label> |
28 | </div> | 28 | </div> |
29 | - <span data-id="<?= isset( $model[ $i ][ 'parent_key' ] ) ? $model[ $i ][ 'parent_key' ] : 0 ?>" title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span> | 29 | + <span data-id="<?= isset( $model[ $i ][ 'parent_key' ] ) ? $model[ $i ][ 'parent_key' ] : 0 ?>" title="<?= Yii::t('app','add') ?>" class="glyphicon glyphicon-trash delete-field-item"></span> |
30 | <?= Html::endTag('div') ?> | 30 | <?= Html::endTag('div') ?> |
31 | <?php $i = ++$t; ?> | 31 | <?php $i = ++$t; ?> |
32 | <?php endfor; ?> | 32 | <?php endfor; ?> |
33 | 33 | ||
34 | </div> | 34 | </div> |
35 | - <p class="btn btn-success add_field_<?= $this->context->id ?>">Добавить поле</p> | 35 | + <p class="btn btn-success add_field_<?= $this->context->id ?>"><?= Yii::t('add', 'add_field') ?></p> |
36 | </fieldset> | 36 | </fieldset> |
37 | <script> | 37 | <script> |
38 | var start_i_<?=$this->context->id?> = <?=$i?>; | 38 | var start_i_<?=$this->context->id?> = <?=$i?>; |
@@ -58,7 +58,7 @@ | @@ -58,7 +58,7 @@ | ||
58 | '<input id="dev-year-' + ++start_label_<?=$this->context->id?> +'" type="number" class="form-control custom-input-2 custom-input-2-date" value="" name="Fields[development][' + start_i_<?=$this->context->id?>++ + '][1][year]" min="1950" max="<?=date('Y')?>" />' + | 58 | '<input id="dev-year-' + ++start_label_<?=$this->context->id?> +'" type="number" class="form-control custom-input-2 custom-input-2-date" value="" name="Fields[development][' + start_i_<?=$this->context->id?>++ + '][1][year]" min="1950" max="<?=date('Y')?>" />' + |
59 | '<label for="dev-year-' + start_label_<?=$this->context->id?> +'">год</label>'+ | 59 | '<label for="dev-year-' + start_label_<?=$this->context->id?> +'">год</label>'+ |
60 | '</div>'+ | 60 | '</div>'+ |
61 | - '<span title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>' + | 61 | + '<span title="<?= Yii::t('app','add') ?>" class="glyphicon glyphicon-trash delete-field-item"></span>' + |
62 | '<div>'; | 62 | '<div>'; |
63 | console.log (block); | 63 | console.log (block); |
64 | block.append (sub_block); | 64 | block.append (sub_block); |
common/widgets/views/education_field.php
@@ -33,13 +33,13 @@ | @@ -33,13 +33,13 @@ | ||
33 | <input id="edu-out-<?= ++$label ?>" type="number" class="form-control form-control custom-input-2 custom-input-2-date" value="<?= isset( $model[ ++$t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[education][<?= $row ?>][2][year_to]" min="1950" /> | 33 | <input id="edu-out-<?= ++$label ?>" type="number" class="form-control form-control custom-input-2 custom-input-2-date" value="<?= isset( $model[ ++$t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[education][<?= $row ?>][2][year_to]" min="1950" /> |
34 | <label for="edu-out-<?= $label ?>">год окончания</label> | 34 | <label for="edu-out-<?= $label ?>">год окончания</label> |
35 | </div> | 35 | </div> |
36 | - <span data-id="<?= isset( $model[ $i ][ 'parent_key' ] ) ? $model[ $i ][ 'parent_key' ] : 0 ?>" title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span> | 36 | + <span data-id="<?= isset( $model[ $i ][ 'parent_key' ] ) ? $model[ $i ][ 'parent_key' ] : 0 ?>" title="<?= Yii::t('app','add') ?>" class="glyphicon glyphicon-trash delete-field-item"></span> |
37 | <?= Html::endTag('div') ?> | 37 | <?= Html::endTag('div') ?> |
38 | <?php $i = ++$t; ?> | 38 | <?php $i = ++$t; ?> |
39 | <?php endfor; ?> | 39 | <?php endfor; ?> |
40 | 40 | ||
41 | </div> | 41 | </div> |
42 | - <p class="btn btn-success add_field_<?= $this->context->id ?>">добавить еще</p> | 42 | + <p class="btn btn-success add_field_<?= $this->context->id ?>"><?= Yii::t('add', 'add_field') ?></p> |
43 | </fieldset> | 43 | </fieldset> |
44 | 44 | ||
45 | <script> | 45 | <script> |
@@ -70,7 +70,7 @@ | @@ -70,7 +70,7 @@ | ||
70 | '<input id="edu-out-' + ++start_label_<?=$this->context->id?> +'"" type="number" class="form-control custom-input-2 custom-input-2-date" value="" name="Fields[education][' + start_i_<?=$this->context->id?>++ + '][2][year_to]" min="1950" />' + | 70 | '<input id="edu-out-' + ++start_label_<?=$this->context->id?> +'"" type="number" class="form-control custom-input-2 custom-input-2-date" value="" name="Fields[education][' + start_i_<?=$this->context->id?>++ + '][2][year_to]" min="1950" />' + |
71 | '<label for="edu-out-' + start_label_<?=$this->context->id?> +'">год окончания</label>'+ | 71 | '<label for="edu-out-' + start_label_<?=$this->context->id?> +'">год окончания</label>'+ |
72 | '</div>'+ | 72 | '</div>'+ |
73 | - '<span title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>' + | 73 | + '<span title="<?= Yii::t('app','add') ?>" class="glyphicon glyphicon-trash delete-field-item"></span>' + |
74 | '<div>'; | 74 | '<div>'; |
75 | console.log (block); | 75 | console.log (block); |
76 | block.append (sub_block); | 76 | block.append (sub_block); |
common/widgets/views/phone_field.php
@@ -22,7 +22,7 @@ | @@ -22,7 +22,7 @@ | ||
22 | <label for="cont-phone-<?= ++$label ?>">Телефон</label> | 22 | <label for="cont-phone-<?= ++$label ?>">Телефон</label> |
23 | <input id="cont-phone-<?= $label ?>" type="tel" pattern="^\+?(?:\d{0,3})?[\(\s]?\d{0,5}[\)\s]?\d{3}[-\s]?\d{2}[-\s]?\d{2}$" placeholder="+xx(xxx)xxx-xx-xx" class="form-control custom-input-2" value="<?= isset($model[$t]['value']) ? $model[$t]['value'] : '' ?>" name="Fields[phone][<?=$row?>][0][phone]" /> | 23 | <input id="cont-phone-<?= $label ?>" type="tel" pattern="^\+?(?:\d{0,3})?[\(\s]?\d{0,5}[\)\s]?\d{3}[-\s]?\d{2}[-\s]?\d{2}$" placeholder="+xx(xxx)xxx-xx-xx" class="form-control custom-input-2" value="<?= isset($model[$t]['value']) ? $model[$t]['value'] : '' ?>" name="Fields[phone][<?=$row?>][0][phone]" /> |
24 | </div> | 24 | </div> |
25 | - <span data-id="<?= isset($model[$i]['parent_key']) ? $model[$i]['parent_key'] : 0 ?>" title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span> | 25 | + <span data-id="<?= isset($model[$i]['parent_key']) ? $model[$i]['parent_key'] : 0 ?>" title="<?= Yii::t('app','add') ?>" class="glyphicon glyphicon-trash delete-field-item"></span> |
26 | <?= Html::endTag('div')?> | 26 | <?= Html::endTag('div')?> |
27 | <?php $i = ++ $t; ?> | 27 | <?php $i = ++ $t; ?> |
28 | <?php endfor; ?> | 28 | <?php endfor; ?> |
common/widgets/views/requirements_field.php
@@ -20,13 +20,13 @@ | @@ -20,13 +20,13 @@ | ||
20 | 'id' => isset( $model[ $i ][ 'parent_key' ] ) ? $model[ $i ][ 'parent_key' ] : 0, | 20 | 'id' => isset( $model[ $i ][ 'parent_key' ] ) ? $model[ $i ][ 'parent_key' ] : 0, |
21 | ]) ?> | 21 | ]) ?> |
22 | <input type="text" placeholder="Требование" class="form-control custom-input-2" value="<?= isset( $model[ $t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[requirements][<?= $row ?>][0][requirements]"/> | 22 | <input type="text" placeholder="Требование" class="form-control custom-input-2" value="<?= isset( $model[ $t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[requirements][<?= $row ?>][0][requirements]"/> |
23 | - <span data-id="<?= isset( $model[ $i ][ 'parent_key' ] ) ? $model[ $i ][ 'parent_key' ] : 0 ?>" title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span> | 23 | + <span data-id="<?= isset( $model[ $i ][ 'parent_key' ] ) ? $model[ $i ][ 'parent_key' ] : 0 ?>" title="<?= Yii::t('app','add') ?>" class="glyphicon glyphicon-trash delete-field-item"></span> |
24 | <?= Html::endTag('div') ?> | 24 | <?= Html::endTag('div') ?> |
25 | <?php $i = ++$t; ?> | 25 | <?php $i = ++$t; ?> |
26 | <?php endfor; ?> | 26 | <?php endfor; ?> |
27 | 27 | ||
28 | </div> | 28 | </div> |
29 | - <p class="btn btn-success add_field_<?= $this->context->id ?>">Добавить еще</p> | 29 | + <p class="btn btn-success add_field_<?= $this->context->id ?>"><?= Yii::t('app','add_more') ?></p> |
30 | </fieldset> | 30 | </fieldset> |
31 | <script> | 31 | <script> |
32 | var start_i_<?=$this->context->id?> = <?=$i?>; | 32 | var start_i_<?=$this->context->id?> = <?=$i?>; |
@@ -44,7 +44,7 @@ | @@ -44,7 +44,7 @@ | ||
44 | .parent ('fieldset'); | 44 | .parent ('fieldset'); |
45 | var sub_block = '<div class="form-group" >' + | 45 | var sub_block = '<div class="form-group" >' + |
46 | '<input type="text" placeholder="" class="form-control custom-input-2" value="" name="Fields[requirements][' + start_i_<?=$this->context->id?>++ + '][0][requirements]" />' + | 46 | '<input type="text" placeholder="" class="form-control custom-input-2" value="" name="Fields[requirements][' + start_i_<?=$this->context->id?>++ + '][0][requirements]" />' + |
47 | - '<span title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>' + | 47 | + '<span title="<?= Yii::t('app','add') ?>" class="glyphicon glyphicon-trash delete-field-item"></span>' + |
48 | '<div>'; | 48 | '<div>'; |
49 | console.log (block); | 49 | console.log (block); |
50 | block.append (sub_block); | 50 | block.append (sub_block); |
common/widgets/views/site_field.php
@@ -23,12 +23,12 @@ use yii\helpers\Html; | @@ -23,12 +23,12 @@ use yii\helpers\Html; | ||
23 | <label for="cont-site-<?= ++$label ?>">Сайт</label> | 23 | <label for="cont-site-<?= ++$label ?>">Сайт</label> |
24 | <input id="cont-site-<?= $label ?>" type="url" placeholder="http://" class="form-control custom-input-2" value="<?= isset($model[$t]['value']) ? $model[$t]['value'] : '' ?>" name="Fields[site][<?=$row?>][0][site]" /> | 24 | <input id="cont-site-<?= $label ?>" type="url" placeholder="http://" class="form-control custom-input-2" value="<?= isset($model[$t]['value']) ? $model[$t]['value'] : '' ?>" name="Fields[site][<?=$row?>][0][site]" /> |
25 | </div> | 25 | </div> |
26 | - <span data-id="<?= isset($model[$i]['parent_key']) ? $model[$i]['parent_key'] : 0 ?>" title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span> | 26 | + <span data-id="<?= isset($model[$i]['parent_key']) ? $model[$i]['parent_key'] : 0 ?>" title="<?= Yii::t('app','add') ?>" class="glyphicon glyphicon-trash delete-field-item"></span> |
27 | <?= Html::endTag('div')?> | 27 | <?= Html::endTag('div')?> |
28 | <?php $i = ++ $t; ?> | 28 | <?php $i = ++ $t; ?> |
29 | <?php endfor; ?> | 29 | <?php endfor; ?> |
30 | </div> | 30 | </div> |
31 | - <p class="btn btn-success add_field_<?= $this->context->id ?>">Добавить еще</p> | 31 | + <p class="btn btn-success add_field_<?= $this->context->id ?>"><?= Yii::t('app','add_more') ?></p> |
32 | 32 | ||
33 | </fieldset> | 33 | </fieldset> |
34 | <script> | 34 | <script> |
@@ -45,7 +45,7 @@ use yii\helpers\Html; | @@ -45,7 +45,7 @@ use yii\helpers\Html; | ||
45 | '<label for="cont-site-' + ++start_label_<?=$this->context->id?> +'">Сайт</label>'+ | 45 | '<label for="cont-site-' + ++start_label_<?=$this->context->id?> +'">Сайт</label>'+ |
46 | '<input id="cont-site-' + start_label_<?=$this->context->id?> +'" type="url" placeholder="http://" class="form-control custom-input-2" value="" name="Fields[site]['+ start_i_<?=$this->context->id?>++ +'][0][site]" />'+ | 46 | '<input id="cont-site-' + start_label_<?=$this->context->id?> +'" type="url" placeholder="http://" class="form-control custom-input-2" value="" name="Fields[site]['+ start_i_<?=$this->context->id?>++ +'][0][site]" />'+ |
47 | '</div>'+ | 47 | '</div>'+ |
48 | - '<span title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>'+ | 48 | + '<span title="<?= Yii::t('app','add') ?>" class="glyphicon glyphicon-trash delete-field-item"></span>'+ |
49 | '<div>'; | 49 | '<div>'; |
50 | block.append(sub_block); | 50 | block.append(sub_block); |
51 | 51 |
common/widgets/views/soft_field.php
@@ -20,13 +20,13 @@ | @@ -20,13 +20,13 @@ | ||
20 | 'id' => isset( $model[ $i ][ 'parent_key' ] ) ? $model[ $i ][ 'parent_key' ] : 0, | 20 | 'id' => isset( $model[ $i ][ 'parent_key' ] ) ? $model[ $i ][ 'parent_key' ] : 0, |
21 | ]) ?> | 21 | ]) ?> |
22 | <input type="text" placeholder="" class="form-control custom-input-2" value="<?= isset( $model[ $t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[soft][<?= $row ?>][0][soft]"/> | 22 | <input type="text" placeholder="" class="form-control custom-input-2" value="<?= isset( $model[ $t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[soft][<?= $row ?>][0][soft]"/> |
23 | - <span data-id="<?= isset( $model[ $i ][ 'parent_key' ] ) ? $model[ $i ][ 'parent_key' ] : 0 ?>" title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span> | 23 | + <span data-id="<?= isset( $model[ $i ][ 'parent_key' ] ) ? $model[ $i ][ 'parent_key' ] : 0 ?>" title="<?= Yii::t('app','add') ?>" class="glyphicon glyphicon-trash delete-field-item"></span> |
24 | <?= Html::endTag('div') ?> | 24 | <?= Html::endTag('div') ?> |
25 | <?php $i = ++$t; ?> | 25 | <?php $i = ++$t; ?> |
26 | <?php endfor; ?> | 26 | <?php endfor; ?> |
27 | 27 | ||
28 | </div> | 28 | </div> |
29 | - <p class="btn btn-success add_field_<?= $this->context->id ?>">Добавить поле</p> | 29 | + <p class="btn btn-success add_field_<?= $this->context->id ?>"><?= Yii::t('add', 'add_field') ?></p> |
30 | </fieldset> | 30 | </fieldset> |
31 | <script> | 31 | <script> |
32 | var start_i_<?=$this->context->id?> = <?=$i?>; | 32 | var start_i_<?=$this->context->id?> = <?=$i?>; |
@@ -44,7 +44,7 @@ | @@ -44,7 +44,7 @@ | ||
44 | .parent ('fieldset'); | 44 | .parent ('fieldset'); |
45 | var sub_block = '<div class="form-group" >' + | 45 | var sub_block = '<div class="form-group" >' + |
46 | '<input type="text" placeholder="" class="form-control custom-input-2" value="" name="Fields[soft][' + start_i_<?=$this->context->id?>++ + '][0][soft]" />' + | 46 | '<input type="text" placeholder="" class="form-control custom-input-2" value="" name="Fields[soft][' + start_i_<?=$this->context->id?>++ + '][0][soft]" />' + |
47 | - '<span title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>' + | 47 | + '<span title="<?= Yii::t('app','add') ?>" class="glyphicon glyphicon-trash delete-field-item"></span>' + |
48 | '<div>'; | 48 | '<div>'; |
49 | console.log (block); | 49 | console.log (block); |
50 | block.append (sub_block); | 50 | block.append (sub_block); |
common/widgets/views/youtube_field.php
@@ -23,12 +23,12 @@ | @@ -23,12 +23,12 @@ | ||
23 | <label for="iframe_youtube-<?= ++$label ?>">Youtube</label> | 23 | <label for="iframe_youtube-<?= ++$label ?>">Youtube</label> |
24 | <input id="iframe_youtube-<?= $label ?>" type="text" placeholder="iframe" class="form-control custom-input-2" value='<?= isset( $model[ $t ][ 'value' ] ) ? '<iframe width="560" height="315" src="'.$model[ $t ][ 'value' ].'" frameborder="0" allowfullscreen></iframe>' : '' ?>' name="Fields[youtube][<?= $row ?>][0][youtube]"/> | 24 | <input id="iframe_youtube-<?= $label ?>" type="text" placeholder="iframe" class="form-control custom-input-2" value='<?= isset( $model[ $t ][ 'value' ] ) ? '<iframe width="560" height="315" src="'.$model[ $t ][ 'value' ].'" frameborder="0" allowfullscreen></iframe>' : '' ?>' name="Fields[youtube][<?= $row ?>][0][youtube]"/> |
25 | </div> | 25 | </div> |
26 | - <span data-id="<?= isset( $model[ $i ][ 'parent_key' ] ) ? $model[ $i ][ 'parent_key' ] : 0 ?>" title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span> | 26 | + <span data-id="<?= isset( $model[ $i ][ 'parent_key' ] ) ? $model[ $i ][ 'parent_key' ] : 0 ?>" title="<?= Yii::t('app','add') ?>" class="glyphicon glyphicon-trash delete-field-item"></span> |
27 | <?= Html::endTag('div') ?> | 27 | <?= Html::endTag('div') ?> |
28 | <?php $i = ++$t; ?> | 28 | <?php $i = ++$t; ?> |
29 | <?php endfor; ?> | 29 | <?php endfor; ?> |
30 | </div> | 30 | </div> |
31 | - <p class="btn btn-success add_field_<?= $this->context->id ?>">Добавить поле</p> | 31 | + <p class="btn btn-success add_field_<?= $this->context->id ?>"><?= Yii::t('add', 'add_field') ?></p> |
32 | 32 | ||
33 | </fieldset> | 33 | </fieldset> |
34 | <script> | 34 | <script> |
@@ -51,7 +51,7 @@ | @@ -51,7 +51,7 @@ | ||
51 | '<label for="iframe_youtube-' + ++start_label_<?=$this->context->id?> +'">Youtube</label>'+ | 51 | '<label for="iframe_youtube-' + ++start_label_<?=$this->context->id?> +'">Youtube</label>'+ |
52 | '<input id="iframe_youtube-' + start_label_<?=$this->context->id?> +'" type="text" placeholder="iframe" class="form-control custom-input-2" value="" name="Fields[youtube][' + start_i_<?=$this->context->id?>++ + '][0][youtube]" />' + | 52 | '<input id="iframe_youtube-' + start_label_<?=$this->context->id?> +'" type="text" placeholder="iframe" class="form-control custom-input-2" value="" name="Fields[youtube][' + start_i_<?=$this->context->id?>++ + '][0][youtube]" />' + |
53 | '</div>'+ | 53 | '</div>'+ |
54 | - '<span title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>' + | 54 | + '<span title="<?= Yii::t('app','add') ?>" class="glyphicon glyphicon-trash delete-field-item"></span>' + |
55 | '<div>'; | 55 | '<div>'; |
56 | // console.log (block); | 56 | // console.log (block); |
57 | block.append (sub_block); | 57 | block.append (sub_block); |
frontend/assets/AdminAsset.php
@@ -21,7 +21,7 @@ class AdminAsset extends AssetBundle | @@ -21,7 +21,7 @@ class AdminAsset extends AssetBundle | ||
21 | 'css/style.css', | 21 | 'css/style.css', |
22 | 'css/art_box.css', | 22 | 'css/art_box.css', |
23 | '/admin/css/flags32.css', | 23 | '/admin/css/flags32.css', |
24 | - //'https://fonts.googleapis.com/css?family=Roboto:400,700&subset=cyrillic,latin', | 24 | + 'https://fonts.googleapis.com/css?family=Roboto:400,700&subset=cyrillic,latin', |
25 | ]; | 25 | ]; |
26 | public $js = [ | 26 | public $js = [ |
27 | 'js/script.js', | 27 | 'js/script.js', |
frontend/assets/AppAsset.php
@@ -19,7 +19,7 @@ class AppAsset extends AssetBundle | @@ -19,7 +19,7 @@ class AppAsset extends AssetBundle | ||
19 | public $css = [ | 19 | public $css = [ |
20 | 'css/style.css', | 20 | 'css/style.css', |
21 | '/admin/css/flags32.css', | 21 | '/admin/css/flags32.css', |
22 | - //'https://fonts.googleapis.com/css?family=Roboto:400,700&subset=cyrillic,latin', | 22 | + 'https://fonts.googleapis.com/css?family=Roboto:400,700&subset=cyrillic,latin', |
23 | ]; | 23 | ]; |
24 | public $js = [ | 24 | public $js = [ |
25 | '/js/script.js', | 25 | '/js/script.js', |
frontend/config/main.php
frontend/controllers/ChatController.php
@@ -9,6 +9,7 @@ use Yii; | @@ -9,6 +9,7 @@ use Yii; | ||
9 | use common\models\User; | 9 | use common\models\User; |
10 | use yii\data\ActiveDataProvider; | 10 | use yii\data\ActiveDataProvider; |
11 | use yii\filters\AccessControl; | 11 | use yii\filters\AccessControl; |
12 | +use yii\helpers\ArrayHelper; | ||
12 | use yii\web\Controller; | 13 | use yii\web\Controller; |
13 | use yii\web\NotFoundHttpException; | 14 | use yii\web\NotFoundHttpException; |
14 | use yii\web\UploadedFile; | 15 | use yii\web\UploadedFile; |
1 | +<?php | ||
2 | +return [ | ||
3 | + 'blog_id' => 'Blog ID', | ||
4 | + 'user_id' => 'User ID', | ||
5 | + 'name' => 'Название', | ||
6 | + 'link' => 'Link', | ||
7 | + 'date_add' => 'Дата добавления', | ||
8 | + 'user_add_id' => 'User Add ID', | ||
9 | + 'view_count' => 'Количество просмотров', | ||
10 | + 'description' => 'Описание', | ||
11 | + 'cover' => 'Фото главное', | ||
12 | + 'chat_id' => 'Chat ID', | ||
13 | + 'status' => 'Status', | ||
14 | + 'comment' => 'Comment', | ||
15 | + 'from_user'=> 'From User', | ||
16 | + 'to_user' => 'To User', | ||
17 | + 'id' => 'ID', | ||
18 | + 'is_active' => 'Is Active', | ||
19 | + 'parent' => 'Parent', | ||
20 | + 'company_info_id' => 'Company Info ID', | ||
21 | + 'name_company' => 'Название компании', | ||
22 | + 'staff' => 'Количество сотрудников', | ||
23 | + 'street' => 'Улица', | ||
24 | + 'house' => 'Дом', | ||
25 | + 'country_id' => 'Страна', | ||
26 | + 'oid' => 'Oid', | ||
27 | + 'country_name' => 'Country Name', | ||
28 | + 'country_name_en' => 'Country Name En', | ||
29 | + 'currency_id' => 'Currency ID', | ||
30 | + 'symbol' => 'Symbol', | ||
31 | + 'code' => 'Code', | ||
32 | + 'rate' => 'Rate', | ||
33 | + 'date_update' => 'Date Update', | ||
34 | + 'is_default' => 'Is Default', | ||
35 | + 'type' => 'Тип заказчика', | ||
36 | + 'rating' => 'Рейтинг', | ||
37 | + 'online' => 'Статус', | ||
38 | + 'city' => 'Город', | ||
39 | + 'info' => 'Любая информация о заказчике', | ||
40 | + 'employment_id' => 'Employment ID', | ||
41 | + 'table_name' => 'Model Name', | ||
42 | + 'table_id' => 'Model ID', | ||
43 | + 'value' => 'Value', | ||
44 | + 'field_name' => 'Field Name', | ||
45 | + 'language' => 'Language', | ||
46 | + 'file_id' => 'File ID', | ||
47 | + 'dir' => 'Dir', | ||
48 | + 'cover_g' => 'Фото главное', | ||
49 | + 'type_g' => 'Вид галереи', | ||
50 | + 'photo_g' => 'Фото галереи', | ||
51 | + 'job_id' => 'Job ID', | ||
52 | + 'date_start' => 'Date Start', | ||
53 | + 'total_count' => 'Total Count', | ||
54 | + 'complete_count' => 'Complete Count', | ||
55 | + 'current' => 'Current', | ||
56 | + 'media_id' => 'ID', | ||
57 | + 'hash' => 'Hash', | ||
58 | + 'extension' => 'Extension', | ||
59 | + 'message_id' => 'Message ID', | ||
60 | + 'text' => 'Сообщение', | ||
61 | + 'files' => 'Files', | ||
62 | + 'date' => 'Date', | ||
63 | + 'model' => 'Model', | ||
64 | + 'option_id' => 'Option ID', | ||
65 | + 'model_id' => 'Model ID', | ||
66 | + 'template' => 'Template', | ||
67 | + 'option_pid' => 'Option Pid', | ||
68 | + 'option_lang_id' => 'Option Lang ID', | ||
69 | + 'language_id' => 'Language ID', | ||
70 | + 'payment_id' => 'Payment ID', | ||
71 | + 'portfolio_id' => 'Portfolio ID', | ||
72 | + 'cover_m' => 'Фото главное', | ||
73 | + 'gallery_id' => 'Фото галерея', | ||
74 | + 'specializationString' => 'Специализации', | ||
75 | + 'preview' => 'Описание кратко', | ||
76 | + 'portfolio_specialization_id' => 'Portfolio Specialization ID', | ||
77 | + 'specialization_id' => 'Specialization ID', | ||
78 | + 'project_id' => 'Project ID', | ||
79 | + 'project_pid' => 'Родительский проект', | ||
80 | + 'date_end' => 'Дата окончания', | ||
81 | + 'budget' => 'Бюджет', | ||
82 | + 'payment_variant' => 'Варианты оплаты', | ||
83 | + 'deadline' => 'Срок выполнения', | ||
84 | + 'contractual' => 'Договорной', | ||
85 | + 'file' => 'Присоединить файл', | ||
86 | + 'specializationInput' => 'Специализации', | ||
87 | + 'paymentInput' => 'Способ оплаты', | ||
88 | + 'project_payment_id' => 'Project Payment ID', | ||
89 | + 'project_specialization_id' => 'Project Specialization ID', | ||
90 | + 'social_id' => 'Social ID', | ||
91 | + 'social_name' => 'Social Name', | ||
92 | + 'social_user_id' => 'Social User ID', | ||
93 | + 'specialization_pid' => 'Specialization Pid', | ||
94 | + 'specialization_name' => 'Specialization Name', | ||
95 | + 'specialization_parent_name' => 'Specialization Parent Name', | ||
96 | + 'image' => 'Картинка', | ||
97 | + 'background' => 'Background', | ||
98 | + 'team_id' => 'Team ID', | ||
99 | + 'firstname' => 'Имя', | ||
100 | + 'lastname' => 'Фамилия', | ||
101 | + 'middlename' => 'Отчество', | ||
102 | + 'link_profile' => 'Ссылка на профиль МФП', | ||
103 | + 'position' => 'Должность', | ||
104 | + 'department_id' => 'Отдел компании', | ||
105 | + 'experience_from' => 'Опыт', | ||
106 | + 'photo' => 'Фото', | ||
107 | + 'specialization' => 'Специализация', | ||
108 | + 'budget_currency' => 'Валюта', | ||
109 | + 'payment' => 'Способ оплаты', | ||
110 | + 'budget_from' => 'от', | ||
111 | + 'budget_to' => 'до', | ||
112 | + 'email' => 'Email', | ||
113 | + 'busy' => 'Статус', | ||
114 | + 'date_visit' => 'Дата визита', | ||
115 | + 'experience' => 'Опыт работы', | ||
116 | + 'rank' => 'Rank', | ||
117 | + 'salary' => 'Заработная плата', | ||
118 | + 'job' => 'Место работы', | ||
119 | + 'location' => 'Место расположения', | ||
120 | + 'soft' => 'Работа с программами', | ||
121 | + 'user_info_id' => 'User Info ID', | ||
122 | + 'guarantee' => 'Гарантия качества работ', | ||
123 | + 'contract' => 'Работа по договору', | ||
124 | + 'estimate' => 'Предоставляете смету', | ||
125 | + 'purchase' => 'Делаете сами закупку материалов', | ||
126 | + 'delivery' => 'Занимаетесь сами доставкой материалов', | ||
127 | + 'prepayment' => 'Минимальная предоплата за работы', | ||
128 | + 'about' => 'О себе', | ||
129 | + 'member' => 'Членство в МФП', | ||
130 | + 'alt_location' => 'Город не в списке', | ||
131 | + 'country' => 'Страна', | ||
132 | + 'image_ui' => 'Аватар', | ||
133 | + 'poster' => 'Подложка', | ||
134 | + 'social_vk' => 'Vk.com', | ||
135 | + 'social_fb' => 'FaceBook.com', | ||
136 | + 'social_in' => 'LinkedIn.com', | ||
137 | + 'social_t' => 'Twitter.com', | ||
138 | + 'geography' => 'География работ', | ||
139 | + 'geographies' => 'География работ', | ||
140 | + 'salary_currency' => 'Валюта', | ||
141 | + 'is_customer' => '', | ||
142 | + 'is_freelancer' => '', | ||
143 | + 'hide_mail' => 'не публиковать Email', | ||
144 | + 'user_payment_id' => 'User Payment ID', | ||
145 | + 'user_specialization_id' => 'User Specialization ID', | ||
146 | + 'vacancy_id' => 'Vacancy ID', | ||
147 | + 'user_name' => 'Контактное лицо', | ||
148 | + 'employmentInput' => 'Вид занятости', | ||
149 | + 'phone' => 'Телефон', | ||
150 | + 'vacancy_employment' => 'Vacancy Employment', | ||
151 | + 'vacancy_specialization_id' => 'Vacancy Specialization ID', | ||
152 | + 'delete_img' => 'удалить изображение', | ||
153 | + 'delete' => 'Удалить', | ||
154 | + 'delete_confirm' => 'Вы уверены, что хотите удалить этот элемент?', | ||
155 | + 'add' => 'Добавить', | ||
156 | + 'add_answer' => 'Добавить ответ', | ||
157 | + 'add_field' => 'Добавить поле', | ||
158 | + 'add_more' => 'Добавить еще', | ||
159 | + 'add_in_' => 'Добавить еще', | ||
160 | + | ||
161 | +]; | ||
0 | \ No newline at end of file | 162 | \ No newline at end of file |
frontend/views/accounts/_blog_form.php
@@ -67,17 +67,17 @@ use yii\helpers\Html; | @@ -67,17 +67,17 @@ use yii\helpers\Html; | ||
67 | 67 | ||
68 | <div class="input-blocks-wrapper"> | 68 | <div class="input-blocks-wrapper"> |
69 | <div class="admin-save-btn skills-save-btn admin-add-remove-wr style"> | 69 | <div class="admin-save-btn skills-save-btn admin-add-remove-wr style"> |
70 | - <?= Html::submitButton($blog->isNewRecord?'Добавить':'Обновить', [ 'class' => 'input-blocks-wrapper button' ]) ?> | 70 | + <?= Html::submitButton($blog->isNewRecord? Yii::t('app', 'add'):'Обновить', [ 'class' => 'input-blocks-wrapper button' ]) ?> |
71 | <div class="admin-remove-note"> | 71 | <div class="admin-remove-note"> |
72 | <?php | 72 | <?php |
73 | if(!$blog->isNewRecord) { | 73 | if(!$blog->isNewRecord) { |
74 | - echo Html::a('Удалить', [ | 74 | + echo Html::a(Yii::t('app', 'delete'), [ |
75 | 'accounts/blog-delete', | 75 | 'accounts/blog-delete', |
76 | 'id' => $blog->blog_id, | 76 | 'id' => $blog->blog_id, |
77 | ], [ | 77 | ], [ |
78 | - 'title' => 'Удалить', | ||
79 | - 'aria-label' => 'Удалить', | ||
80 | - 'data-confirm' => 'Вы уверены, что хотите удалить этот элемент?', | 78 | + 'title' => Yii::t('app', 'delete'), |
79 | + 'aria-label' => Yii::t('app', 'delete'), | ||
80 | + 'data-confirm' => Yii::t('app', 'delete_confirm'), | ||
81 | 'data-method' => 'post', | 81 | 'data-method' => 'post', |
82 | 'data-pjax' => 0, | 82 | 'data-pjax' => 0, |
83 | ]); | 83 | ]); |
frontend/views/accounts/_gallery_form.php
@@ -64,17 +64,17 @@ | @@ -64,17 +64,17 @@ | ||
64 | 64 | ||
65 | <div class="input-blocks-wrapper"> | 65 | <div class="input-blocks-wrapper"> |
66 | <div class="admin-save-btn skills-save-btn admin-add-remove-wr style"> | 66 | <div class="admin-save-btn skills-save-btn admin-add-remove-wr style"> |
67 | - <?= Html::submitButton($gallery->isNewRecord?'Добавить':'Обновить', [ 'class' => 'input-blocks-wrapper button' ]) ?> | 67 | + <?= Html::submitButton($gallery->isNewRecord? Yii::t('app', 'add'):'Обновить', [ 'class' => 'input-blocks-wrapper button' ]) ?> |
68 | <div class="admin-remove-note"> | 68 | <div class="admin-remove-note"> |
69 | <?php | 69 | <?php |
70 | if(!$gallery->isNewRecord) { | 70 | if(!$gallery->isNewRecord) { |
71 | - echo Html::a('Удалить', [ | 71 | + echo Html::a(Yii::t('app', 'delete'), [ |
72 | 'accounts/gallery-delete', | 72 | 'accounts/gallery-delete', |
73 | 'id' => $gallery->gallery_id, | 73 | 'id' => $gallery->gallery_id, |
74 | ], [ | 74 | ], [ |
75 | - 'title' => 'Удалить', | ||
76 | - 'aria-label' => 'Удалить', | ||
77 | - 'data-confirm' => 'Вы уверены, что хотите удалить этот элемент?', | 75 | + 'title' => Yii::t('app', 'delete'), |
76 | + 'aria-label' => Yii::t('app', 'delete'), | ||
77 | + 'data-confirm' => Yii::t('app', 'delete_confirm'), | ||
78 | 'data-method' => 'post', | 78 | 'data-method' => 'post', |
79 | 'data-pjax' => 0, | 79 | 'data-pjax' => 0, |
80 | ]); | 80 | ]); |
frontend/views/accounts/_portfolio_form.php
@@ -183,17 +183,17 @@ use mihaildev\ckeditor\CKEditor; | @@ -183,17 +183,17 @@ use mihaildev\ckeditor\CKEditor; | ||
183 | 183 | ||
184 | <div class="input-blocks-wrapper"> | 184 | <div class="input-blocks-wrapper"> |
185 | <div class="admin-save-btn skills-save-btn admin-add-remove-wr style"> | 185 | <div class="admin-save-btn skills-save-btn admin-add-remove-wr style"> |
186 | - <?= Html::submitButton($portfolio->isNewRecord ? 'Добавить' : 'Обновить', [ 'class' => 'input-blocks-wrapper button' ]) ?> | 186 | + <?= Html::submitButton($portfolio->isNewRecord ? Yii::t('app', 'add') : 'Обновить', [ 'class' => 'input-blocks-wrapper button' ]) ?> |
187 | <div class="admin-remove-note"> | 187 | <div class="admin-remove-note"> |
188 | <?php | 188 | <?php |
189 | if(!$portfolio->isNewRecord) { | 189 | if(!$portfolio->isNewRecord) { |
190 | - echo Html::a('Удалить', [ | 190 | + echo Html::a(Yii::t('app', 'delete'), [ |
191 | 'accounts/portfolio-delete', | 191 | 'accounts/portfolio-delete', |
192 | 'id' => $portfolio->portfolio_id, | 192 | 'id' => $portfolio->portfolio_id, |
193 | ], [ | 193 | ], [ |
194 | - 'title' => 'Удалить', | ||
195 | - 'aria-label' => 'Удалить', | ||
196 | - 'data-confirm' => 'Вы уверены, что хотите удалить этот элемент?', | 194 | + 'title' => Yii::t('app', 'delete'), |
195 | + 'aria-label' => Yii::t('app', 'delete'), | ||
196 | + 'data-confirm' => Yii::t('app', 'delete_confirm'), | ||
197 | 'data-method' => 'post', | 197 | 'data-method' => 'post', |
198 | 'data-pjax' => 0, | 198 | 'data-pjax' => 0, |
199 | ]); | 199 | ]); |
frontend/views/accounts/_projects_form.php
@@ -254,17 +254,17 @@ | @@ -254,17 +254,17 @@ | ||
254 | 254 | ||
255 | <div class="input-blocks-wrapper"> | 255 | <div class="input-blocks-wrapper"> |
256 | <div class="admin-save-btn skills-save-btn admin-add-remove-wr style"> | 256 | <div class="admin-save-btn skills-save-btn admin-add-remove-wr style"> |
257 | - <?= Html::submitButton($project->isNewRecord ? 'Добавить' : 'Обновить', [ 'class' => 'input-blocks-wrapper button' ]) ?> | 257 | + <?= Html::submitButton($project->isNewRecord ? Yii::t('app', 'add') : 'Обновить', [ 'class' => 'input-blocks-wrapper button' ]) ?> |
258 | <div class="admin-remove-note"> | 258 | <div class="admin-remove-note"> |
259 | <?php | 259 | <?php |
260 | if(!$project->isNewRecord) { | 260 | if(!$project->isNewRecord) { |
261 | - echo Html::a('Удалить', [ | 261 | + echo Html::a(Yii::t('app', 'delete'), [ |
262 | 'accounts/projects-delete', | 262 | 'accounts/projects-delete', |
263 | 'id' => $project->project_id, | 263 | 'id' => $project->project_id, |
264 | ], [ | 264 | ], [ |
265 | - 'title' => 'Удалить', | ||
266 | - 'aria-label' => 'Удалить', | ||
267 | - 'data-confirm' => 'Вы уверены, что хотите удалить этот элемент?', | 265 | + 'title' => Yii::t('app', 'delete'), |
266 | + 'aria-label' => Yii::t('app', 'delete'), | ||
267 | + 'data-confirm' => Yii::t('app', 'delete_confirm'), | ||
268 | 'data-method' => 'post', | 268 | 'data-method' => 'post', |
269 | 'data-pjax' => 0, | 269 | 'data-pjax' => 0, |
270 | ]); | 270 | ]); |
frontend/views/accounts/_team_form.php
@@ -118,17 +118,17 @@ | @@ -118,17 +118,17 @@ | ||
118 | 118 | ||
119 | <div class="input-blocks-wrapper"> | 119 | <div class="input-blocks-wrapper"> |
120 | <div class="admin-save-btn skills-save-btn admin-add-remove-wr style"> | 120 | <div class="admin-save-btn skills-save-btn admin-add-remove-wr style"> |
121 | - <?= Html::submitButton($team->isNewRecord ? 'Добавить' : 'Обновить', [ 'class' => 'input-blocks-wrapper button' ]) ?> | 121 | + <?= Html::submitButton($team->isNewRecord ? Yii::t('app', 'add') : 'Обновить', [ 'class' => 'input-blocks-wrapper button' ]) ?> |
122 | <div class="admin-remove-note"> | 122 | <div class="admin-remove-note"> |
123 | <?php | 123 | <?php |
124 | if(!$team->isNewRecord) { | 124 | if(!$team->isNewRecord) { |
125 | - echo Html::a('Удалить', [ | 125 | + echo Html::a(Yii::t('app', 'delete'), [ |
126 | 'accounts/team-delete', | 126 | 'accounts/team-delete', |
127 | 'id' => $team->team_id, | 127 | 'id' => $team->team_id, |
128 | ], [ | 128 | ], [ |
129 | - 'title' => 'Удалить', | ||
130 | - 'aria-label' => 'Удалить', | ||
131 | - 'data-confirm' => 'Вы уверены, что хотите удалить этот элемент?', | 129 | + 'title' => Yii::t('app', 'delete'), |
130 | + 'aria-label' => Yii::t('app', 'delete'), | ||
131 | + 'data-confirm' => Yii::t('app', 'delete_confirm'), | ||
132 | 'data-method' => 'post', | 132 | 'data-method' => 'post', |
133 | 'data-pjax' => 0, | 133 | 'data-pjax' => 0, |
134 | ]); | 134 | ]); |
frontend/views/accounts/_vacancy_form.php
@@ -214,17 +214,17 @@ | @@ -214,17 +214,17 @@ | ||
214 | </div> | 214 | </div> |
215 | 215 | ||
216 | <div class="admin-save-btn skills-save-btn admin-add-remove-wr style"> | 216 | <div class="admin-save-btn skills-save-btn admin-add-remove-wr style"> |
217 | - <?= Html::submitButton($vacancy->isNewRecord ? 'Добавить' : 'Обновить', [ 'class' => 'input-blocks-wrapper button' ]) ?> | 217 | + <?= Html::submitButton($vacancy->isNewRecord ? Yii::t('app', 'add') : 'Обновить', [ 'class' => 'input-blocks-wrapper button' ]) ?> |
218 | <div class="admin-remove-note"> | 218 | <div class="admin-remove-note"> |
219 | <?php | 219 | <?php |
220 | if(!$vacancy->isNewRecord) { | 220 | if(!$vacancy->isNewRecord) { |
221 | - echo Html::a('Удалить', [ | 221 | + echo Html::a(Yii::t('app', 'delete'), [ |
222 | 'accounts/vacancy-delete', | 222 | 'accounts/vacancy-delete', |
223 | 'id' => $vacancy->vacancy_id, | 223 | 'id' => $vacancy->vacancy_id, |
224 | ], [ | 224 | ], [ |
225 | - 'title' => 'Удалить', | ||
226 | - 'aria-label' => 'Удалить', | ||
227 | - 'data-confirm' => 'Вы уверены, что хотите удалить этот элемент?', | 225 | + 'title' => Yii::t('app', 'delete'), |
226 | + 'aria-label' => Yii::t('app', 'delete'), | ||
227 | + 'data-confirm' => Yii::t('app', 'delete_confirm'), | ||
228 | 'data-method' => 'post', | 228 | 'data-method' => 'post', |
229 | 'data-pjax' => 0, | 229 | 'data-pjax' => 0, |
230 | ]); | 230 | ]); |
frontend/views/accounts/blog.php
@@ -16,7 +16,7 @@ | @@ -16,7 +16,7 @@ | ||
16 | ?> | 16 | ?> |
17 | <div class="login-left-column-title"><?= $this->title ?></div> | 17 | <div class="login-left-column-title"><?= $this->title ?></div> |
18 | <div class="admin-all-pages-add"> | 18 | <div class="admin-all-pages-add"> |
19 | - <?= Html::a(Yii::t('app', 'Добавить'), [ 'blog-create' ], [ 'class' => 'btn btn-success' ]) ?> | 19 | + <?= Html::a(Yii::t('app', 'add'), [ 'blog-create' ], [ 'class' => 'btn btn-success' ]) ?> |
20 | </div> | 20 | </div> |
21 | 21 | ||
22 | <div class="admin-table-portfolio"> | 22 | <div class="admin-table-portfolio"> |
@@ -84,9 +84,9 @@ | @@ -84,9 +84,9 @@ | ||
84 | 'blog-delete', | 84 | 'blog-delete', |
85 | 'id' => $model->blog_id, | 85 | 'id' => $model->blog_id, |
86 | ], [ | 86 | ], [ |
87 | - 'title' => 'Удалить', | ||
88 | - 'aria-label' => 'Удалить', | ||
89 | - 'data-confirm' => 'Вы уверены, что хотите удалить этот элемент?', | 87 | + 'title' => Yii::t('app', 'delete'), |
88 | + 'aria-label' => Yii::t('app', 'delete'), | ||
89 | + 'data-confirm' => Yii::t('app', 'delete_confirm'), | ||
90 | 'data-method' => 'post', | 90 | 'data-method' => 'post', |
91 | 'data-pjax' => '0', | 91 | 'data-pjax' => '0', |
92 | ]); | 92 | ]); |
frontend/views/accounts/gallery.php
@@ -14,7 +14,7 @@ | @@ -14,7 +14,7 @@ | ||
14 | ?> | 14 | ?> |
15 | <div class="login-left-column-title"><?= $this->title ?></div> | 15 | <div class="login-left-column-title"><?= $this->title ?></div> |
16 | <div class="admin-all-pages-add"> | 16 | <div class="admin-all-pages-add"> |
17 | - <?= Html::a(Yii::t('app', 'Добавить'), [ 'gallery-create' ], [ 'class' => 'btn btn-success' ]) ?> | 17 | + <?= Html::a(Yii::t('app', 'add'), [ 'gallery-create' ], [ 'class' => 'btn btn-success' ]) ?> |
18 | </div> | 18 | </div> |
19 | <div class="admin-table-portfolio admin-table-gallery"> | 19 | <div class="admin-table-portfolio admin-table-gallery"> |
20 | <?= GridView::widget([ | 20 | <?= GridView::widget([ |
@@ -72,9 +72,9 @@ | @@ -72,9 +72,9 @@ | ||
72 | }, | 72 | }, |
73 | 'delete' => function($url, $model, $key) { | 73 | 'delete' => function($url, $model, $key) { |
74 | return Html::a('<img src="/images/delete-ico.png" alt="">', ['gallery-delete', 'id' => $model->gallery_id], [ | 74 | return Html::a('<img src="/images/delete-ico.png" alt="">', ['gallery-delete', 'id' => $model->gallery_id], [ |
75 | - 'title' => 'Удалить', | ||
76 | - 'aria-label' => 'Удалить', | ||
77 | - 'data-confirm' => 'Вы уверены, что хотите удалить этот элемент?', | 75 | + 'title' => Yii::t('app', 'delete'), |
76 | + 'aria-label' => Yii::t('app', 'delete'), | ||
77 | + 'data-confirm' => Yii::t('app', 'delete_confirm'), | ||
78 | 'data-method' => 'post', | 78 | 'data-method' => 'post', |
79 | 'data-pjax' => '0', | 79 | 'data-pjax' => '0', |
80 | ]); | 80 | ]); |
frontend/views/accounts/portfolio.php
@@ -15,7 +15,7 @@ | @@ -15,7 +15,7 @@ | ||
15 | ?> | 15 | ?> |
16 | <div class="login-left-column-title"><?= $this->title ?></div> | 16 | <div class="login-left-column-title"><?= $this->title ?></div> |
17 | <div class="admin-all-pages-add"> | 17 | <div class="admin-all-pages-add"> |
18 | - <?= Html::a(Yii::t('app', 'Добавить'), [ 'portfolio-create' ], [ 'class' => 'btn btn-success' ]) ?> | 18 | + <?= Html::a(Yii::t('app', 'add'), [ 'portfolio-create' ], [ 'class' => 'btn btn-success' ]) ?> |
19 | </div> | 19 | </div> |
20 | <div class="admin-table-portfolio"> | 20 | <div class="admin-table-portfolio"> |
21 | <?= GridView::widget([ | 21 | <?= GridView::widget([ |
@@ -93,9 +93,9 @@ | @@ -93,9 +93,9 @@ | ||
93 | 'portfolio-delete', | 93 | 'portfolio-delete', |
94 | 'id' => $model->portfolio_id, | 94 | 'id' => $model->portfolio_id, |
95 | ], [ | 95 | ], [ |
96 | - 'title' => 'Удалить', | ||
97 | - 'aria-label' => 'Удалить', | ||
98 | - 'data-confirm' => 'Вы уверены, что хотите удалить этот элемент?', | 96 | + 'title' => Yii::t('app', 'delete'), |
97 | + 'aria-label' => Yii::t('app', 'delete'), | ||
98 | + 'data-confirm' => Yii::t('app', 'delete_confirm'), | ||
99 | 'data-method' => 'post', | 99 | 'data-method' => 'post', |
100 | 'data-pjax' => '0', | 100 | 'data-pjax' => '0', |
101 | ]); | 101 | ]); |
frontend/views/accounts/projects.php
@@ -17,7 +17,7 @@ | @@ -17,7 +17,7 @@ | ||
17 | ?> | 17 | ?> |
18 | <div class="login-left-column-title"><?= $this->title ?></div> | 18 | <div class="login-left-column-title"><?= $this->title ?></div> |
19 | <div class="admin-all-pages-add"> | 19 | <div class="admin-all-pages-add"> |
20 | - <?= Html::a(Yii::t('app', 'Добавить'), [ 'projects-create' ], [ 'class' => 'btn btn-success' ]) ?> | 20 | + <?= Html::a(Yii::t('app', 'add'), [ 'projects-create' ], [ 'class' => 'btn btn-success' ]) ?> |
21 | </div> | 21 | </div> |
22 | <?= GridView::widget([ | 22 | <?= GridView::widget([ |
23 | 'options' => ['class'=>'style admin-all-pages-wr'], | 23 | 'options' => ['class'=>'style admin-all-pages-wr'], |
@@ -113,9 +113,9 @@ | @@ -113,9 +113,9 @@ | ||
113 | 'projects-delete', | 113 | 'projects-delete', |
114 | 'id' => $model->project_id, | 114 | 'id' => $model->project_id, |
115 | ], [ | 115 | ], [ |
116 | - 'title' => 'Удалить', | ||
117 | - 'aria-label' => 'Удалить', | ||
118 | - 'data-confirm' => 'Вы уверены, что хотите удалить этот элемент?', | 116 | + 'title' => Yii::t('app', 'delete'), |
117 | + 'aria-label' => Yii::t('app', 'delete'), | ||
118 | + 'data-confirm' => Yii::t('app', 'delete_confirm'), | ||
119 | 'data-method' => 'post', | 119 | 'data-method' => 'post', |
120 | 'data-pjax' => '0', | 120 | 'data-pjax' => '0', |
121 | ]); | 121 | ]); |
frontend/views/accounts/team.php
@@ -15,7 +15,7 @@ | @@ -15,7 +15,7 @@ | ||
15 | ?> | 15 | ?> |
16 | <div class="login-left-column-title"><?= $this->title ?></div> | 16 | <div class="login-left-column-title"><?= $this->title ?></div> |
17 | <div class="admin-all-pages-add"> | 17 | <div class="admin-all-pages-add"> |
18 | - <?= Html::a(Yii::t('app', 'Добавить'), [ 'team-create' ], [ 'class' => 'btn btn-success' ]) ?> | 18 | + <?= Html::a(Yii::t('app', 'add'), [ 'team-create' ], [ 'class' => 'btn btn-success' ]) ?> |
19 | </div> | 19 | </div> |
20 | 20 | ||
21 | 21 | ||
@@ -88,9 +88,9 @@ | @@ -88,9 +88,9 @@ | ||
88 | 'team-delete', | 88 | 'team-delete', |
89 | 'id' => $model->team_id, | 89 | 'id' => $model->team_id, |
90 | ], [ | 90 | ], [ |
91 | - 'title' => 'Удалить', | ||
92 | - 'aria-label' => 'Удалить', | ||
93 | - 'data-confirm' => 'Вы уверены, что хотите удалить этот элемент?', | 91 | + 'title' => Yii::t('app', 'delete'), |
92 | + 'aria-label' => Yii::t('app', 'delete'), | ||
93 | + 'data-confirm' => Yii::t('app', 'delete_confirm'), | ||
94 | 'data-method' => 'post', | 94 | 'data-method' => 'post', |
95 | 'data-pjax' => '0', | 95 | 'data-pjax' => '0', |
96 | ]); | 96 | ]); |
frontend/views/accounts/vacancy.php
@@ -15,7 +15,7 @@ | @@ -15,7 +15,7 @@ | ||
15 | ?> | 15 | ?> |
16 | <div class="login-left-column-title"><?= $this->title ?></div> | 16 | <div class="login-left-column-title"><?= $this->title ?></div> |
17 | <div class="admin-all-pages-add"> | 17 | <div class="admin-all-pages-add"> |
18 | - <?= Html::a(Yii::t('app', 'Добавить'), [ 'vacancy-create' ], [ 'class' => 'btn btn-success' ]) ?> | 18 | + <?= Html::a(Yii::t('app', 'add'), [ 'vacancy-create' ], [ 'class' => 'btn btn-success' ]) ?> |
19 | </div> | 19 | </div> |
20 | <div class="admin-table-portfolio admin-table-vacancy"> | 20 | <div class="admin-table-portfolio admin-table-vacancy"> |
21 | <?= GridView::widget([ | 21 | <?= GridView::widget([ |
@@ -74,9 +74,9 @@ | @@ -74,9 +74,9 @@ | ||
74 | }, | 74 | }, |
75 | 'delete' => function($url, $model, $key) { | 75 | 'delete' => function($url, $model, $key) { |
76 | return Html::a('<img src="/images/delete-ico.png" alt="">', ['vacancy-delete', 'id' => $model->vacancy_id], [ | 76 | return Html::a('<img src="/images/delete-ico.png" alt="">', ['vacancy-delete', 'id' => $model->vacancy_id], [ |
77 | - 'title' => 'Удалить', | ||
78 | - 'aria-label' => 'Удалить', | ||
79 | - 'data-confirm' => 'Вы уверены, что хотите удалить этот элемент?', | 77 | + 'title' => Yii::t('app', 'delete'), |
78 | + 'aria-label' => Yii::t('app', 'delete'), | ||
79 | + 'data-confirm' => Yii::t('app', 'delete_confirm'), | ||
80 | 'data-method' => 'post', | 80 | 'data-method' => 'post', |
81 | 'data-pjax' => '0', | 81 | 'data-pjax' => '0', |
82 | ]); | 82 | ]); |
frontend/views/chat/_chat_list_view.php
@@ -2,12 +2,13 @@ | @@ -2,12 +2,13 @@ | ||
2 | 2 | ||
3 | use yii\helpers\Html; | 3 | use yii\helpers\Html; |
4 | 4 | ||
5 | -?> | ||
6 | 5 | ||
6 | +?> | ||
7 | <?php if($model->hasNewMessage()):?> | 7 | <?php if($model->hasNewMessage()):?> |
8 | <div class="cabinet-message-blocks new-message-cabinet-blocks"> | 8 | <div class="cabinet-message-blocks new-message-cabinet-blocks"> |
9 | <div class="ico-sender-wrapper"> | 9 | <div class="ico-sender-wrapper"> |
10 | <div class="ico-sender"> | 10 | <div class="ico-sender"> |
11 | + | ||
11 | <?= Html::a(Html::img($model->interlocutor->image));?> | 12 | <?= Html::a(Html::img($model->interlocutor->image));?> |
12 | </div> | 13 | </div> |
13 | </div> | 14 | </div> |
frontend/views/chat/list.php
@@ -5,6 +5,7 @@ use yii\widgets\ListView; | @@ -5,6 +5,7 @@ use yii\widgets\ListView; | ||
5 | 5 | ||
6 | $this->title = 'Мой профиль'; | 6 | $this->title = 'Мой профиль'; |
7 | $this->params['breadcrumbs'][] = $this->title; | 7 | $this->params['breadcrumbs'][] = $this->title; |
8 | + | ||
8 | ?> | 9 | ?> |
9 | <div class="section-box content"> | 10 | <div class="section-box content"> |
10 | <div class="section-box-15"> | 11 | <div class="section-box-15"> |
frontend/views/option-lang/_form_ajax.php
@@ -25,7 +25,7 @@ | @@ -25,7 +25,7 @@ | ||
25 | 'model' => $model, | 25 | 'model' => $model, |
26 | 'attribute' => "[$model->language_id][2]value[]", | 26 | 'attribute' => "[$model->language_id][2]value[]", |
27 | 'form' => $form, | 27 | 'form' => $form, |
28 | - 'template' => "{label}\n{input}\n{hint}\n{error}<div class='add_column'><a href=''>Добавить</a></div>", | 28 | + 'template' => "{label}\n{input}\n{hint}\n{error}<div class='add_column'><a href=''>".Yii::t('app', 'add')."</a></div>", |
29 | ])) | 29 | ])) |
30 | ->textInput() ?> | 30 | ->textInput() ?> |
31 | 31 |