Launchpad itself

Merge lp:~gary/launchpad/launchpad-templates-2 into lp:launchpad

  1. launchpad-templates-2
  2. Merge into devel
Proposed by Gary Poster
Status: Merged
Merged at revision: not available
Proposed branch: lp:~gary/launchpad/launchpad-templates-2
Merge into: lp:launchpad
Diff against target: None lines
To merge this branch: bzr merge lp:~gary/launchpad/launchpad-templates-2
Reviewer Review Type Date Requested Status
Edwin Grubbs (community) code Approve
Review via email: mp+12012@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Gary Poster (gary) wrote :

This converts three templates to 3.0. The +graphics page has the most changes because the table layout was a bit insane.

Revision history for this message
Edwin Grubbs (edwin-grubbs) wrote :

Hi Gary,

This is a nice branch. Just a few changes.

merge-conditional

-Edwin

>=== modified file 'lib/canonical/launchpad/browser/temporaryblobstorage.py'
>--- lib/canonical/launchpad/browser/temporaryblobstorage.py 2009-06-25 05:30:52 +0000
>+++ lib/canonical/launchpad/browser/temporaryblobstorage.py 2009-09-17 22:21:52 +0000
>@@ -20,6 +20,7 @@
> class TemporaryBlobStorageAddView(LaunchpadFormView):

Can you add an XXX referencing bug 315358 and a comment that this page
could possibly be removed after that bug has been completed.

> schema = ITemporaryBlobStorage
> label = 'Store BLOB'
>+ page_title = 'Store a BLOB temporarily in Launchpad'
> field_names = ['blob']
> for_input = True
>
>
>=== modified file 'lib/canonical/launchpad/templates/root-index.pt'
>--- lib/canonical/launchpad/templates/root-index.pt 2009-08-03 10:00:43 +0000
>+++ lib/canonical/launchpad/templates/root-index.pt 2009-09-17 22:21:52 +0000
>@@ -3,10 +3,7 @@
> xmlns:tal="http://xml.zope.org/namespaces/tal"
> xmlns:metal="http://xml.zope.org/namespaces/metal"
> xmlns:i18n="http://xml.zope.org/namespaces/i18n"
>- xml:lang="en"
>- lang="en"
>- dir="ltr"
>- metal:use-macro="view/macro:page/search"
>+ metal:use-macro="view/macro:page/searchless"

You didn't remove the root_index variable from pagetitles.py. BTW, this
seems like a fourth template, so I will have to charge extra.

> i18n:domain="launchpad">
> <body>
> <div metal:fill-slot="main">
>
>=== modified file 'lib/canonical/launchpad/zcml/launchpad.zcml'
>--- lib/canonical/launchpad/zcml/launchpad.zcml 2009-09-04 15:32:52 +0000
>+++ lib/canonical/launchpad/zcml/launchpad.zcml 2009-09-17 22:21:52 +0000
>@@ -256,6 +256,7 @@
> <browser:page
> for="canonical.launchpad.webapp.interfaces.ILaunchpadApplication"
> name="+graphics"
>+ class="canonical.launchpad.browser.LaunchpadGraphics"

Should specify exact module, e.g.
"canonical.launchpad.browser.launchpad.LaunchpadGraphics".

> template="../templates/launchpad-graphics.pt"
> permission="zope.Public"
> />
>
>=== modified file 'lib/canonical/launchpad/zcml/launchpadstatistic.zcml'
>--- lib/canonical/launchpad/zcml/launchpadstatistic.zcml 2009-07-13 18:15:02 +0000
>+++ lib/canonical/launchpad/zcml/launchpadstatistic.zcml 2009-09-17 22:21:52 +0000
>@@ -35,6 +35,7 @@
> <browser:pages
> for="canonical.launchpad.interfaces.ILaunchpadStatisticSet"
> facet="overview"
>+ class="canonical.launchpad.browser.LaunchpadStatisticSet"

Here, too.

> permission="launchpad.Admin">
> <browser:page
> name="+index"
>

review: Approve (code)
Revision history for this message
Gary Poster (gary) wrote :

Thank you very much, Edwin.

I made all requested changes, except I reverted the change to root-index. Henning is working on that page, so I shouldn't stomp on his work.

Incremental diff follows.

Gary

=== modified file 'lib/canonical/launchpad/browser/temporaryblobstorage.py'
--- lib/canonical/launchpad/browser/temporaryblobstorage.py 2009-09-17 22:05:48 +0000
+++ lib/canonical/launchpad/browser/temporaryblobstorage.py 2009-09-18 13:18:15 +0000
@@ -18,6 +18,10 @@

 class TemporaryBlobStorageAddView(LaunchpadFormView):
+ # XXX: gary 2009-09-18 bug=31358
+ # This page might be able to be removed after the referenced bug is
+ # fixed and apport (Ubuntu's bug reporting tool) has been changed to use
+ # it.
     schema = ITemporaryBlobStorage
     label = 'Store BLOB'
     page_title = 'Store a BLOB temporarily in Launchpad'

=== modified file 'lib/canonical/launchpad/templates/root-index.pt'
--- lib/canonical/launchpad/templates/root-index.pt 2009-09-17 22:05:48 +0000
+++ lib/canonical/launchpad/templates/root-index.pt 2009-09-18 13:18:31 +0000
@@ -3,7 +3,10 @@
   xmlns:tal="http://xml.zope.org/namespaces/tal"
   xmlns:metal="http://xml.zope.org/namespaces/metal"
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
- metal:use-macro="view/macro:page/searchless"
+ xml:lang="en"
+ lang="en"
+ dir="ltr"
+ metal:use-macro="view/macro:page/search"
   i18n:domain="launchpad">
   <body>
     <div metal:fill-slot="main">

=== modified file 'lib/canonical/launchpad/zcml/launchpad.zcml'
--- lib/canonical/launchpad/zcml/launchpad.zcml 2009-09-17 22:05:48 +0000
+++ lib/canonical/launchpad/zcml/launchpad.zcml 2009-09-18 13:19:36 +0000
@@ -256,7 +256,7 @@
   <browser:page
       for="canonical.launchpad.webapp.interfaces.ILaunchpadApplication"
       name="+graphics"
- class="canonical.launchpad.browser.LaunchpadGraphics"
+ class="canonical.launchpad.browser.launchpad.LaunchpadGraphics"
       template="../templates/launchpad-graphics.pt"
       permission="zope.Public"
       />

=== modified file 'lib/canonical/launchpad/zcml/launchpadstatistic.zcml'
--- lib/canonical/launchpad/zcml/launchpadstatistic.zcml 2009-09-17 22:05:48 +0000
+++ lib/canonical/launchpad/zcml/launchpadstatistic.zcml 2009-09-18 13:19:14 +0000
@@ -35,7 +35,7 @@
   <browser:pages
     for="canonical.launchpad.interfaces.ILaunchpadStatisticSet"
     facet="overview"
- class="canonical.launchpad.browser.LaunchpadStatisticSet"
+ class="canonical.launchpad.browser.launchpadstatistic.LaunchpadStatisticSet"
     permission="launchpad.Admin">
     <browser:page
       name="+index"

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/canonical/launchpad/browser/launchpad.py'
2--- lib/canonical/launchpad/browser/launchpad.py 2009-09-08 22:42:42 +0000
3+++ lib/canonical/launchpad/browser/launchpad.py 2009-09-17 22:05:48 +0000
4@@ -13,6 +13,7 @@
5 'IcingContribFolder',
6 'IcingFolder',
7 'LaunchpadImageFolder',
8+ 'LaunchpadGraphics',
9 'LaunchpadRootNavigation',
10 'LinkView',
11 'LoginStatus',
12@@ -956,6 +957,10 @@
13 return u'Thanks.'
14
15
16+class LaunchpadGraphics(LaunchpadView):
17+ label = page_title = 'Overview of Launchpad graphics and icons'
18+
19+
20 def get_launchpad_views(cookies):
21 """The state of optional page elements the user may choose to view.
22
23
24=== modified file 'lib/canonical/launchpad/browser/launchpadstatistic.py'
25--- lib/canonical/launchpad/browser/launchpadstatistic.py 2009-06-25 05:30:52 +0000
26+++ lib/canonical/launchpad/browser/launchpadstatistic.py 2009-09-17 22:05:48 +0000
27@@ -6,11 +6,12 @@
28 __metaclass__ = type
29
30 __all__ = [
31+ 'LaunchpadStatisticSet',
32 'LaunchpadStatisticSetFacets',
33 ]
34
35 from canonical.launchpad.interfaces import ILaunchpadStatisticSet
36-from canonical.launchpad.webapp import StandardLaunchpadFacets
37+from canonical.launchpad.webapp import StandardLaunchpadFacets, LaunchpadView
38
39
40 class LaunchpadStatisticSetFacets(StandardLaunchpadFacets):
41@@ -23,3 +24,5 @@
42 enable_only = ['overview',]
43
44
45+class LaunchpadStatisticSet(LaunchpadView):
46+ label = page_title = "Launchpad statistics"
47
48=== modified file 'lib/canonical/launchpad/browser/temporaryblobstorage.py'
49--- lib/canonical/launchpad/browser/temporaryblobstorage.py 2009-06-25 05:30:52 +0000
50+++ lib/canonical/launchpad/browser/temporaryblobstorage.py 2009-09-17 22:05:48 +0000
51@@ -20,6 +20,7 @@
52 class TemporaryBlobStorageAddView(LaunchpadFormView):
53 schema = ITemporaryBlobStorage
54 label = 'Store BLOB'
55+ page_title = 'Store a BLOB temporarily in Launchpad'
56 field_names = ['blob']
57 for_input = True
58
59
60=== modified file 'lib/canonical/launchpad/pagetitles.py'
61--- lib/canonical/launchpad/pagetitles.py 2009-09-16 17:07:14 +0000
62+++ lib/canonical/launchpad/pagetitles.py 2009-09-17 22:05:48 +0000
63@@ -457,8 +457,6 @@
64
65 launchpad_forgottenpassword = 'Need a new Launchpad password?'
66
67-launchpad_graphics = 'Overview of Launchpad graphics and icons'
68-
69 template_form = 'XXX PLEASE DO NOT USE THIS TEMPLATE XXX'
70
71 # launchpad_css is a css file
72@@ -481,8 +479,6 @@
73
74 # launchpad_widget_macros doesn't need a title.
75
76-launchpadstatisticset_index = 'Launchpad statistics'
77-
78 loginservice_email_sent = 'Launchpad Login Service - Email sent'
79
80 def loginservice_authorize(context, view):
81@@ -1004,8 +1000,6 @@
82
83 template_new = 'EXAMPLE NEW TITLE'
84
85-temporaryblobstorage_storeblob = 'Store a BLOB temporarily in Launchpad'
86-
87 token_authorized = 'Almost finished ...'
88
89 translationgroup_index = ContextTitle(
90
91=== modified file 'lib/canonical/launchpad/templates/launchpad-graphics.pt'
92--- lib/canonical/launchpad/templates/launchpad-graphics.pt 2009-07-28 23:30:09 +0000
93+++ lib/canonical/launchpad/templates/launchpad-graphics.pt 2009-09-17 22:05:48 +0000
94@@ -3,10 +3,7 @@
95 xmlns:tal="http://xml.zope.org/namespaces/tal"
96 xmlns:metal="http://xml.zope.org/namespaces/metal"
97 xmlns:i18n="http://xml.zope.org/namespaces/i18n"
98- xml:lang="en"
99- lang="en"
100- dir="ltr"
101- metal:use-macro="view/macro:page/applicationhome"
102+ metal:use-macro="view/macro:page/main_only"
103 i18n:domain="launchpad"
104 >
105
106@@ -169,12 +166,12 @@
107 <tr>
108 <td>cancel</td>
109 <td><img alt="cancel" src="/@@/cancel" /></td>
110- <td rowspan="2">Cancel an action.</td>
111+ <td>Cancel an action.</td>
112 </tr>
113 <tr>
114 <td>confirm</td>
115 <td><img alt="confirm" src="/@@/confirm" /></td>
116- <td rowspan="2">Confirm an action.</td>
117+ <td>Confirm an action.</td>
118 </tr>
119 <tr>
120 <td>crowd</td>
121@@ -203,15 +200,15 @@
122 <tr>
123 <td>distribution-badge</td>
124 <td><img alt="" src="/@@/distribution-badge" /></td>
125- <td rowspan="4">An operating system compiled from various software.</td>
126+ <td rowspan="3">An operating system compiled from various software.</td>
127 </tr>
128 <tr>
129 <td>distribution</td>
130- <td colspan="2"><img alt="" src="/@@/distribution" /></td>
131+ <td><img alt="" src="/@@/distribution" /></td>
132 </tr>
133 <tr>
134 <td>distribution-logo</td>
135- <td colspan="2"><img alt="" src="/@@/distribution-logo" /></td>
136+ <td><img alt="" src="/@@/distribution-logo" /></td>
137 </tr>
138 <tr>
139 <td>download</td>
140@@ -246,15 +243,17 @@
141 <tr>
142 <td>flame-icon</td>
143 <td><img alt="" src="/@@/flame-icon" /></td>
144- <td>Currently used to show a bug affecting many users.</td>
145+ <td rowspan="3">
146+ Currently used to show a bug affecting many users.
147+ </td>
148 </tr>
149 <tr>
150 <td>flame-large</td>
151- <td colspan="2"><img alt="" src="/@@/flame-large" /></td>
152+ <td><img alt="" src="/@@/flame-large" /></td>
153 </tr>
154 <tr>
155 <td>flame-logo</td>
156- <td colspan="2"><img alt="" src="/@@/flame-logo" /></td>
157+ <td><img alt="" src="/@@/flame-logo" /></td>
158 </tr>
159 <tr>
160 <td>info</td>
161@@ -278,7 +277,7 @@
162 <tr>
163 <td>launchpad-large</td>
164 <td><img alt="" src="/@@/launchpad-large" /></td>
165- <td colspan="2">
166+ <td rowspan="2">
167 The Launchpad icon,
168 used for pages that don't belong to a pillar with its own icon.
169 </td>
170@@ -292,7 +291,7 @@
171 <td>
172 <img alt="" src="/@@/tour-icon" />
173 </td>
174- <td>The Launchpad Tour icon</td>
175+ <td rowspan="3">The Launchpad Tour icon</td>
176 </tr>
177 <tr>
178 <td>tour-large</td>
179@@ -338,32 +337,32 @@
180 </tr>
181 <tr>
182 <td>person</td>
183- <td colspan="2"><img alt="person icon" src="/@@/person" /></td>
184+ <td><img alt="person icon" src="/@@/person" /></td>
185 </tr>
186 <tr>
187 <td>person-logo</td>
188- <td colspan="2"><img alt="" src="/@@/person-logo" /></td>
189+ <td><img alt="" src="/@@/person-logo" /></td>
190 </tr>
191 <tr>
192 <td>person-mugshot</td>
193- <td colspan="2"><img alt="" src="/@@/person-mugshot" /></td>
194+ <td><img alt="" src="/@@/person-mugshot" /></td>
195 </tr>
196 <tr>
197 <td>person-inactive-badge</td>
198 <td><img alt="" src="/@@/person-inactive-badge" /></td>
199- <td>A person who does not use Launchpad.</td>
200+ <td rowspan="4">A person who does not use Launchpad.</td>
201 </tr>
202 <tr>
203 <td>person-inactive</td>
204- <td colspan="2"><img alt="" src="/@@/person-inactive" /></td>
205+ <td><img alt="" src="/@@/person-inactive" /></td>
206 </tr>
207 <tr>
208 <td>person-inactive-logo</td>
209- <td colspan="2"><img alt="" src="/@@/person-inactive-logo" /></td>
210+ <td><img alt="" src="/@@/person-inactive-logo" /></td>
211 </tr>
212 <tr>
213 <td>person-inactive-mugshot</td>
214- <td colspan="2"><img alt="" src="/@@/person-inactive-mugshot" /></td>
215+ <td><img alt="" src="/@@/person-inactive-mugshot" /></td>
216 </tr>
217 <tr>
218 <td>private</td>
219@@ -380,7 +379,7 @@
220 <tr>
221 <td>product-badge</td>
222 <td><img alt="" src="/@@/product-badge" /></td>
223- <td>
224+ <td rowspan="3">
225 A software project.
226 The <code>-logo</code> and <code>-mugshot</code> sizes should be
227 used where the project owner has not uploaded a custom icon.
228@@ -397,7 +396,7 @@
229 <tr>
230 <td>project-badge</td>
231 <td><img alt="" src="/@@/project-badge" /></td>
232- <td rowspan="4">A group of projects.</td>
233+ <td rowspan="3">A group of projects.</td>
234 </tr>
235 <tr>
236 <td>project</td>
237@@ -463,29 +462,26 @@
238 <tr>
239 <td>meeting</td>
240 <td><img alt="" src="/@@/meeting" /></td>
241- <td>A meeting or sprint.</td>
242+ <td rowspan="3">A meeting or sprint.</td>
243 </tr>
244 <tr>
245 <td>meeting-logo</td>
246 <td><img alt="" src="/@@/meeting-logo" /></td>
247- <td></td>
248 </tr>
249 <tr>
250 <td>meeting-mugshot</td>
251 <td><img alt="" src="/@@/meeting-mugshot" /></td>
252- <td></td>
253 </tr>
254 <tr>
255 <td>mentoring</td>
256 <td><img alt="" src="/@@/mentoring" /></td>
257- <td>A bug or blueprint for which mentoring has been
258+ <td rowspan="2">A bug or blueprint for which mentoring has been
259 offered.
260 </td>
261 </tr>
262 <tr>
263 <td>mentoring-large</td>
264 <td><img alt="" src="/@@/mentoring-large" /></td>
265- <td></td>
266 </tr>
267 <tr>
268 <td>milestone</td>
269@@ -496,7 +492,7 @@
270 <tr>
271 <td>team-badge</td>
272 <td><img alt="" src="/@@/team-badge" /></td>
273- <td colspan="4">
274+ <td rowspan="4">
275 An anonymous icon for a team.
276 The <code>-logo</code> and <code>-mugshot</code> sizes should be
277 used where the team has not uploaded their own custom picture.
278@@ -504,15 +500,15 @@
279 </tr>
280 <tr>
281 <td>team</td>
282- <td colspan="2"><img alt="" src="/@@/team" /></td>
283+ <td><img alt="" src="/@@/team" /></td>
284 </tr>
285 <tr>
286 <td>team-logo</td>
287- <td colspan="2"><img alt="" src="/@@/team-logo" /></td>
288+ <td><img alt="" src="/@@/team-logo" /></td>
289 </tr>
290 <tr>
291 <td>team-mugshot</td>
292- <td colspan="2"><img alt="" src="/@@/team-mugshot" /></td>
293+ <td><img alt="" src="/@@/team-mugshot" /></td>
294 </tr>
295 <tr>
296 <td>treeCollapsed</td>
297@@ -537,7 +533,6 @@
298 <tr>
299 <td>warning-large</td>
300 <td><img alt="" src="/@@/warning-large" /></td>
301- <td></td>
302 </tr>
303 <tr>
304 <td>yes</td>
305@@ -575,7 +570,7 @@
306 <tr>
307 <td>file a bug</td>
308 <td><img src="/@@/bugs-bg-button" /></td>
309- <td>This is used as the "file a bug" background image. Can be
310+ <td>This is used as the "file a bug" background image. Can be
311 used for other bug-related actions.</td>
312 </tr>
313 <tr>
314@@ -705,32 +700,26 @@
315 <tr>
316 <td>blueprint-essential</td>
317 <td><img src="/@@/blueprint-essential" /></td>
318- <td></td>
319 </tr>
320 <tr>
321 <td>blueprint-high</td>
322 <td><img src="/@@/blueprint-high" /></td>
323- <td></td>
324 </tr>
325 <tr>
326 <td>blueprint-medium</td>
327 <td><img src="/@@/blueprint-medium" /></td>
328- <td></td>
329 </tr>
330 <tr>
331 <td>blueprint-low</td>
332 <td><img src="/@@/blueprint-low" /></td>
333- <td></td>
334 </tr>
335 <tr>
336 <td>blueprint-not</td>
337 <td><img src="/@@/blueprint-not" /></td>
338- <td></td>
339 </tr>
340 <tr>
341 <td>blueprint-undefined</td>
342 <td><img src="/@@/blueprint-undefined" /></td>
343- <td></td>
344 </tr>
345 <tr>
346 <td colspan="3">
347@@ -746,22 +735,20 @@
348 <tr>
349 <td>branch</td>
350 <td><img src="/@@/branch" /></td>
351- <td>A branch, or line of development.</td>
352+ <td rowspan="2">A branch, or line of development.</td>
353 </tr>
354 <tr>
355 <td>branch-large</td>
356 <td><img src="/@@/branch-large" /></td>
357- <td></td>
358 </tr>
359 <tr>
360 <td>merge-proposal-icon</td>
361 <td><img src="/@@/merge-proposal-icon" /></td>
362- <td>Represents a merge proposal.</td>
363+ <td rowspan="2">Represents a merge proposal.</td>
364 </tr>
365 <tr>
366 <td>merge-proposal-large</td>
367 <td><img src="/@@/merge-proposal-large" /></td>
368- <td></td>
369 </tr>
370 <tr>
371 <td>branch-upgrade</td>
372@@ -778,14 +765,7 @@
373 <td>
374 <img alt="" src="/@@/ppa-icon" />
375 </td>
376- <td>Icon for active PPAs</td>
377- </tr>
378- <tr>
379- <td>ppa-icon-inactive</td>
380- <td>
381- <img alt="" src="/@@/ppa-icon-inactive" />
382- </td>
383- <td>Icon for inactive PPAs</td>
384+ <td rowspan="3">An active PPA.</td>
385 </tr>
386 <tr>
387 <td>ppa-large</td>
388@@ -796,6 +776,13 @@
389 <td><img alt="" src="/@@/ppa-logo" /></td>
390 </tr>
391 <tr>
392+ <td>ppa-icon-inactive</td>
393+ <td>
394+ <img alt="" src="/@@/ppa-icon-inactive" />
395+ </td>
396+ <td>Icon for inactive PPAs</td>
397+ </tr>
398+ <tr>
399 <td>architecture</td>
400 <td><img src="/@@/architecture" /></td>
401 <td>A system architecture, like x86 or ppc or SPARC or IA64</td>
402
403=== modified file 'lib/canonical/launchpad/templates/launchpadstatisticset-index.pt'
404--- lib/canonical/launchpad/templates/launchpadstatisticset-index.pt 2009-07-17 17:59:07 +0000
405+++ lib/canonical/launchpad/templates/launchpadstatisticset-index.pt 2009-09-17 22:05:48 +0000
406@@ -3,17 +3,12 @@
407 xmlns:tal="http://xml.zope.org/namespaces/tal"
408 xmlns:metal="http://xml.zope.org/namespaces/metal"
409 xmlns:i18n="http://xml.zope.org/namespaces/i18n"
410- xml:lang="en"
411- lang="en"
412- dir="ltr"
413- metal:use-macro="view/macro:page/applicationhome"
414+ metal:use-macro="view/macro:page/main_only"
415 i18n:domain="launchpad"
416 >
417
418 <body>
419
420-<h1 metal:fill-slot="heading">Launchpad statistics</h1>
421-
422 <div metal:fill-slot="main">
423
424 <p>
425
426=== modified file 'lib/canonical/launchpad/templates/root-index.pt'
427--- lib/canonical/launchpad/templates/root-index.pt 2009-08-03 10:00:43 +0000
428+++ lib/canonical/launchpad/templates/root-index.pt 2009-09-17 22:05:48 +0000
429@@ -3,10 +3,7 @@
430 xmlns:tal="http://xml.zope.org/namespaces/tal"
431 xmlns:metal="http://xml.zope.org/namespaces/metal"
432 xmlns:i18n="http://xml.zope.org/namespaces/i18n"
433- xml:lang="en"
434- lang="en"
435- dir="ltr"
436- metal:use-macro="view/macro:page/search"
437+ metal:use-macro="view/macro:page/searchless"
438 i18n:domain="launchpad">
439 <body>
440 <div metal:fill-slot="main">
441
442=== modified file 'lib/canonical/launchpad/templates/temporaryblobstorage-storeblob.pt'
443--- lib/canonical/launchpad/templates/temporaryblobstorage-storeblob.pt 2009-07-17 17:59:07 +0000
444+++ lib/canonical/launchpad/templates/temporaryblobstorage-storeblob.pt 2009-09-17 22:05:48 +0000
445@@ -3,18 +3,12 @@
446 xmlns:tal="http://xml.zope.org/namespaces/tal"
447 xmlns:metal="http://xml.zope.org/namespaces/metal"
448 xmlns:i18n="http://xml.zope.org/namespaces/i18n"
449- xml:lang="en"
450- lang="en"
451- dir="ltr"
452- metal:use-macro="context/@@main_template/master"
453+ metal:use-macro="view/macro:page/main_only"
454 i18n:domain="launchpad"
455 >
456
457 <body>
458
459-<metal:portlets fill-slot="portlets">
460-</metal:portlets>
461-
462 <div metal:fill-slot="main">
463
464 <div metal:use-macro="context/@@launchpad_form/form">
465@@ -27,6 +21,6 @@
466 </div>
467
468 </div>
469-
470+
471 </body>
472 </html>
473
474=== modified file 'lib/canonical/launchpad/zcml/launchpad.zcml'
475--- lib/canonical/launchpad/zcml/launchpad.zcml 2009-09-04 15:32:52 +0000
476+++ lib/canonical/launchpad/zcml/launchpad.zcml 2009-09-17 22:05:48 +0000
477@@ -256,6 +256,7 @@
478 <browser:page
479 for="canonical.launchpad.webapp.interfaces.ILaunchpadApplication"
480 name="+graphics"
481+ class="canonical.launchpad.browser.LaunchpadGraphics"
482 template="../templates/launchpad-graphics.pt"
483 permission="zope.Public"
484 />
485
486=== modified file 'lib/canonical/launchpad/zcml/launchpadstatistic.zcml'
487--- lib/canonical/launchpad/zcml/launchpadstatistic.zcml 2009-07-13 18:15:02 +0000
488+++ lib/canonical/launchpad/zcml/launchpadstatistic.zcml 2009-09-17 22:05:48 +0000
489@@ -35,6 +35,7 @@
490 <browser:pages
491 for="canonical.launchpad.interfaces.ILaunchpadStatisticSet"
492 facet="overview"
493+ class="canonical.launchpad.browser.LaunchpadStatisticSet"
494 permission="launchpad.Admin">
495 <browser:page
496 name="+index"