Merge pull request #191 from Xety/fix-ui

Fixed the button in forgortPassword & resetPassword actions
XetaIO · Nov 4, 2016 · b7dd99e · b7dd99e
2 parents 5210b69 + fa703ea
commit b7dd99e
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 16 deletions.
diff --git a/src/Controller/UsersController.php b/src/Controller/UsersController.php
@@ -428,8 +428,6 @@ public function forgotPassword()
             return $this->redirect(['controller' => 'pages', 'action' => 'home']);
         }
 
-        $user = $this->Users->newEntity($this->request->data);
-
         if ($this->request->is('post')) {
             $user = $this->Users
                 ->find()

diff --git a/src/Template/Users/forgot_password.ctp b/src/Template/Users/forgot_password.ctp
@@ -22,15 +22,17 @@
         </div>
     </div>
     <div class="row">
-        <div class="col-md-12">
+        <div class="col-md-offset-2 col-md-8">
             <section class="section animated bounceInLeft">
                 <div class="section-title">
-                    <h3>
-                        <?= __("Forgot your Password") ?>
-                    </h3>
+                    <div class="hr-divider">
+                        <h3 class="hr-divider-content hr-divider-heading">
+                            <?= __("Forgot your Password") ?>
+                        </h3>
+                    </div>
                 </div>
 
-                <?= $this->Form->create($user) ?>
+                <?= $this->Form->create() ?>
                 <div class="form-group">
                     <div class="input-group">
                         <span class="input-group-addon">
@@ -49,13 +51,13 @@
                     </div>
                     <?= $this->Form->error('email') ?>
                 </div>
-                <div class="form-groups">
+                <div class="form-group text-center">
                     <?= $this->Recaptcha->display() ?>
                 </div>
-                <div class="form-group">
+                <div class="form-group text-center">
                     <?= $this->Form->button(
                         __('Reset {0}', '<i class="fa fa-arrow-right"></i>'),
-                        ['class' => 'btn btn-primary']
+                        ['class' => 'btn btn-primary-outline']
                     ); ?>
                 </div>
                 <?= $this->Form->end(); ?>

diff --git a/src/Template/Users/reset_password.ctp b/src/Template/Users/reset_password.ctp
@@ -22,12 +22,14 @@
         </div>
     </div>
     <div class="row">
-        <div class="col-md-12">
+        <div class="col-md-offset-2 col-md-8">
             <section class="section animated bounceInLeft">
                 <div class="section-title">
-                    <h3>
-                        <?= __("Reset your Password") ?>
-                    </h3>
+                    <div class="hr-divider">
+                        <h3 class="hr-divider-content hr-divider-heading">
+                            <?= __("Reset your Password") ?>
+                        </h3>
+                    </div>
                 </div>
 
                 <?= $this->Form->create($user) ?>
@@ -70,10 +72,10 @@
                     </div>
                     <?= $this->Form->error('password_confirm') ?>
                 </div>
-                <div class="form-group">
+                <div class="form-group text-center">
                     <?= $this->Form->button(
                         __('Reset {0}', '<i class="fa fa-arrow-right"></i>'),
-                        ['class' => 'btn btn-primary']
+                        ['class' => 'btn btn-primary-outline']
                     ); ?>
                 </div>
                 <?= $this->Form->end(); ?>