Merge lp:~milo/linaro-license-protection/bug1183747 into lp:~linaro-automation/linaro-license-protection/trunk

Proposed by Milo Casagrande
Status: Merged
Approved by: Stevan Radaković
Approved revision: 214
Merged at revision: 212
Proposed branch: lp:~milo/linaro-license-protection/bug1183747
Merge into: lp:~linaro-automation/linaro-license-protection/trunk
Diff against target: 47 lines (+11/-10)
1 file modified
templates/dir_template.html (+11/-10)
To merge this branch: bzr merge lp:~milo/linaro-license-protection/bug1183747
Reviewer Review Type Date Requested Status
Stevan Radaković Approve
Review via email: mp+181352@code.launchpad.net

Description of the change

The MP adds:
- an "align=center" for the License colum, now the text should be correctly aligned
- an onmouseover and onmouseout event on all the rows in the table (apart from the first one with the Parent directory link), so that the row is highlighted when passing over it
- fixes for the table header, the markup was not correct
- use of colspan instead of adding empty columns in a row

To post a comment you must log in.
Revision history for this message
Stevan Radaković (stevanr) wrote :

Looks good.
Approve +1.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'templates/dir_template.html'
2--- templates/dir_template.html 2013-05-10 09:44:09 +0000
3+++ templates/dir_template.html 2013-08-21 16:35:48 +0000
4@@ -3,24 +3,25 @@
5 {% block content %}
6 {{ header_content|safe }}
7 <table>
8- <tr>
9- <th></th><th>Name</th><th>Last modified</th><th>Size</th><th>License</th>
10- <tr><th colspan="5"><hr></th>
11- </tr>
12+ <thead>
13+ <tr>
14+ <th></th><th>Name</th><th>Last modified</th><th>Size</th><th>License</th>
15+ </tr>
16+ <tr>
17+ <th colspan="5"><hr></th>
18+ </tr>
19+ </thead>
20 {% if up_dir != None %}
21 <tr>
22 <td>
23 <img src="{{ STATIC_URL }}/static/go-up.png" alt="Parent Directory"/>
24 </td>
25- <td><a href="{{ up_dir }}">Parent Directory</a></td>
26- <td></td>
27- <td></td>
28- <td></td>
29+ <td colspan="0"><a href="{{ up_dir }}">Parent Directory</a></td>
30 </tr>
31 {% endif %}
32
33 {% for value in dirlist %}
34- <tr>
35+ <tr onmouseover="this.style.background='#CBE68F'" onmouseout="this.style.background='#FFFFFF'">
36 <td valign="top">
37 <img src="{{ STATIC_URL }}/static/{{ value.type }}.png"
38 alt="{{ value.type }}"/>
39@@ -37,7 +38,7 @@
40 <td align="center">
41 {% if value.type != 'folder' %}{{ value.size }}{% endif %}
42 </td>
43- <td>
44+ <td align="center">
45 {% if value.license_digest_list == "OPEN" %}
46 <i>open</i>
47 {% else %}

Subscribers

People subscribed via source and target branches