loic/istic-openstack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'loic' of github.com:manzerbredes/istic-openstack into loic

Browse source
This commit is contained in:
manzerbredes 2016-02-05 16:44:15 +01:00
commit 31f3a9d77f
5 changed files with 53 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
client/index.html
View file

@ -73,6 +73,7 @@
<!-- Include resquest dependencies -->
<script src="./js/requests/identity.js"></script>
<script src="./js/requests/errors.js"></script>
<!-- Include controller -->
<script src="./js/controllers/login.js"></script>

48
client/js/controllers/login.js
View file

@ -1,8 +1,3 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
/**
* Represents a book.
@ -10,30 +5,37 @@
*/
mainApp.controller('loginCtrl', function ($scope,$interval,$sce)
{
// Define default states
$('#loginModal').modal({backdrop: 'static', keyboard: false});
$('#loadingLoginButton').hide();
$('#failedToLoginAlert').hide();
// Define default states
$('#loginModal').modal({backdrop: 'static', keyboard: false});
$('#loadingLoginButton').hide();
$('#failedToLoginAlert').hide();
$('#loginButton').click(function(){
$('#loginButton').hide();
$('#loadingLoginButton').show();
$('#failedToLoginAlert').hide();
$('#loginButton').click(function(){
$('#loginButton').hide();
$('#loadingLoginButton').show();
$('#failedToLoginAlert').hide();
var result=identity.login($("#loginFormUsername").val(), $("#loginFormProjectname").val(), $("#loginFormPassword").val());
$interval(
function()
{
$('#failedToLoginAlert').show();
$interval(
function()
{
// Check for error
if(!errors.checkForLogin(result)){
$('#failedToLoginAlert').show();
}
else {
$('#loginModal').modal('hide');
}
// Reset button state
$('#loginButton').show();
$('#loadingLoginButton').hide();
}, 2000,1);
$('#loadingLoginButton').hide();
}, 2000,1);
});
})
});

14
client/js/requests/errors.js Normal file
View file

@ -0,0 +1,14 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
var errors={};
errors.checkForLogin=function(result){
// TODO
return true;
};

9
client/js/requests/identity.js
View file

@ -1,9 +1,14 @@
// Make Namespace
var identity = {} ;
var identity = {};
identity.login=function(username, projectname, password){
// Todo
return "tokens";
};

12
client/partials/login.html
View file

@ -12,18 +12,18 @@
<div class="modal-body">
<div class="form-group">
<label label-default="" for="inputUser">User</label>
<input class="form-control" id="inputUser"
<label label-default="" for="loginFormUsername">User</label>
<input class="form-control" id="loginFormUsername"
placeholder="Email" type="text" ng-model="identityFormData.user">
</div>
<div class="form-group">
<label label-default="" for="inputProject">Project</label>
<input class="form-control" id="inputProject"
<label label-default="" for="loginFormProjectname">Project</label>
<input class="form-control" id="loginFormProjectname"
placeholder="Project Name" type="password" ng-model="identityFormData.project">
</div>
<div class="form-group">
<label label-default="" for="inputPassword">Password</label>
<input class="form-control" id="inputPassword"
<label label-default="" for="loginFormPassword">Password</label>
<input class="form-control" id="loginFormPassword"
placeholder="Password" type="password" ng-model="identityFormData.password">
</div>