diff --git a/rundeckapp/grails-app/i18n/messages.properties b/rundeckapp/grails-app/i18n/messages.properties
index 916294489ed..df35388ff6d 100644
--- a/rundeckapp/grails-app/i18n/messages.properties
+++ b/rundeckapp/grails-app/i18n/messages.properties
@@ -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
diff --git a/rundeckapp/grails-app/views/common/_progressBar.gsp b/rundeckapp/grails-app/views/common/_progressBar.gsp
index 9c3708a8f69..2dceacedf33 100644
--- a/rundeckapp/grails-app/views/common/_progressBar.gsp
+++ b/rundeckapp/grails-app/views/common/_progressBar.gsp
@@ -1,8 +1,8 @@
-
+
${completePercent>100?'100':completePercent}%${completePercent<100?remaining:''}
+ style="width:${completePercent>100?'100':completePercent<10?40:completePercent}"
+ >
${completePercent>100?'100':completePercent}%${completePercent<100?remaining:''}${innerContent}
\ No newline at end of file
diff --git a/rundeckapp/grails-app/views/framework/_nodes.gsp b/rundeckapp/grails-app/views/framework/_nodes.gsp
index 78553564d15..71bab6770c6 100644
--- a/rundeckapp/grails-app/views/framework/_nodes.gsp
+++ b/rundeckapp/grails-app/views/framework/_nodes.gsp
@@ -66,9 +66,9 @@
-
- » history
-
+ %{----}%
+
+ %{----}%
diff --git a/rundeckapp/grails-app/views/reports/_baseReport.gsp b/rundeckapp/grails-app/views/reports/_baseReport.gsp
index 9ba943ea413..b663d902fbe 100644
--- a/rundeckapp/grails-app/views/reports/_baseReport.gsp
+++ b/rundeckapp/grails-app/views/reports/_baseReport.gsp
@@ -16,21 +16,14 @@
def j = 0;
%>
-
+
-
-
-
-
-
-
-
-
- |
+ |
|
+ |
|
@@ -38,7 +31,7 @@
|
|
- |
+ |
|
@@ -51,9 +44,14 @@
-
-
- |
+
+
+
+
+
+
+
+
${rpt?.reportId.encodeAsHTML()}
@@ -66,6 +64,14 @@
|
+
+
+ ${vals[1]} failed
+
+
+ ${vals[0]} ok
+
+ |
@@ -111,16 +117,24 @@
+
-
+
+
+
+
+
+
+
-
-
+
+
+
|
diff --git a/rundeckapp/grails-app/views/reports/_expandedReportContent.gsp b/rundeckapp/grails-app/views/reports/_expandedReportContent.gsp
index 817d52a70d6..f2190708d35 100644
--- a/rundeckapp/grails-app/views/reports/_expandedReportContent.gsp
+++ b/rundeckapp/grails-app/views/reports/_expandedReportContent.gsp
@@ -71,23 +71,25 @@
-
-
-
+
+
+
+
+
:
-
: ${perc}%
+
: ${perc}%
- : ${vals[0]}
+ : ${vals[1]}
- : ${vals[1]}
+ : ${vals[0]}
@@ -104,9 +106,6 @@
%{----}%
%{----}%
-
- Report ID: ${it.reportId}
-
diff --git a/rundeckapp/web-app/css/main.css b/rundeckapp/web-app/css/main.css
index 6368c5e588b..ca12cbad9fb 100644
--- a/rundeckapp/web-app/css/main.css
+++ b/rundeckapp/web-app/css/main.css
@@ -844,8 +844,7 @@ div.progressContainer{
background: #ddd;
height:14px;
border:1px solid #aaa;
- float:right;
-
+ position:relative;
}
div.progressContainer.small{
@@ -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 */
@@ -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;