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
=== modified file 'lib/canonical/launchpad/browser/launchpad.py'
--- lib/canonical/launchpad/browser/launchpad.py 2009-09-08 22:42:42 +0000
+++ lib/canonical/launchpad/browser/launchpad.py 2009-09-17 22:05:48 +0000
@@ -13,6 +13,7 @@
13 'IcingContribFolder',13 'IcingContribFolder',
14 'IcingFolder',14 'IcingFolder',
15 'LaunchpadImageFolder',15 'LaunchpadImageFolder',
16 'LaunchpadGraphics',
16 'LaunchpadRootNavigation',17 'LaunchpadRootNavigation',
17 'LinkView',18 'LinkView',
18 'LoginStatus',19 'LoginStatus',
@@ -956,6 +957,10 @@
956 return u'Thanks.'957 return u'Thanks.'
957958
958959
960class LaunchpadGraphics(LaunchpadView):
961 label = page_title = 'Overview of Launchpad graphics and icons'
962
963
959def get_launchpad_views(cookies):964def get_launchpad_views(cookies):
960 """The state of optional page elements the user may choose to view.965 """The state of optional page elements the user may choose to view.
961966
962967
=== modified file 'lib/canonical/launchpad/browser/launchpadstatistic.py'
--- lib/canonical/launchpad/browser/launchpadstatistic.py 2009-06-25 05:30:52 +0000
+++ lib/canonical/launchpad/browser/launchpadstatistic.py 2009-09-17 22:05:48 +0000
@@ -6,11 +6,12 @@
6__metaclass__ = type6__metaclass__ = type
77
8__all__ = [8__all__ = [
9 'LaunchpadStatisticSet',
9 'LaunchpadStatisticSetFacets',10 'LaunchpadStatisticSetFacets',
10 ]11 ]
1112
12from canonical.launchpad.interfaces import ILaunchpadStatisticSet13from canonical.launchpad.interfaces import ILaunchpadStatisticSet
13from canonical.launchpad.webapp import StandardLaunchpadFacets14from canonical.launchpad.webapp import StandardLaunchpadFacets, LaunchpadView
1415
1516
16class LaunchpadStatisticSetFacets(StandardLaunchpadFacets):17class LaunchpadStatisticSetFacets(StandardLaunchpadFacets):
@@ -23,3 +24,5 @@
23 enable_only = ['overview',]24 enable_only = ['overview',]
2425
2526
27class LaunchpadStatisticSet(LaunchpadView):
28 label = page_title = "Launchpad statistics"
2629
=== 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:05:48 +0000
@@ -20,6 +20,7 @@
20class TemporaryBlobStorageAddView(LaunchpadFormView):20class TemporaryBlobStorageAddView(LaunchpadFormView):
21 schema = ITemporaryBlobStorage21 schema = ITemporaryBlobStorage
22 label = 'Store BLOB'22 label = 'Store BLOB'
23 page_title = 'Store a BLOB temporarily in Launchpad'
23 field_names = ['blob']24 field_names = ['blob']
24 for_input = True25 for_input = True
2526
2627
=== modified file 'lib/canonical/launchpad/pagetitles.py'
--- lib/canonical/launchpad/pagetitles.py 2009-09-16 17:07:14 +0000
+++ lib/canonical/launchpad/pagetitles.py 2009-09-17 22:05:48 +0000
@@ -457,8 +457,6 @@
457457
458launchpad_forgottenpassword = 'Need a new Launchpad password?'458launchpad_forgottenpassword = 'Need a new Launchpad password?'
459459
460launchpad_graphics = 'Overview of Launchpad graphics and icons'
461
462template_form = 'XXX PLEASE DO NOT USE THIS TEMPLATE XXX'460template_form = 'XXX PLEASE DO NOT USE THIS TEMPLATE XXX'
463461
464# launchpad_css is a css file462# launchpad_css is a css file
@@ -481,8 +479,6 @@
481479
482# launchpad_widget_macros doesn't need a title.480# launchpad_widget_macros doesn't need a title.
483481
484launchpadstatisticset_index = 'Launchpad statistics'
485
486loginservice_email_sent = 'Launchpad Login Service - Email sent'482loginservice_email_sent = 'Launchpad Login Service - Email sent'
487483
488def loginservice_authorize(context, view):484def loginservice_authorize(context, view):
@@ -1004,8 +1000,6 @@
10041000
1005template_new = 'EXAMPLE NEW TITLE'1001template_new = 'EXAMPLE NEW TITLE'
10061002
1007temporaryblobstorage_storeblob = 'Store a BLOB temporarily in Launchpad'
1008
1009token_authorized = 'Almost finished ...'1003token_authorized = 'Almost finished ...'
10101004
1011translationgroup_index = ContextTitle(1005translationgroup_index = ContextTitle(
10121006
=== modified file 'lib/canonical/launchpad/templates/launchpad-graphics.pt'
--- lib/canonical/launchpad/templates/launchpad-graphics.pt 2009-07-28 23:30:09 +0000
+++ lib/canonical/launchpad/templates/launchpad-graphics.pt 2009-09-17 22:05:48 +0000
@@ -3,10 +3,7 @@
3 xmlns:tal="http://xml.zope.org/namespaces/tal"3 xmlns:tal="http://xml.zope.org/namespaces/tal"
4 xmlns:metal="http://xml.zope.org/namespaces/metal"4 xmlns:metal="http://xml.zope.org/namespaces/metal"
5 xmlns:i18n="http://xml.zope.org/namespaces/i18n"5 xmlns:i18n="http://xml.zope.org/namespaces/i18n"
6 xml:lang="en"6 metal:use-macro="view/macro:page/main_only"
7 lang="en"
8 dir="ltr"
9 metal:use-macro="view/macro:page/applicationhome"
10 i18n:domain="launchpad"7 i18n:domain="launchpad"
11>8>
129
@@ -169,12 +166,12 @@
169 <tr>166 <tr>
170 <td>cancel</td>167 <td>cancel</td>
171 <td><img alt="cancel" src="/@@/cancel" /></td>168 <td><img alt="cancel" src="/@@/cancel" /></td>
172 <td rowspan="2">Cancel an action.</td>169 <td>Cancel an action.</td>
173 </tr>170 </tr>
174 <tr>171 <tr>
175 <td>confirm</td>172 <td>confirm</td>
176 <td><img alt="confirm" src="/@@/confirm" /></td>173 <td><img alt="confirm" src="/@@/confirm" /></td>
177 <td rowspan="2">Confirm an action.</td>174 <td>Confirm an action.</td>
178 </tr>175 </tr>
179 <tr>176 <tr>
180 <td>crowd</td>177 <td>crowd</td>
@@ -203,15 +200,15 @@
203 <tr>200 <tr>
204 <td>distribution-badge</td>201 <td>distribution-badge</td>
205 <td><img alt="" src="/@@/distribution-badge" /></td>202 <td><img alt="" src="/@@/distribution-badge" /></td>
206 <td rowspan="4">An operating system compiled from various software.</td>203 <td rowspan="3">An operating system compiled from various software.</td>
207 </tr>204 </tr>
208 <tr>205 <tr>
209 <td>distribution</td>206 <td>distribution</td>
210 <td colspan="2"><img alt="" src="/@@/distribution" /></td>207 <td><img alt="" src="/@@/distribution" /></td>
211 </tr>208 </tr>
212 <tr>209 <tr>
213 <td>distribution-logo</td>210 <td>distribution-logo</td>
214 <td colspan="2"><img alt="" src="/@@/distribution-logo" /></td>211 <td><img alt="" src="/@@/distribution-logo" /></td>
215 </tr>212 </tr>
216 <tr>213 <tr>
217 <td>download</td>214 <td>download</td>
@@ -246,15 +243,17 @@
246 <tr>243 <tr>
247 <td>flame-icon</td>244 <td>flame-icon</td>
248 <td><img alt="" src="/@@/flame-icon" /></td>245 <td><img alt="" src="/@@/flame-icon" /></td>
249 <td>Currently used to show a bug affecting many users.</td>246 <td rowspan="3">
247 Currently used to show a bug affecting many users.
248 </td>
250 </tr>249 </tr>
251 <tr>250 <tr>
252 <td>flame-large</td>251 <td>flame-large</td>
253 <td colspan="2"><img alt="" src="/@@/flame-large" /></td>252 <td><img alt="" src="/@@/flame-large" /></td>
254 </tr>253 </tr>
255 <tr>254 <tr>
256 <td>flame-logo</td>255 <td>flame-logo</td>
257 <td colspan="2"><img alt="" src="/@@/flame-logo" /></td>256 <td><img alt="" src="/@@/flame-logo" /></td>
258 </tr>257 </tr>
259 <tr>258 <tr>
260 <td>info</td>259 <td>info</td>
@@ -278,7 +277,7 @@
278 <tr>277 <tr>
279 <td>launchpad-large</td>278 <td>launchpad-large</td>
280 <td><img alt="" src="/@@/launchpad-large" /></td>279 <td><img alt="" src="/@@/launchpad-large" /></td>
281 <td colspan="2">280 <td rowspan="2">
282 The Launchpad icon,281 The Launchpad icon,
283 used for pages that don't belong to a pillar with its own icon.282 used for pages that don't belong to a pillar with its own icon.
284 </td>283 </td>
@@ -292,7 +291,7 @@
292 <td>291 <td>
293 <img alt="" src="/@@/tour-icon" />292 <img alt="" src="/@@/tour-icon" />
294 </td>293 </td>
295 <td>The Launchpad Tour icon</td>294 <td rowspan="3">The Launchpad Tour icon</td>
296 </tr>295 </tr>
297 <tr>296 <tr>
298 <td>tour-large</td>297 <td>tour-large</td>
@@ -338,32 +337,32 @@
338 </tr>337 </tr>
339 <tr>338 <tr>
340 <td>person</td>339 <td>person</td>
341 <td colspan="2"><img alt="person icon" src="/@@/person" /></td>340 <td><img alt="person icon" src="/@@/person" /></td>
342 </tr>341 </tr>
343 <tr>342 <tr>
344 <td>person-logo</td>343 <td>person-logo</td>
345 <td colspan="2"><img alt="" src="/@@/person-logo" /></td>344 <td><img alt="" src="/@@/person-logo" /></td>
346 </tr>345 </tr>
347 <tr>346 <tr>
348 <td>person-mugshot</td>347 <td>person-mugshot</td>
349 <td colspan="2"><img alt="" src="/@@/person-mugshot" /></td>348 <td><img alt="" src="/@@/person-mugshot" /></td>
350 </tr>349 </tr>
351 <tr>350 <tr>
352 <td>person-inactive-badge</td>351 <td>person-inactive-badge</td>
353 <td><img alt="" src="/@@/person-inactive-badge" /></td>352 <td><img alt="" src="/@@/person-inactive-badge" /></td>
354 <td>A person who does not use Launchpad.</td>353 <td rowspan="4">A person who does not use Launchpad.</td>
355 </tr>354 </tr>
356 <tr>355 <tr>
357 <td>person-inactive</td>356 <td>person-inactive</td>
358 <td colspan="2"><img alt="" src="/@@/person-inactive" /></td>357 <td><img alt="" src="/@@/person-inactive" /></td>
359 </tr>358 </tr>
360 <tr>359 <tr>
361 <td>person-inactive-logo</td>360 <td>person-inactive-logo</td>
362 <td colspan="2"><img alt="" src="/@@/person-inactive-logo" /></td>361 <td><img alt="" src="/@@/person-inactive-logo" /></td>
363 </tr>362 </tr>
364 <tr>363 <tr>
365 <td>person-inactive-mugshot</td>364 <td>person-inactive-mugshot</td>
366 <td colspan="2"><img alt="" src="/@@/person-inactive-mugshot" /></td>365 <td><img alt="" src="/@@/person-inactive-mugshot" /></td>
367 </tr>366 </tr>
368 <tr>367 <tr>
369 <td>private</td>368 <td>private</td>
@@ -380,7 +379,7 @@
380 <tr>379 <tr>
381 <td>product-badge</td>380 <td>product-badge</td>
382 <td><img alt="" src="/@@/product-badge" /></td>381 <td><img alt="" src="/@@/product-badge" /></td>
383 <td>382 <td rowspan="3">
384 A software project.383 A software project.
385 The <code>-logo</code> and <code>-mugshot</code> sizes should be384 The <code>-logo</code> and <code>-mugshot</code> sizes should be
386 used where the project owner has not uploaded a custom icon.385 used where the project owner has not uploaded a custom icon.
@@ -397,7 +396,7 @@
397 <tr>396 <tr>
398 <td>project-badge</td>397 <td>project-badge</td>
399 <td><img alt="" src="/@@/project-badge" /></td>398 <td><img alt="" src="/@@/project-badge" /></td>
400 <td rowspan="4">A group of projects.</td>399 <td rowspan="3">A group of projects.</td>
401 </tr>400 </tr>
402 <tr>401 <tr>
403 <td>project</td>402 <td>project</td>
@@ -463,29 +462,26 @@
463 <tr>462 <tr>
464 <td>meeting</td>463 <td>meeting</td>
465 <td><img alt="" src="/@@/meeting" /></td>464 <td><img alt="" src="/@@/meeting" /></td>
466 <td>A meeting or sprint.</td>465 <td rowspan="3">A meeting or sprint.</td>
467 </tr>466 </tr>
468 <tr>467 <tr>
469 <td>meeting-logo</td>468 <td>meeting-logo</td>
470 <td><img alt="" src="/@@/meeting-logo" /></td>469 <td><img alt="" src="/@@/meeting-logo" /></td>
471 <td></td>
472 </tr>470 </tr>
473 <tr>471 <tr>
474 <td>meeting-mugshot</td>472 <td>meeting-mugshot</td>
475 <td><img alt="" src="/@@/meeting-mugshot" /></td>473 <td><img alt="" src="/@@/meeting-mugshot" /></td>
476 <td></td>
477 </tr>474 </tr>
478 <tr>475 <tr>
479 <td>mentoring</td>476 <td>mentoring</td>
480 <td><img alt="" src="/@@/mentoring" /></td>477 <td><img alt="" src="/@@/mentoring" /></td>
481 <td>A bug or blueprint for which mentoring has been478 <td rowspan="2">A bug or blueprint for which mentoring has been
482 offered.479 offered.
483 </td>480 </td>
484 </tr>481 </tr>
485 <tr>482 <tr>
486 <td>mentoring-large</td>483 <td>mentoring-large</td>
487 <td><img alt="" src="/@@/mentoring-large" /></td>484 <td><img alt="" src="/@@/mentoring-large" /></td>
488 <td></td>
489 </tr>485 </tr>
490 <tr>486 <tr>
491 <td>milestone</td>487 <td>milestone</td>
@@ -496,7 +492,7 @@
496 <tr>492 <tr>
497 <td>team-badge</td>493 <td>team-badge</td>
498 <td><img alt="" src="/@@/team-badge" /></td>494 <td><img alt="" src="/@@/team-badge" /></td>
499 <td colspan="4">495 <td rowspan="4">
500 An anonymous icon for a team.496 An anonymous icon for a team.
501 The <code>-logo</code> and <code>-mugshot</code> sizes should be497 The <code>-logo</code> and <code>-mugshot</code> sizes should be
502 used where the team has not uploaded their own custom picture.498 used where the team has not uploaded their own custom picture.
@@ -504,15 +500,15 @@
504 </tr>500 </tr>
505 <tr>501 <tr>
506 <td>team</td>502 <td>team</td>
507 <td colspan="2"><img alt="" src="/@@/team" /></td>503 <td><img alt="" src="/@@/team" /></td>
508 </tr>504 </tr>
509 <tr>505 <tr>
510 <td>team-logo</td>506 <td>team-logo</td>
511 <td colspan="2"><img alt="" src="/@@/team-logo" /></td>507 <td><img alt="" src="/@@/team-logo" /></td>
512 </tr>508 </tr>
513 <tr>509 <tr>
514 <td>team-mugshot</td>510 <td>team-mugshot</td>
515 <td colspan="2"><img alt="" src="/@@/team-mugshot" /></td>511 <td><img alt="" src="/@@/team-mugshot" /></td>
516 </tr>512 </tr>
517 <tr>513 <tr>
518 <td>treeCollapsed</td>514 <td>treeCollapsed</td>
@@ -537,7 +533,6 @@
537 <tr>533 <tr>
538 <td>warning-large</td>534 <td>warning-large</td>
539 <td><img alt="" src="/@@/warning-large" /></td>535 <td><img alt="" src="/@@/warning-large" /></td>
540 <td></td>
541 </tr>536 </tr>
542 <tr>537 <tr>
543 <td>yes</td>538 <td>yes</td>
@@ -575,7 +570,7 @@
575 <tr>570 <tr>
576 <td>file a bug</td>571 <td>file a bug</td>
577 <td><img src="/@@/bugs-bg-button" /></td>572 <td><img src="/@@/bugs-bg-button" /></td>
578 <td>This is used as the "file a bug" background image. Can be 573 <td>This is used as the "file a bug" background image. Can be
579 used for other bug-related actions.</td>574 used for other bug-related actions.</td>
580 </tr>575 </tr>
581 <tr>576 <tr>
@@ -705,32 +700,26 @@
705 <tr>700 <tr>
706 <td>blueprint-essential</td>701 <td>blueprint-essential</td>
707 <td><img src="/@@/blueprint-essential" /></td>702 <td><img src="/@@/blueprint-essential" /></td>
708 <td></td>
709 </tr>703 </tr>
710 <tr>704 <tr>
711 <td>blueprint-high</td>705 <td>blueprint-high</td>
712 <td><img src="/@@/blueprint-high" /></td>706 <td><img src="/@@/blueprint-high" /></td>
713 <td></td>
714 </tr>707 </tr>
715 <tr>708 <tr>
716 <td>blueprint-medium</td>709 <td>blueprint-medium</td>
717 <td><img src="/@@/blueprint-medium" /></td>710 <td><img src="/@@/blueprint-medium" /></td>
718 <td></td>
719 </tr>711 </tr>
720 <tr>712 <tr>
721 <td>blueprint-low</td>713 <td>blueprint-low</td>
722 <td><img src="/@@/blueprint-low" /></td>714 <td><img src="/@@/blueprint-low" /></td>
723 <td></td>
724 </tr>715 </tr>
725 <tr>716 <tr>
726 <td>blueprint-not</td>717 <td>blueprint-not</td>
727 <td><img src="/@@/blueprint-not" /></td>718 <td><img src="/@@/blueprint-not" /></td>
728 <td></td>
729 </tr>719 </tr>
730 <tr>720 <tr>
731 <td>blueprint-undefined</td>721 <td>blueprint-undefined</td>
732 <td><img src="/@@/blueprint-undefined" /></td>722 <td><img src="/@@/blueprint-undefined" /></td>
733 <td></td>
734 </tr>723 </tr>
735 <tr>724 <tr>
736 <td colspan="3">725 <td colspan="3">
@@ -746,22 +735,20 @@
746 <tr>735 <tr>
747 <td>branch</td>736 <td>branch</td>
748 <td><img src="/@@/branch" /></td>737 <td><img src="/@@/branch" /></td>
749 <td>A branch, or line of development.</td>738 <td rowspan="2">A branch, or line of development.</td>
750 </tr>739 </tr>
751 <tr>740 <tr>
752 <td>branch-large</td>741 <td>branch-large</td>
753 <td><img src="/@@/branch-large" /></td>742 <td><img src="/@@/branch-large" /></td>
754 <td></td>
755 </tr>743 </tr>
756 <tr>744 <tr>
757 <td>merge-proposal-icon</td>745 <td>merge-proposal-icon</td>
758 <td><img src="/@@/merge-proposal-icon" /></td>746 <td><img src="/@@/merge-proposal-icon" /></td>
759 <td>Represents a merge proposal.</td>747 <td rowspan="2">Represents a merge proposal.</td>
760 </tr>748 </tr>
761 <tr>749 <tr>
762 <td>merge-proposal-large</td>750 <td>merge-proposal-large</td>
763 <td><img src="/@@/merge-proposal-large" /></td>751 <td><img src="/@@/merge-proposal-large" /></td>
764 <td></td>
765 </tr>752 </tr>
766 <tr>753 <tr>
767 <td>branch-upgrade</td>754 <td>branch-upgrade</td>
@@ -778,14 +765,7 @@
778 <td>765 <td>
779 <img alt="" src="/@@/ppa-icon" />766 <img alt="" src="/@@/ppa-icon" />
780 </td>767 </td>
781 <td>Icon for active PPAs</td>768 <td rowspan="3">An active PPA.</td>
782 </tr>
783 <tr>
784 <td>ppa-icon-inactive</td>
785 <td>
786 <img alt="" src="/@@/ppa-icon-inactive" />
787 </td>
788 <td>Icon for inactive PPAs</td>
789 </tr>769 </tr>
790 <tr>770 <tr>
791 <td>ppa-large</td>771 <td>ppa-large</td>
@@ -796,6 +776,13 @@
796 <td><img alt="" src="/@@/ppa-logo" /></td>776 <td><img alt="" src="/@@/ppa-logo" /></td>
797 </tr>777 </tr>
798 <tr>778 <tr>
779 <td>ppa-icon-inactive</td>
780 <td>
781 <img alt="" src="/@@/ppa-icon-inactive" />
782 </td>
783 <td>Icon for inactive PPAs</td>
784 </tr>
785 <tr>
799 <td>architecture</td>786 <td>architecture</td>
800 <td><img src="/@@/architecture" /></td>787 <td><img src="/@@/architecture" /></td>
801 <td>A system architecture, like x86 or ppc or SPARC or IA64</td>788 <td>A system architecture, like x86 or ppc or SPARC or IA64</td>
802789
=== modified file 'lib/canonical/launchpad/templates/launchpadstatisticset-index.pt'
--- lib/canonical/launchpad/templates/launchpadstatisticset-index.pt 2009-07-17 17:59:07 +0000
+++ lib/canonical/launchpad/templates/launchpadstatisticset-index.pt 2009-09-17 22:05:48 +0000
@@ -3,17 +3,12 @@
3 xmlns:tal="http://xml.zope.org/namespaces/tal"3 xmlns:tal="http://xml.zope.org/namespaces/tal"
4 xmlns:metal="http://xml.zope.org/namespaces/metal"4 xmlns:metal="http://xml.zope.org/namespaces/metal"
5 xmlns:i18n="http://xml.zope.org/namespaces/i18n"5 xmlns:i18n="http://xml.zope.org/namespaces/i18n"
6 xml:lang="en"6 metal:use-macro="view/macro:page/main_only"
7 lang="en"
8 dir="ltr"
9 metal:use-macro="view/macro:page/applicationhome"
10 i18n:domain="launchpad"7 i18n:domain="launchpad"
11>8>
129
13<body>10<body>
1411
15<h1 metal:fill-slot="heading">Launchpad statistics</h1>
16
17<div metal:fill-slot="main">12<div metal:fill-slot="main">
1813
19 <p>14 <p>
2015
=== 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:05:48 +0000
@@ -3,10 +3,7 @@
3 xmlns:tal="http://xml.zope.org/namespaces/tal"3 xmlns:tal="http://xml.zope.org/namespaces/tal"
4 xmlns:metal="http://xml.zope.org/namespaces/metal"4 xmlns:metal="http://xml.zope.org/namespaces/metal"
5 xmlns:i18n="http://xml.zope.org/namespaces/i18n"5 xmlns:i18n="http://xml.zope.org/namespaces/i18n"
6 xml:lang="en"6 metal:use-macro="view/macro:page/searchless"
7 lang="en"
8 dir="ltr"
9 metal:use-macro="view/macro:page/search"
10 i18n:domain="launchpad">7 i18n:domain="launchpad">
11 <body>8 <body>
12 <div metal:fill-slot="main">9 <div metal:fill-slot="main">
1310
=== modified file 'lib/canonical/launchpad/templates/temporaryblobstorage-storeblob.pt'
--- lib/canonical/launchpad/templates/temporaryblobstorage-storeblob.pt 2009-07-17 17:59:07 +0000
+++ lib/canonical/launchpad/templates/temporaryblobstorage-storeblob.pt 2009-09-17 22:05:48 +0000
@@ -3,18 +3,12 @@
3 xmlns:tal="http://xml.zope.org/namespaces/tal"3 xmlns:tal="http://xml.zope.org/namespaces/tal"
4 xmlns:metal="http://xml.zope.org/namespaces/metal"4 xmlns:metal="http://xml.zope.org/namespaces/metal"
5 xmlns:i18n="http://xml.zope.org/namespaces/i18n"5 xmlns:i18n="http://xml.zope.org/namespaces/i18n"
6 xml:lang="en"6 metal:use-macro="view/macro:page/main_only"
7 lang="en"
8 dir="ltr"
9 metal:use-macro="context/@@main_template/master"
10 i18n:domain="launchpad"7 i18n:domain="launchpad"
11>8>
129
13<body>10<body>
1411
15<metal:portlets fill-slot="portlets">
16</metal:portlets>
17
18<div metal:fill-slot="main">12<div metal:fill-slot="main">
1913
20 <div metal:use-macro="context/@@launchpad_form/form">14 <div metal:use-macro="context/@@launchpad_form/form">
@@ -27,6 +21,6 @@
27 </div>21 </div>
2822
29</div>23</div>
30 24
31</body>25</body>
32</html>26</html>
3327
=== 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:05:48 +0000
@@ -256,6 +256,7 @@
256 <browser:page256 <browser:page
257 for="canonical.launchpad.webapp.interfaces.ILaunchpadApplication"257 for="canonical.launchpad.webapp.interfaces.ILaunchpadApplication"
258 name="+graphics"258 name="+graphics"
259 class="canonical.launchpad.browser.LaunchpadGraphics"
259 template="../templates/launchpad-graphics.pt"260 template="../templates/launchpad-graphics.pt"
260 permission="zope.Public"261 permission="zope.Public"
261 />262 />
262263
=== 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:05:48 +0000
@@ -35,6 +35,7 @@
35 <browser:pages35 <browser:pages
36 for="canonical.launchpad.interfaces.ILaunchpadStatisticSet"36 for="canonical.launchpad.interfaces.ILaunchpadStatisticSet"
37 facet="overview"37 facet="overview"
38 class="canonical.launchpad.browser.LaunchpadStatisticSet"
38 permission="launchpad.Admin">39 permission="launchpad.Admin">
39 <browser:page40 <browser:page
40 name="+index"41 name="+index"