Skip to content

Commit

Permalink
[JENKINS-31746] Removing unnecessary CSS styles
Browse files Browse the repository at this point in the history
  • Loading branch information
@recena
recena committed Dec 21, 2015
1 parent 2b84104 commit 290e8da
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 51 deletions.
61 changes: 29 additions & 32 deletions ...n/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp.jelly
View file
Expand Up @@ -101,7 +101,7 @@
{{#if build.isSuccess}}
{{#if ${!from.triggerOnlyLatestJob}}}
<j:if test="${from.hasBuildPermission()}">
<span class="pointer trigger" onclick="buildPipeline.showSpinner({{id}}); buildPipeline.rerunBuild({{id}}, '{{build.extId}}', [{{build.dependencyIds}}])">
<span onclick="buildPipeline.showSpinner({{id}}); buildPipeline.rerunBuild({{id}}, '{{build.extId}}', [{{build.dependencyIds}}])">
<img title="re-run" alt="re-run" src="${rootURL}/images/16x16/redo.png" />
</span>
</j:if>
Expand All @@ -110,18 +110,18 @@
{{#if ${from.triggerOnlyLatestJob}}}
{{#if build.isLatestBuild}}
{{#if build.isUpstreamBuildLatest}}
<span class="pointer trigger" onclick="buildPipeline.showSpinner({{id}}); buildPipeline.rerunBuild({{id}}, '{{build.extId}}', [{{build.dependencyIds}}])">
<span onclick="buildPipeline.showSpinner({{id}}); buildPipeline.rerunBuild({{id}}, '{{build.extId}}', [{{build.dependencyIds}}])">
<img title="retry" alt="retry" src="${rootURL}/images/16x16/redo.png" />
</span>
{{/if}}
{{/if}}
{{else}}
{{#if build.isManual}}
<span class="pointer trigger" onclick="buildPipeline.showSpinner({{id}}); buildPipeline.triggerBuild({{id}}, '{{upstream.projectName}}', {{upstream.buildNumber}}, '{{project.name}}', [{{build.dependencyIds}}])">
<img title="retry" alt="retry" src="${rootURL}/images/16x16/redo.png" />
<span onclick="buildPipeline.showSpinner({{id}}); buildPipeline.triggerBuild({{id}}, '{{upstream.projectName}}', {{upstream.buildNumber}}, '{{project.name}}', [{{build.dependencyIds}}])">
<img title="retry" alt="retry" src="${rootURL}/images/16x16/clock.png" />
</span>
{{else}}
<span class="pointer trigger" onclick="buildPipeline.showSpinner({{id}}); buildPipeline.rerunBuild({{id}}, '{{build.extId}}', [{{build.dependencyIds}}])">
<span onclick="buildPipeline.showSpinner({{id}}); buildPipeline.rerunBuild({{id}}, '{{build.extId}}', [{{build.dependencyIds}}])">
<img title="retry" alt="retry" src="${rootURL}/images/16x16/redo.png" />
</span>
{{/if}}
Expand All @@ -132,12 +132,12 @@
{{#if build.isReadyToBeManuallyBuilt}}
{{#if ${from.triggerOnlyLatestJob}}}
{{#if build.isUpstreamBuildLatestSuccess}}
<span class="pointer trigger" onclick="buildPipeline.showSpinner({{id}}); buildPipeline.triggerBuild({{id}}, '{{upstream.projectName}}', {{upstream.buildNumber}}, '{{project.name}}', [{{build.dependencyIds}}])">
<span onclick="buildPipeline.showSpinner({{id}}); buildPipeline.triggerBuild({{id}}, '{{upstream.projectName}}', {{upstream.buildNumber}}, '{{project.name}}', [{{build.dependencyIds}}])">
<img title="trigger" alt="trigger" src="${rootURL}/images/16x16/clock.png" />
</span>
{{/if}}
{{else}}
<span class="pointer trigger" onclick="buildPipeline.showSpinner({{id}}); buildPipeline.triggerBuild({{id}}, '{{upstream.projectName}}', {{upstream.buildNumber}}, '{{project.name}}', [{{build.dependencyIds}}])">
<span onclick="buildPipeline.showSpinner({{id}}); buildPipeline.triggerBuild({{id}}, '{{upstream.projectName}}', {{upstream.buildNumber}}, '{{project.name}}', [{{build.dependencyIds}}])">
<img title="trigger" alt="trigger" src="${rootURL}/images/16x16/clock.png" />
</span>
{{/if}}
Expand All @@ -155,28 +155,31 @@

<script id="project-card-template" type="text/x-handlebars-template">
<div class="build-card rounded">
<div class="header-alt">
<a href="${rootURL}/{{url}}" title="{{name}}" style="background: url('${rootURL}/images/24x24/{{health}}')
no-repeat 4px center; padding-left: 32px">{{name}}</a>
<div class="header">
<a href="${rootURL}/{{url}}" title="{{name}}">{{name}}</a>
</div>
<div>
<ul>
<li>Health: <img src="${rootURL}/images/16x16/{{health}}" /></li>
<j:if test="${from.isShowPipelineParametersInHeaders()}">
{{#if lastSuccessfulBuildNumber}}
<li>Execution: <a href="${rootURL}/{{url}}{{lastSuccessfulBuildNumber}}">
#{{lastSuccessfulBuildNumber}}</a></li>
{{/if}}
</j:if>
</ul>
<j:if test="${from.isShowPipelineParametersInHeaders()}">
{{#if lastSuccessfulBuildNumber}}
<a href="${rootURL}/{{url}}{{lastSuccessfulBuildNumber}}"> (#{{lastSuccessfulBuildNumber}})</a>
<ul>
{{#each lastSuccessfulBuildParams}}
<li>{{paramName}}: {{paramValue}}</li>
{{/each}}
</ul>
{{else}}
<span>Awaiting Execution</span>
{{/if}}
</j:if>
</div>
<div>
<j:if test="${from.isShowPipelineParametersInHeaders()}">
{{#if lastSuccessfulBuildNumber}}
<ul>
{{#each lastSuccessfulBuildParams}}
<li>{{paramName}}: {{paramValue}}</li>
{{/each}}
</ul>
{{else}}
<span>Awaiting Execution</span>
{{/if}}
</j:if>
</div>
</div>
</script>

Expand All @@ -186,11 +189,6 @@
var projectCardTemplateSource = jQuery("#project-card-template").html();
var buildPipeline = new BuildPipeline(buildPipelineViewProxy, Handlebars.compile(buildCardTemplateSource), Handlebars.compile(projectCardTemplateSource), ${from.getRefreshFrequencyInMillis()});
</script>
<style>
.trigger {
background: url("${rootURL}/images/16x16/clock.png") no-repeat center center !important;
}
</style>
<form method="post" action="gridBuilder/build" id="triggerPipelineForm" class="no-json"/>
<form method="post" name="pipelineViewForm" action="manualExecution" id="manualExecutionForm">

Expand Down Expand Up @@ -327,8 +325,8 @@
</j:if>


<j:forEach items="${buildPipelineForm.getBuildGrids()}" var="buildGrid" indexVar="i">
<div class="pipeline-wrapper">
<j:forEach items="${buildPipelineForm.getBuildGrids()}" var="buildGrid" indexVar="i">
<div class="pipeline-info">
<div class="revision rounded">
<j:choose>
Expand Down Expand Up @@ -429,9 +427,8 @@
</tbody>
</table>
</div>
</j:forEach>
</div>

</j:forEach>
</div>
</form>
</j:jelly>
33 changes: 14 additions & 19 deletions src/main/webapp/css/main.css
View file
Expand Up @@ -146,7 +146,7 @@ div.pipeline-wrapper div.pipeline {

.build-card .build-info div {
padding: 0 0 0 20px;
margin: 0 0 2px 0;
margin: 0 0 4px 0;
font-size: 11px;
text-align: left;
font-weight: normal;
Expand All @@ -173,29 +173,15 @@ div.pipeline-wrapper div.pipeline {
background: rgba(255, 255, 255, 0.7);
color: #333;
padding: 4px 6px;
margin-bottom: 4px;
}

.build-card .header-alt {
background: rgba(255, 255, 255, 0.7);
color: #333;
margin-bottom: 4px;
margin-bottom: 8px;
text-align: left;
}

.build-card .header-alt a {
line-height: 28px;
padding: 5px 0;
}

.build-card .header a {
position: relative;
display: block;
margin: 0;
padding: 0;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
width: 100%;
}

Expand Down Expand Up @@ -223,6 +209,18 @@ div.pipeline-wrapper div.pipeline {
.build-card .build-actions .icons img {
width: 16px;
height: 16px;
cursor: pointer;
}

.build-card ul {
margin: 0;
padding: 0;
}

.build-card ul li {
list-style: none;
text-align: left;
line-height: 16px;
}

.param-name {
Expand Down Expand Up @@ -332,9 +330,6 @@ a:hover {
color: expression(this.parentNode.currentStyle['color']);
font-weight: inherit;
}
.pointer {
cursor: pointer;
}

.hidden {
display: none;
Expand Down

0 comments on commit 290e8da

Please sign in to comment.