Author: ivol37 at gmail.com
Date: Thu Dec 2 09:05:12 2010
New Revision: 464
Log:
[AMDATU-76] Fixed bug in login gadget causing it fail rendering properly.
Modified:
trunk/amdatu-authorization/login-gadget/src/main/resources/jsp/LoginGadget.jsp
Modified:
trunk/amdatu-authorization/login-gadget/src/main/resources/jsp/LoginGadget.jsp
==============================================================================
---
trunk/amdatu-authorization/login-gadget/src/main/resources/jsp/LoginGadget.jsp
(original)
+++
trunk/amdatu-authorization/login-gadget/src/main/resources/jsp/LoginGadget.jsp
Thu Dec 2 09:05:12 2010
@@ -27,12 +27,12 @@
<Module>
<ModulePrefs
- title="Amdatu Login Gadget"
- description="Provides login/logout functionality for Amdatu users"
- author="Ivo Ladage-van Doorn"
- screenshot="${gadgetBaseUrl}/static/images/login.png"
- icon="${gadgetBaseUrl}/static/images/login.png"
- height="400">
+ title="Amdatu Login Gadget"
+ description="Provides login/logout functionality for Amdatu users"
+ author="Ivo Ladage-van Doorn"
+ screenshot="${gadgetBaseUrl}/static/images/login.png"
+ icon="${gadgetBaseUrl}/static/images/login.png"
+ height="400">
<Require feature="osapi"/>
<Require feature="dynamic-height"/>
</ModulePrefs>
@@ -41,140 +41,139 @@
<link rel="stylesheet" href="/dashboard/static/css/dashboard.css">
<script type="text/javascript"
src="/dashboard/static/js/lib/jquery-1.4.2.min.js"></script>
- <script type="text/javascript"
src="/dashboard/static/js/lib/jquery-ui-1.8.2.custom.min.js"></script>
+ <script type="text/javascript"
src="/dashboard/static/js/lib/jquery-ui-1.8.2.custom.min.js"></script>
+ <div id="login" style="display:none;visibility:hidden">
+ <p>
+ You are currently not logged in<br/><br/>
+
+ <table width="95%">
+ <tr>
+ <td>Username</td><td><input type="edit" id="username"
value="Administrator" onKeyPress="return submitenter(this, event)"/></td>
+ </tr>
+ <tr>
+ <td>Password</td><td><input type="password" id="password"
value="Administrator" onKeyPress="return submitenter(this, event)"/></td>
+ </tr>
+ <tr>
+ <td><input type="submit" value="Login"
onclick="javascript:login()" /></td><td/>
+ </tr>
+ <tr><td colspan="2"><font color="red"><div
id="result"></div></font></td></tr>
+ </table>
+ </p>
+ </div>
+ <div id="logout" style="display:none;visibility:hidden"></div>
+
<script type="text/javascript">
function showLoginBox() {
- document.getElementById("login").style.visibility = "";
- document.getElementById("login").style.display = "";
-
document.getElementById("logout").style.visibility = "hidden";
- document.getElementById("logout").style.display
= "none";
+ document.getElementById("login").style.visibility = "";
+ document.getElementById("login").style.display = "";
+ document.getElementById("logout").style.visibility = "hidden";
+ document.getElementById("logout").style.display = "none";
}
function showLogoutBox(username) {
- document.getElementById("login").style.visibility = "hidden";
- document.getElementById("login").style.display = "none";
-
document.getElementById("logout").style.visibility = "";
- document.getElementById("logout").style.display
= "";
- var userdiv = document.getElementById("logout");
- userdiv.innerHTML = "<p>You are currently
logged in as " + username + "<br/><br/>" +
- "<input type='submit' value='Logout'
onclick='javascript:logout()' /></p>";
+ document.getElementById("login").style.visibility = "hidden";
+ document.getElementById("login").style.display = "none";
+ document.getElementById("logout").style.visibility = "";
+ document.getElementById("logout").style.display = "";
+ var userdiv = document.getElementById("logout");
+ userdiv.innerHTML = "<p>You are currently logged in as " + username +
"<br/><br/>" +
+ "<input type='submit' value='Logout' onclick='javascript:logout()'
/></p>";
}
function login() {
- var postdata = {
- username :
document.getElementById('username').value,
- password :
document.getElementById('password').value
+ var postdata = {
+ username : document.getElementById('username').value,
+ password : document.getElementById('password').value
};
-
- var url = "${baseRestUrl}/login";
- jQuery.ajax({
- url: url,
- type: "POST",
- data: postdata,
- dataType: "json",
- async:true,
- success: function(response) {
- if (response.result !=
null && response.result == 'ok') {
-
showLogoutBox(response.username);
- } else {
- var errorMsg =
"An unexpected error occurred";
- if
(response.msg) {
-
errorMsg = response.msg;
- }
- var resultDiv =
document.getElementById("result");
-
resultDiv.innerHTML = errorMsg;
- }
- }
- }
- );
+
+ var url = "${baseRestUrl}/login";
+ jQuery.ajax({
+ url: url,
+ type: "POST",
+ data: postdata,
+ dataType: "json",
+ async:true,
+ success: function(response) {
+ if (response.result != null && response.result == 'ok') {
+ showLogoutBox(response.username);
+ } else {
+ var errorMsg = "An unexpected error occurred";
+ if (response.msg) {
+ errorMsg = response.msg;
+ }
+ var resultDiv = document.getElementById("result");
+ resultDiv.innerHTML = errorMsg;
+ }
+ }
+ }
+ );
}
function logout() {
- var postdata = {
- username :
document.getElementById('username').value,
- password :
document.getElementById('password').value
+ var postdata = {
+ username : document.getElementById('username').value,
+ password : document.getElementById('password').value
};
-
- var url = "${baseRestUrl}/logout";
- jQuery.ajax({
- url: url,
- type: "POST",
- data: postdata,
- dataType: "json",
- async:true,
- success: function(response) {
- if (response.result !=
null && response.result == 'ok') {
- showLoginBox();
- } else {
- var errorMsg =
"An unexpected error occurred";
- var resultDiv =
document.getElementById("result");
-
resultDiv.innerHTML = errorMsg;
- }
- }
- }
- );
- }
-
- function getLoginStatus() {
- var url = "${baseRestUrl}/status";
- jQuery.ajax({
- url: url,
- type: "GET",
- dataType: "json",
- async:true,
- success: function(response) {
- if (response.username
!= null) {
-
showLogoutBox(response.username);
- } else {
- showLoginBox();
- }
- }
- }
- );
- }
-
- function submitenter(field, e) {
- var keycode;
- if (window.event) {
- keycode = window.event.keyCode;
- } else if (e) {
- keycode = e.which;
- } else {
- return true;
- }
-
- if (keycode == 13) {
- login();
- return false;
- } else {
- return true;
- }
- }
-
- getLoginStatus();
+
+ var url = "${baseRestUrl}/logout";
+ jQuery.ajax({
+ url: url,
+ type: "POST",
+ data: postdata,
+ dataType: "json",
+ async:true,
+ success: function(response) {
+ if (response.result != null && response.result == 'ok') {
+ showLoginBox();
+ } else {
+ var errorMsg = "An unexpected error occurred";
+ var resultDiv = document.getElementById("result");
+ resultDiv.innerHTML = errorMsg;
+ }
+ }
+ }
+ );
+ }
+
+ function getLoginStatus() {
+ var url = "${baseRestUrl}/status";
+ jQuery.ajax({
+ url: url,
+ type: "GET",
+ dataType: "json",
+ async:true,
+ success: function(response) {
+ if (response.username != null) {
+ showLogoutBox(response.username);
+ } else {
+ showLoginBox();
+ }
+ }
+ }
+ );
+ }
+
+ function submitenter(field, e) {
+ var keycode;
+ if (window.event) {
+ keycode = window.event.keyCode;
+ } else if (e) {
+ keycode = e.which;
+ } else {
+ return true;
+ }
+
+ if (keycode == 13) {
+ login();
+ return false;
+ } else {
+ return true;
+ }
+ }
+
+ getLoginStatus();
</script>
-
- <div id="login" style="display:none;visibility:hidden">
- <p>
- You are currently not logged in<br/><br/>
-
- <table width="95%">
- <tr>
- <td>Username</td><td><input
type="edit" id="username" value="Administrator" onKeyPress="return
submitenter(this, event)"/></td>
- </tr>
- <tr>
- <td>Password</td><td><input
type="password" id="password" value="Administrator" onKeyPress="return
submitenter(this, event)"/></td>
- </tr>
- <tr>
- <td><input type="submit"
value="Login" onclick="javascript:login()" /></td><td/>
- </tr>
- <tr><td colspan="2"><font
color="red"><div id="result"></div></font></td></tr>
- </table>
- </p>
- </div>
- <div id="logout" style="display:none;visibility:hidden">
- </div>
]]>
</Content>
</Module>
