2:19 p.m.
Author: wesleyhales
Date: 2009-05-21 15:19:35 -0400 (Thu, 21 May 2009)
New Revision: 13401
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/css/login.css
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/css/modal.css
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/js/modal.js
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/common/modal_body.jsp
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp
Log:
JBPORTAL-2227
Modified: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/css/login.css
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/css/login.css 2009-05-21
15:12:39 UTC (rev 13400)
+++ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/css/login.css 2009-05-21
19:19:35 UTC (rev 13401)
@@ -2,7 +2,7 @@
font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
font-size: 11px;
width: 255px;
- border: 1px solid #436999;
+ /*border: 1px solid #436999;*/
position: relative;
margin: 0 auto 0 auto;
background-color:white;
Modified: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/css/modal.css
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/css/modal.css 2009-05-21
15:12:39 UTC (rev 13400)
+++ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/css/modal.css 2009-05-21
19:19:35 UTC (rev 13401)
@@ -45,6 +45,6 @@
iframe.login-content{
padding:0;
margin:0;
- border:0;
+ border: 1px solid #436999;
}
Modified: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/js/modal.js
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/js/modal.js 2009-05-21
15:12:39 UTC (rev 13400)
+++ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/js/modal.js 2009-05-21
19:19:35 UTC (rev 13401)
@@ -591,18 +591,6 @@
// preload and create loader image
var imgPreloader = new Image();
- // if loader image found, create link to hide Modal and create loadingimage
- //imgPreloader.onload=function(){
-
- /*var objLoadingImageLink = document.getElementById(componentId +
'ImageLink');
-
- if (!objLoadingImageLink){
- objLoadingImageLink.setAttribute('href','#');
- objLoadingImageLink.onclick = function () {hideModal(); return false;}
- objLoadingImageLink.setAttribute('id',componentId +
'ImageLink');
- objModal.appendChild(objLoadingImageLink);
- }*/
-
var objLoadingImageWidth = "100";
var objLoadingImage = document.getElementById(componentId +
'loading-image')
@@ -652,6 +640,7 @@
}catch(Exception){
}
+ return true;
}
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/common/modal_body.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/common/modal_body.jsp 2009-05-21
15:12:39 UTC (rev 13400)
+++
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/common/modal_body.jsp 2009-05-21
19:19:35 UTC (rev 13401)
@@ -1,5 +1,5 @@
<div id="login-modal" style="display:none">
- <div id="login-modal-msg"
style="display:none;width:257px;height:157px">
- <iframe src="" frameborder="0" width="257"
height="157" scrolling="no" marginheight="0"
marginwidth="0" name="login-content" class="login-content"
id="loginIframe"></iframe>
+ <div id="login-modal-msg"
style="display:none;width:255px;height:157px">
+ <iframe src="" frameborder="0" width="255"
height="157" scrolling="no" marginheight="0"
marginwidth="0" name="login-content" class="login-content"
id="loginIframe"></iframe>
</div>
</div>
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp 2009-05-21
15:12:39 UTC (rev 13400)
+++
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp 2009-05-21
19:19:35 UTC (rev 13401)
@@ -39,7 +39,7 @@
<link rel="stylesheet" href="/portal-core/css/login.css"
type="text/css"/>
</head>
-<body
onload="JBossPortal.login.setFocusOnLoginForm();JBossPortal.login.displayStatus();">
+<body
onload="JBossPortal.login.setFocusOnLoginForm();JBossPortal.login.displayStatus();JBossPortal.login.validate(10);">
<div class="login-container">
@@ -69,12 +69,12 @@
<div class="form-field">
<label for="j_username"><%=
rb.getString("LOGIN_USERNAME") %>
</label>
- <input type="text" style="width:155px;"
name="j_username" id="j_username" value=""
onFocus="JBossPortal.login.highlight('j_username');"
onblur="JBossPortal.login.highlight('j_username');"/>
+ <input type="text" style="width:155px;"
name="j_username" id="j_username" value=""
onkeydown="JBossPortal.login.validate();"
onFocus="JBossPortal.login.highlight('j_username');JBossPortal.login.validate();"
onblur="JBossPortal.login.highlight('j_username');"/>
</div>
<div class="form-field">
<label for="j_password"><%=
rb.getString("LOGIN_PASSWORD") %>
</label>
- <input type="password" style="width:155px;"
name="j_password" id="j_password" value=""
onFocus="JBossPortal.login.highlight('j_password');"
onblur="JBossPortal.login.highlight('j_password');"/>
+ <input type="password" style="width:155px;"
name="j_password" id="j_password" value=""
onkeydown="JBossPortal.login.validate();"
onFocus="JBossPortal.login.highlight('j_password');JBossPortal.login.validate();"
onblur="JBossPortal.login.highlight('j_password');"/>
</div>
<br class="clear"/>