Skip to content

Commit

Permalink
Merge branch 'i118' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
@gschueler
gschueler committed Dec 18, 2010
2 parents e71da01 + 9b0ce7a commit 3d438ac
Show file tree
Hide file tree
Showing 6 changed files with 81 additions and 39 deletions.
5 changes: 5 additions & 0 deletions rundeckapp/grails-app/i18n/messages.properties
View file
Expand Up @@ -177,7 +177,12 @@ events.history.title.Name=Name
events.history.title.Summary=Summary
events.history.title.Completed=Completed
events.history.title.PercentCompleted=Percent Completed
events.history.title.PercentFailed=Percent Failed
events.history.jobname.adhoc=adhoc
events.history.title.Success=Success
events.history.title.Failed=Failed
events.history.title.FailureRate=Failure Rate
events.history.title.Nodes=Nodes

status.label.succeed=Succeeded
status.label.fail=Failed
Expand Down
8 changes: 4 additions & 4 deletions rundeckapp/grails-app/views/common/_progressBar.gsp
View file
@@ -1,8 +1,8 @@
<div id="${containerId}" class="progressContainer small ${className}" >
<div id="${containerId}" class="progressContainer small ${className} ${(!completePercent || completePercent < 1 ) ? 'empty':''}" >
<div
id="${barId}"
class="progressBar ${(!completePercent || completePercent < 1 ) ? 'empty':''} ${className} ${completePercent>=100?:'full'}"
class="progressBar ${(!completePercent || completePercent < 1 ) ? 'empty':''} ${className} ${completePercent>=100?'full':''}"
title="${title}"
style="width:${completePercent>100?'100':completePercent}"
><g:if test="${showpercent}">${completePercent>100?'100':completePercent}%</g:if>${completePercent<100?remaining:''}</div>
style="width:${completePercent>100?'100':completePercent<10?40:completePercent}"
><div class="progresscontent"><g:if test="${showpercent}">${completePercent>100?'100':completePercent}%</g:if>${completePercent<100?remaining:''}${innerContent}</div></div>
</div>
6 changes: 3 additions & 3 deletions rundeckapp/grails-app/views/framework/_nodes.gsp
View file
Expand Up @@ -66,9 +66,9 @@
</g:elseif>

<g:if test="${expanddetail}">
<g:link controller="reports" action="index" params="${[nodeFilter:node.nodename]}" title="View History for Node ${node.nodename}">
&raquo; history
</g:link>
%{--<g:link controller="reports" action="index" params="${[nodeFilter:node.nodename]}" title="View History for Node ${node.nodename}">--}%
<!--&raquo; history-->
%{--</g:link>--}%
<div id="${ukey}node_detail_${i}" class="detail_content nodedetail" style="display:none">
<g:render template="nodeDetailsSimple" model="[node:node,key:ukey+'_'+node.nodename+'_key',projects:nodedata.projects]"/>
</div>
Expand Down
48 changes: 31 additions & 17 deletions rundeckapp/grails-app/views/reports/_baseReport.gsp
View file
Expand Up @@ -16,29 +16,22 @@
def j = 0;
%>
<g:set var="maxmsgsize" value="${options.evtmaxsize?options.evtmaxsize:options.msgsplitsize?options.msgsplitsize:-1}"/>
<g:set var="maxtitlesize" value="${40}"/>
<g:set var="maxtitlesize" value="${20}"/>
<table cellpadding="0" cellspacing="0" class="jobsList list" >
<col style="width:16px;"/>
<col style="width:16px;"/>
<col style="width:50px;"/>
<col style="width:18px;"/>
<col />
<col style="width:60px;"/>
<col style="width:100px;"/>
<col style="width:10ex;"/>
<thead>

<tr>
<th colspan="2"></th>
<th colspan="1"></th>
<th><g:message code="events.history.title.Name"/></th>
<th><g:message code="events.history.title.Nodes"/></th>
<th colspan="1"><g:message code="events.history.title.Summary"/></th>

<g:if test="${options.tags}">
<th><g:message code="jobquery.title.tagsFilter"/></th>
</g:if>
<th><g:message code="jobquery.title.projFilter"/></th>
<th><g:message code="jobquery.title.userFilter"/></th>
<th><g:message code="events.history.title.Completed"/></th>
<th><g:message code="events.history.title.FailureRate"/></th>
<th><g:message code="jobquery.title.endFilter"/></th>
</tr>
</thead>
Expand All @@ -51,9 +44,14 @@
</span>
</td>

<td style="width:16px;" class="${it?.status} statusmessage">
<g:message code="${it?.status=='succeed'?'status.label.short.OK':'status.label.short.FAIL'}"/>
</td>
<g:set var="vals" value="${['?','?','?']}"/>
<g:if test="${it instanceof ExecReport}">
<g:if test="${it?.node=~/^\d+\/\d+\/\d+$/}">
<g:set var="vals" value="${it.node.split('/')}"/>
</g:if>
</g:if>


<td class="eventtitle ${rpt?.jcJobId?'job':'adhoc'}">
<g:if test="${rpt?.reportId }">
<g:truncate max="${maxtitlesize}" front="true">${rpt?.reportId.encodeAsHTML()}</g:truncate>
Expand All @@ -66,6 +64,14 @@
<g:message code="events.history.jobname.adhoc"/>
</g:else>
</td>
<td style="white-space:nowrap;text-align:right;" class="${vals[1]!='0'?'fail':'ok'} nodecount">
<g:if test="${vals[1]!='0'}">
${vals[1]} failed
</g:if>
<g:else>
${vals[0]} ok
</g:else>
</td>

<td style="" class="eventsummary ${rpt?.jcJobId?'job':'adhoc'}">

Expand Down Expand Up @@ -111,16 +117,24 @@
<g:if test="${it instanceof ExecReport}">
<g:if test="${it?.node=~/^\d+\/\d+\/\d+$/}">
<g:set var="vals" value="${it.node.split('/')}"/>
<g:set var="summary" value=""/>
<g:if test="${vals.length>2 && vals[2]!='0'}">
<g:set var="a" value="${Integer.parseInt(vals[0])}"/>
<g:set var="den" value="${Integer.parseInt(vals[2])}"/>
<g:set var="perc" value="${Math.floor((a/den)*100)}"/>
<g:set var="fai" value="${Integer.parseInt(vals[1])}"/>
<g:set var="sucperc" value="${(int)Math.floor((a/den)*100)}"/>
<g:set var="perc" value="${(int)Math.floor((fai/den)*100)}"/>
<g:if test="${vals[0] && vals[2]}">
<g:set var="sucsummary" value="${vals[0]+' of '+vals[2]}"/>
<g:set var="summary" value="${vals[1]+' of '+vals[2]}"/>
</g:if>
</g:if>
<g:else>
<g:set var="perc" value="${0}"/>
</g:else>
<g:render template="/common/progressBar" model="${[completePercent:(int)perc,title:'Completed nodes',className:'nodes',showpercent:true]}"/>

<g:if test="${perc>0}">
<g:render template="/common/progressBar" model="${[completePercent:(int)perc,title:'Completed nodes',className:'nodes failure',showpercent:false,innerContent:summary]}"/>
</g:if>
</g:if>
</g:if>
</td>
Expand Down
17 changes: 8 additions & 9 deletions rundeckapp/grails-app/views/reports/_expandedReportContent.gsp
View file
Expand Up @@ -71,23 +71,25 @@
<g:if test="${it?.node=~/^\d+\/\d+\/\d+$/}">
<g:set var="vals" value="${it.node.split('/')}"/>
<g:if test="${vals.length>2 && vals[2]!='0'}">
<g:set var="a" value="${Integer.parseInt(vals[0])}"/>
<g:set var="den" value="${Integer.parseInt(vals[2])}"/>
<g:set var="perc" value="${Math.floor((a/den)*100)}"/>
<g:set var="suc" value="${Integer.parseInt(vals[0])}"/>
<g:set var="fail" value="${Integer.parseInt(vals[1])}"/>
<g:set var="tot" value="${Integer.parseInt(vals[2])}"/>
<g:set var="sucperc" value="${Math.floor((suc/tot)*100)}"/>
<g:set var="perc" value="${Math.floor((fail/tot)*100)}"/>
</g:if>
<g:else>
<g:set var="perc" value="${0}"/>
</g:else>
<span class="title"><g:message code="events.history.title.Completed"/>:</span>
<div class="rptitem">
<g:message code="events.history.title.PercentCompleted"/>: ${perc}%
<g:message code="events.history.title.PercentFailed"/>: ${perc}%

<div class="rptitem">
<div>
<g:message code="status.label.succeed"/>: ${vals[0]}
<g:message code="status.label.fail"/>: ${vals[1]}
</div>
<div>
<g:message code="status.label.fail"/>: ${vals[1]}
<g:message code="status.label.succeed"/>: ${vals[0]}
</div>
</div>
</div>
Expand All @@ -104,9 +106,6 @@
%{--</div>--}%
%{--</g:if>--}%

<g:if test="${it.reportId}">
<span class="info note">Report ID: ${it.reportId}</span>
</g:if>
</div>
</div>
</td>
Expand Down
36 changes: 30 additions & 6 deletions rundeckapp/web-app/css/main.css
View file
Expand Up @@ -844,8 +844,7 @@ div.progressContainer{
background: #ddd;
height:14px;
border:1px solid #aaa;
float:right;

position:relative;
}

div.progressContainer.small{
Expand All @@ -866,15 +865,31 @@ div.progressContainer.nodes{
border: 0;
}
div.progressBar.nodes{
background:#5d5;
background:#ccf;
border-right:2px solid #aaf;
}
div.progressBar.full{
border-right:0;
div.progressBar.nodes.failure{
background:#fcc;
border-right:2px solid #faa;
}
div.progressBar.empty{
div.progressBar.full,div.progressBar.full.nodes{
}
div.progressBar.empty, div.progressBar.empty.failure{
background:none;
border-right: 0;
}
div.progressContainer.empty.nodes{
border-right: 0;
}
div.progressContainer div.progressContent{
padding-top:2px;
padding-left: 5px;
position: absolute;
left:0;
right:0;
top:0;
width: 100%;
}

/* END execution output table */

Expand Down Expand Up @@ -1767,6 +1782,15 @@ tr.sectionhead td.statusmessage.fail{
tr.sectionhead td.statusmessage.succeed{
color:green;
}
tr.sectionhead td.nodecount.fail{
color:red;
font-weight:bold;
/*color:black;*/
/*background: #fcc;*/
}
tr.sectionhead td.nodecount.ok{
color: #555;
}

tr.subsection span.title{
color: #888;
Expand Down

0 comments on commit 3d438ac

Please sign in to comment.