Remove login successful and logout successful messages.

diff --git a/data/templates/login-successful.html b/data/templates/login-successful.html
deleted file mode 100644 (file)
index d7e7462..0000000
--- a/data/templates/login-successful.html
+++ /dev/null
@@ -1,33 +0,0 @@
-{% extends "base.html" %}
-
-{% block title %}{{ _("Login successful") }}{% end block %}
-
-{% block body %}
-       <ul class="breadcrumb">
-               <li>
-                       <a href="/">{{ _("Home") }}</a>
-                       <span class="divider">/</span>
-               </li>
-               <li class="active">
-                       {{ _("Login successful") }}
-               </li>
-       </ul>
-
-       <div class="page-header">
-               <h1>{{ _("Login successful") }}</h1>
-       </div>
-
-       <div class="row">
-               <div class="span6 offset3">
-                       <p>
-                               {{ _("Welcome, %s.") % user.realname }}
-                       </p>
-
-                       <p>
-                               {{ _("Your login to the Pakfire Build Service was successful.") }}
-                       </p>
-
-                       <a class="btn btn-primary pull-right" href="/">{{ _("Start!") }}</a>
-               </div>
-       </div>
-{% end %}

diff --git a/data/templates/logout.html b/data/templates/logout.html
deleted file mode 100644 (file)
index b7bb91a..0000000
--- a/data/templates/logout.html
+++ /dev/null
@@ -1,30 +0,0 @@
-{% extends "base.html" %}
-
-{% block title %}{{ _("Logout successful") }}{% end block %}
-
-{% block body %}
-       <ul class="breadcrumb">
-               <li>
-                       <a href="/">{{ _("Home") }}</a>
-                       <span class="divider">/</span>
-               </li>
-               <li class="active">
-                       {{ _("Logout successful") }}
-               </li>
-       </ul>
-
-       <div class="page-header">
-               <h1>{{ _("Logout successful") }}</h1>
-       </div>
-
-       <div class="row">
-               <div class="span6 offset3">
-                       <p>
-                               {{ _("You have successfully logged out from the Pakfire Build Server.") }}
-                               {{ _("Have a nice day!") }}
-                       </p>
-
-                       <a class="btn btn-primary pull-right" href="/">{{ _("Goodbye!") }}</a>
-               </div>
-       </div>
-{% end %}

diff --git a/web/handlers_auth.py b/web/handlers_auth.py
index b3b06d8ae12613e2be9b6fa927ac789e292ee828..541311bdfd2cf282b6c257dc7afd4441652b4b21 100644 (file)
--- a/web/handlers_auth.py
+++ b/web/handlers_auth.py
@@ -32,14 +32,9 @@ class LoginHandler(BaseHandler):
                        self._current_user = user
 
                        # If there is "next" given, we redirect the user accordingly.
-                       # Otherwise we show a nice welcome message and tell the user, that
-                       # the login was successful.
-                       next = self.get_argument("next", None)
-
-                       if next:
-                               self.redirect(next)
-                       else:
-                               self.render("login-successful.html", user=user)
+                       # Otherwise we redirect to the front page.
+                       next = self.get_argument("next", "/")
+                       self.redirect(next)
 
                else:
                        # If the login failed we return an error message.
@@ -153,7 +148,6 @@ class LogoutHandler(BaseHandler):
 
                # Destroy the user's session.
                self.session.destroy()
-               self._current_user = None
 
-               # Show a message to the user.
-               self.render("logout.html")
+               # Redirect the user to the front page.
+               self.redirect("/")