summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
Diffstat (limited to 'client')
-rw-r--r--client/js/controllers/login.js10
-rw-r--r--client/partials/login.html2
2 files changed, 8 insertions, 4 deletions
diff --git a/client/js/controllers/login.js b/client/js/controllers/login.js
index 4cd4bf4..6de348c 100644
--- a/client/js/controllers/login.js
+++ b/client/js/controllers/login.js
@@ -10,23 +10,27 @@ mainApp.controller('loginCtrl', function ($scope,$interval,$sce)
// Define default states
$('#loginModal').modal({backdrop: 'static', keyboard: false});
$('#loadingLoginButton').hide();
-
+ $('#failedToLoginAlert').hide();
$('#loginButton').click(function(){
$('#loginButton').hide();
$('#loadingLoginButton').show();
-
+ $('#failedToLoginAlert').hide();
+
$interval(
function()
{
+ $('#failedToLoginAlert').show();
+
$('#loginButton').show();
$('#loadingLoginButton').hide();
- }, 2000,1);
+ }, 2000,1);
+
});
})
diff --git a/client/partials/login.html b/client/partials/login.html
index 40680b3..8571e61 100644
--- a/client/partials/login.html
+++ b/client/partials/login.html
@@ -33,7 +33,7 @@
<div class="modal-footer">
<!--<a href="#" data-dismiss="modal" class="btn btn-default">Close</a>-->
<button class="btn btn-lg btn-warning btn-block" id="loadingLoginButton"><span class="glyphicon glyphicon-refresh glyphicon-refresh-animate"></span> Loading...</button>
-
+ <div class="alert alert-danger text-center" role="alert" id="failedToLoginAlert">Failed to login</div>
<a href="#" class="btn btn-lg btn-primary btn-block" id="loginButton" ng-click="processForm()">Login</a>
</div>
</div>