Merge remote-tracking branch 'origin/master'

Yarik
2 parents 723a81cb 4a6500eb
Showing 4 changed files with 26 additions and 4 deletions Show diff stats
backend/assets/FileUploadAsset.php
console/migrations/m160204_104222_specialization_add_fields.php
frontend/controllers/SiteController.php
frontend/views/site/registration.php
@@ -19,9 +19,11 @@ use yii\web\AssetBundle;
 class FileUploadAsset extends AssetBundle
 {
     public $sourcePath = '@bower/blueimp-file-upload/';
+
     public $css = [
         'css/jquery.fileupload.css'
     ];
+
     public $js = [
         'js/vendor/jquery.ui.widget.js',
         'js/jquery.iframe-transport.js',
+<?php
+
+use yii\db\Migration;
+
+class m160204_104222_specialization_add_fields extends Migration
+{
+    public function up()
+    {
+        $this->addColumn('specialization', 'status', $this->smallInteger());
+        $this->addColumn('specialization', 'background', $this->string(50));
+    }
+
+    public function down()
+    {
+        $this->dropColumn('specialization', 'status');
+        $this->dropColumn('specialization', 'background');
+
+    }
+
+
+}
@@ -183,9 +183,8 @@ class SiteController extends Controller
      *
      * @return mixed
      */
-    public function actionSignup()
+    public function actionRegistration()
     {
-        $this->layout = 'admin';
  
         $model = new SignupForm();
         if ($model->load(Yii::$app->request->post())) {
@@ -203,7 +202,7 @@ class SiteController extends Controller
             }
         }
  
-        return $this->render('signup', [
+        return $this->render('registration', [
             'model' => $model,
         ]);
     }
@@ -120,7 +120,7 @@
  
                                     <div class="input-blocks-wrapper captcha">
                                         <div class="input-blocks-captcha">
-                                            <img id="accountsform-verifycode-image" src="images/captcha.png" alt="">
+                                            <img id="accountsform-verifycode-image" src="/images/captcha.png" alt="">
                                         </div>
                                     </div>