Anastasia / energyforum

Commit 5983654be68cb6f129d31f6edb34e81533b57b87

Authored by alex
1 parent fb400cd6

****WARNING ==> 3 миграции 

ДОбавил поля для таблицы Customer
И под них переделал site/register
Часть 1
Showing 11 changed files with 529 additions and 81 deletions   Show diff stats
Inline Side-by-side
common/messages/en/app.php
  Show/Hide comments   View file @5983654
@@ -61,8 +61,28 @@ return [ @@ -61,8 +61,28 @@ return [
61 61
62 'Signup' => 'Signup', 62 'Signup' => 'Signup',
63 63
  64 + 'Special meal' => 'Special meal',
  65 + 'Meal1' => 'Halal',
  66 + 'Meal2' => 'Kashrut',
  67 + 'Meal3' => 'Vegetarian',
64 68
  69 + 'Working language' => 'Working language',
  70 + 'RusW' => 'Russian',
  71 + 'EngW' => 'English',
  72 + 'FrW' => 'French',
65 73
  74 + 'Need visa' => 'Do your need a visa to enter Ukraine?',
  75 + 'Passport number' => 'Number ',
  76 + 'Passport date' => 'Date of issue',
  77 + 'Passport place' => 'Place of issue',
  78 + 'Passport valid' => 'Valid untill',
  79 + 'Passport details' => 'Passport details:',
  80 + 'Phone own' => 'Telephone',
  81 + 'Phone office' => 'Telephone (office)',
  82 + 'Phone other' => 'Telephone (other)',
  83 + 'fax' => 'Fax',
  84 + 'Acceptance' => 'Acceptance',
  85 + 'Acc text1' => 'I, the undersigned, hereby accept the invitation of the Government of Ukraine and the United Nations (UNECE) to participate in the 9th International Forum on energy for sustainable development, which will take place in Kyiv, Ukraine.',
66 86
67 87
68 ]; 88 ];
common/messages/fr/app.php
  Show/Hide comments   View file @5983654
@@ -64,15 +64,26 @@ return [ @@ -64,15 +64,26 @@ return [
64 'Female' => 'femelle', 64 'Female' => 'femelle',
65 65
66 'Signup' => 'S\'inscrire', 66 'Signup' => 'S\'inscrire',
67 -  
68 -  
69 -  
70 -  
71 -  
72 -  
73 -  
74 -  
75 - 67 + 'Special meal' => 'Alimentation spéciale',
  68 + 'Meal1' => 'Halal',
  69 + 'Meal2' => 'Kashrut',
  70 + 'Meal3' => 'Végétarien',
  71 + 'Working language' => 'Langue de travail',
  72 + 'RusW' => 'Russe',
  73 + 'EngW' => 'Anglais',
  74 + 'FrW' => 'Français',
  75 + 'Need visa' => 'Avez-vous besoin d\'un visa pour entrer en Ukraine?',
  76 + 'Passport number' => 'Nombre',
  77 + 'Passport date' => 'Date d\'Emission',
  78 + 'Passport place' => 'Lieu d\'émission',
  79 + 'Passport valid' => 'Valide jusqu\'à',
  80 + 'Passport details' => 'Informations du passeport:',
  81 + 'Phone own' => 'Telephone',
  82 + 'Phone office' => 'Telephone (bureau)',
  83 + 'Phone other' => 'Telephone (autre)',
  84 + 'fax' => 'Fax',
  85 + 'Acceptance' => 'Acceptation',
  86 + 'Acc text1' => 'Je, soussigné, accepte l’invitation du Gouvernement ukrainien et de l’Organisation des Nations Unies (CEE-ONU) à participer au 9ème Forum international sur l’énergie pour le développement durable, qui se tiendra à Kiev, en Ukraine. ',
76 87
77 88
78 89
common/messages/ru/app.php
  Show/Hide comments   View file @5983654
@@ -60,6 +60,35 @@ return [ @@ -60,6 +60,35 @@ return [
60 'Partners' => 'Международные партнеры', 60 'Partners' => 'Международные партнеры',
61 'Male' => 'мужской', 61 'Male' => 'мужской',
62 'Female' => 'женский', 62 'Female' => 'женский',
  63 + 'Special meal' => 'Особенное питание',
  64 + 'Meal1' => 'Халяль',
  65 + 'Meal2' => 'Кашрут',
  66 + 'Meal3' => 'Вегитарианец',
  67 + 'Working language' => 'Рабочий язык',
  68 + 'RusW' => 'Русский',
  69 + 'EngW' => 'Английский',
  70 + 'FrW' => 'Французский',
  71 + 'Need visa' => 'Нужна ли Вам виза для въезда в Украину?',
  72 + 'Passport number' => 'Серия, номер',
  73 + 'Passport date' => 'Дата выдачи',
  74 + 'Passport place' => 'Орган выдачи',
  75 + 'Passport valid' => 'Действителен до',
  76 + 'Passport details' => 'Паспортные данные:',
  77 + 'Phone own' => 'Телефон',
  78 + 'Phone office' => 'Телефон (рабочий)',
  79 + 'Phone other' => 'Телефон (дополнительный)',
  80 + 'fax' => 'Факс',
  81 + 'Acceptance' => 'СОГЛАСИЕ',
  82 + 'Acc text1' => 'Я, нижеподписавшийся, настоящим принимаю приглашение правительства Украины и Организации Объединенных Наций (ЕЭК ООН) принять участие в 9-м Международном форуме по энергетике для устойчивого развития, который состоится в Киеве, Украина.',
  83 +
  84 +
  85 +
  86 +
  87 +
  88 +
  89 +
  90 +
  91 +
63 92
64 93
65 94
common/messages/ua/app.php
  Show/Hide comments   View file @5983654
@@ -14,8 +14,8 @@ return [ @@ -14,8 +14,8 @@ return [
14 'Organization' => 'Місце роботи, посада', 14 'Organization' => 'Місце роботи, посада',
15 15
16 'Conference' => 'Міністерська конференція', 16 'Conference' => 'Міністерська конференція',
17 - 'Geee' => 'Група експертів з енергоефективності(GEEE)',  
18 - 'Gere' => 'Група експертів з відновлювальної ененргетики (GERE)', 17 + 'Geee' => 'Група експертів з енергоефективності (GEEE)',
  18 + 'Gere' => 'Група експертів з відновлювальної енергетики (GERE)',
19 19
20 'Participation in events' => 'Участь у заходах', 20 'Participation in events' => 'Участь у заходах',
21 'mark required' => 'відмітити необхідне', 21 'mark required' => 'відмітити необхідне',
@@ -59,7 +59,32 @@ return [ @@ -59,7 +59,32 @@ return [
59 'Male' => 'чоловік', 59 'Male' => 'чоловік',
60 'Female' => 'жінка', 60 'Female' => 'жінка',
61 61
62 - 'Signup' => 'Реєстрацiя' 62 + 'Signup' => 'Реєстрацiя',
  63 + 'Special meal' => 'ОСОБЛИВЕ ХАРЧУВАННЯ',
  64 + 'Meal1' => 'Халяль',
  65 + 'Meal2' => 'Кашрут',
  66 + 'Meal3' => 'Вегітаріанець',
  67 + 'Working language' => 'РОБОЧА МОВА',
  68 + 'RusW' => 'Російська',
  69 + 'EngW' => 'Англійська',
  70 + 'FrW' => 'Французька',
  71 + 'Need visa' => 'Чи потрібна Вам віза для в\'їзду в Україну',
  72 + 'Passport number' => 'Серія та номер',
  73 + 'Passport date' => 'Дата видачі',
  74 + 'Passport place' => 'Орган видачі',
  75 + 'Passport valid' => 'Дійсний до',
  76 + 'Passport details' => 'Паспортні дані:',
  77 + 'Phone own' => 'Телефон',
  78 + 'Phone office' => 'Телефон (робочий)',
  79 + 'Phone other' => 'Телефон (додатковий)',
  80 + 'fax' => 'Факс',
  81 + 'Acceptance' => 'ЗГОДА',
  82 + 'Acc text1' => 'Я, що нижче підписався, цим приймаю запрошення уряду України та Організації Об\'єднаних Націй (ЄЕК ООН) взяти участь у 9-му Міжнародному форумі з енергетики для сталого розвитку, який відбудеться в Києві, Україна.',
  83 +
  84 +
  85 +
  86 +
  87 +
63 88
64 89
65 90
common/models/Customer.php
  Show/Hide comments   View file @5983654
@@ -24,10 +24,35 @@ @@ -24,10 +24,35 @@
24 * @property bool $conference 24 * @property bool $conference
25 * @property bool $geee 25 * @property bool $geee
26 * @property bool $gere 26 * @property bool $gere
  27 + *
  28 + *
  29 + * New properties
  30 + * @property string $phone_own
  31 + * @property string $phone_office
  32 + * @property string $phone_other
  33 + * @property string $fax
  34 + * @property integer $passport_number
  35 + * @property integer $passport_date
  36 + * @property string $passport_place
  37 + * @property integer $passport_valid
  38 + * @property boolean $need_visa
  39 + * @property string $special_meal
  40 + *
  41 + * @property boolean $working_language_ru
  42 + * @property boolean $working_language_en
  43 + * @property boolean $working_language_fr
  44 + * @property boolean $meal_halal
  45 + * @property boolean $meal_kashrut
  46 + * @property boolean $meal_vegan
  47 + *
  48 + *
27 */ 49 */
28 class Customer extends \yii\db\ActiveRecord 50 class Customer extends \yii\db\ActiveRecord
29 { 51 {
30 public $file; 52 public $file;
  53 +
  54 + public $acceptance;
  55 +
31 const STATUS_NEW = 2; 56 const STATUS_NEW = 2;
32 const STATUS_ACTIVE = 1; 57 const STATUS_ACTIVE = 1;
33 const STATUS_NO = 0; 58 const STATUS_NO = 0;
@@ -62,6 +87,7 @@ @@ -62,6 +87,7 @@
62 'gender', 87 'gender',
63 'status', 88 'status',
64 'language_id', 89 'language_id',
  90 + 'acceptance'
65 ], 91 ],
66 'integer', 92 'integer',
67 ], 93 ],
@@ -74,6 +100,14 @@ @@ -74,6 +100,14 @@
74 'conference', 100 'conference',
75 'geee', 101 'geee',
76 'gere', 102 'gere',
  103 + 'need_visa',
  104 + 'working_language_ru',
  105 + 'working_language_en',
  106 + 'working_language_fr',
  107 + 'meal_halal',
  108 + 'meal_kashrut',
  109 + 'meal_vegan',
  110 +
77 ], 111 ],
78 'boolean', 112 'boolean',
79 ], 113 ],
@@ -87,10 +121,26 @@ @@ -87,10 +121,26 @@
87 'passport', 121 'passport',
88 'email', 122 'email',
89 'image', 123 'image',
  124 + 'passport_place',
  125 + 'special_meal',
  126 + 'passport_number',
  127 + 'passport_date',
  128 + 'passport_valid',
90 ], 129 ],
91 'string', 130 'string',
92 'max' => 255, 131 'max' => 255,
93 ], 132 ],
  133 + [
  134 + [
  135 + 'phone_own',
  136 + 'phone_office',
  137 + 'phone_other',
  138 + 'fax'
  139 + ],
  140 + 'string',
  141 + 'max' => 30,
  142 + ],
  143 +
94 [ 144 [
95 [ 'gender' ], 145 [ 'gender' ],
96 'in', 146 'in',
@@ -104,14 +154,25 @@ @@ -104,14 +154,25 @@
104 'gender', 154 'gender',
105 'organization', 155 'organization',
106 'name', 156 'name',
107 - 'secondname', 157 + #'secondname',
108 'birth', 158 'birth',
109 'citizenship', 159 'citizenship',
110 - 'passport', 160 + #'passport',
111 'email', 161 'email',
  162 + 'passport_number',
  163 + 'passport_date',
  164 + 'passport_place',
  165 + 'passport_valid',
  166 + 'need_visa',
  167 + 'acceptance'
112 ], 168 ],
113 'required', 169 'required',
114 ], 170 ],
  171 + [
  172 + ['acceptance'],
  173 + 'compare',
  174 + 'compareValue' => 1
  175 + ],
115 ['email', 'email'], 176 ['email', 'email'],
116 ['file', 'file', 'skipOnEmpty' => false, 'checkExtensionByMimeType'=>false,'extensions' => ['png', 'jpg', 'gif'], 'maxSize' => 1024*1024*1024*2] 177 ['file', 'file', 'skipOnEmpty' => false, 'checkExtensionByMimeType'=>false,'extensions' => ['png', 'jpg', 'gif'], 'maxSize' => 1024*1024*1024*2]
117 178
@@ -124,22 +185,32 @@ @@ -124,22 +185,32 @@
124 public function attributeLabels() 185 public function attributeLabels()
125 { 186 {
126 return [ 187 return [
127 - 'id' => Yii::t('app', 'ID'),  
128 - 'name' => Yii::t('app', 'Name'),  
129 - 'secondname' => Yii::t('app', 'Secondname'),  
130 - 'dignity' => Yii::t('app', 'Dignity'),  
131 - 'gender' => Yii::t('app', 'Gender'),  
132 - 'birth' => Yii::t('app', 'Birth'),  
133 - 'citizenship' => Yii::t('app', 'Citizenship'),  
134 - 'passport' => Yii::t('app', 'Passport'),  
135 - 'email' => Yii::t('app', 'Email'),  
136 - 'organization' => Yii::t('app', 'Organization'),  
137 - 'status' => Yii::t('app', 'Status'),  
138 - 'language_id' => Yii::t('app', 'Language ID'),  
139 - 'image' => Yii::t('app', 'Image'),  
140 - 'conference' => Yii::t('app', 'Conference'),  
141 - 'geee' => Yii::t('app', 'Geee'),  
142 - 'gere' => Yii::t('app', 'Gere'), 188 + 'id' => Yii::t('app', 'ID'),
  189 + 'name' => Yii::t('app', 'Name'),
  190 + 'secondname' => Yii::t('app', 'Secondname'),
  191 + 'dignity' => Yii::t('app', 'Dignity'),
  192 + 'gender' => Yii::t('app', 'Gender'),
  193 + 'birth' => Yii::t('app', 'Birth'),
  194 + 'citizenship' => Yii::t('app', 'Citizenship'),
  195 + 'passport' => Yii::t('app', 'Passport'),
  196 + 'email' => Yii::t('app', 'Email'),
  197 + 'organization' => Yii::t('app', 'Organization'),
  198 + 'status' => Yii::t('app', 'Status'),
  199 + 'language_id' => Yii::t('app', 'Language ID'),
  200 + 'image' => Yii::t('app', 'Image'),
  201 + 'conference' => Yii::t('app', 'Conference'),
  202 + 'geee' => Yii::t('app', 'Geee'),
  203 + 'gere' => Yii::t('app', 'Gere'),
  204 + 'need_visa' => Yii::t('app', 'Need visa'),
  205 + 'passport_number' => Yii::t('app', 'Passport number'),
  206 + 'passport_date' => Yii::t('app', 'Passport date'),
  207 + 'passport_place' => Yii::t('app', 'Passport place'),
  208 + 'passport_valid' => Yii::t('app', 'Passport valid'),
  209 + 'phone_own' => Yii::t('app', 'Phone own'),
  210 + 'phone_office' => Yii::t('app', 'Phone office'),
  211 + 'phone_other' => Yii::t('app', 'Phone other'),
  212 + 'fax' => Yii::t('app', 'fax'),
  213 + 'acceptance' => Yii::t('app', 'acceptance'),
143 ]; 214 ];
144 } 215 }
145 216
console/migrations/m180905_072743_customer_add_columns.php 0 → 100644
  Show/Hide comments   View file @5983654
  1 +<?php
  2 +
  3 +use yii\db\Migration;
  4 +
  5 +/**
  6 + * Class m180905_072743_customer_add_columns
  7 + */
  8 +class m180905_072743_customer_add_columns extends Migration
  9 +{
  10 + /*
  11 +* New properties
  12 +* 1 phone ==> office
  13 +* 2 phone ==> other
  14 +* 3 fax
  15 +* 4 phone ==> own
  16 +* 5 passport
  17 +* 1) number
  18 +* 2) date
  19 +* 3) place
  20 +* 4) valid until
  21 +* 6 need visa
  22 +* 7 special meal
  23 +* 1) halal
  24 +* 2) kashrut
  25 +* 3) vegetarian
  26 +* 8 working language
  27 +* 1) rus
  28 +* 2) eng
  29 +* 3) french
  30 + * */
  31 +
  32 + public function up()
  33 + {
  34 + $this->addColumn('customer','phone_own',$this->string(30));
  35 + $this->addColumn('customer','phone_office',$this->string(30));
  36 + $this->addColumn('customer','phone_other',$this->string(30));
  37 + $this->addColumn('customer','fax',$this->string(30));
  38 + $this->addColumn('customer','passport_number',$this->integer());
  39 + $this->addColumn('customer','passport_date',$this->integer());
  40 + $this->addColumn('customer','passport_place',$this->string(200));
  41 + $this->addColumn('customer','passport_valid',$this->integer());
  42 + $this->addColumn('customer','need_visa',$this->boolean());
  43 + #$this->addColumn('customer','working_language',$this->tinyInteger());
  44 + $this->addColumn('customer','special_meal',$this->string(255)->defaultValue('none'));
  45 +
  46 +
  47 + $this->addCommentOnColumn('customer','passport_date','когда выдан');
  48 + $this->addCommentOnColumn('customer','passport_place','кем выдан');
  49 + $this->addCommentOnColumn('customer','passport_valid','действителен до');
  50 +
  51 +
  52 +
  53 +
  54 +
  55 + }
  56 +
  57 + public function down()
  58 + {
  59 + $this->dropColumn('customer','phone_own');
  60 + $this->dropColumn('customer','phone_office');
  61 + $this->dropColumn('customer','phone_other');
  62 + $this->dropColumn('customer','fax');
  63 + $this->dropColumn('customer','passport_number');
  64 + $this->dropColumn('customer','passport_date');
  65 + $this->dropColumn('customer','passport_place');
  66 + $this->dropColumn('customer','passport_valid');
  67 + $this->dropColumn('customer','need_visa');
  68 + $this->dropColumn('customer','special_meal');
  69 +
  70 + }
  71 +
  72 +}
console/migrations/m180905_082107_customer_change_some_new_fields.php 0 → 100644
  Show/Hide comments   View file @5983654
  1 +<?php
  2 +
  3 +use yii\db\Migration;
  4 +
  5 +/**
  6 + * Class m180905_082107_customer_change_some_new_fields
  7 + */
  8 +class m180905_082107_customer_change_some_new_fields extends Migration
  9 +{
  10 +
  11 +
  12 +
  13 +
  14 + public function up()
  15 + {
  16 + $this->alterColumn('customer','passport_place',$this->string(255));
  17 + $this->alterColumn('customer','special_meal',$this->string(255));
  18 + $this->alterColumn('customer','passport_date',$this->string(255));
  19 + $this->alterColumn('customer','passport_valid',$this->string(255));
  20 + $this->alterColumn('customer','passport_number',$this->string(255));
  21 + }
  22 +
  23 + public function down()
  24 + {
  25 +
  26 + }
  27 +
  28 +}
console/migrations/m180905_085556_customer_add_work_and_meal_cols.php 0 → 100644
  Show/Hide comments   View file @5983654
  1 +<?php
  2 +
  3 +use yii\db\Migration;
  4 +
  5 +/**
  6 + * Class m180905_085556_customer_add_work_and_meal_cols
  7 + */
  8 +class m180905_085556_customer_add_work_and_meal_cols extends Migration
  9 +{
  10 +
  11 +
  12 +
  13 +
  14 + public function up()
  15 + {
  16 + $this->addColumn('customer','working_language_ru',$this->boolean());
  17 + $this->addColumn('customer','working_language_en',$this->boolean());
  18 + $this->addColumn('customer','working_language_fr',$this->boolean());
  19 + $this->addColumn('customer','meal_halal',$this->boolean());
  20 + $this->addColumn('customer','meal_kashrut',$this->boolean());
  21 + $this->addColumn('customer','meal_vegan',$this->boolean());
  22 + }
  23 +
  24 + public function down()
  25 + {
  26 + $this->dropColumn('customer','working_language_ru');
  27 + $this->dropColumn('customer','working_language_en');
  28 + $this->dropColumn('customer','working_language_fr');
  29 + $this->dropColumn('customer','meal_halal');
  30 + $this->dropColumn('customer','meal_kashrut');
  31 + $this->dropColumn('customer','meal_vegan');
  32 +
  33 + }
  34 +
  35 +}
frontend/controllers/SiteController.php
  Show/Hide comments   View file @5983654
@@ -174,7 +174,7 @@ @@ -174,7 +174,7 @@
174 public function actionRegister() 174 public function actionRegister()
175 { 175 {
176 $model = new Customer(); 176 $model = new Customer();
177 - if ($model->load(\Yii::$app->request->post())) { 177 + if ($model->load(\Yii::$app->request->post()) && $model->acceptance!==0) {
178 $model->file = UploadedFile::getInstance($model, 'file'); 178 $model->file = UploadedFile::getInstance($model, 'file');
179 if ($model->upload() and $model->save()) { 179 if ($model->upload() and $model->save()) {
180 \Yii::$app->session->setFlash( 180 \Yii::$app->session->setFlash(
@@ -200,6 +200,7 @@ @@ -200,6 +200,7 @@
200 200
201 return $this->redirect([ 'site/index' ]); 201 return $this->redirect([ 'site/index' ]);
202 } 202 }
  203 +
203 } 204 }
204 return $this->render( 205 return $this->render(
205 'signup', 206 'signup',
frontend/views/site/signup.php
  Show/Hide comments   View file @5983654
@@ -32,95 +32,241 @@ $js=$dp-&gt;getDatepickerJs(); @@ -32,95 +32,241 @@ $js=$dp-&gt;getDatepickerJs();
32 <div class="row"> 32 <div class="row">
33 <div class="col-xs-12 col-sm-7 col-md-7 col-lg-6"> 33 <div class="col-xs-12 col-sm-7 col-md-7 col-lg-6">
34 <div class="row"> 34 <div class="row">
35 - <div class="col-xs-12 col-sm-12 col-md-9 col-md-push-2 form-register-inputs-wr">  
36 - <div class="input-wr">  
37 - <?=$form->field($model, 'secondname')->textInput(['class' => ''])?>  
38 - </div> 35 + <div class="col-xs-12 col-sm-12 col-md-9 col-md-push-2
  36 + form-register-inputs-wr">
  37 + <!-- <div class="input-wr">
  38 + <?php /*echo $form->field($model, 'secondname')->textInput(['class' => ''])*/?>
  39 + </div>-->
39 <div class="input-wr"> 40 <div class="input-wr">
40 <?=$form->field($model, 'name')->textInput(['class' => ''])?> 41 <?=$form->field($model, 'name')->textInput(['class' => ''])?>
41 </div> 42 </div>
42 -  
43 - <div class="input-wr">  
44 - <?=$form->field($model, 'dignity')->textInput(['class' => ''])?>  
45 - </div>  
46 -  
47 - <div class="row">  
48 - <div class="col-xs-12 col-sm-6">  
49 - <div class="input-wr">  
50 - <?=$form->field($model, 'gender')->dropDownList([  
51 - Customer::MALE => \Yii::t('app', 'Male'),  
52 - Customer::FEMALE => \Yii::t('app', 'Female'),  
53 - ],['class' => ''])?>  
54 - </div> 43 + <div class="input-wr">
  44 + <?=$form->field($model, 'organization')->textInput(['class' => ''])?>
55 </div> 45 </div>
56 - <div class="col-xs-12 col-sm-6">  
57 - <div class="input-wr">  
58 - <?=$form->field($model, 'birth')->textInput(['class' => '_datepicer'])?>  
59 - </div> 46 + <div class="input-wr">
  47 + <?=$form->field($model, 'email')->textInput(['class' => ''])?>
60 </div> 48 </div>
61 - </div>  
62 -  
63 - <div class="input-wr">  
64 - <?=$form->field($model, 'citizenship')->textInput(['class' => ''])?>  
65 - </div>  
66 -  
67 - <div class="input-wr">  
68 - <?=$form->field($model, 'passport')->textInput(['class' => ''])?>  
69 - </div>  
70 - <div class="input-wr">  
71 - <?=$form->field($model, 'email')->textInput(['class' => ''])?>  
72 - </div>  
73 - <div class="input-wr">  
74 - <?=$form->field($model, 'organization')->textInput(['class' => ''])?>  
75 - </div> 49 +
  50 + <div class="input-wr">
  51 + <?=$form->field($model, 'phone_office')->textInput(['class' => ''])?>
  52 + </div>
  53 +
  54 + <div class="input-wr">
  55 + <?=$form->field($model, 'phone_other')->textInput(['class' => ''])?>
  56 + </div>
  57 +
  58 + <div class="input-wr">
  59 + <?=$form->field($model, 'fax')->textInput(['class' => ''])?>
  60 + </div>
  61 + <div class="input-wr">
  62 + <?=$form->field($model, 'phone_own')->textInput(['class' => ''])?>
  63 + </div>
  64 + <div class="signup_text1" >
  65 + <b><?php echo \Yii::t('app','Passport details');?></b>
  66 + (<?php echo \Yii::t('app','mark required');?>)</div>
  67 + <div class="input-wr">
  68 + <?=$form->field($model, 'passport_number')->textInput(['class' => ''])?>
  69 + </div>
  70 +
  71 + <div class="input-wr">
  72 + <?=$form->field($model, 'passport_date')->textInput(['class' => '_datepicer'])?>
  73 + </div>
  74 + <div class="input-wr">
  75 + <?=$form->field($model, 'passport_place')->textInput(['class' => ''])?>
  76 + </div>
  77 + <div class="input-wr">
  78 + <?=$form->field($model, 'passport_valid')->textInput(['class' => '_datepicer'])?>
  79 + </div>
  80 +
76 </div> 81 </div>
77 <div class="col-xs-12 col-sm-12 col-sm-push-1 col-md-push-2"> 82 <div class="col-xs-12 col-sm-12 col-sm-push-1 col-md-push-2">
78 <div class="registr-text"> 83 <div class="registr-text">
79 - <b><?=\Yii::t('app','Participation in events');?></b>  
80 - (<?=\Yii::t('app','mark required');?>)</div>  
81 - 84 + <b><?php echo \Yii::t('app','Participation in events');?></b>
  85 + (<?php echo \Yii::t('app','mark required');?>)</div>
  86 +
82 <div class="input-wr sidebar_checks"> 87 <div class="input-wr sidebar_checks">
83 - <?=$form->field($model, 'conference',[ 88 + <?php echo $form->field($model, 'conference',[
84 'template' => '{input}{label}', 89 'template' => '{input}{label}',
85 ]) 90 ])
86 - ->checkbox([], false)->label(\Yii::t('app', 'Conference'))?> 91 + ->checkbox([], false)
  92 + ->label(\Yii::t('app', 'Conference'))?>
87 </div> 93 </div>
88 - 94 +
89 <div class="input-wr sidebar_checks"> 95 <div class="input-wr sidebar_checks">
90 - <?=$form->field($model, 'geee',[ 96 + <?php echo $form->field($model, 'geee',[
91 'template' => '{input}{label}', 97 'template' => '{input}{label}',
92 ]) 98 ])
93 ->checkbox([], false)->label(\Yii::t('app', 'Geee'))?> 99 ->checkbox([], false)->label(\Yii::t('app', 'Geee'))?>
94 </div> 100 </div>
95 - 101 +
96 <div class="input-wr sidebar_checks"> 102 <div class="input-wr sidebar_checks">
97 - <?=$form->field($model, 'gere',[ 103 + <?php echo $form->field($model, 'gere',[
98 'template' => '{input}{label}', 104 'template' => '{input}{label}',
99 ]) 105 ])
100 ->checkbox([], false)->label(\Yii::t('app', 'Gere'))?> 106 ->checkbox([], false)->label(\Yii::t('app', 'Gere'))?>
  107 +
  108 + </div> </div>
  109 +
  110 +
  111 +
  112 + <div class="col-xs-12 col-sm-12 col-sm-push-1 col-md-push-2">
  113 + <div class="registr-text">
  114 + <b><?php echo \Yii::t('app','Special meal');?></b>
  115 + </div>
  116 +
  117 + <div class="input-wr sidebar_checks">
  118 + <?php echo $form->field($model, 'meal_halal',[
  119 + 'template' => '{input}{label}',
  120 + ])
  121 + ->checkbox([], false)
  122 + ->label(\Yii::t('app', 'Meal1'))?>
  123 + </div>
  124 +
  125 + <div class="input-wr sidebar_checks">
  126 + <?php echo $form->field($model, 'meal_kashrut',[
  127 + 'template' => '{input}{label}',
  128 + ])
  129 + ->checkbox([], false)->label(\Yii::t('app', 'Meal2'))?>
  130 + </div>
  131 +
  132 + <div class="input-wr sidebar_checks">
  133 + <?php echo $form->field($model, 'meal_vegan',[
  134 + 'template' => '{input}{label}',
  135 + ])
  136 + ->checkbox([], false)->label(\Yii::t('app', 'Meal3'))?>
  137 +
  138 + </div>
  139 + </div>
  140 +
  141 +
  142 +
  143 +
  144 +
  145 + <div class="col-xs-12 col-sm-12 col-sm-push-1 col-md-push-2">
  146 + <div class="registr-text">
  147 + <b><?php echo \Yii::t('app','Need visa?');?></b>
  148 + </div>
  149 +
  150 + <div class="input-wr sidebar_checks">
  151 + <?php echo $form->field($model, 'need_visa',[
  152 + 'template' => '{input}{label}',
  153 + ])
  154 + ->checkbox([], false)
  155 + ->label(\Yii::t('app', 'yes'))?>
  156 + </div>
  157 +
101 </div> 158 </div>
  159 +
  160 +
  161 +
  162 +
  163 +
  164 +
  165 +
  166 +
  167 +
  168 +
  169 +
  170 +
  171 +
  172 +
  173 +
  174 + <div class="col-xs-12 col-sm-12 col-sm-push-1 col-md-push-2">
  175 + <div class="registr-text">
  176 + <b><?php echo \Yii::t('app','Working language');?></b>
  177 + </div>
  178 +
  179 + <div class="input-wr sidebar_checks">
  180 + <?php echo $form->field($model, 'working_language_ru',[
  181 + 'template' => '{input}{label}',
  182 + ])
  183 + ->checkbox([], false)
  184 + ->label(\Yii::t('app', 'RusW'))?>
  185 + </div>
  186 +
  187 + <div class="input-wr sidebar_checks">
  188 + <?php echo $form->field($model, 'working_language_en',[
  189 + 'template' => '{input}{label}',
  190 + ])
  191 + ->checkbox([], false)->label(\Yii::t('app',
  192 + 'EngW'))?>
  193 + </div>
  194 +
  195 + <div class="input-wr sidebar_checks">
  196 + <?php echo $form->field($model, 'working_language_fr',[
  197 + 'template' => '{input}{label}',
  198 + ])
  199 + ->checkbox([], false)->label(\Yii::t('app',
  200 + 'FrW'))?>
  201 +
  202 + </div>
  203 +
  204 +
  205 +
  206 +
  207 + <div class="input-wr">
  208 + <?php echo $form->field($model, 'dignity')->textInput(['class' => ''])?>
  209 + </div>
  210 +
  211 +
  212 + <div class="row">
  213 + <div class="col-xs-12 col-sm-6">
  214 + <div class="input-wr">
  215 + <?php echo $form->field($model, 'gender')->dropDownList([
  216 + Customer::MALE => \Yii::t('app', 'Male'),
  217 + Customer::FEMALE => \Yii::t('app', 'Female'),
  218 + ],['class' => ''])?>
  219 + </div>
  220 + </div>
  221 + <div class="col-xs-12 col-sm-6">
  222 + <div class="input-wr">
  223 + <?php echo $form->field($model, 'birth')->textInput(['class' => '_datepicer'])?>
  224 + </div>
  225 + </div>
  226 + </div>
  227 +
  228 + <div class="input-wr">
  229 + <?php echo $form->field($model, 'citizenship')
  230 + ->textInput(['class' => ''])?>
  231 + </div>
  232 +
102 </div> 233 </div>
  234 + <div class="col-xs-12 col-sm-12 col-sm-push-1 col-md-push-2">
  235 + <div class="registr-text">
  236 + <b><?php echo \Yii::t('app','Acceptance');?></b>
  237 + </div>
  238 +
  239 + <div class="input-wr sidebar_checks">
  240 + <?php echo $form->field($model, 'acceptance',[
  241 + 'template' => '{input}{label}',
  242 + ])
  243 + ->checkbox([ 'uncheck' => 0 ],false)
  244 + ->label(\Yii::t('app', 'Acc text1'))?>
  245 + </div>
  246 +
  247 + </div>
103 </div> 248 </div>
104 </div> 249 </div>
105 - 250 +
  251 +
106 <div class="col-xs-12 col-sm-5 col-md-5 col-lg-6"> 252 <div class="col-xs-12 col-sm-5 col-md-5 col-lg-6">
107 <div class="input-wr-file"> 253 <div class="input-wr-file">
108 - <?=$form->field($model, 'file',[ 254 + <?php echo $form->field($model, 'file',[
109 'template' => '{label}{input}', 255 'template' => '{label}{input}',
110 ])->fileInput()->label(\Yii::t('app', ' 256 ])->fileInput()->label(\Yii::t('app', '
111 <span> 257 <span>
112 '.\Yii::t("app","Add photo").'</span>'))?> 258 '.\Yii::t("app","Add photo").'</span>'))?>
113 <!--выбранное изо--> 259 <!--выбранное изо-->
114 <div class="img-file" style="display: none;"> 260 <div class="img-file" style="display: none;">
115 - <!--166x166--> 261 +
116 <img src="/images/autor-img.jpg" alt=""> 262 <img src="/images/autor-img.jpg" alt="">
117 </div> 263 </div>
118 </div> 264 </div>
119 <div class="register-img-txt"> 265 <div class="register-img-txt">
120 - <?=\Yii::t('app','Reqs1')?> 266 + <?php echo \Yii::t('app','Reqs1')?>
121 </div> 267 </div>
122 </div> 268 </div>
123 - 269 +
124 </div> 270 </div>
125 <div class="row"> 271 <div class="row">
126 <div class="col-xs-12 button-wr"> 272 <div class="col-xs-12 button-wr">
frontend/web/css/changes.css
  Show/Hide comments   View file @5983654
@@ -4,4 +4,14 @@ @@ -4,4 +4,14 @@
4 .li_to_upper > li 4 .li_to_upper > li
5 { 5 {
6 text-transform: uppercase; 6 text-transform: uppercase;
  7 +}
  8 +
  9 +
  10 +/*
  11 +Стили для текста вне формы(прим: Пасспортные данные), чтобы весь текст имел одинаковый размер
  12 +*/
  13 +.signup_text1{
  14 + margin-top: 13px;
  15 + float: left;
  16 + font-size: 15px;
7 } 17 }
8 \ No newline at end of file 18 \ No newline at end of file