Merge lp:~allenap/launchpad/remove-too-many-download-icons-bug-423105 into lp:launchpad

Proposed by Gavin Panella
Status: Merged
Approved by: Brad Crittenden
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~allenap/launchpad/remove-too-many-download-icons-bug-423105
Merge into: lp:launchpad
Diff against target: None lines
To merge this branch: bzr merge lp:~allenap/launchpad/remove-too-many-download-icons-bug-423105
Reviewer Review Type Date Requested Status
Brad Crittenden (community) release-critical Approve
Jonathan Lange (community) Approve
Martin Albisetti (community) Approve
Review via email: mp+12237@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Gavin Panella (allenap) wrote :

This changes the use of the "download" CSS class to "download-attachment". The "download" class is used for sprites now. The "download-attachment" class remains as it's useful for testing.

Lint free.

bin/test -vvt bugattachment

Revision history for this message
Martin Albisetti (beuno) wrote :

Perfect fix, thank you.

review: Approve
Revision history for this message
Jonathan Lange (jml) wrote :

I'm happy with the code change. I'm not competent to verify the semantics of the CSS change, and you need an RC from bac if you want it to land for this release.

review: Approve
Revision history for this message
Brad Crittenden (bac) :
review: Approve (release-critical)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/bugs/stories/bugattachments/10-add-bug-attachment.txt'
2--- lib/lp/bugs/stories/bugattachments/10-add-bug-attachment.txt 2009-08-28 14:31:15 +0000
3+++ lib/lp/bugs/stories/bugattachments/10-add-bug-attachment.txt 2009-09-22 16:35:00 +0000
4@@ -35,7 +35,7 @@
5 We can check that the attachment is there
6
7 >>> attachments = find_portlet(user_browser.contents, 'Bug attachments')
8- >>> for li_tag in attachments.findAll('li', 'download'):
9+ >>> for li_tag in attachments.findAll('li', 'download-attachment'):
10 ... print li_tag.a.renderContents()
11 Some information
12
13@@ -66,7 +66,7 @@
14 'http://bugs.launchpad.dev/firefox/+bug/1'
15
16 >>> attachments = find_portlet(user_browser.contents, 'Bug attachments')
17- >>> for li_tag in attachments.findAll('li', 'download'):
18+ >>> for li_tag in attachments.findAll('li', 'download-attachment'):
19 ... print li_tag.a.renderContents()
20 Some information
21 bar.txt
22
23=== modified file 'lib/lp/bugs/stories/bugattachments/xx-delete-bug-attachment.txt'
24--- lib/lp/bugs/stories/bugattachments/xx-delete-bug-attachment.txt 2009-09-18 15:24:30 +0000
25+++ lib/lp/bugs/stories/bugattachments/xx-delete-bug-attachment.txt 2009-09-22 16:35:00 +0000
26@@ -17,7 +17,7 @@
27 >>> user_browser.open('http://launchpad.dev/bugs/2')
28 >>> attachment_portlet = find_portlet(
29 ... user_browser.contents, 'Bug attachments')
30- >>> for li in attachment_portlet.findAll('li', 'download'):
31+ >>> for li in attachment_portlet.findAll('li', 'download-attachment'):
32 ... print li.a.renderContents()
33 Great deal
34
35
36=== modified file 'lib/lp/bugs/stories/bugattachments/xx-display-filesize-attachment.txt'
37--- lib/lp/bugs/stories/bugattachments/xx-display-filesize-attachment.txt 2009-08-28 14:31:15 +0000
38+++ lib/lp/bugs/stories/bugattachments/xx-display-filesize-attachment.txt 2009-09-22 16:35:00 +0000
39@@ -20,7 +20,7 @@
40 >>> last_comment = find_tags_by_class(
41 ... user_browser.contents, 'boardCommentBody')[-1]
42 >>> fileinfo = '(270 bytes, text/plain)'
43- >>> for attachment in last_comment('li', {'class': 'download'}):
44+ >>> for attachment in last_comment('li', 'download-attachment'):
45 ... print extract_text(attachment)
46 description text
47 (270 bytes, text/plain)
48@@ -51,7 +51,7 @@
49 >>> last_comment = find_tags_by_class(
50 ... user_browser.contents, 'boardCommentBody')[-1]
51 >>> fileinfo = '(270 bytes, text/plain)'
52- >>> for attachment in last_comment('li', {'class': 'download'}):
53+ >>> for attachment in last_comment('li', 'download-attachment'):
54 ... print extract_text(attachment)
55 description text
56 (2.6 KiB, text/plain)
57
58=== modified file 'lib/lp/bugs/templates/bug-portlet-attachments.pt'
59--- lib/lp/bugs/templates/bug-portlet-attachments.pt 2009-09-10 16:13:39 +0000
60+++ lib/lp/bugs/templates/bug-portlet-attachments.pt 2009-09-22 16:35:00 +0000
61@@ -6,7 +6,7 @@
62 tal:condition="context/attachments">
63 <h2>Bug attachments</h2>
64 <ul>
65- <li class="download"
66+ <li class="download-attachment"
67 tal:repeat="attachment context/attachments">
68 <a tal:attributes="href attachment/libraryfile/http_url"
69 tal:content="attachment/title"
70
71=== modified file 'lib/lp/bugs/templates/bugcomment-box.pt'
72--- lib/lp/bugs/templates/bugcomment-box.pt 2009-09-01 17:41:53 +0000
73+++ lib/lp/bugs/templates/bugcomment-box.pt 2009-09-22 16:35:00 +0000
74@@ -55,7 +55,7 @@
75
76 <div class="boardCommentBody">
77 <ul tal:condition="comment/bugattachments" style="margin-bottom: 1em">
78- <li tal:repeat="attachment comment/bugattachments" class="download">
79+ <li tal:repeat="attachment comment/bugattachments" class="download-attachment">
80 <a tal:attributes="href attachment/libraryfile/http_url"
81 tal:content="attachment/title" class="sprite download-icon">foo.txt</a>
82 (<span