Merge branch 'develop' of https://github.com/wez3/domoboard into develop

server.py

@@ -89,7 +89,7 @@ def login_form():
             if g.users[username].authenticate(request.form['password']):
                 security.generateCsrfToken()
                 return redirect(url_for('dashboard'))
-            return render_template('login.html')
+        return render_template('login.html', failed = "Login failed")
     return render_template('login.html')
 
 @app.errorhandler(404)

templates/footer_login.html

@@ -1,16 +1,2 @@
-<!-- footer content -->
-<div id="custom_notifications" class="custom-notifications dsp_none">
-  <ul class="list-unstyled notifications clearfix" data-tabbed_notifications="notif-group">
-  </ul>
-  <div class="clearfix"></div>
-  <div id="notif-group" class="tabbed_notifications"></div>
-</div>
-<!-- /footer content -->
-<!-- Domoboard -->
-<script src="/static/js/custom.js"></script>
-<!-- bootstrap-slider -->
-<link href="/static/css/bootstrap-slider.css" rel="stylesheet">
-<script type="text/javascript" src="/static/js/bootstrap-slider.js"></script>
-<script type="text/javascript" src="static/js/moment.min.js"></script>
 </body>
 </html>

templates/login.html

@@ -23,7 +23,7 @@
         <div class="panel-heading"> <strong class="">Login</strong>
         </div>
         <div class="panel-body">
-          <form class="form-horizontal" role="form" action="/login/" method="post">
+          <form class="form-horizontal" role="form" action="/login/" method="post" autocomplete="on">
             <div class="form-group">
           <div class="form-group input-group">
             <span class="input-group-addon"><i class="glyphicon glyphicon-user"></i></span>
@@ -36,6 +36,11 @@
            </div>
             <div class="form-group">
               <div class="col-sm-offset-3 col-sm-9">
+                {% if failed %}
+                <div>
+                    <font color="red">{{failed}}</font>
+                </div>
+                {% endif %}
                 <div class="checkbox">
                   <label class="">
                     <input type="checkbox" class="">Remember me</label>