VItaliy 03.12.2015

Administrator
1 parent dbba187f
Showing 5 changed files with 18 additions and 91 deletions Show diff stats
common/models/UserLoginForm.php
frontend/views/accounts/cabinet.php
frontend/views/page/about_view.php
frontend/views/page/view.php
frontend/views/site/login.php
@@ -3,7 +3,7 @@ namespace common\models;
 use Yii;
 use yii\base\Model;
-
+use yii\web\IdentityInterface;
 /**
  * Login form
  */
@@ -26,6 +26,8 @@ class UserLoginForm extends Model
             [['email', 'pass'], 'required'],
             // rememberMe must be a boolean value
             ['rememberMe', 'boolean'],
+            // password is validated by validatePassword()
+            ['pass', 'validatePassword'],
         ];
     }
@@ -40,8 +42,8 @@ class UserLoginForm extends Model
     {
         if (!$this->hasErrors()) {
             $user = $this->getUser();
-            if (!$user || !$user->validatePassword($this->password)) {
-                $this->addError($attribute, 'Incorrect email or password.');
+            if (!$user || $user->pass != $this->pass) {
+                $this->addError($attribute, 'Неправильный логин или пароль');
             }
         }
     }
@@ -59,6 +61,7 @@ class UserLoginForm extends Model
         } else {
             return false;
         }
+
     }
     /**
@@ -35,7 +35,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
             <?php $form = ActiveForm::begin(['options' => ['enctype'=> 'multipart/form-data','class'=>'my_profile'], 'method'=>'post','action' => '/site/signup',]); ?>
-            <?= $form->field($model, 'is_firm')->hiddenInput(['value'=>'0']) ?>
+            <?= $form->field($model, 'is_firm')->hiddenInput(['value'=>'0'])->label(false) ?>
             <?= $form->field($model, 'company')->hiddenInput(['value'=>'Частное лицо']) ?>
@@ -51,19 +51,19 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
             <?= $form->field($model, 're_pass',['options'=>['class'=>'input2']])->passwordInput(['maxlength' => 45,'placeholder'=>'Пароль','class'=>'form-control telephone_registration']) ?>
-            <?= $form->field($model, 'country',['options'=>['class'=>'selectize_item2' ]])->dropDownList(
+            <?= $form->field($model, 'country',['options'=>['class'=>'selectize_item2 input2' ]])->dropDownList(
                 ArrayHelper::map(DicCities::find()->where(['parent' => 0])->all(), 'id', 'name'),
                 ['prompt' => 'Выберите область']
             );
             ?>
-            <?= $form->field($model, 'city',['options'=>['class'=>'selectize_item2' ]])->dropDownList(
+            <?= $form->field($model, 'city',['options'=>['class'=>'selectize_item2 input2' ]])->dropDownList(
                 [],
                 ['prompt' => 'Выберите город']
             );
             ?>
-            <?= $form->field($model, 'deliveries',['options'=>['class'=>'selectize_item2' ]])->dropDownList(
+            <?= $form->field($model, 'deliveries',['options'=>['class'=>'selectize_item2 input2' ]])->dropDownList(
                 ArrayHelper::map(Deliveries::find()->all(), 'id', 'name'),
                 ['prompt' => 'Выберите тип перевозки']
             );
@@ -79,7 +79,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
         </div>
-</div>
+
 </div>
     <div role="tabpanel" class="tab-pane" id="notepad">
     <p class="tab-content_header">Блокнот</p>
@@ -249,85 +249,6 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
 </div>	    
-<div class="slider_block1">
-		<div class="tovars">
-			<p style="display:inline-block">Наши проекты</p>
-			<span><img src="/images/arrow_slider_back.png"></span>
-			<span class="number_of">1/</span>
-		<span class="general_number">5</span>
-			<span><img src="/images/arrow_slider_go.png"></span>
-			<div class="slider_tovars">
-
-				<table class="block_project">
-				<tbody><tr><td>
-					<img src="/images/logo-lr-small.png">
-				</td></tr>
-				<tr><td>
-					<a href="">lr.italauto.com.ua</a>
-				</td></tr>
-				<tr><td>	
-					<ul>
-					<h4>Запчасти на Land Rover<br> и Range Rover</h4>
-								<li>Оригинальные запчасти</li>
-								<li>Сертифицированый продавец</li>
-								<li>Более 300 000 товаров</li>
-					</ul>
-				</td></tr>
-				</tbody></table>
-				<table class="block_project">
-				<tbody><tr><td>
-					<img src="/images/logo-mersedes-small.png">
-				</td></tr>
-				<tr><td>
-					<a href="">lr.italauto.com.ua</a>
-				</td></tr>
-				<tr><td>	
-					<ul>
-					<h4>Запчасти на<br> Mercedes Benz</h4>
-								<li>Оригинальные запчасти</li>
-								<li>Сертифицированый продавец</li>
-								<li>Более 300 000 товаров</li>
-					</ul>
-				</td></tr>
-				</tbody></table>
-				<table class="block_project">
-				<tbody><tr><td>
-					<img src="/images/logo-fiat-small.png">
-				</td></tr>
-				<tr><td>
-					<a href="">lr.italauto.com.ua</a>
-				</td></tr>
-				<tr><td>	
-					<ul>
-					<h4>Запчасти на FIAT</h4>
-								<li>Оригинальные запчасти</li>
-								<li>Сертифицированый продавец</li>
-								<li>Более 300 000 товаров</li>
-					</ul>
-				</td></tr>
-				</tbody></table>
-				<table class="block_project">
-				<tbody><tr><td>
-					<img src="/images/logo-lr-small.png">
-				</td></tr>
-				<tr><td>
-					<a href="">lr.italauto.com.ua</a>
-				</td></tr>
-				<tr><td>	
-					<ul>
-					<h4>Запчасти на Land Rover<br> и Range Rover</h4>
-								<li>Оригинальные запчасти</li>
-								<li>Сертифицированый продавец</li>
-								<li>Более 300 000 товаров</li>
-					</ul>
-				</td></tr>
-				</tbody></table>
-
-			</div>
-			
-		</div>
-	  </div>
-
 <script>
 <?php
-$this->registerCssFile('/css/about_company.css');
 use \yii\helpers\Url;
+$this->registerCssFile('/css/about_company.css');
+$this->registerCssFile('/css/style/optovikam.css');
+
 $this->registerMetaTag(['description' => $model->descr,'keywords'=>$model->kwords]);
 $this->title = $model->title ? $model->title: $model->name;
 $this->params['breadcrumbs'][] = $this->title;
 <?php
 $this->registerCssFile('/css/about_company.css');
+$this->registerCssFile('/css/style/optovikam.css');
 $this->registerMetaTag(['description' => $model->descr,'keywords'=>$model->kwords]);
 $this->title = $model->title ? $model->title: $model->name;
 $this->params['breadcrumbs'][] = $this->title;
@@ -14,9 +14,9 @@ use yii\captcha\Captcha;
             <?php $form = ActiveForm::begin(['id' => 'enter_form','class'=>'cmxform','action' => '/site/login']); ?>
             <fieldset>
                 <h3>Вход в личный кабинет</h3>
-                <?= $form->field(new UserLoginForm(), 'email')->label(false) ?>
-                <?= $form->field(new UserLoginForm(), 'pass')->passwordInput()->label(false)  ?>
-                <?= $form->field(new UserLoginForm(), 'rememberMe')->checkbox() ?>
+                <?= $form->field($model, 'email')->label(false) ?>
+                <?= $form->field($model, 'pass')->passwordInput()->label(false)  ?>
+                <?= $form->field($model, 'rememberMe')->checkbox() ?>
                 <?= Html::a('Забыли пароль?', ['site/request-password-reset']) ?>
                 <?= Html::submitButton('Submit', ['class' => 'purple', 'name' => 'login-button']) ?>
             </fieldset>