* preserving URL on manual login

2 files changed, 9 insertions, 3 deletions

diff --git a/app/php/controls/HeaderMenu.php b/app/php/controls/HeaderMenu.php
index a9759da..1e74be3 100644
--- a/app/php/controls/HeaderMenu.php
+++ b/app/php/controls/HeaderMenu.php
@@ -6,6 +6,13 @@ Prado::using('System.Web.UI.ActiveControls.TActiveLinkButton');
 
 class HeaderMenu extends TemplateControl {
 
+    public function loginUser($sender, $param) {
+        $this->Application->getModule('auth')->setReturnUrl($this->Request->RequestUri);
+        $this->Response->redirect(
+            $this->Service->ConstructUrl('Login')
+        );
+    }
+
     public function logoutUser($sender, $param) {
         $this->Application->getModule('auth')->logout();
         $this->Response->redirect(
diff --git a/app/php/controls/HeaderMenu.tpl b/app/php/controls/HeaderMenu.tpl
index 603a231..b50c4ef 100644
--- a/app/php/controls/HeaderMenu.tpl
+++ b/app/php/controls/HeaderMenu.tpl
@@ -1,8 +1,7 @@
 <nav role="navigation">
-  <com:THyperLink Text="Login">
-    <prop:NavigateUrl><%= $this->Service->constructUrl('Login') %></prop:NavigateUrl>
+  <com:TActiveLinkButton Text="Login" OnCommand="loginUser">
     <prop:Visible><%= $this->User->IsGuest %></prop:Visible>
-  </com:THyperLink>
+  </com:TActiveLinkButton>
   <com:THyperLink Text="Profile">
     <prop:NavigateUrl><%= $this->Service->constructUrl('Profile') %></prop:NavigateUrl>
     <prop:Visible><%= !$this->User->IsGuest %></prop:Visible>