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
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')
-rw-r--r--hudson-core/src/main/resources/META-INF/services/org.kohsuke.args4j.spi.OptionHandler2
-rw-r--r--hudson-core/src/main/resources/hudson/model/BuildTimelineWidget/control.jelly2
-rw-r--r--hudson-core/src/main/resources/hudson/model/Messages.properties3
-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
-rw-r--r--hudson-core/src/main/resources/lib/layout/layout.jelly2
6 files changed, 12 insertions, 24 deletions
diff --git a/hudson-core/src/main/resources/META-INF/services/org.kohsuke.args4j.spi.OptionHandler b/hudson-core/src/main/resources/META-INF/services/org.kohsuke.args4j.spi.OptionHandler
new file mode 100644
index 00000000..21d3e856
--- /dev/null
+++ b/hudson-core/src/main/resources/META-INF/services/org.kohsuke.args4j.spi.OptionHandler
@@ -0,0 +1,2 @@
+hudson.cli.handlers.AbstractProjectOptionHandler
+hudson.cli.handlers.TopLevelItemOptionHandler
diff --git a/hudson-core/src/main/resources/hudson/model/BuildTimelineWidget/control.jelly b/hudson-core/src/main/resources/hudson/model/BuildTimelineWidget/control.jelly
index b59f5886..99bae19c 100644
--- a/hudson-core/src/main/resources/hudson/model/BuildTimelineWidget/control.jelly
+++ b/hudson-core/src/main/resources/hudson/model/BuildTimelineWidget/control.jelly
@@ -56,7 +56,7 @@
<j:invokeStatic var="tz" className="java.util.TimeZone" method="getDefault"/>
- <div id="tl" style="height:250px; border:1px solid black;" />
+ <div id="tl" class="timeline" />
<div id="status" />
<script type="text/javascript">
diff --git a/hudson-core/src/main/resources/hudson/model/Messages.properties b/hudson-core/src/main/resources/hudson/model/Messages.properties
index 49efb39c..17cc7df0 100644
--- a/hudson-core/src/main/resources/hudson/model/Messages.properties
+++ b/hudson-core/src/main/resources/hudson/model/Messages.properties
@@ -18,7 +18,8 @@ AbstractBuild.BuildingRemotely=Building remotely on {0}
AbstractBuild.BuildingOnMaster=Building on master
AbstractBuild.KeptBecause=kept because of {0}
-AbstractItem.NoSuchJobExists=No such job ''{0}'' exists. Perhaps you meant ''{1}''?
+AbstractItem.NoSuchJobExists=No such job ''{0}'' exists.
+AbstractItem.NoSuchJobExists2=No such job ''{0}'' exists. Perhaps you meant ''{1}''?
AbstractItem.Pronoun=Job
AbstractProject.NewBuildForWorkspace=Scheduling a new build to get a workspace.
AbstractProject.AwaitingBuildForWorkspace=Awaiting build to get a workspace.
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;
});
diff --git a/hudson-core/src/main/resources/lib/layout/layout.jelly b/hudson-core/src/main/resources/lib/layout/layout.jelly
index 3c487310..1cd09871 100644
--- a/hudson-core/src/main/resources/lib/layout/layout.jelly
+++ b/hudson-core/src/main/resources/lib/layout/layout.jelly
@@ -253,7 +253,7 @@
<div style=" height:100%">
<img src="${imagesURL}/top-left-round.png" style="float:left"/>
<div style="margin-left:25; height:25; background-image:url(${imagesURL}/spacer.png); background-repeat:repeat-x" />
- <div id="main-panel-container" style=" background-color:#FFF; padding-left: 10px; height:100%">
+ <div id="main-panel-container" style=" background-color:#FFFFFF; padding-left: 10px; height:100%">
<table width="95%" height="100%" border="0">
<tr>
<td id="global-messages" width="100%">

Back to the top