| author | akozak | 2011-11-21 02:50:49 (EST) |
|---|---|---|
| committer | Winston Prakash | 2011-12-01 20:46:46 (EST) |
| commit | ad50cebe6bb0b88438a5438390378e51d118bd1d (patch) (side-by-side diff) | |
| tree | bf3afeaeb56fda0bf9a32b896b6505dc3f329568 | |
| parent | 0fe9353c2f4c107b1a9bf1163352872ebb9c5300 (diff) | |
| download | org.eclipse.hudson.core-ad50cebe6bb0b88438a5438390378e51d118bd1d.zip org.eclipse.hudson.core-ad50cebe6bb0b88438a5438390378e51d118bd1d.tar.gz org.eclipse.hudson.core-ad50cebe6bb0b88438a5438390378e51d118bd1d.tar.bz2 | |
Resolve HUDSON-9011 (Javascript bugs in Hudson Version 2.1.1 using Internet Explorer 8)
Signed-off-by: Winston Prakash <winston.prakash@gmail.com>
3 files changed, 26 insertions, 13 deletions
diff --git a/hudson-core/src/main/resources/hudson/security/SecurityRealm/loginDialog.jelly b/hudson-core/src/main/resources/hudson/security/SecurityRealm/loginDialog.jelly index 82d24cc..1970a49 100644 --- a/hudson-core/src/main/resources/hudson/security/SecurityRealm/loginDialog.jelly +++ b/hudson-core/src/main/resources/hudson/security/SecurityRealm/loginDialog.jelly @@ -52,17 +52,29 @@ <input type="hidden" name="from" value="${submitFrom}" /> <input style="width:75px" type="button" id="loginButton" value="${%Login}" /> <input style="margin-left:10px; width:75px" type="button" id="cancelButton" value="${%Cancel}" /> - <script> - $('j_username').focus(); - </script> - + </form> - - <div id="loginError" style="opacity:0.0; text-align:center; color:red; font-weight:bold"> + <style type="text/css"> + #loginError, #loginMsg { + opacity:0; + -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; + filter: alpha(opacity=0); + text-align:center; + font-weight:bold; + } + #loginError { + color: red; + } + #loginMsg { + color: black; + } + </style> + + <div id="loginError"> ${%Invalid login information. Please try again.} </div> - - <div id="loginMsg" style="opacity:0.0; text-align:center; color:black; font-weight:bold"> + + <div id="loginMsg"> ${%Logging in...} </div> diff --git a/hudson-core/src/main/resources/hudson/security/SecurityRealm/loginLink.jelly b/hudson-core/src/main/resources/hudson/security/SecurityRealm/loginLink.jelly index 5fdbea7..e8505c2 100644 --- a/hudson-core/src/main/resources/hudson/security/SecurityRealm/loginLink.jelly +++ b/hudson-core/src/main/resources/hudson/security/SecurityRealm/loginLink.jelly @@ -32,12 +32,13 @@ jQuery.blockUI({ message: jQuery('#loginDialog'), css: { - width: '350px', + width: '350px' }, - title: 'Confirmation', + title: 'Confirmation' }); - } - + jQuery('j_username').focus(); + } + function submitForm(){ jQuery('#loginMsg').css({ opacity: 1.0 }); jQuery('#loginError').css({ opacity: 0.0 }); diff --git a/hudson-war/src/main/webapp/scripts/popup-dialog.js b/hudson-war/src/main/webapp/scripts/popup-dialog.js index bad52db..2be3f63 100644 --- a/hudson-war/src/main/webapp/scripts/popup-dialog.js +++ b/hudson-war/src/main/webapp/scripts/popup-dialog.js @@ -11,7 +11,7 @@ function onLinkClick(dialogContainerId) { opacity: .6, color: '#fff' }, - title: 'Confirmation', + title: 'Confirmation' }); } |

