backup/ROC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated Loging form:

Browse Source 
Display invalid credentials message inside the primary-tabs div.
Added support to submit the form using <Enter>.
This commit is contained in:
jvelilla
2015-09-01 11:41:50 -03:00
parent 2f65a084ac
commit 634a078282
4 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
examples/demo/site/modules/basic_auth/files/js/roc_basic_auth.js
View File

@@ -25,7 +25,7 @@ ROC_AUTH.login = function() {
var newdiv = document.createElement('div'); var newdiv = document.createElement('div');
newdiv.innerHTML = "<br>Invalid Credentials</br>"; newdiv.innerHTML = "<br>Invalid Credentials</br>";
newdiv.id = 'myModalFormId'; newdiv.id = 'myModalFormId';
$("body").append(newdiv); $(".primary-tabs").append(newdiv);
} }
}else{ }else{
@@ -49,7 +49,7 @@ ROC_AUTH.login = function() {
var newdiv = document.createElement('div'); var newdiv = document.createElement('div');
newdiv.innerHTML = "<br>Invalid Credentials</br>"; newdiv.innerHTML = "<br>Invalid Credentials</br>";
newdiv.id = 'myModalFormId'; newdiv.id = 'myModalFormId';
$("body").append(newdiv); $(".primary-tabs").append(newdiv);
} }
} }
@@ -93,7 +93,7 @@ ROC_AUTH.login_with_redirect = function() {
var newdiv = document.createElement('div'); var newdiv = document.createElement('div');
newdiv.innerHTML = "<br>Invalid Credentials</br>"; newdiv.innerHTML = "<br>Invalid Credentials</br>";
newdiv.id = 'myModalFormId'; newdiv.id = 'myModalFormId';
$("body").append(newdiv); $(".primary-tabs").append(newdiv);
$("#imgProgressRedirect").hide(); $("#imgProgressRedirect").hide();
} }
}else{ }else{
@@ -122,7 +122,7 @@ ROC_AUTH.login_with_redirect = function() {
var newdiv = document.createElement('div'); var newdiv = document.createElement('div');
newdiv.innerHTML = "<br>Invalid Credentials</br>"; newdiv.innerHTML = "<br>Invalid Credentials</br>";
newdiv.id = 'myModalFormId'; newdiv.id = 'myModalFormId';
$("body").append(newdiv); $(".primary-tabs").append(newdiv);
$("#imgProgressRedirect").hide(); $("#imgProgressRedirect").hide();
} }

9
examples/demo/site/modules/basic_auth/templates/block_login.tpl
View File

@@ -5,12 +5,12 @@
<div> <div>
<form name="cms_basic_auth" action method="POST"> <form name="cms_basic_auth" action method="POST">
<div> <div>
<input type="text" name="username" required> <input type="text" name="username" id="username" required>
<label>Username</label> <label>Username</label>
</div> </div>
<div> <div>
<input type="password" name="password" required> <input type="password" name="password" id="password" required>
<label>Password</label> <label>Password</label>
</div> </div>
@@ -25,10 +25,5 @@
</p> </p>
</div> </div>
</div> </div>
<div>
{foreach item="item" from="$oauth_consumers"}
<a href="{$site_url/}account/login-with-oauth/{$item/}">Login with {$item/}</a><br>
{/foreach}
</div>
{/unless} {/unless}
</div> </div>

8
modules/basic_auth/site/files/js/roc_basic_auth.js
View File

@@ -25,7 +25,7 @@ ROC_AUTH.login = function() {
var newdiv = document.createElement('div'); var newdiv = document.createElement('div');
newdiv.innerHTML = "<br>Invalid Credentials</br>"; newdiv.innerHTML = "<br>Invalid Credentials</br>";
newdiv.id = 'myModalFormId'; newdiv.id = 'myModalFormId';
$("body").append(newdiv); $(".primary-tabs").append(newdiv);
} }
}else{ }else{
@@ -49,7 +49,7 @@ ROC_AUTH.login = function() {
var newdiv = document.createElement('div'); var newdiv = document.createElement('div');
newdiv.innerHTML = "<br>Invalid Credentials</br>"; newdiv.innerHTML = "<br>Invalid Credentials</br>";
newdiv.id = 'myModalFormId'; newdiv.id = 'myModalFormId';
$("body").append(newdiv); $(".primary-tabs").append(newdiv);
} }
} }
@@ -93,7 +93,7 @@ ROC_AUTH.login_with_redirect = function() {
var newdiv = document.createElement('div'); var newdiv = document.createElement('div');
newdiv.innerHTML = "<br>Invalid Credentials</br>"; newdiv.innerHTML = "<br>Invalid Credentials</br>";
newdiv.id = 'myModalFormId'; newdiv.id = 'myModalFormId';
$("body").append(newdiv); $(".primary-tabs").append(newdiv);
$("#imgProgressRedirect").hide(); $("#imgProgressRedirect").hide();
} }
}else{ }else{
@@ -122,7 +122,7 @@ ROC_AUTH.login_with_redirect = function() {
var newdiv = document.createElement('div'); var newdiv = document.createElement('div');
newdiv.innerHTML = "<br>Invalid Credentials</br>"; newdiv.innerHTML = "<br>Invalid Credentials</br>";
newdiv.id = 'myModalFormId'; newdiv.id = 'myModalFormId';
$("body").append(newdiv); $(".primary-tabs").append(newdiv);
$("#imgProgressRedirect").hide(); $("#imgProgressRedirect").hide();
} }

4
modules/basic_auth/site/templates/block_login.tpl
View File

@@ -5,12 +5,12 @@
<div> <div>
<form name="cms_basic_auth" action method="POST"> <form name="cms_basic_auth" action method="POST">
<div> <div>
<input type="text" name="username" required> <input type="text" name="username" id="username" required>
<label>Username</label> <label>Username</label>
</div> </div>
<div> <div>
<input type="password" name="password" required> <input type="password" name="password" id="password" required>
<label>Password</label> <label>Password</label>
</div> </div>