Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWinston Prakash2012-02-14 19:17:52 -0500
committerWinston Prakash2012-02-14 19:17:52 -0500
commitc39f59a75a338fa95e733a6afbb7660fab1715c5 (patch)
treecec83630c6a33cabf2b21b8720425e4dcd617d59 /hudson-core/src/main/resources/hudson/security
parent82acf4773947a90450ae04bef07c3f11688d7908 (diff)
parenta98426587708c26e1641e8f734e39749c4889e8f (diff)
downloadorg.eclipse.hudson.core-c39f59a75a338fa95e733a6afbb7660fab1715c5.tar.gz
org.eclipse.hudson.core-c39f59a75a338fa95e733a6afbb7660fab1715c5.tar.xz
org.eclipse.hudson.core-c39f59a75a338fa95e733a6afbb7660fab1715c5.zip
Merger with master
Diffstat (limited to 'hudson-core/src/main/resources/hudson/security')
-rw-r--r--hudson-core/src/main/resources/hudson/security/SecurityRealm/loginDialog.jelly15
-rw-r--r--hudson-core/src/main/resources/hudson/security/SecurityRealm/loginLink.jelly12
2 files changed, 6 insertions, 21 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 1970a49f..eef2528c 100644
--- a/hudson-core/src/main/resources/hudson/security/SecurityRealm/loginDialog.jelly
+++ b/hudson-core/src/main/resources/hudson/security/SecurityRealm/loginDialog.jelly
@@ -54,21 +54,6 @@
<input style="margin-left:10px; width:75px" type="button" id="cancelButton" value="${%Cancel}" />
</form>
- <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.}
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 e8505c29..206efa23 100644
--- a/hudson-core/src/main/resources/hudson/security/SecurityRealm/loginLink.jelly
+++ b/hudson-core/src/main/resources/hudson/security/SecurityRealm/loginLink.jelly
@@ -40,8 +40,8 @@
}
function submitForm(){
- jQuery('#loginMsg').css({ opacity: 1.0 });
- jQuery('#loginError').css({ opacity: 0.0 });
+ jQuery('#loginMsg').show();
+ jQuery('#loginError').hide();
var dataString = jQuery("#loginForm").serialize();
jQuery.ajax({
type: 'POST',
@@ -51,8 +51,8 @@
window.location.href="${from}";
},
error: function(){
- jQuery('#loginError').css({ opacity: 1.0 });
- jQuery('#loginMsg').css({ opacity: 0.0 });
+ jQuery('#loginError').show();
+ jQuery('#loginMsg').hide();
},
dataType: "html"
});
@@ -82,8 +82,8 @@
jQuery.unblockUI();
jQuery('#j_username').attr({value:""});
jQuery('#j_password').attr({value:""});
- jQuery('#loginError').css({ opacity: 0.0 });
- jQuery('#loginMsg').css({ opacity: 0.0 });
+ jQuery('#loginError').hide();
+ jQuery('#loginMsg').hide();
return false;
});

Back to the top