From e0412102965852298693a08bdf360564ab54653d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=BCller?= <mueller@miconware.de>
Date: Sat, 4 Oct 2014 15:44:21 +0200
Subject: [PATCH] #92 Loginanfrage - mit Fehlermeldung

---
 app/Controller/HomeController.php     |   7 +--
 app/Controller/JobController.php      |  52 ++++++++++++++++++-----
 app/Controller/PdfController.php      |  10 ++++-
 app/Controller/SearchController.php   |  15 +++++--
 app/Controller/UserController.php     |  59 ++++++++++++++++++--------
 app/Locale/deu/LC_MESSAGES/default.mo | Bin 18195 -> 18146 bytes
 app/Locale/deu/LC_MESSAGES/default.po |   4 +-
 app/View/Home/login.ctp               |  22 ++++++++++
 app/webroot/js/dreamjob.js            |   2 +
 9 files changed, 130 insertions(+), 41 deletions(-)
 create mode 100644 app/View/Home/login.ctp

diff --git a/app/Controller/HomeController.php b/app/Controller/HomeController.php
index 65ee90e..268f98d 100755
--- a/app/Controller/HomeController.php
+++ b/app/Controller/HomeController.php
@@ -63,12 +63,7 @@ class HomeController extends AppController {
 		
 		
 		$this->MiconwareSession->initWeb($this);
-		$openings = $this->DreamjobJobOpening->find('all',array('conditions'=>$this->MiconwareSession->getOpeningCondition(),
-		'order'=>'DreamjobJobOpening.id DESC','limit'=> self::$opening_limit));
-		$this->set('openings',$openings);
-		$this->set('title', __('dreamjob.startpage'));
-		$this->set('MENU_START', true);
-		$this->render('/Home/home');
+		$this->render('/Home/login');
 	}
 	
 	public function logout(){
diff --git a/app/Controller/JobController.php b/app/Controller/JobController.php
index 1918112..ca7a346 100644
--- a/app/Controller/JobController.php
+++ b/app/Controller/JobController.php
@@ -27,7 +27,10 @@ class JobController extends AppController {
 
         if (!is_array($self) or count($self) <= 0) {
             $this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text')));
-            $this->render('/Home/error');
+            if(!$this->MiconwareSession->isLoggedin())
+                $this->render('/Home/login');
+            else
+                $this->render('/Home/error'); 
         } else {
             if (!empty($this->request->query['del'])) {
                 $o = $this->DreamjobJobOpening->findById($this->request->query['del']);
@@ -69,7 +72,10 @@ class JobController extends AppController {
             $this->render('/Job/opening_edit');
         } else {
             $this->set('error', array('title'=>__('dreamjob.error.noCompany.title'),'text'=>__('dreamjob.error.noCompany.text')));
-            $this->render('/Home/error');
+            if(!$this->MiconwareSession->isLoggedin())
+                $this->render('/Home/login');
+            else
+                $this->render('/Home/error'); 
         }
     }
 
@@ -80,8 +86,10 @@ class JobController extends AppController {
         $a = $this->MiconwareSession->getCompany();
         if (empty($a)) {
             $this->set('error', array('title'=>__('dreamjob.error.noCompany.title'),'text'=>__('dreamjob.error.noCompany.text')));
-            $this->render('/Home/error');
-            return null;
+            if(!$this->MiconwareSession->isLoggedin())
+                $this->render('/Home/login');
+            else
+                $this->render('/Home/error');
         }
         if (!empty($this->request->params['id'])) {
             $load = $this->DreamjobJobOpening->findById($this->request->params['id']);
@@ -110,7 +118,7 @@ class JobController extends AppController {
             $this->set('error', array('title'=>__('dreamjob.error.opening.notFound.title'),'text'=>__('dreamjob.error.opening.notFound.text')));
             $this->render('/Home/error');
         } elseif ($this->request->data['DreamjobJobOpening']['company_id'] != $a['AppUser']['id']) {
-            $this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text')));
+            $this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text'))); 
             $this->render('/Home/error');
         } else {
             $this->render('/Job/opening_edit');
@@ -153,6 +161,10 @@ class JobController extends AppController {
 
         if (!is_array($opening) or count($opening) <= 0) {
             $this->set('error', array('title'=>__('dreamjob.error.opening.notFound.title'),'text'=>__('dreamjob.error.opening.notFound.text')));
+            if(!$this->MiconwareSession->isLoggedin())
+                $this->render('/Home/login');
+            else
+                $this->render('/Home/error'); 
             $this->render('/Home/error');
         } else {
             $this->set('opening', $opening);
@@ -167,7 +179,10 @@ class JobController extends AppController {
         $self = $this->MiconwareSession->getWorker();
         if (!is_array($self) or count($self) <= 0) {
             $this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text')));
-            $this->render('/Home/error');
+            if(!$this->MiconwareSession->isLoggedin())
+                $this->render('/Home/login');
+            else
+                $this->render('/Home/error');  
         } else {
             $fav_id = array();
             foreach ($self['Favority'] as $fav)
@@ -189,7 +204,10 @@ class JobController extends AppController {
 
         if (!is_array($self) or count($self) <= 0) {
             $this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text')));
-            $this->render('/Home/error');
+            if(!$this->MiconwareSession->isLoggedin())
+                $this->render('/Home/login');
+            else
+                $this->render('/Home/error');
         } else {
             $applications = $this->DreamjobJobApplication->find('all', array('conditions' => array('DreamjobJobApplication.worker_id' => $self['AppUser']['id'])));
             $this->set('applications', $applications);
@@ -214,7 +232,10 @@ class JobController extends AppController {
 
         if (!is_array($application) or count($application) <= 0) {
             $this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text')));
-            $this->render('/Home/error');
+            if(!$this->MiconwareSession->isLoggedin())
+                $this->render('/Home/login');
+            else
+                $this->render('/Home/error'); 
         } else {
             $this->set('page', null);
             $this->set("edit", false);
@@ -313,7 +334,10 @@ class JobController extends AppController {
         }
         if (!is_array($opening) or count($opening) <= 0) {
             $this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text')));
-            $this->render('/Home/error');
+            if(!$this->MiconwareSession->isLoggedin())
+                $this->render('/Home/login');
+            else
+                $this->render('/Home/error'); 
         } else {
             $this->set('opening', $opening);
             $this->set('applications', $applications);
@@ -364,7 +388,10 @@ class JobController extends AppController {
             }
         } else {
             $this->set('error', array('title'=>__('dreamjob.error.noWorker.title'),'text'=>__('dreamjob.error.noWorker.text')));
-            $this->render('/Home/error');
+            if(!$this->MiconwareSession->isLoggedin())
+                $this->render('/Home/login');
+            else
+                $this->render('/Home/error'); 
         }
     }
     public function applicationSendExt() {
@@ -445,7 +472,10 @@ class JobController extends AppController {
 
         } else {
             $this->set('error', array('title'=>__('dreamjob.error.noWorker.title'),'text'=>__('dreamjob.error.noWorker.text')));
-            $this->render('/Home/error');
+            if(!$this->MiconwareSession->isLoggedin())
+                $this->render('/Home/login');
+            else
+                $this->render('/Home/error'); 
         }
     }
 
diff --git a/app/Controller/PdfController.php b/app/Controller/PdfController.php
index 2d95dc8..3257a1b 100644
--- a/app/Controller/PdfController.php
+++ b/app/Controller/PdfController.php
@@ -23,7 +23,10 @@ class PdfController extends AppController {
 			
 		if(!is_array($application) or count($application) <= 0){
 			$this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text')));
-			$this->render('/Home/error');
+			if(!$this->MiconwareSession->isLoggedin())
+				$this->render('/Home/login');
+			else
+				$this->render('/Home/error');
 		}else{
 			$this->response->type('application/pdf');
 			$this->set('application',$application);
@@ -44,7 +47,10 @@ class PdfController extends AppController {
 			
 		if(!is_array($WORKER) or count($WORKER) <= 0){
 			$this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text')));
-			$this->render('/Home/error');
+			if(!$this->MiconwareSession->isLoggedin())
+				$this->render('/Home/login');
+			else
+				$this->render('/Home/error');
 		}else{
 			$this->response->type('application/pdf');
 			$cv = $this->DreamjobCvEntry->find('all',array('conditions' => array('worker_id'=> $WORKER['AppUser']['id'])));
diff --git a/app/Controller/SearchController.php b/app/Controller/SearchController.php
index e36f75e..fb4ab31 100644
--- a/app/Controller/SearchController.php
+++ b/app/Controller/SearchController.php
@@ -72,7 +72,10 @@ class SearchController extends AppController {
             $this->render('/Search/' . $type);
         } else {
             $this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text')));
-            $this->render('/Home/error');
+            if(!$this->MiconwareSession->isLoggedin())
+                $this->render('/Home/login');
+            else
+                $this->render('/Home/error'); 
         }
     }
 
@@ -152,7 +155,10 @@ class SearchController extends AppController {
             $this->render('/Search/auto');
         } else {
             $this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text')));
-            $this->render('/Home/error');
+            if(!$this->MiconwareSession->isLoggedin())
+                $this->render('/Home/login');
+            else
+                $this->render('/Home/error');
         }
     }
 
@@ -190,7 +196,10 @@ class SearchController extends AppController {
             $this->render('/Search/worker');
         }else {
             $this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text')));
-            $this->render('/Home/error');
+            if(!$this->MiconwareSession->isLoggedin())
+                $this->render('/Home/login');
+            else
+                $this->render('/Home/error'); 
         }
     }
 
diff --git a/app/Controller/UserController.php b/app/Controller/UserController.php
index 25ae989..6936cb9 100755
--- a/app/Controller/UserController.php
+++ b/app/Controller/UserController.php
@@ -98,7 +98,10 @@ class UserController extends AppController {
 				$hard_error = true;
 				$this->MiconwareSession->setFlash(__('dreamjob.error.page.notFound'),'flash',array('alert'=>'danger'));	
 				$this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text')));
-				$this->render('/Home/error');
+				if(!$this->MiconwareSession->isLoggedin())
+					$this->render('/Home/login');
+				else
+					$this->render('/Home/error');	
 			}
 		}elseif($profil['AppUser']['id'] == $self['AppUser']['id']){
 			$this->set('edit', true);
@@ -155,7 +158,10 @@ class UserController extends AppController {
 			$this->render('/User/worker');
 		}else{
 			$this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text')));
-			$this->render('/Home/error');
+			if(!$this->MiconwareSession->isLoggedin())
+				$this->render('/Home/login');
+			else
+				$this->render('/Home/error');
 		}
 	}
 	/*
@@ -201,7 +207,10 @@ class UserController extends AppController {
 		if(empty($profil) or count($profil) <= 0){
 			$this->MiconwareSession->setFlash(__('dreamjob.error.page.notFound'),'flash',array('alert'=>'danger'));	
 			$this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text')));
-			$this->render('/Home/error');
+			if(!$this->MiconwareSession->isLoggedin())
+				$this->render('/Home/login');
+			else
+				$this->render('/Home/error');		
 		}else{
 			if(isset($this->request->query['list']) and is_array($this->request->query['list'])){
 				$i=10;
@@ -246,9 +255,12 @@ class UserController extends AppController {
 		}
 			
 		if(empty($profil) or count($profil) <= 0){
-				$this->MiconwareSession->setFlash(__('dreamjob.error.page.notFound'),'flash',array('alert'=>'danger'));	
-				$this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text')));
-				$this->render('/Home/error');
+			$this->MiconwareSession->setFlash(__('dreamjob.error.page.notFound'),'flash',array('alert'=>'danger'));	
+			$this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text')));
+			if(!$this->MiconwareSession->isLoggedin())
+				$this->render('/Home/login');
+			else
+				$this->render('/Home/error');	
 		}else{
 			if ($this->request->is('post')){
 				if($this->request->data['User']['password1'] == $this->request->data['User']['password2']) {
@@ -322,9 +334,12 @@ class UserController extends AppController {
 			$profil = $this->MiconwareSession->getCompany();
 			
 		if(empty($profil) or count($profil) <= 0){
-				$this->MiconwareSession->setFlash(__('dreamjob.error.page.notFound'),'flash',array('alert'=>'danger'));	
-				$this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text')));
-				$this->render('/Home/error');
+			$this->MiconwareSession->setFlash(__('dreamjob.error.page.notFound'),'flash',array('alert'=>'danger'));	
+			$this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text')));
+			if(!$this->MiconwareSession->isLoggedin())
+				$this->render('/Home/login');
+			else
+				$this->render('/Home/error');		
 		}else{
 			//PAGE BEARBEITEN
 			if(!empty($this->request->params['page'])){
@@ -438,8 +453,11 @@ class UserController extends AppController {
 		$profil = $this->MiconwareSession->getWorker();
 			
 		if(empty($profil) or count($profil) <= 0){
-				$this->MiconwareSession->setFlash(__('dreamjob.error.page.notFound'),'flash',array('alert'=>'danger'));	
-				$this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text')));
+			$this->MiconwareSession->setFlash(__('dreamjob.error.page.notFound'),'flash',array('alert'=>'danger'));	
+			$this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text')));
+			if(!$this->MiconwareSession->isLoggedin())
+				$this->render('/Home/login');
+			else
 				$this->render('/Home/error');
 		}else{
 			if($this->request->is('post')){
@@ -484,9 +502,13 @@ class UserController extends AppController {
 		}
 			
 		if(empty($profil) or count($profil) <= 0){
-				$this->MiconwareSession->setFlash(__('dreamjob.error.page.notFound'),'flash',array('alert'=>'danger'));	
-				$this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text')));
-				$this->render('/Home/error');
+			$this->MiconwareSession->setFlash(__('dreamjob.error.page.notFound'),'flash',array('alert'=>'danger'));	
+			$this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text')));
+
+			if(!$this->MiconwareSession->isLoggedin())
+				$this->render('/Home/login');
+			else
+				$this->render('/Home/error');	
 		}else{
 			if ($this->request->is('post')){
 				$key = $this->MiconwareSession->generateKey();
@@ -513,9 +535,12 @@ class UserController extends AppController {
 		$profil = $this->MiconwareSession->getApplication('AppUser');
 		
 		if(empty($profil) or count($profil) <= 0){
-				$this->MiconwareSession->setFlash(__('dreamjob.error.page.notFound'),'flash',array('alert'=>'danger'));	
-				$this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text')));
-				$this->render('/Home/error');
+			$this->MiconwareSession->setFlash(__('dreamjob.error.page.notFound'),'flash',array('alert'=>'danger'));	
+			$this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text')));
+			if(!$this->MiconwareSession->isLoggedin())
+				$this->render('/Home/login');
+			else
+				$this->render('/Home/error');	
 		}else{
 			if($this->request->is('put') or $this->request->is('post')){
 				$data['AppUser']['id'] = $profil['AppUser']['id'];
diff --git a/app/Locale/deu/LC_MESSAGES/default.mo b/app/Locale/deu/LC_MESSAGES/default.mo
index 92c231c65a09ce33167a3b5c7794015746839b49..efe4f265e430e884598a6227b2b40d0f8cdb94a6 100644
GIT binary patch
delta 1369
zcmaLWSx8h-9LMo9Q<G-7<Wg?gXgXqxQjp`;xa0^eT9{#}L}nKpN-2wasJKBvAT1A8
zP(&aILI!0<gpUysL6igq>Qfn%L<B*P+4t8y&w=<k_uPBV|9^h>&d@dAr>nk4T?uZk
zF{UtVOe)r+uG{SO3EaZ<B`m>7%*HuP!39jjlnP@qF%MT^7~^m^`mo)409SC`iCNfJ
zVcdTcm+g()r~+fCg)dPXy}}xNhv}GDY0OeAKyA1ImtX|rF^XE>g4=Nqs<AuRhL15H
z<EmU^0t`y3yoF_`jVf?C)}l7rW#?OP8Q1%)-KYloFd1D`g4gZ+2dMSWP>oOGW_*iz
z=y$8VDDqLASEC+i#6moSO5iRg;0WqfJ;V?`$CdaEi%>D;KnPW^0o7nT)?o~_?mnuX
zJH<eqPop}Ww|=+tKTuKs!3K=qYRo3wiTWnaqY96rB7TEv^b0E4pLYJYH7R1uTINH@
zD{##Y20GC()Ja^Vmbr!M@I4mbET-WC>O^U^-t$GMkFf?buo-p29_t_~$#GndA8<AL
z>x@}MeG_D$lNX|r2%%0?j@q~j^_BNw7M{fycoP+MN4+r{@ieNj5zNM?sN|+l2bn=7
zGH374V;c2MfLwDi3-xi8qatiTCDM#Zcm(xPo<u)hKs9&~_1q2A3CB>c=A*su+vX*l
ziazFxa2*z-tIk?Az)n<w8B_ybQH6h@67V;A8>gTWszN1p2xE90`DK}DR0HWz?|uZ8
zL<{m~_VZ75??oxAf}>27;uBP)pHT%DP>m!uc_++7{Tj+pCkf+Xti&}KLA~39sP*Si
z&kdq}4OdVN52F$oZ=#I=gW0Buj^x+HxqD+yu($iL(;w`OIRn9?PORSvwmLn%r<~HE
Q;c!OIf9_8VhX<1X0;8d!Qvd(}

delta 1419
zcmb8u*-KPm9LDi?Ow(Mlaw)eQ%aZnS%cXM3CF~~3(vSkT$(d3|9P6g?6hT;NQQA$A
zPzZHVVOS7o5KIdg5d?yeK^PI?Wf##+^nE&~KOh+9^Pcmb_x&yJIrBrV;j6CkBhgl&
zF($jnm=)NB1=!_W-$l(o#SOTCshCu3%rf*~99H5g+=naChmm*=T{z%)8JBZCh$%Q)
zY^=XGo;efKr~q@Qg+Ean{lcB-DlsMz%Ww(Sqc%K>i!p#vcnY=N!a6*UO6)Bj#4nhI
z#if=p5e%A2?S;*#jr<skJ*bV&I`=J%;rgQE4O9Z77?0zajxU_~PpI|ZQHd{L9-1A-
ztcHAxK?;KdsLVT251hnoypQU@JB-E|)KPuL_4osmF_reL!(2?mMpVEcD!~D)z+0$w
zA5rnFuw8cMF{n(_95bBznW$E8!`)bdxp)TkPCP;do<+6zH!9KOGP|=`sQWpN<+zsX
zM&t-AbDDuFx{a!297)c+L1h?TZp<2t!vyr8Dyl|3-++1<yD$m+Q5B9jPNF(FkDD;E
z!k7%q$3?_9`x&V6L#Q)sL{-#*+IR@{mXD&2>H)sQ*Qi!ssWfH_-a{oegQ@rp)wwX*
zrb1#d0+UelX_!EKvz<XY?nS*^9jF!tQ5E*%QoM<JDaSAjAEOd{f_m;1s=_(c(L`0*
z^LeNaSD_0Va3dZ@OPO8J00&V4Vyo>0Qc!`jQ60!fZCr`!&<Rw>uA?9CAYYb=sj;7{
zLCptHov@Ifxx}C1zONyy0?u+{D}F__G_lqW=s|U&3{_zr>T765RpP^NJdT+dK%MP1
zRKgEY&rPDfhUch+KA<`<UrQPh4C3}oG{sNn6o#f+y}doXp{ZluZg;)kyV)IRmF~Wl
szF=sq&DZH~^SN8PJG@=q&USB~JLvCjAFe1$Ecl<5{}xX46!pgc0bW$N^#A|>

diff --git a/app/Locale/deu/LC_MESSAGES/default.po b/app/Locale/deu/LC_MESSAGES/default.po
index 82bc67e..aa6f0d6 100644
--- a/app/Locale/deu/LC_MESSAGES/default.po
+++ b/app/Locale/deu/LC_MESSAGES/default.po
@@ -104,7 +104,7 @@ msgstr "Zugriff verweigert"
 #: Controller/SearchController.php:74;154;192
 #: Controller/UserController.php:100;157;203;250;326;442;488;517
 msgid "dreamjob.error.noPermision.text"
-msgstr "überprüfen Sie, ob Sie tatsächlich angemeldet sind"
+msgstr "Sie haben hier keine Rechte."
 
 #: Controller/JobController.php:36
 msgid "dreamjob.opening.delete.success"
@@ -181,7 +181,7 @@ msgstr "Zugriff verweigert"
 
 #: Controller/JobController.php:365
 msgid "dreamjob.error.noWorker.text"
-msgstr "überprüfen Sie, ob Sie tatsächlich angemedet sind"
+msgstr "Sie haben hier keine Rechte."
 
 #: Controller/RegistrationController.php:21;76;134;147;171
 msgid "dreamjob.error.loggedin.title"
diff --git a/app/View/Home/login.ctp b/app/View/Home/login.ctp
new file mode 100644
index 0000000..fc993d7
--- /dev/null
+++ b/app/View/Home/login.ctp
@@ -0,0 +1,22 @@
+<?php
+?>
+<div class="box 2modal">
+    <h1 class="modal-title" style="background-color:#9D1C16;color:white;"><?=__('dreamjob.login');?></h1>
+    <?php
+        $default_Form['back'] = true;
+        $default_Form['url'] = array('controller'=>'home','action'=>'login');
+        $default_Form['class'] = 'modal-body';
+        echo $this->Form->create(null, $default_Form);
+
+            echo $this->Form->input('User.mail',array('placeholder'=>__('dreamjob.mail'),'label'=>array('text'=>__("dreamjob.mail"),"class"=>$default_Form['inputDefaults']['label']['class'])));
+            echo $this->Form->input('User.password',array('placeholder'=>__('dreamjob.password'),'label'=>array('text'=>__("dreamjob.password"),"class"=>$default_Form['inputDefaults']['label']['class'])));
+        ?>
+        <div class="form-group">
+            <div class="modal-footer">
+               <?=$this->Form->button(__('dreamjob.login'),array('class'=>'btn btn-primary','type'=>'submit'));?>
+               <?=$this->Html->link(__('dreamjob.registration.to'),array('controller'=>'registration','action'=>'worker'),array('class'=>'btn btn-default'));?>
+               <?=$this->Html->link(__('dreamjob.password.forget'),array('controller'=>'registration','action'=>'password_reset'),array('style'=>'float:left;'));?>
+            </div>
+        </div>
+    <?=$this->Form->end();?>
+</div>
diff --git a/app/webroot/js/dreamjob.js b/app/webroot/js/dreamjob.js
index 1fab3d0..3e24b0b 100755
--- a/app/webroot/js/dreamjob.js
+++ b/app/webroot/js/dreamjob.js
@@ -26,6 +26,8 @@ var global_load = null;
                  $("#popup .modal-title").html($("#container div.box.2modal .modal-title", data).html());
                  $("#popup .modal-body").html($("#container div.box.2modal .modal-body", data).html());
                  $("#popup .modal-footer").html($("#container div.box.2modal .modal-footer", data).html());
+                 $("#popup .modal-body .modal-footer").remove();
+                 $("#popup .modal-content").attr("action",$(".2modal form.modal-body",data).attr("action"));
                 }, error: function(data) {
                 }});
         });