Paired-With: Randall Hansen
Signed-off-by: Pieter van de Bruggen <[email protected]>
---
Local-branch: tickets/next/6989
app/views/reports/_log.html.haml | 29 +++++++++++------------
app/views/reports/_metrics.html.haml | 2 +-
app/views/reports/_resource_statuses.html.haml | 7 ++++-
3 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/app/views/reports/_log.html.haml b/app/views/reports/_log.html.haml
index 9c814a8..96668cf 100644
--- a/app/views/reports/_log.html.haml
+++ b/app/views/reports/_log.html.haml
@@ -1,18 +1,17 @@
.section
%h3 Log
- .section
- %table.inspector
- %thead
- %tr
- %th Level
- %th Message
- %th Source
- %th File
- %th Line
- %th Time
- %tbody
- - if report.logs.present?
+ - if report.logs.present?
+ .section
+ %table.inspector
+ %thead
+ %tr
+ %th Level
+ %th Message
+ %th Source
+ %th File
+ %th Line
+ %th Time
+ %tbody
= render :partial => 'puppet/util/logs/log', :collection =>
puppet_log_sorter(report.logs.compact)
- - else
- %td.empty{:colspan => 6}
- = describe_no_matches_for 'log messages', :report
+ - else
+ %p= describe_no_matches_for(:logs, :report)
diff --git a/app/views/reports/_metrics.html.haml
b/app/views/reports/_metrics.html.haml
index 5430a1e..e686738 100644
--- a/app/views/reports/_metrics.html.haml
+++ b/app/views/reports/_metrics.html.haml
@@ -7,4 +7,4 @@
%table.inspector
= render :partial => 'metrics/metrics_table', :locals => {:metrics
=> metrics_in_category}
- else
- — No metrics in this report —
+ %p= describe_no_matches_for(:metrics, :report)
diff --git a/app/views/reports/_resource_statuses.html.haml
b/app/views/reports/_resource_statuses.html.haml
index f0dac77..ee713ed 100644
--- a/app/views/reports/_resource_statuses.html.haml
+++ b/app/views/reports/_resource_statuses.html.haml
@@ -1,5 +1,5 @@
-- if report.resource_statuses.present?
- .section
+.section
+ - if report.resource_statuses.present?
%h3
Events
%a{ :href => '#', :class => 'expand-all' } (expand all)
@@ -22,3 +22,6 @@
%tr{:class => "status #{event.status}"}
%td= event.property
%td= popup_md5s( h event.message )
+ - else
+ %h3 Events
+ %p= describe_no_matches_for(:events, :report)
--
1.7.4.1
--
You received this message because you are subscribed to the Google Groups
"Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/puppet-dev?hl=en.
