Show message for wrong user/password (closes #275)

getredash · Jul 12, 2015 · e09aa6f · e09aa6f
1 parent a692e3f
commit e09aa6f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/rd_ui/app/login.html b/rd_ui/app/login.html
@@ -13,6 +13,10 @@
     <link rel="stylesheet" href="/styles/redash.css">
     <link rel="stylesheet" href="/styles/login.css">
     <!-- endbuild -->
+
+    <link rel="icon" type="image/png" sizes="32x32" href="/images/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="96x96" href="/images/favicon-96x96.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="/images/favicon-16x16.png">
 </head>
 <body>
 
@@ -26,13 +30,20 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
         </button>
-        <a class="navbar-brand" href="/"><strong>{{name}}</strong></a>
+        <a class="navbar-brand" href="/"><img src="/images/redash_icon_small.png"/></a>
     </div>
     </div>
 </nav>
 
 <div class="container">
     <div class="row">
+        {% with messages = get_flashed_messages() %}
+          {% if messages %}
+            {% for message in messages %}
+                <div class="alert alert-warning" role="alert">{{ message }}</div>
+            {% endfor %}
+          {% endif %}
+        {% endwith %}
 
         <div class="main">
             {% if show_google_openid %}

diff --git a/redash/controllers.py b/redash/controllers.py
@@ -12,7 +12,7 @@
 import logging
 
 from flask import render_template, send_from_directory, make_response, request, jsonify, redirect, \
-    session, url_for, current_app
+    session, url_for, current_app, flash
 from flask.ext.restful import Resource, abort
 from flask_login import current_user, login_user, logout_user, login_required
 import sqlparse
@@ -80,7 +80,7 @@ def login():
                 login_user(user, remember=remember)
                 return redirect(request.args.get('next') or '/')
         except models.User.DoesNotExist:
-            pass
+            flash("Wrong username or password.")
 
     return render_template("login.html",
                            name=settings.NAME,