From c669d3cb47a3092ac27fb3995f0dc72955f0740d Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Wed, 20 Jun 2012 18:02:46 -0400
Subject: [PATCH] CC-3969: Reset Password: specifying wrong e-mail keeps you on
 the same page without possibility to navigate back gracefully

- done
---
 airtime_mvc/application/controllers/LoginController.php   | 6 ++++++
 airtime_mvc/application/forms/PasswordRestore.php         | 8 ++++++++
 .../application/views/scripts/form/password-restore.phtml | 3 +++
 airtime_mvc/public/css/styles.css                         | 6 ++++++
 airtime_mvc/public/js/airtime/login/password-restore.js   | 3 +++
 5 files changed, 26 insertions(+)
 create mode 100644 airtime_mvc/public/js/airtime/login/password-restore.js

diff --git a/airtime_mvc/application/controllers/LoginController.php b/airtime_mvc/application/controllers/LoginController.php
index 5aab66d38..6cef61761 100644
--- a/airtime_mvc/application/controllers/LoginController.php
+++ b/airtime_mvc/application/controllers/LoginController.php
@@ -100,6 +100,12 @@ class LoginController extends Zend_Controller_Action
     
     public function passwordRestoreAction()
     {
+        global $CC_CONFIG;
+        
+        $request = $this->getRequest();
+        $baseUrl = $request->getBaseUrl();
+        $this->view->headScript()->appendFile($baseUrl.'/js/airtime/login/password-restore.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
+        
         if (!Application_Model_Preference::GetEnableSystemEmail()) {
             $this->_redirect('login');
         }
diff --git a/airtime_mvc/application/forms/PasswordRestore.php b/airtime_mvc/application/forms/PasswordRestore.php
index 54bfbd47a..5544e0ec1 100644
--- a/airtime_mvc/application/forms/PasswordRestore.php
+++ b/airtime_mvc/application/forms/PasswordRestore.php
@@ -29,5 +29,13 @@ class Application_Form_PasswordRestore extends Zend_Form
                 'ViewHelper'
             )
         ));
+        
+        $cancel = new Zend_Form_Element_Button("cancel");
+        $cancel->class = 'ui-button ui-widget ui-state-default ui-button-text-only center';
+        $cancel->setLabel("Cancel")
+               ->setIgnore(True)
+               ->setAttrib('onclick', 'redirectToLogin();')
+               ->setDecorators(array('ViewHelper'));
+        $this->addElement($cancel);
     }
 }
\ No newline at end of file
diff --git a/airtime_mvc/application/views/scripts/form/password-restore.phtml b/airtime_mvc/application/views/scripts/form/password-restore.phtml
index 5c8d099ac..a617ec971 100644
--- a/airtime_mvc/application/views/scripts/form/password-restore.phtml
+++ b/airtime_mvc/application/views/scripts/form/password-restore.phtml
@@ -21,5 +21,8 @@
     <dd id="submit-element">
       <?php echo $this->element->getElement('submit') ?>
     </dd>
+    <dd id="cancel-element">
+      <?php echo $this->element->getElement('cancel') ?>
+    </dd>
     </dl>
 </form>
\ No newline at end of file
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css
index 81d165a92..4f17a5d40 100644
--- a/airtime_mvc/public/css/styles.css
+++ b/airtime_mvc/public/css/styles.css
@@ -808,6 +808,12 @@ dt.block-display, dd.block-display {
 	font-size:14px;
 	padding: 6px 10px 6px;
 }
+
+.login-content dd button.ui-button, .login-content dd button.btn {
+   width:100%;
+    font-size:14px;
+    padding: 6px 10px 6px;
+}
 .login-content .hidden, .hidden {
 	display:none;
 }
diff --git a/airtime_mvc/public/js/airtime/login/password-restore.js b/airtime_mvc/public/js/airtime/login/password-restore.js
new file mode 100644
index 000000000..ac8e62e28
--- /dev/null
+++ b/airtime_mvc/public/js/airtime/login/password-restore.js
@@ -0,0 +1,3 @@
+function redirectToLogin(){
+    window.location = "/Login"
+}
\ No newline at end of file