Merge lp:~mabac/launchpad-work-items-tracker/move-card-healh-check into lp:~linaro-automation/launchpad-work-items-tracker/linaro

[Mattias Backman]

Hi,

This branch moves the roadmap card health check to the top right as requested by Kiko.

Thanks,

Mattias

[Guilherme Salgado (salgado)]

 review approve

On Fri, 2011-12-09 at 10:44 +0000, Mattias Backman wrote:
[...]
> === modified file 'templates/roadmap_card.html'
> --- templates/roadmap_card.html 2011-11-30 20:38:49 +0000
> +++ templates/roadmap_card.html 2011-12-09 10:43:21 +0000
> @@ -11,6 +11,18 @@
> </%def>
>
> <h1>${title()}</h1>
> +<div style="float: right">
> +<h3>Health check</h3>
> +
> +<table>${'<tr colspan="2"><td><font color="#FF0000"><b>Needs attention!</b></font></td></tr>' if not card.is_healthy else ''}
> + % for result in health_checks:
> + <tr ${'bgcolor="#FFAAAA"' if result['result'] == 'Not OK' else 'bgcolor="#FFFFFF"'}>
> + <td>${result['name']}</td>
> + <td>${result['result']}</td>
> +</tr>
> +% endfor

The indentation of the two lines above is off by 2 levels and 1 level
respectively. Care to fix it? :)

> +</table>
> +</div>

review: Approve

[lp:~mabac/launchpad-work-items-tracker/move-card-healh-check]

312. By Mattias Backman on 2011-12-13

Fix indentation in card html template.

[Mattias Backman (mabac)]

> review approve
>
> On Fri, 2011-12-09 at 10:44 +0000, Mattias Backman wrote:
> [...]
> > === modified file 'templates/roadmap_card.html'
> > --- templates/roadmap_card.html 2011-11-30 20:38:49 +0000
> > +++ templates/roadmap_card.html 2011-12-09 10:43:21 +0000
> > @@ -11,6 +11,18 @@
> > </%def>
> >
> > <h1>${title()}</h1>
> > +<div style="float: right">
> > +<h3>Health check</h3>
> > +
> > +<table>${'<tr colspan="2"><td><font color="#FF0000"><b>Needs
> attention!</b></font></td></tr>' if not card.is_healthy else ''}
> > + % for result in health_checks:
> > + <tr ${'bgcolor="#FFAAAA"' if result['result'] == 'Not OK' else
> 'bgcolor="#FFFFFF"'}>
> > + <td>${result['name']}</td>
> > + <td>${result['result']}</td>
> > +</tr>
> > +% endfor
>
> The indentation of the two lines above is off by 2 levels and 1 level
> respectively. Care to fix it? :)

Absolutely, thanks for catching that too!

>
> > +</table>
> > +</div>

=== modified file 'templates/roadmap_card.html'
--- templates/roadmap_card.html	2011-11-30 20:38:49 +0000
+++ templates/roadmap_card.html	2011-12-13 09:59:26 +0000
@@ -11,6 +11,18 @@
 </%def>
 
 <h1>${title()}</h1>
+<div style="float: right">
+<h3>Health check</h3>
+
+<table>${'<tr colspan="2"><td><font color="#FF0000"><b>Needs attention!</b></font></td></tr>' if not card.is_healthy else ''}
+% for result in health_checks:
+    <tr ${'bgcolor="#FFAAAA"' if result['result'] == 'Not OK' else 'bgcolor="#FFFFFF"'}>
+        <td>${result['name']}</td>
+        <td>${result['result']}</td>
+    </tr>
+% endfor
+</table>
+</div>
 <h2>${card.status} in <a href="roadmap-${lane}.html">${lane}</a></h2>
 <p>
 <ul>
@@ -21,7 +33,7 @@
     <li>Team: ${card.team}
 </ul>
 
-<div style="text-align: center">Overall blueprint completion</div>
+<div style="clear:both; text-align: center">Overall blueprint completion</div>
 ${util.progress_bar(blueprint_status_count) if card_has_blueprints else '<center><i>Progress graph pending linked blueprints.</i></center>'}
 
 <h3>Description</h3> ${card.description if card.description is not None else '<i>No description could be found.</i>'}
@@ -54,13 +66,3 @@
 </table>
 % endif
 
-<h3>Health check</h3>
-
-<table>${'<tr colspan="2"><td><font color="#FF0000"><b>Needs attention!</b></font></td></tr>' if not card.is_healthy else ''}
- % for result in health_checks:
-    <tr ${'bgcolor="#FFAAAA"' if result['result'] == 'Not OK' else 'bgcolor="#FFFFFF"'}>
-        <td>${result['name']}</td>
-        <td>${result['result']}</td>
-</tr>
-% endfor
-</table>