Merge lp:~allenap/launchpad/ui-convert-bug-portlet-x-3.0-bug-427275 into lp:launchpad
- ui-convert-bug-portlet-x-3.0-bug-427275
- Merge into devel
Proposed by
Gavin Panella
Status: | Merged |
---|---|
Merged at revision: | not available |
Proposed branch: | lp:~allenap/launchpad/ui-convert-bug-portlet-x-3.0-bug-427275 |
Merge into: | lp:launchpad |
Diff against target: | None lines |
To merge this branch: | bzr merge lp:~allenap/launchpad/ui-convert-bug-portlet-x-3.0-bug-427275 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Paul Hummer (community) | Approve | ||
Review via email: mp+11558@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
Gavin Panella (allenap) wrote : | # |
Revision history for this message
Paul Hummer (rockstar) wrote : | # |
Thanks for the branch!
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'lib/lp/bugs/browser/configure.zcml' | |||
2 | --- lib/lp/bugs/browser/configure.zcml 2009-09-09 09:00:58 +0000 | |||
3 | +++ lib/lp/bugs/browser/configure.zcml 2009-09-10 16:14:04 +0000 | |||
4 | @@ -1007,9 +1007,6 @@ | |||
5 | 1007 | name="+portlet-duplicates" | 1007 | name="+portlet-duplicates" |
6 | 1008 | template="../templates/bug-portlet-duplicates.pt"/> | 1008 | template="../templates/bug-portlet-duplicates.pt"/> |
7 | 1009 | <browser:page | 1009 | <browser:page |
8 | 1010 | name="+portlet-cve" | ||
9 | 1011 | template="../templates/bug-portlet-cve.pt"/> | ||
10 | 1012 | <browser:page | ||
11 | 1013 | name="+portlet-attachments" | 1010 | name="+portlet-attachments" |
12 | 1014 | template="../templates/bug-portlet-attachments.pt"/> | 1011 | template="../templates/bug-portlet-attachments.pt"/> |
13 | 1015 | <browser:page | 1012 | <browser:page |
14 | 1016 | 1013 | ||
15 | === modified file 'lib/lp/bugs/stories/bugs/xx-bug-create-question.txt' | |||
16 | --- lib/lp/bugs/stories/bugs/xx-bug-create-question.txt 2009-09-04 09:45:19 +0000 | |||
17 | +++ lib/lp/bugs/stories/bugs/xx-bug-create-question.txt 2009-09-10 20:38:38 +0000 | |||
18 | @@ -93,7 +93,7 @@ | |||
19 | 93 | Bug #10: | 93 | Bug #10: |
20 | 94 | 94 | ||
21 | 95 | >>> portlet = find_portlet(user_browser.contents, 'Related questions') | 95 | >>> portlet = find_portlet(user_browser.contents, 'Related questions') |
23 | 96 | >>> question_anchor = portlet.div.a | 96 | >>> question_anchor = portlet.a |
24 | 97 | >>> question_anchor | 97 | >>> question_anchor |
25 | 98 | <a href=".../ubuntu/+source/linux-source-2.6.15/+question/...">another | 98 | <a href=".../ubuntu/+source/linux-source-2.6.15/+question/...">another |
26 | 99 | test bug</a> | 99 | test bug</a> |
27 | 100 | 100 | ||
28 | === modified file 'lib/lp/bugs/templates/bug-portlet-attachments.pt' | |||
29 | --- lib/lp/bugs/templates/bug-portlet-attachments.pt 2009-07-17 17:59:07 +0000 | |||
30 | +++ lib/lp/bugs/templates/bug-portlet-attachments.pt 2009-09-10 16:13:39 +0000 | |||
31 | @@ -1,37 +1,27 @@ | |||
32 | 1 | <div | 1 | <div |
42 | 2 | xmlns:tal="http://xml.zope.org/namespaces/tal" | 2 | xmlns:tal="http://xml.zope.org/namespaces/tal" |
43 | 3 | xmlns:metal="http://xml.zope.org/namespaces/metal" | 3 | xmlns:metal="http://xml.zope.org/namespaces/metal" |
44 | 4 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" | 4 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" |
45 | 5 | class="portlet" id="portlet-attachments" | 5 | class="portlet" id="portlet-attachments" |
46 | 6 | tal:condition="context/attachments" | 6 | tal:condition="context/attachments"> |
38 | 7 | tal:define="current_task view/current_bugtask; | ||
39 | 8 | url current_task/fmt:url" | ||
40 | 9 | > | ||
41 | 10 | |||
47 | 11 | <h2>Bug attachments</h2> | 7 | <h2>Bug attachments</h2> |
73 | 12 | 8 | <ul> | |
74 | 13 | <div class="portletBody"> | 9 | <li class="download" |
75 | 14 | <div class="portletContent"> | 10 | tal:repeat="attachment context/attachments"> |
76 | 15 | <ul> | 11 | <a tal:attributes="href attachment/libraryfile/http_url" |
77 | 16 | <li class="download" | 12 | tal:content="attachment/title" |
78 | 17 | tal:repeat="attachment context/attachments"> | 13 | class="sprite download-icon"> |
79 | 18 | <a tal:attributes="href attachment/libraryfile/http_url" | 14 | Attachment Title |
80 | 19 | tal:content="attachment/title" | 15 | </a> |
81 | 20 | class="sprite download-icon"> | 16 | <small> |
82 | 21 | Attachment Title | 17 | (<a tal:attributes="href attachment/fmt:url">edit</a>) |
83 | 22 | </a> | 18 | </small> |
84 | 23 | <small> | 19 | </li> |
85 | 24 | (<a tal:attributes="href attachment/fmt:url">edit</a>) | 20 | </ul> |
86 | 25 | </small> | 21 | <ul> |
87 | 26 | </li> | 22 | <li> |
88 | 27 | </ul> | 23 | <a tal:attributes="href view/current_bugtask/fmt:url/+addcomment" |
89 | 28 | <ul style="text-align: right"> | 24 | class="sprite add">Add</a> |
90 | 29 | <li> | 25 | </li> |
91 | 30 | <a tal:attributes="href string:$url/+addcomment" class="sprite add"> | 26 | </ul> |
67 | 31 | Add | ||
68 | 32 | </a> | ||
69 | 33 | </li> | ||
70 | 34 | </ul> | ||
71 | 35 | </div> | ||
72 | 36 | </div> | ||
92 | 37 | </div> | 27 | </div> |
93 | 38 | 28 | ||
94 | === removed file 'lib/lp/bugs/templates/bug-portlet-cve.pt' | |||
95 | --- lib/lp/bugs/templates/bug-portlet-cve.pt 2009-07-17 17:59:07 +0000 | |||
96 | +++ lib/lp/bugs/templates/bug-portlet-cve.pt 1970-01-01 00:00:00 +0000 | |||
97 | @@ -1,25 +0,0 @@ | |||
98 | 1 | <div | ||
99 | 2 | xmlns:tal="http://xml.zope.org/namespaces/tal" | ||
100 | 3 | xmlns:metal="http://xml.zope.org/namespaces/metal" | ||
101 | 4 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" | ||
102 | 5 | class="portlet" id="portlet-cve" tal:condition="context/cves" | ||
103 | 6 | tal:define="current_task view/current_bugtask; | ||
104 | 7 | url current_task/fmt:url" | ||
105 | 8 | > | ||
106 | 9 | <h2> | ||
107 | 10 | <abbr title="Common Vulnerabilities and Exposures index">CVE</abbr> | ||
108 | 11 | references | ||
109 | 12 | </h2> | ||
110 | 13 | <div class="portletBody"> | ||
111 | 14 | |||
112 | 15 | <ul> | ||
113 | 16 | <li class="cve" tal:repeat="cve context/cves"> | ||
114 | 17 | <a tal:attributes="href cve/fmt:url; | ||
115 | 18 | title cve/description/fmt:shorten/40" | ||
116 | 19 | tal:content="cve/sequence" | ||
117 | 20 | >2002-1342</a> | ||
118 | 21 | </li> | ||
119 | 22 | </ul> | ||
120 | 23 | |||
121 | 24 | </div> | ||
122 | 25 | </div> | ||
123 | 26 | 0 | ||
124 | === modified file 'lib/lp/bugs/templates/bug-portlet-duplicates.pt' | |||
125 | --- lib/lp/bugs/templates/bug-portlet-duplicates.pt 2009-07-17 17:59:07 +0000 | |||
126 | +++ lib/lp/bugs/templates/bug-portlet-duplicates.pt 2009-09-10 16:13:39 +0000 | |||
127 | @@ -1,22 +1,15 @@ | |||
128 | 1 | <div | 1 | <div |
136 | 2 | xmlns:tal="http://xml.zope.org/namespaces/tal" | 2 | xmlns:tal="http://xml.zope.org/namespaces/tal" |
137 | 3 | xmlns:metal="http://xml.zope.org/namespaces/metal" | 3 | xmlns:metal="http://xml.zope.org/namespaces/metal" |
138 | 4 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" | 4 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" |
139 | 5 | class="portlet" id="portlet-duplicates" | 5 | class="portlet" id="portlet-duplicates" |
140 | 6 | tal:condition="context/duplicates" | 6 | tal:condition="context/duplicates"> |
134 | 7 | > | ||
135 | 8 | |||
141 | 9 | <h2>Duplicates of this bug</h2> | 7 | <h2>Duplicates of this bug</h2> |
154 | 10 | 8 | <ul> | |
155 | 11 | <div class="portletBody"> | 9 | <li tal:repeat="dupe view/duplicates"> |
156 | 12 | <div class="portletContent"> | 10 | <a tal:content="string: Bug #${dupe/id}" |
157 | 13 | <div tal:repeat="dupe view/duplicates"> | 11 | tal:attributes="href dupe/url; title dupe/title; |
158 | 14 | <a tal:attributes="href dupe/url; | 12 | class context/image:sprite_css" /> |
159 | 15 | title dupe/title; | 13 | </li> |
160 | 16 | class context/image:sprite_css"> | 14 | </ul> |
149 | 17 | Bug #<span tal:replace="dupe/id">3445</span> | ||
150 | 18 | </a> | ||
151 | 19 | </div> | ||
152 | 20 | </div> | ||
153 | 21 | </div> | ||
161 | 22 | </div> | 15 | </div> |
162 | 23 | 16 | ||
163 | === modified file 'lib/lp/bugs/templates/bug-portlet-privacy.pt' | |||
164 | --- lib/lp/bugs/templates/bug-portlet-privacy.pt 2009-08-10 21:07:02 +0000 | |||
165 | +++ lib/lp/bugs/templates/bug-portlet-privacy.pt 2009-09-10 20:18:28 +0000 | |||
166 | @@ -9,28 +9,21 @@ | |||
167 | 9 | tal:define="link context/menu:context/visibility" | 9 | tal:define="link context/menu:context/visibility" |
168 | 10 | > | 10 | > |
169 | 11 | <div tal:condition="not:context/private" id="privacy-text"> | 11 | <div tal:condition="not:context/private" id="privacy-text"> |
178 | 12 | <a | 12 | <a class="sprite edit" id="privacy-link" |
179 | 13 | tal:condition="link/enabled" | 13 | tal:attributes="href link/path; title link/text" |
180 | 14 | tal:attributes="href link/path; title link/text" | 14 | tal:condition="link/enabled">This report is public</a> |
181 | 15 | class="sprite edit" | 15 | <tal:unchangeable condition="not:link/enabled"> |
182 | 16 | id="privacy-link" | 16 | This report is public |
183 | 17 | >This report is public</a> | 17 | </tal:unchangeable> |
176 | 18 | <tal:unchangeable condition="not:link/enabled" | ||
177 | 19 | >This report is public</tal:unchangeable> | ||
184 | 20 | </div> | 18 | </div> |
185 | 21 | <div tal:condition="context/private" id="privacy-text"> | 19 | <div tal:condition="context/private" id="privacy-text"> |
188 | 22 | <a | 20 | <a class="sprite edit" id="privacy-link" |
187 | 23 | tal:condition="link/enabled" | ||
189 | 24 | tal:attributes="href link/path; title link/text" | 21 | tal:attributes="href link/path; title link/text" |
195 | 25 | class="sprite edit" | 22 | tal:condition="link/enabled">This report is <strong>private</strong></a> |
196 | 26 | id="privacy-link" | 23 | <tal:unchangeable condition="not:link/enabled"> |
197 | 27 | >This report is <strong>private</strong></a> | 24 | This report is private |
198 | 28 | <tal:unchangeable condition="not:link/enabled" | 25 | </tal:unchangeable> |
194 | 29 | >This report is private</tal:unchangeable> | ||
199 | 30 | </div> | 26 | </div> |
205 | 31 | <div | 27 | <div class="sprite security" id="security-message" |
206 | 32 | tal:condition="context/security_related" | 28 | tal:condition="context/security_related">Security vulnerability</div> |
202 | 33 | class="sprite security" | ||
203 | 34 | id="security-message" | ||
204 | 35 | >Security vulnerability</div> | ||
207 | 36 | </div> | 29 | </div> |
208 | 37 | 30 | ||
209 | === modified file 'lib/lp/bugs/templates/bug-portlet-questions.pt' | |||
210 | --- lib/lp/bugs/templates/bug-portlet-questions.pt 2009-07-17 17:59:07 +0000 | |||
211 | +++ lib/lp/bugs/templates/bug-portlet-questions.pt 2009-09-10 20:18:28 +0000 | |||
212 | @@ -1,24 +1,16 @@ | |||
213 | 1 | <div | 1 | <div |
221 | 2 | xmlns:tal="http://xml.zope.org/namespaces/tal" | 2 | xmlns:tal="http://xml.zope.org/namespaces/tal" |
222 | 3 | xmlns:metal="http://xml.zope.org/namespaces/metal" | 3 | xmlns:metal="http://xml.zope.org/namespaces/metal" |
223 | 4 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" | 4 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" |
224 | 5 | class="portlet" id="portlet-questions" | 5 | class="portlet" id="portlet-questions" |
225 | 6 | tal:condition="context/questions" | 6 | tal:condition="context/questions"> |
219 | 7 | > | ||
220 | 8 | |||
226 | 9 | <h2>Related questions</h2> | 7 | <h2>Related questions</h2> |
241 | 10 | 8 | <ul> | |
242 | 11 | <div class="portletBody portletContent"> | 9 | <li tal:repeat="question context/questions" class="question-row"> |
243 | 12 | 10 | <span tal:content="question/target/displayname" | |
244 | 13 | <ul> | 11 | tal:attributes="class question/image:sprite_css">Ubuntu</span>: |
245 | 14 | <li tal:repeat="question context/questions" class="question-row"> | 12 | <a tal:attributes="href question/fmt:url" |
246 | 15 | <span tal:content="question/target/displayname" | 13 | tal:content="question/title">question title here</a> |
247 | 16 | tal:attributes="class question/image:sprite_css">Ubuntu</span>: | 14 | </li> |
248 | 17 | <a tal:attributes="href question/fmt:url" | 15 | </ul> |
235 | 18 | tal:content="question/title">question title here</a> | ||
236 | 19 | </li> | ||
237 | 20 | </ul> | ||
238 | 21 | |||
239 | 22 | </div> | ||
240 | 23 | |||
249 | 24 | </div> | 16 | </div> |
250 | 25 | 17 | ||
251 | === modified file 'lib/lp/bugs/templates/bug-portlet-specs.pt' | |||
252 | --- lib/lp/bugs/templates/bug-portlet-specs.pt 2009-07-17 17:59:07 +0000 | |||
253 | +++ lib/lp/bugs/templates/bug-portlet-specs.pt 2009-09-10 20:18:28 +0000 | |||
254 | @@ -1,15 +1,12 @@ | |||
255 | 1 | <div | 1 | <div |
262 | 2 | xmlns:tal="http://xml.zope.org/namespaces/tal" | 2 | xmlns:tal="http://xml.zope.org/namespaces/tal" |
263 | 3 | xmlns:metal="http://xml.zope.org/namespaces/metal" | 3 | xmlns:metal="http://xml.zope.org/namespaces/metal" |
264 | 4 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" | 4 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" |
265 | 5 | class="portlet" id="portlet-blueprints" | 5 | class="portlet" id="portlet-blueprints" |
266 | 6 | tal:condition="context/specifications" | 6 | tal:condition="context/specifications"> |
261 | 7 | > | ||
267 | 8 | <h2>Related blueprints</h2> | 7 | <h2>Related blueprints</h2> |
274 | 9 | <div class="portletBody"> | 8 | <ul> |
275 | 10 | <table> | 9 | <li tal:repeat="spec context/specifications" |
276 | 11 | <tr tal:repeat="spec context/specifications" | 10 | tal:content="structure spec/fmt:link" /> |
277 | 12 | tal:replace="structure spec/@@+listing-compact" /> | 11 | </ul> |
272 | 13 | </table> | ||
273 | 14 | </div> | ||
278 | 15 | </div> | 12 | </div> |
279 | 16 | 13 | ||
280 | === modified file 'lib/lp/bugs/templates/bug-portlet-watch.pt' | |||
281 | --- lib/lp/bugs/templates/bug-portlet-watch.pt 2009-07-17 17:59:07 +0000 | |||
282 | +++ lib/lp/bugs/templates/bug-portlet-watch.pt 2009-09-10 20:18:28 +0000 | |||
283 | @@ -1,26 +1,21 @@ | |||
284 | 1 | <div | 1 | <div |
292 | 2 | xmlns:tal="http://xml.zope.org/namespaces/tal" | 2 | xmlns:tal="http://xml.zope.org/namespaces/tal" |
293 | 3 | xmlns:metal="http://xml.zope.org/namespaces/metal" | 3 | xmlns:metal="http://xml.zope.org/namespaces/metal" |
294 | 4 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" | 4 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" |
295 | 5 | class="portlet" id="portlet-watches" | 5 | class="portlet" id="portlet-watches" |
296 | 6 | tal:condition="context/watches" | 6 | tal:condition="context/watches"> |
290 | 7 | tal:define="current_task view/current_bugtask; | ||
291 | 8 | url current_task/fmt:url"> | ||
297 | 9 | <h2>Remote bug watches</h2> | 7 | <h2>Remote bug watches</h2> |
314 | 10 | <div class="portletBody portletContent"> | 8 | <ul> |
315 | 11 | <ul style="padding-left:0;"> | 9 | <li tal:repeat="watch context/watches"> |
316 | 12 | <li tal:repeat="watch context/watches"> | 10 | <span class="sprite bug-remote" /> |
317 | 13 | <span class="sprite bug-remote" /> | 11 | <a tal:replace="structure watch/fmt:external-link" /> |
318 | 14 | <a tal:replace="structure watch/fmt:external-link" /> | 12 | <tal:block tal:condition="watch/remotestatus"> |
319 | 15 | <tal:block tal:condition="watch/remotestatus"> | 13 | <br />[<span tal:content="watch/remotestatus" />] |
320 | 16 | <br />[<span tal:content="watch/remotestatus" />] | 14 | </tal:block> <a |
321 | 17 | </tal:block> <a | 15 | tal:attributes="href watch/fmt:url" |
322 | 18 | tal:attributes="href watch/fmt:url" | 16 | class="sprite edit" alt="Change watch details" |
323 | 19 | class="sprite edit" | 17 | ><span class="invisible-link">[edit]</span></a> |
324 | 20 | alt="Change watch details" | 18 | </li> |
325 | 21 | ><span class="invisible-link">[edit]</span></a> | 19 | </ul> |
326 | 22 | </li> | 20 | <p>Bug watches keep track of this bug in other bug trackers.</p> |
311 | 23 | </ul> | ||
312 | 24 | <p>Bug watches keep track of this bug in other bug trackers.</p> | ||
313 | 25 | </div> | ||
327 | 26 | </div> | 21 | </div> |
This branch converts all the bug-portlet-*.pt templates to observe 3.0
rules:
Converted:
bug- portlet- attachments. pt portlet- duplicates. pt portlet- questions. pt portlet- specs.pt portlet- watch.pt
bug-
bug-
bug-
bug-
Tidied:
bug- portlet- privacy. pt
No change needed:
bug- portlet- subscribers- content. pt portlet- subscribers. pt portlet- notified. pt
bug-
bug-
Unused, removed:
bug- portlet- cve.pt
./bin/test -vvct lp/bugs/.*/stories
Lint free.