diff options
| author | Simon | 2011-04-11 15:20:08 +0200 |
|---|---|---|
| committer | Simon | 2011-04-11 15:20:08 +0200 |
| commit | e2efbc3d4c4c52a0fd86a7a5d81c9ae05fce27f0 (patch) | |
| tree | 07c0e8f79e35a005a25efa4cb6edf3af82102ad6 /application/modules/user/views/scripts | |
| parent | fallbacks in session hinzugefügt (diff) | |
| parent | fixes (diff) | |
| download | pbs2-e2efbc3d4c4c52a0fd86a7a5d81c9ae05fce27f0.tar.gz pbs2-e2efbc3d4c4c52a0fd86a7a5d81c9ae05fce27f0.tar.xz pbs2-e2efbc3d4c4c52a0fd86a7a5d81c9ae05fce27f0.zip | |
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/modules/user/views/scripts')
| -rw-r--r-- | application/modules/user/views/scripts/auth/login.phtml | 1 | ||||
| -rw-r--r-- | application/modules/user/views/scripts/auth/register.phtml | 3 |
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 +?> |