summaryrefslogtreecommitdiffstats
path: root/application/modules/user/views/scripts/auth
diff options
context:
space:
mode:
authormichael pereira2011-04-11 15:15:03 +0200
committermichael pereira2011-04-11 15:15:03 +0200
commit4a09baa8ff974b950b7b5ed8e28b894c7cfe8b42 (patch)
tree6b3b9959f3479641322a0130956c1c0908cd3253 /application/modules/user/views/scripts/auth
parentfixes (diff)
parentMerge branch 'master' of ssh://git.openslx.org/lsfks/master-teamprojekt/pbs2 (diff)
downloadpbs2-4a09baa8ff974b950b7b5ed8e28b894c7cfe8b42.tar.gz
pbs2-4a09baa8ff974b950b7b5ed8e28b894c7cfe8b42.tar.xz
pbs2-4a09baa8ff974b950b7b5ed8e28b894c7cfe8b42.zip
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/modules/user/views/scripts/auth')
-rw-r--r--application/modules/user/views/scripts/auth/login.phtml1
-rw-r--r--application/modules/user/views/scripts/auth/register.phtml3
2 files changed, 3 insertions, 1 deletions
diff --git a/application/modules/user/views/scripts/auth/login.phtml b/application/modules/user/views/scripts/auth/login.phtml
index 899c6e7..cc2a3ef 100644
--- a/application/modules/user/views/scripts/auth/login.phtml
+++ b/application/modules/user/views/scripts/auth/login.phtml
@@ -1,6 +1,7 @@
<h1>Login</h1>
<?php
$this->loginForm->setAction($this->url());
+echo $this->notification;
echo $this->loginForm;
?>
<div><button onclick="location.href='/user/auth/recoverpassword'">Recover Password</button></div> \ No newline at end of file
diff --git a/application/modules/user/views/scripts/auth/register.phtml b/application/modules/user/views/scripts/auth/register.phtml
index 6217e06..eb59c68 100644
--- a/application/modules/user/views/scripts/auth/register.phtml
+++ b/application/modules/user/views/scripts/auth/register.phtml
@@ -1,5 +1,6 @@
<h1>New Account</h1>
<?php
+echo $this->notification;
$this->registerForm->setAction($this->url());
echo $this->registerForm;
-?> \ No newline at end of file
+?>