launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #05704
[Merge] lp:~wgrant/launchpad/delayer-views into lp:launchpad
William Grant has proposed merging lp:~wgrant/launchpad/delayer-views into lp:launchpad.
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~wgrant/launchpad/delayer-views/+merge/83547
Code and Translations have most of their views restricted to their respective layers, limiting visibility to their own subdomains. Bugs also has one such view, +subscriptions. This is a problem if we want to shrink down to a single domain.
This branch fixes all but one view to be visible everywhere. As part of the promotion to the default layer, three redirects to a particular vhost are removed: +translate and +translations -> translations.launchpad.net, and +subscriptions -> bugs.launchpad.net. Since globalise-help-folder landed, those views function fine on any domain.
The remaining layer-specific view is TranslationsLayer:DistroSeries:+admin, which conflicts with Registry's DistroSeries:+admin. I intend to rename the former to DistroSeries:+translations-admin and promote it in a subsequent branch.
There are a few translations views with questionable namespacing, perhaps most notably +export and +import. But they don't conflict with anything now, and we can always rename them later.
--
https://code.launchpad.net/~wgrant/launchpad/delayer-views/+merge/83547
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~wgrant/launchpad/delayer-views into lp:launchpad.
=== modified file 'lib/canonical/launchpad/pagetests/basics/notfound-traversals.txt'
--- lib/canonical/launchpad/pagetests/basics/notfound-traversals.txt 2011-09-29 05:41:31 +0000
+++ lib/canonical/launchpad/pagetests/basics/notfound-traversals.txt 2011-11-28 04:33:24 +0000
@@ -67,32 +67,28 @@
>>> check_redirect("/+index", host='feeds.launchpad.dev', status=301)
>>> check("/+graphics")
->>> check("/+imports", host='translations.launchpad.dev')
->>> check("/+imports/1/+index", auth=True, host='translations.launchpad.dev')
->>> check_not_found("/+imports/foo", host='translations.launchpad.dev')
-
->>> check("/+languages", host='translations.launchpad.dev')
->>> check("/+languages/+add", auth=True, host='translations.launchpad.dev')
->>> check("/+languages/es", host='translations.launchpad.dev')
->>> check("/+languages/es/+admin", auth=True, host='translations.launchpad.dev')
->>> check_not_found("/+languages/es/foos", host='translations.launchpad.dev')
->>> check_not_found("/+languages/foos", host='translations.launchpad.dev')
-
->>> check("/+groups", host='translations.launchpad.dev')
->>> check("/+groups/+new", auth=True,
-... host='translations.launchpad.dev')
->>> check("/+groups/testing-translation-team",
-... host='translations.launchpad.dev')
+>>> check("/+imports")
+>>> check("/+imports/1/+index", auth=True)
+>>> check_not_found("/+imports/foo")
+
+>>> check("/+languages")
+>>> check("/+languages/+add", auth=True)
+>>> check("/+languages/es")
+>>> check("/+languages/es/+admin", auth=True)
+>>> check_not_found("/+languages/es/foos")
+>>> check_not_found("/+languages/foos")
+
+>>> check("/+groups")
+>>> check("/+groups/+new", auth=True)
+>>> check("/+groups/testing-translation-team")
>>> check("/+groups/testing-translation-team/+edit",
-... auth=True, host='translations.launchpad.dev')
+... auth=True)
>>> check("/+groups/testing-translation-team/+appoint",
-... auth=True, host='translations.launchpad.dev')
+... auth=True)
>>> check("/+groups/testing-translation-team/es",
-... auth=True, host='translations.launchpad.dev')
->>> check_not_found("/+groups/testing-translation-team/pt_br",
-... host='translations.launchpad.dev')
->>> check_not_found("/+groups/foos",
-... host='translations.launchpad.dev')
+... auth=True)
+>>> check_not_found("/+groups/testing-translation-team/pt_br")
+>>> check_not_found("/+groups/foos")
>>> check("/codeofconduct")
@@ -103,8 +99,7 @@
>>> check("/projectgroups/+all", auth=True)
>>> check("/mozilla")
>>> check("/mozilla/firefox")
->>> check_redirect("/mozilla/+translations", status=301)
->>> check("/mozilla/+translations", host='translations.launchpad.dev')
+>>> check("/mozilla/+translations")
>>> check_redirect("/products", status=301)
>>> check("/projects")
@@ -117,9 +112,8 @@
>>> check("/firefox/1.0/+edit", auth=True)
>>> check("/firefox/1.0/+specs")
>>> check("/firefox/+milestone/1.0/+addrelease", auth=True)
->>> check_redirect("/firefox/1.0/+translations", status=301)
->>> check("/firefox/1.0/+translations", host='translations.launchpad.dev')
->>> check("/firefox/1.0/+imports", host='translations.launchpad.dev')
+>>> check("/firefox/1.0/+translations")
+>>> check("/firefox/1.0/+imports")
>>> check("/firefox/1.0/1.0.0")
>>> check("/firefox/1.0/1.0.0/+edit", auth=True)
>>> check("/firefox/1.0/1.0.0/+adddownloadfile", auth=True)
@@ -128,8 +122,7 @@
>>> check("/firefox/1.0/+rdf")
>>> check("/firefox/+bugs")
>>> check("/firefox/+cve")
->>> check_redirect("/firefox/+translations", status=301)
->>> check("/firefox/+translations", host='translations.launchpad.dev')
+>>> check("/firefox/+translations")
>>> check_redirect("/projects/firefox", status=301)
>>> check_not_found("/firefox/+milestone")
@@ -142,29 +135,24 @@
>>> check("/ubuntu/+bugs")
>>> check("/ubuntu/+specs")
>>> check("/ubuntu/+cve")
->>> check_redirect("/ubuntu/+translations", status=301)
->>> check("/ubuntu/+translations", host='translations.launchpad.dev')
+>>> check("/ubuntu/+translations")
>>> check("/ubuntu/+edit", auth=True)
>>> check("/ubuntu/+reassign", auth=True)
>>> check("/ubuntu/+selectmemberteam", auth=True)
->>> check("/ubuntu/+configure-translations",
-... host='translations.launchpad.dev', auth=True)
+>>> check("/ubuntu/+configure-translations", auth=True)
>>> check("/ubuntu/hoary/+addmilestone", auth=True)
>>> check("/ubuntu/+addspec", auth=True)
->>> check("/ubuntu/+imports", host='translations.launchpad.dev')
+>>> check("/ubuntu/+imports")
>>> check("/debian/+milestone/3.1")
>>> check("/ubuntu/+source/evolution/+subscribe", auth=True)
>>> check_redirect("/ubuntu/+source/evolution/+editbugcontact")
>>> check("/ubuntu/hoary/+cve")
->>> check_redirect("/ubuntu/hoary/+translations", status=301)
->>> check("/ubuntu/hoary/+translations", host='translations.launchpad.dev')
->>> check_redirect("/ubuntu/hoary/+latest-full-language-pack",
-... host="translations.launchpad.dev")
->>> check("/ubuntu/hoary/+imports", host='translations.launchpad.dev')
+>>> check("/ubuntu/hoary/+translations")
+>>> check_redirect("/ubuntu/hoary/+latest-full-language-pack")
+>>> check("/ubuntu/hoary/+imports")
>>> check("/ubuntu/hoary/+source/pmount")
->>> check("/ubuntu/hoary/+source/pmount/+imports",
-... host='translations.launchpad.dev')
+>>> check("/ubuntu/hoary/+source/pmount/+imports")
>>> check("/ubuntu/hoary/+source/libstdc++")
>>> check("/ubuntu/hoary/+package/pmount")
>>> check("/ubuntu/hoary/i386/pmount/0.1-1")
@@ -184,8 +172,7 @@
>>> check("/ubuntu/hoary/+source/evolution/+bugs")
>>> check("/ubuntu/+source/evolution/+bugs")
>>> check("/ubuntu/+source/evolution/+portlet-bugfilters")
->>> check_not_found("/ubuntu/+source/evolution/+translations",
-... host='translations.launchpad.dev')
+>>> check_not_found("/ubuntu/+source/evolution/+translations")
>>> check("/ubuntu/hoary/+source/evolution/+changelog")
>>> check("/ubuntu/hoary/+source/evolution/+edit-packaging", auth=True)
@@ -195,17 +182,11 @@
removing this, you must be completely sure that no supported Ubuntu release
is still pointing to this old URL (see bug #138090).
->>> check_redirect("/ubuntu/hoary/+source/evolution/+translations", status=301)
->>> check("/ubuntu/hoary/+source/evolution/+translations",
-... host='translations.launchpad.dev')
->>> check_redirect("/ubuntu/hoary/+source/mozilla-firefox/+pots",
-... host='translations.launchpad.dev')
+>>> check("/ubuntu/hoary/+source/evolution/+translations")
>>> check("/ubuntu/hoary/+source/evolution/+pots/evolution-2.2/+export",
-... host='translations.launchpad.dev', auth=True)
->>> check_redirect("/ubuntu/hoary/+source/pmount/+pots/pmount/apa/+translate",
-... status=301)
+... auth=True)
>>> check("/ubuntu/hoary/+source/pmount/+pots/pmount/apa/+translate",
-... host='translations.launchpad.dev', auth=True)
+... auth=True)
>>> check_not_found("/ubuntu/hoary/+source/evolution/+buildlog")
>>> check_not_found(
... '/ubuntu/hoary/+sources/evolution/+pots/evolution-2.2/xxxx')
@@ -365,9 +346,8 @@
>>> check("/~name18/+reassign", auth=True)
>>> check("/~name18/+review", auth=True)
>>> check("/~name18/+specs")
->>> check_redirect("/~name18/+translations", status=301)
->>> check("/~name18/+translations", host='translations.launchpad.dev')
->>> check("/~name18/+imports", host='translations.launchpad.dev')
+>>> check("/~name18/+translations")
+>>> check("/~name18/+imports")
>>> check("/~name18/+teamlist")
>>> check("/~name18/+polls")
>>> check("/~name18/+newpoll", auth=True)
@@ -393,7 +373,7 @@
>>> check("/~name16/+edithomepage", auth=True)
>>> check("/~name16/+review", auth=True)
>>> check("/~name16/+specworkload")
->>> check("/~name16/+imports", host='translations.launchpad.dev')
+>>> check("/~name16/+imports")
mark owns many packages, so he's a better test for some pages:
=== modified file 'lib/lp/bugs/browser/bugtarget.py'
--- lib/lp/bugs/browser/bugtarget.py 2011-11-24 06:08:40 +0000
+++ lib/lp/bugs/browser/bugtarget.py 2011-11-28 04:33:24 +0000
@@ -135,7 +135,6 @@
from lp.bugs.model.structuralsubscription import (
get_structural_subscriptions_for_target,
)
-from lp.bugs.publisher import BugsLayer
from lp.bugs.utilities.filebugdataparser import FileBugData
from lp.hardwaredb.interfaces.hwdb import IHWSubmissionSet
from lp.registry.browser.product import ProductConfigureBase
@@ -1574,14 +1573,6 @@
def initialize(self):
super(TargetSubscriptionView, self).initialize()
- # Some resources such as help files are only provided on the bugs
- # rootsite. So if we got here via another, possibly hand-crafted, URL
- # redirect to the equivalent URL on the bugs rootsite.
- if not BugsLayer.providedBy(self.request):
- new_url = urljoin(
- self.request.getRootURL('bugs'), self.request['PATH_INFO'])
- self.request.response.redirect(new_url)
- return
expose_structural_subscription_data_to_js(
self.context, self.request, self.user, self.subscriptions)
=== modified file 'lib/lp/bugs/browser/tests/test_bugtarget_subscription.py'
--- lib/lp/bugs/browser/tests/test_bugtarget_subscription.py 2011-05-18 12:41:34 +0000
+++ lib/lp/bugs/browser/tests/test_bugtarget_subscription.py 2011-11-28 04:33:24 +0000
@@ -12,7 +12,6 @@
person_logged_in,
TestCaseWithFactory,
)
-from lp.testing.views import create_view
class TargetSubscriptionViewTestCase(TestCaseWithFactory):
@@ -34,19 +33,3 @@
harness = LaunchpadFormHarness(
self.product, TargetSubscriptionView)
harness.view.initialize()
-
- def test_does_not_redirect(self):
- # +subscriptions on the bugs facet does not redirect.
- with person_logged_in(self.subscriber):
- view = create_view(
- self.product, name='+subscriptions', rootsite='bugs')
- view.initialize()
- self.assertFalse(view._isRedirected())
-
- def test_redirects(self):
- # +subscriptions on anything but the bugs facet redirects.
- with person_logged_in(self.subscriber):
- view = create_view(
- self.product, name='+subscriptions', rootsite='code')
- view.initialize()
- self.assertTrue(view._isRedirected())
=== modified file 'lib/lp/code/browser/configure.zcml'
--- lib/lp/code/browser/configure.zcml 2011-11-27 01:16:55 +0000
+++ lib/lp/code/browser/configure.zcml 2011-11-28 04:33:24 +0000
@@ -22,7 +22,6 @@
name="+project-cloud"/>
<browser:page
for="lp.registry.interfaces.product.IProductSet"
- layer="lp.code.publisher.CodeLayer"
name="+project-cloud"
class="lp.code.browser.bazaar.BazaarProductView"
template="../templates/code-in-branches.pt"
@@ -37,7 +36,6 @@
/>
<browser:page
for="canonical.launchpad.webapp.interfaces.ILaunchpadApplication"
- layer="lp.code.publisher.CodeLayer"
name="+recently-registered-branches"
class="lp.code.browser.branchlisting.RecentlyRegisteredBranchesView"
template="../templates/branch-listing-cross-product.pt"
@@ -45,7 +43,6 @@
/>
<browser:page
for="canonical.launchpad.webapp.interfaces.ILaunchpadApplication"
- layer="lp.code.publisher.CodeLayer"
name="+recently-imported-branches"
class="lp.code.browser.branchlisting.RecentlyImportedBranchesView"
template="../templates/branch-listing-cross-product.pt"
@@ -53,7 +50,6 @@
/>
<browser:page
for="canonical.launchpad.webapp.interfaces.ILaunchpadApplication"
- layer="lp.code.publisher.CodeLayer"
name="+recently-changed-branches"
class="lp.code.browser.branchlisting.RecentlyChangedBranchesView"
template="../templates/branch-listing-cross-product.pt"
@@ -73,7 +69,6 @@
rootsite="code"/>
<browser:page
for="lp.code.interfaces.codereviewvote.ICodeReviewVoteReference"
- layer="lp.code.publisher.CodeLayer"
name="+reassign"
class="lp.code.browser.codereviewvote.CodeReviewVoteReassign"
permission="launchpad.AnyPerson"
@@ -85,11 +80,9 @@
rootsite="code"/>
<browser:defaultView
for="lp.code.interfaces.codeimportmachine.ICodeImportMachine"
- name="+index"
- layer="lp.code.publisher.CodeLayer"/>
+ name="+index"/>
<browser:page
for="lp.code.interfaces.codeimportmachine.ICodeImportMachine"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.codeimportmachine.CodeImportMachineView"
name="+index"
template="../templates/codeimport-machine-index.pt"
@@ -104,11 +97,9 @@
rootsite="code"/>
<browser:defaultView
for="lp.code.interfaces.codeimportmachine.ICodeImportMachineSet"
- name="+index"
- layer="lp.code.publisher.CodeLayer"/>
+ name="+index"/>
<browser:page
for="lp.code.interfaces.codeimportmachine.ICodeImportMachineSet"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.codeimportmachine.CodeImportMachineSetView"
name="+index"
template="../templates/codeimport-machines.pt"
@@ -127,18 +118,15 @@
rootsite="code"/>
<browser:defaultView
for="canonical.launchpad.interfaces.launchpad.IBazaarApplication"
- layer="lp.code.publisher.CodeLayer"
name="+index"/>
<browser:page
for="canonical.launchpad.interfaces.launchpad.IBazaarApplication"
- layer="lp.code.publisher.CodeLayer"
permission="zope.Public"
class="lp.code.browser.bazaar.BazaarApplicationView"
name="+index"
template="../templates/bazaar-index.pt" />
<browser:page
for="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
- layer="lp.code.publisher.CodeLayer"
permission="zope.Public"
class="lp.code.browser.recipebuildslisting.CompletedDailyBuildsView"
name="+daily-builds"
@@ -146,7 +134,6 @@
<browser:page
for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
- layer="lp.code.publisher.CodeLayer"
name="+hierarchy"
class="lp.code.browser.branch.BranchHierarchy"
template="../../app/templates/launchpad-hierarchy.pt"
@@ -156,7 +143,6 @@
classes="BranchMergeProposalNavigation"/>
<browser:defaultView
for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
- layer="lp.code.publisher.CodeLayer"
name="+index"/>
<!-- No view needed -->
@@ -173,7 +159,6 @@
<browser:pages
for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchmergeproposal.BranchMergeProposalView"
permission="launchpad.View">
<browser:page
@@ -199,7 +184,6 @@
</browser:pages>
<browser:pages
for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchmergeproposal.BranchMergeProposalEditView"
permission="launchpad.Edit">
<browser:page
@@ -209,77 +193,66 @@
<browser:page
name="+edit-commit-message"
for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchmergeproposal.BranchMergeProposalCommitMessageEditView"
permission="launchpad.Edit"
template="../../app/templates/generic-edit.pt"/>
<browser:page
name="+edit-description"
for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchmergeproposal.BranchMergeProposalDescriptionEditView"
permission="launchpad.Edit"
template="../../app/templates/generic-edit.pt"/>
<browser:page
name="+delete"
for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchmergeproposal.BranchMergeProposalDeleteView"
permission="launchpad.Edit"
template="../templates/branchmergeproposal-delete.pt"/>
<browser:page
name="+edit-status"
for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchmergeproposal.BranchMergeProposalChangeStatusView"
permission="launchpad.Edit"
template="../templates/branchmergeproposal-editstatus.pt"/>
<browser:page
name="+request-review"
for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchmergeproposal.BranchMergeProposalRequestReviewView"
permission="launchpad.Edit"
template="../../app/templates/generic-edit.pt"/>
<browser:page
name="+resubmit"
for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchmergeproposal.BranchMergeProposalResubmitView"
permission="launchpad.Edit"
template="../templates/branchmergeproposal-resubmit.pt"/>
<browser:page
name="+enqueue"
for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchmergeproposal.BranchMergeProposalEnqueueView"
permission="launchpad.Edit"
template="../templates/branchmergeproposal-enqueue.pt"/>
<browser:page
name="+dequeue"
for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchmergeproposal.BranchMergeProposalDequeueView"
permission="launchpad.Edit"
template="../../app/templates/generic-edit.pt"/>
<browser:page
name="+dequeue-inline"
for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchmergeproposal.BranchMergeProposalInlineDequeueView"
permission="launchpad.Edit"
template="../templates/inline-form-only-buttons.pt"/>
<browser:page
name="+jump-queue"
for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchmergeproposal.BranchMergeProposalJumpQueueView"
permission="launchpad.Edit"
template="../templates/inline-form-only-buttons.pt"/>
<browser:page
name="+merged"
for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchmergeproposal.BranchMergeProposalMergedView"
permission="launchpad.Edit"
template="../../app/templates/generic-edit.pt"/>
@@ -292,21 +265,18 @@
<browser:page
name="+pagelet-subscribers"
for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchmergeproposal.BranchMergeProposalSubscribersView"
permission="launchpad.View"
template="../templates/branchmergeproposal-pagelet-subscribers.pt"/>
<browser:page
name="+comment"
for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.codereviewcomment.CodeReviewCommentAddView"
permission="launchpad.AnyPerson"
template="../templates/codereviewcomment-reply.pt"/>
<browser:page
name="+review"
for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchmergeproposal.BranchMergeProposalAddVoteView"
permission="launchpad.AnyPerson"
template="../templates/branchmergeproposal-vote.pt"/>
@@ -317,13 +287,11 @@
rootsite="code"/>
<browser:page
for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposalListingBatchNavigator"
- layer="lp.code.publisher.CodeLayer"
name="+listing"
template="../templates/branchmergeproposal-listing.pt"
permission="zope.Public"/>
<browser:page
for="*"
- layer="lp.code.publisher.CodeLayer"
name="+bmp-macros"
permission="zope.Public"
template="../templates/branchmergeproposal-macros.pt"
@@ -336,19 +304,16 @@
module="lp.code.browser.branchmergeproposal"/>
<browser:page
for="lp.code.interfaces.branchsubscription.IBranchSubscription"
- layer="lp.code.publisher.CodeLayer"
name="+hierarchy"
class="lp.code.browser.branch.BranchHierarchy"
template="../../app/templates/launchpad-hierarchy.pt"
permission="zope.Public"/>
<browser:defaultView
for="lp.code.interfaces.branchsubscription.IBranchSubscription"
- layer="lp.code.publisher.CodeLayer"
name="+index"/>
<browser:page
name="+index"
for="lp.code.interfaces.branchsubscription.IBranchSubscription"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchsubscription.BranchSubscriptionEditView"
permission="launchpad.Edit"
template="../templates/branchsubscription-edit.pt"/>
@@ -359,14 +324,12 @@
rootsite="code"/>
<browser:page
for="lp.code.interfaces.branch.IBranch"
- layer="lp.code.publisher.CodeLayer"
name="+hierarchy"
class="lp.code.browser.branch.BranchHierarchy"
template="../../app/templates/launchpad-hierarchy.pt"
permission="zope.Public"/>
<browser:defaultView
for="lp.code.interfaces.branch.IBranch"
- layer="lp.code.publisher.CodeLayer"
name="+index"/>
<browser:url
for="lp.code.interfaces.branch.IBranch"
@@ -376,7 +339,6 @@
classes="BranchNavigation"/>
<browser:pages
for="lp.code.interfaces.branch.IBranch"
- layer="lp.code.publisher.CodeLayer"
permission="zope.Public"
class="lp.code.browser.branch.BranchView">
<browser:page
@@ -414,7 +376,6 @@
</browser:pages>
<browser:pages
for="lp.code.interfaces.branch.IBranch"
- layer="lp.code.publisher.CodeLayer"
permission="zope.Public">
<browser:page
name="+portlet-privacy"
@@ -426,20 +387,17 @@
<browser:page
name="+portlet-subscribers"
for="lp.code.interfaces.branch.IBranch"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branch.BranchSubscriptionsView"
permission="zope.Public"
template="../templates/branch-portlet-subscribers.pt"/>
<browser:page
name="+branch-portlet-subscriber-content"
for="lp.code.interfaces.branch.IBranch"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchsubscription.BranchPortletSubscribersContent"
template="../templates/branch-portlet-subscribers-content.pt"
permission="zope.Public" />
<browser:pages
for="lp.code.interfaces.branch.IBranch"
- layer="lp.code.publisher.CodeLayer"
facet="overview"
permission="zope.Public"
class="lp.code.browser.branch.BranchInProductView">
@@ -449,13 +407,11 @@
</browser:pages>
<browser:page
for="lp.code.interfaces.branch.IBranch"
- layer="lp.code.publisher.CodeLayer"
name="+macros"
permission="zope.Public"
template="../templates/branch-macros.pt"/>
<browser:page
for="*"
- layer="lp.code.publisher.CodeLayer"
name="branch-form-macros"
permission="zope.Public"
template="../templates/branch-form-macros.pt"
@@ -464,54 +420,46 @@
name="+whiteboard"
for="lp.code.interfaces.branch.IBranch"
class="lp.code.browser.branch.BranchEditWhiteboardView"
- layer="lp.code.publisher.CodeLayer"
permission="launchpad.AnyPerson"
template="../../app/templates/generic-edit.pt"/>
<browser:page
name="+edit-status"
for="lp.code.interfaces.branch.IBranch"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branch.BranchEditStatusView"
permission="launchpad.Edit"
template="../../app/templates/generic-edit.pt"/>
<browser:page
name="+edit"
for="lp.code.interfaces.branch.IBranch"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branch.BranchEditView"
permission="launchpad.Edit"
template="../../app/templates/generic-edit.pt"/>
<browser:page
name="+upgrade"
for="lp.code.interfaces.branch.IBranch"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branch.BranchUpgradeView"
permission="launchpad.Edit"
template="../../app/templates/generic-edit.pt"/>
<browser:page
name="+reviewer"
for="lp.code.interfaces.branch.IBranch"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branch.BranchReviewerEditView"
permission="launchpad.Edit"
template="../../app/templates/generic-edit.pt"/>
<browser:page
name="+edit-import"
for="lp.code.interfaces.branch.IBranch"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.codeimport.CodeImportEditView"
permission="launchpad.Edit"
template="../../app/templates/generic-edit.pt"/>
<browser:page
name="+delete"
for="lp.code.interfaces.branch.IBranch"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branch.BranchDeletionView"
permission="launchpad.Edit"
template="../templates/branch-delete.pt"/>
<browser:pages
for="lp.code.interfaces.branch.IBranch"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branch.BranchMirrorStatusView"
permission="launchpad.View">
<browser:page
@@ -524,69 +472,59 @@
<browser:page
name="+subscribe"
for="lp.code.interfaces.branch.IBranch"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchsubscription.BranchSubscriptionAddView"
permission="launchpad.AnyPerson"
template="../../app/templates/generic-edit.pt"/>
<browser:page
name="+register-merge"
for="lp.code.interfaces.branch.IBranch"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branch.RegisterBranchMergeProposalView"
permission="launchpad.AnyPerson"
template="../templates/branch-register-merge.pt"/>
<browser:page
name="+linkbug"
for="lp.code.interfaces.branch.IBranch"
- layer="lp.code.publisher.CodeLayer"
class="lp.bugs.browser.bugbranch.BranchLinkToBugView"
permission="launchpad.AnyPerson"
template="../../app/templates/generic-edit.pt"/>
<browser:page
name="+linkblueprint"
for="lp.code.interfaces.branch.IBranch"
- layer="lp.code.publisher.CodeLayer"
class="lp.blueprints.browser.specificationbranch.BranchLinkToSpecificationView"
permission="launchpad.AnyPerson"
template="../../app/templates/generic-edit.pt"/>
<browser:page
name="+addsubscriber"
for="lp.code.interfaces.branch.IBranch"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchsubscription.BranchSubscriptionAddOtherView"
permission="launchpad.AnyPerson"
template="../../app/templates/generic-edit.pt"/>
<browser:page
name="+edit-subscription"
for="lp.code.interfaces.branch.IBranch"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchsubscription.BranchSubscriptionEditOwnView"
permission="launchpad.AnyPerson"
template="../templates/branch-edit-subscription.pt"/>
<browser:page
for="lp.code.interfaces.branch.IBranch"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branch.BranchRequestImportView"
name="+request-import"
template="../templates/inline-form-only-buttons.pt"
permission="launchpad.AnyPerson"/>
<browser:page
for="lp.code.interfaces.branch.IBranch"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branch.TryImportAgainView"
name="+try-again"
template="../templates/inline-form-only-buttons.pt"
permission="launchpad.AnyPerson"/>
<browser:page
for="lp.code.interfaces.branch.IBranch"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchmergeproposallisting.BranchActiveReviewsView"
permission="zope.Public"
name="+activereviews"
template="../templates/active-reviews.pt"/>
<browser:page
for="lp.code.interfaces.branch.IBranchBatchNavigator"
- layer="lp.code.publisher.CodeLayer"
name="+branch-listing"
template="../templates/branch-listing.pt"
permission="zope.Public"/>
@@ -618,7 +556,6 @@
module="lp.code.browser.branch"/>
<browser:page
for="lp.code.interfaces.codereviewcomment.ICodeReviewComment"
- layer="lp.code.publisher.CodeLayer"
name="+hierarchy"
class="lp.code.browser.branch.BranchHierarchy"
template="../../app/templates/launchpad-hierarchy.pt"
@@ -630,11 +567,9 @@
rootsite="code"/>
<browser:defaultView
for="lp.code.interfaces.codereviewcomment.ICodeReviewComment"
- layer="lp.code.publisher.CodeLayer"
name="+index"/>
<browser:pages
for="lp.code.interfaces.codereviewcomment.ICodeReviewComment"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.codereviewcomment.CodeReviewCommentView"
permission="zope.Public">
<browser:page
@@ -646,7 +581,6 @@
</browser:pages>
<browser:pages
for="lp.code.browser.codereviewcomment.ICodeReviewDisplayComment"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.codereviewcomment.CodeReviewCommentView"
permission="zope.Public">
<browser:page
@@ -661,7 +595,6 @@
</browser:pages>
<browser:pages
for="lp.code.browser.branchmergeproposal.ICodeReviewNewRevisions"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchmergeproposal.CodeReviewNewRevisionsView"
permission="zope.Public">
<browser:page
@@ -674,7 +607,6 @@
<browser:page
name="+reply"
for="lp.code.interfaces.codereviewcomment.ICodeReviewComment"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.codereviewcomment.CodeReviewCommentAddView"
permission="launchpad.AnyPerson"
template="../templates/codereviewcomment-reply.pt"/>
@@ -683,7 +615,6 @@
module="lp.code.browser.codereviewcomment"/>
<browser:page
for="lp.code.interfaces.codeimport.ICodeImport"
- layer="lp.code.publisher.CodeLayer"
name="+macros"
permission="zope.Public"
template="../templates/codeimport-macros.pt"/>
@@ -694,25 +625,21 @@
rootsite="code"/>
<browser:defaultView
for="lp.code.interfaces.codeimport.ICodeImportSet"
- name="+index"
- layer="lp.code.publisher.CodeLayer"/>
+ name="+index"/>
<browser:page
for="lp.code.interfaces.codeimport.ICodeImportSet"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.codeimport.CodeImportSetView"
name="+index"
template="../templates/codeimport-list.pt"
permission="zope.Public"/>
<browser:page
for="lp.code.interfaces.codeimport.ICodeImportSet"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.codeimport.CodeImportNewView"
name="+new"
template="../templates/codeimport-new.pt"
permission="launchpad.AnyPerson"/>
<browser:page
for="lp.registry.interfaces.product.IProduct"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.codeimport.CodeImportNewView"
name="+new-import"
template="../templates/codeimport-new.pt"
@@ -731,77 +658,66 @@
layer="lp.code.publisher.CodeLayer"/>
<browser:page
for="lp.registry.interfaces.sourcepackage.ISourcePackage"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchlisting.SourcePackageBranchesView"
permission="zope.Public"
name="+branches"
template="../templates/sourcepackage-branches.pt"/>
<browser:page
for="lp.registry.interfaces.sourcepackage.ISourcePackage"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.summary.BranchCountSummaryView"
permission="zope.Public"
name="+count-summary"
template="../templates/branch-count-summary.pt"/>
<browser:page
for="lp.registry.interfaces.distribution.IDistribution"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchlisting.DistributionBranchListingView"
permission="zope.Public"
name="+branches"
template="../templates/generic-branch-listing.pt"/>
<browser:page
for="lp.registry.interfaces.distribution.IDistribution"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.summary.BranchCountSummaryView"
permission="zope.Public"
name="+count-summary"
template="../templates/branch-count-summary.pt"/>
<browser:page
for="lp.registry.interfaces.distroseries.IDistroSeries"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchlisting.DistroSeriesBranchListingView"
permission="zope.Public"
name="+branches"
template="../templates/generic-branch-listing.pt"/>
<browser:page
for="lp.registry.interfaces.distroseries.IDistroSeries"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.summary.BranchCountSummaryView"
permission="zope.Public"
name="+count-summary"
template="../templates/branch-count-summary.pt"/>
<browser:page
for="lp.registry.interfaces.distributionsourcepackage.IDistributionSourcePackage"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchlisting.DistributionSourcePackageBranchesView"
permission="zope.Public"
name="+branches"
template="../templates/generic-branch-listing.pt"/>
<browser:page
for="lp.registry.interfaces.distributionsourcepackage.IDistributionSourcePackage"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchlisting.GroupedDistributionSourcePackageBranchesView"
permission="zope.Public"
name="+code-index"
template="../templates/distributionsourcepackage-branches-grouped.pt"/>
<browser:page
for="lp.registry.interfaces.distributionsourcepackage.IDistributionSourcePackage"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.summary.BranchCountSummaryView"
permission="zope.Public"
name="+count-summary"
template="../templates/branch-count-summary.pt"/>
<browser:page
for="lp.registry.interfaces.projectgroup.IProjectGroup"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchlisting.ProjectBranchesView"
permission="zope.Public"
name="+branches"
template="../templates/project-branches.pt"/>
<browser:page
for="lp.registry.interfaces.projectgroup.IProjectGroup"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.summary.BranchCountSummaryView"
permission="zope.Public"
name="+count-summary"
@@ -818,41 +734,35 @@
<browser:page
for="lp.registry.interfaces.person.IPerson"
class="lp.code.browser.branchlisting.PersonOwnedBranchesView"
- layer="lp.code.publisher.CodeLayer"
permission="zope.Public"
name="+branches"
template="../templates/person-branches.pt"/>
<browser:page
for="lp.registry.interfaces.person.IPerson"
class="lp.code.browser.branchlisting.PersonOwnedBranchesView"
- layer="lp.code.publisher.CodeLayer"
permission="zope.Public"
name="+ownedbranches"
template="../templates/person-branches.pt"/>
<browser:page
for="lp.registry.interfaces.person.IPerson"
class="lp.code.browser.branchlisting.PersonSubscribedBranchesView"
- layer="lp.code.publisher.CodeLayer"
permission="zope.Public"
name="+subscribedbranches"
template="../templates/person-branches.pt"/>
<browser:page
for="lp.registry.interfaces.person.IPerson"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchlisting.PersonRegisteredBranchesView"
permission="zope.Public"
name="+registeredbranches"
template="../templates/person-branches.pt"/>
<browser:page
for="lp.registry.interfaces.person.IPerson"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchlisting.PersonCodeSummaryView"
permission="zope.Public"
name="+codesummary"
template="../templates/person-codesummary.pt"/>
<browser:page
for="lp.registry.interfaces.person.IPerson"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchmergeproposallisting.PersonActiveReviewsView"
permission="zope.Public"
name="+activereviews"
@@ -860,13 +770,11 @@
<browser:page
name="+addbranch"
for="lp.registry.interfaces.person.IPerson"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branch.BranchAddView"
permission="launchpad.AnyPerson"
template="../templates/branch-add.pt"/>
<browser:page
for="lp.registry.interfaces.person.IPerson"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchlisting.PersonTeamBranchesView"
name="+portlet-teambranches"
template="../templates/person-portlet-teambranches.pt"
@@ -874,14 +782,12 @@
<browser:page
for="lp.registry.interfaces.product.IProduct"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchlisting.ProductBranchesView"
permission="zope.Public"
name="+branches"
template="../templates/product-branches.pt"/>
<browser:page
for="lp.registry.interfaces.product.IProduct"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchlisting.ProductCodeIndexView"
permission="zope.Public"
name="+code-index"
@@ -894,14 +800,12 @@
template="../templates/product-portlet-codestatistics.pt"/>
<browser:page
for="lp.registry.interfaces.product.IProduct"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchlisting.ProductCodeIndexView"
permission="zope.Public"
name="+branch-summary"
template="../templates/product-branch-summary.pt"/>
<browser:page
for="lp.registry.interfaces.product.IProduct"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.summary.BranchCountSummaryView"
permission="zope.Public"
name="+count-summary"
@@ -910,7 +814,6 @@
<browser:page
name="+addbranch"
for="lp.registry.interfaces.product.IProduct"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branch.BranchAddView"
permission="launchpad.AnyPerson"
template="../templates/branch-add.pt"/>
@@ -918,7 +821,6 @@
<browser:page
name="+addbranch"
for="lp.registry.interfaces.productseries.IProductSeries"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branch.BranchAddView"
permission="launchpad.AnyPerson"
template="../templates/branch-add.pt"/>
@@ -975,7 +877,6 @@
<browser:page
for="lp.registry.interfaces.personproduct.IPersonProduct"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchlisting.PersonProductOwnedBranchesView"
permission="zope.Public"
name="+branches"
@@ -983,7 +884,6 @@
/>
<browser:page
for="lp.registry.interfaces.personproduct.IPersonProduct"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchlisting.PersonProductSubscribedBranchesView"
permission="zope.Public"
name="+subscribedbranches"
@@ -991,7 +891,6 @@
/>
<browser:page
for="lp.registry.interfaces.personproduct.IPersonProduct"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchlisting.PersonProductRegisteredBranchesView"
permission="zope.Public"
name="+registeredbranches"
@@ -999,7 +898,6 @@
/>
<browser:page
for="lp.registry.interfaces.personproduct.IPersonProduct"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchmergeproposallisting.PersonProductActiveReviewsView"
permission="zope.Public"
name="+activereviews"
@@ -1007,7 +905,6 @@
<browser:page
for="lp.registry.interfaces.personproduct.IPersonProduct"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchlisting.PersonProductTeamBranchesView"
name="+portlet-teambranches"
template="../templates/person-portlet-teambranches.pt"
@@ -1016,7 +913,6 @@
<browser:page
for="lp.registry.interfaces.personproduct.IPersonProduct"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchlisting.PersonProductCodeSummaryView"
name="+codesummary"
template="../templates/person-codesummary.pt"
@@ -1025,7 +921,6 @@
<browser:page
for="lp.code.interfaces.hasbranches.IHasMergeProposals"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchmergeproposallisting.BranchMergeProposalListingView"
permission="zope.Public"
name="+merges"
@@ -1033,7 +928,6 @@
<browser:page
for="lp.code.interfaces.hasbranches.IHasMergeProposals"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchmergeproposallisting.ActiveReviewsView"
permission="zope.Public"
name="+activereviews"
@@ -1113,32 +1007,27 @@
<browser:defaultView
for="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"
- name="+index"
- layer="lp.code.publisher.CodeLayer"/>
+ name="+index" />
<browser:page
for="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeView"
name="+index"
template="../templates/sourcepackagerecipe-index.pt"
permission="launchpad.View"/>
<browser:page
for="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeRequestBuildsHtmlView"
name="+request-builds"
template="../templates/sourcepackagerecipe-request-builds.pt"
permission="launchpad.AnyPerson"/>
<browser:page
for="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeRequestBuildsAjaxView"
name="+builds"
template="../templates/sourcepackagerecipe-builds.pt"
permission="launchpad.View"/>
<browser:page
for="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeRequestDailyBuildView"
name="+request-daily-build"
permission="launchpad.Edit"/>
@@ -1172,21 +1061,18 @@
<browser:page
for="lp.code.interfaces.branch.IBranch"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeAddView"
permission="launchpad.AnyPerson"
name="+new-recipe"
template="../templates/sourcepackagerecipe-new.pt"/>
<browser:page
for="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeEditView"
permission="launchpad.Edit"
name="+edit"
template="../../app/templates/generic-edit.pt"/>
<browser:page
for="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeDeleteView"
permission="launchpad.Edit"
name="+delete"
@@ -1194,21 +1080,18 @@
<browser:page
for="lp.code.interfaces.branch.IBranch"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.sourcepackagerecipelisting.BranchRecipeListingView"
permission="zope.Public"
name="+recipes"
template="../templates/sourcepackagerecipe-listing.pt"/>
<browser:page
for="lp.registry.interfaces.product.IProduct"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.sourcepackagerecipelisting.ProductRecipeListingView"
permission="zope.Public"
name="+recipes"
template="../templates/sourcepackagerecipe-listing.pt"/>
<browser:page
for="lp.registry.interfaces.person.IPerson"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.sourcepackagerecipelisting.PersonRecipeListingView"
permission="zope.Public"
name="+recipes"
@@ -1216,7 +1099,6 @@
<browser:page
for="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"
- layer="lp.code.publisher.CodeLayer"
name="+hierarchy"
class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeHierarchy"
template="../../app/templates/launchpad-hierarchy.pt"
@@ -1230,7 +1112,6 @@
<browser:page
for="lp.registry.interfaces.person.IPerson"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchmergequeuelisting.PersonMergeQueueListingView"
permission="zope.Public"
name="+merge-queues"
@@ -1238,7 +1119,6 @@
<browser:page
for="*"
- layer="lp.code.publisher.CodeLayer"
name="+bmq-macros"
permission="zope.Public"
template="../templates/branchmergequeue-macros.pt"
@@ -1257,18 +1137,15 @@
<browser:defaultView
for="lp.code.interfaces.branchmergequeue.IBranchMergeQueue"
- name="+index"
- layer="lp.code.publisher.CodeLayer" />
+ name="+index" />
<browser:page
for="lp.code.interfaces.branchmergequeue.IBranchMergeQueue"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchmergequeue.BranchMergeQueueView"
name="+index"
template="../templates/branchmergequeue-index.pt"
permission="zope.Public" />
<browser:page
for="lp.code.interfaces.branch.IBranch"
- layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchmergequeue.BranchMergeQueueAddView"
name="+create-queue"
template="../../app/templates/generic-edit.pt"
=== modified file 'lib/lp/translations/browser/configure.zcml'
--- lib/lp/translations/browser/configure.zcml 2011-11-27 01:08:41 +0000
+++ lib/lp/translations/browser/configure.zcml 2011-11-28 04:33:24 +0000
@@ -15,8 +15,7 @@
parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"/>
<browser:defaultView
for="canonical.launchpad.interfaces.launchpad.IRosettaApplication"
- name="+index"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ name="+index"/>
<browser:navigation
module="lp.translations.browser.translations"
classes="
@@ -24,8 +23,7 @@
<browser:pages
for="canonical.launchpad.interfaces.launchpad.IRosettaApplication"
permission="zope.Public"
- class="lp.translations.browser.translations.RosettaApplicationView"
- layer="lp.translations.publisher.TranslationsLayer">
+ class="lp.translations.browser.translations.RosettaApplicationView">
<browser:page
name="+index"
template="../templates/rosetta-index.pt"/>
@@ -43,7 +41,6 @@
for="canonical.launchpad.interfaces.launchpad.IRosettaApplication"
permission="zope.Public"
class="lp.translations.browser.translations.TranslatableProductsView"
- layer="lp.translations.publisher.TranslationsLayer"
name="+products-with-translations"
template="../templates/rosetta-products.pt"/>
<browser:page
@@ -56,46 +53,39 @@
class="lp.translations.browser.translations.RosettaStatsView"
permission="zope.Public"
name="+barchart"
- template="../templates/rosettastats-barchart.pt"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ template="../templates/rosettastats-barchart.pt"/>
<browser:page
for="*"
name="+translations-macros"
permission="zope.Public"
template="../templates/translations-macros.pt"
- layer="lp.translations.publisher.TranslationsLayer"
class="lp.app.browser.launchpad.Macro"/>
<browser:page
for="lp.translations.interfaces.translationpolicy.ITranslationPolicy"
permission="zope.Public"
name="+portlet-translation-groups-and-permission"
- template="../templates/hastranslationgroup-portlet-translation-groups-and-permission.pt"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ template="../templates/hastranslationgroup-portlet-translation-groups-and-permission.pt"/>
<browser:defaultView
for="lp.translations.interfaces.translator.ITranslator"
- name="+admin"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ name="+admin"/>
<browser:page
name="+admin"
for="lp.translations.interfaces.translator.ITranslator"
permission="launchpad.Admin"
class="lp.translations.browser.translator.TranslatorAdminView"
- template="../../app/templates/generic-edit.pt"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ template="../../app/templates/generic-edit.pt"/>
<browser:page
name="+edit"
for="lp.translations.interfaces.translator.IEditTranslator"
permission="launchpad.Edit"
class="lp.translations.browser.translator.TranslatorEditView"
- template="../../app/templates/generic-edit.pt"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ template="../../app/templates/generic-edit.pt"/>
<browser:page
name="+remove"
for="lp.translations.interfaces.translator.ITranslator"
permission="launchpad.Edit"
class="lp.translations.browser.translator.TranslatorRemoveView"
- template="../../app/templates/generic-edit.pt"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ template="../../app/templates/generic-edit.pt"/>
<browser:navigation
module="lp.translations.browser.translationimportqueue"
classes="
@@ -103,8 +93,7 @@
TranslationImportQueueNavigation"/>
<browser:defaultView
for="lp.translations.interfaces.translationimportqueue.ITranslationImportQueueEntry"
- name="+index"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ name="+index"/>
<browser:url
for="lp.translations.interfaces.translationimportqueue.ITranslationImportQueueEntry"
path_expression="string:${id}"
@@ -114,12 +103,10 @@
for="lp.translations.interfaces.translationimportqueue.ITranslationImportQueueEntry"
class="lp.translations.browser.translationimportqueue.TranslationImportQueueEntryView"
permission="launchpad.Admin"
- template="../templates/translationimportqueueentry-index.pt"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ template="../templates/translationimportqueueentry-index.pt"/>
<browser:page
for="lp.translations.interfaces.translationimportqueue.ITranslationImportQueueEntry"
permission="zope.Public"
- layer="lp.translations.publisher.TranslationsLayer"
name="+portlet-details"
class="lp.translations.browser.translationimportqueue.TranslationImportQueueEntryView"
template="../templates/translationimportqueueentry-portlet-details.pt"/>
@@ -129,15 +116,13 @@
parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"/>
<browser:defaultView
for="lp.translations.interfaces.translationimportqueue.ITranslationImportQueue"
- name="+index"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ name="+index"/>
<browser:page
for="lp.translations.interfaces.translationimportqueue.ITranslationImportQueue"
name="+index"
class="lp.translations.browser.translationimportqueue.TranslationImportQueueView"
permission="zope.Public"
- template="../templates/translationimportqueue-index.pt"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ template="../templates/translationimportqueue-index.pt"/>
<browser:url
for="lp.translations.interfaces.distroserieslanguage.IDistroSeriesLanguage"
path_expression="string:+lang/${language/code}"
@@ -148,12 +133,10 @@
classes="DistroSeriesLanguageNavigation"/>
<browser:defaultView
for="lp.translations.interfaces.distroserieslanguage.IDistroSeriesLanguage"
- name="+index"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ name="+index"/>
<browser:pages
for="lp.translations.interfaces.distroserieslanguage.IDistroSeriesLanguage"
- permission="zope.Public"
- layer="lp.translations.publisher.TranslationsLayer">
+ permission="zope.Public">
<browser:page
name="+rosetta-status-legend"
template="../templates/rosetta-status-legend.pt"/>
@@ -163,8 +146,7 @@
permission="zope.Public"
for="lp.translations.interfaces.distroserieslanguage.IDistroSeriesLanguage"
template="../templates/serieslanguage-index.pt"
- class="lp.translations.browser.serieslanguage.DistroSeriesLanguageView"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ class="lp.translations.browser.serieslanguage.DistroSeriesLanguageView"/>
<browser:navigation
module="lp.translations.browser.pofile"
classes="
@@ -181,20 +163,17 @@
POFileNavigationMenu"/>
<browser:defaultView
for="lp.translations.interfaces.pofile.IPOFile"
- name="+translate"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ name="+translate"/>
<browser:page
for="lp.translations.interfaces.pofile.IPOFile"
name="+details"
permission="zope.Public"
class="lp.translations.browser.pofile.POFileDetailsView"
- layer="lp.translations.publisher.TranslationsLayer"
template="../templates/pofile-details.pt"/>
<browser:pages
for="lp.translations.interfaces.pofile.IPOFile"
permission="zope.Public"
- class="lp.translations.browser.pofile.POFileView"
- layer="lp.translations.publisher.TranslationsLayer">
+ class="lp.translations.browser.pofile.POFileView">
<!-- POFile Portlets -->
<browser:page
name="+contributors"
@@ -214,34 +193,25 @@
permission="launchpad.Edit"
class="lp.translations.browser.pofile.POFileUploadView"
for="lp.translations.interfaces.pofile.IPOFile"
- template="../templates/pofile-upload.pt"
- layer="lp.translations.publisher.TranslationsLayer"/>
- <browser:page
- name="+translate"
- for="lp.translations.interfaces.pofile.IPOFile"
- class="lp.translations.browser.translations.TranslateRedirectView"
- permission="zope.Public"/>
+ template="../templates/pofile-upload.pt"/>
<browser:page
name="+translate"
for="lp.translations.interfaces.pofile.IPOFile"
permission="zope.Public"
template="../templates/pofile-translate.pt"
- class="lp.translations.browser.pofile.POFileTranslateView"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ class="lp.translations.browser.pofile.POFileTranslateView"/>
<browser:page
name="+export"
for="lp.translations.interfaces.pofile.IPOFile"
permission="launchpad.AnyPerson"
template="../templates/pofile-export.pt"
- class="lp.translations.browser.pofile.POExportView"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ class="lp.translations.browser.pofile.POExportView"/>
<browser:page
name="+filter"
for="lp.translations.interfaces.pofile.IPOFile"
permission="zope.Public"
template="../templates/pofile-filter.pt"
- class="lp.translations.browser.pofile.POFileFilteredView"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ class="lp.translations.browser.pofile.POFileFilteredView"/>
<browser:url
for="lp.translations.interfaces.productserieslanguage.IProductSeriesLanguage"
path_expression="string:+lang/${language/code}"
@@ -256,8 +226,7 @@
name="+index"/>
<browser:pages
for="lp.translations.interfaces.productserieslanguage.IProductSeriesLanguage"
- permission="zope.Public"
- layer="lp.translations.publisher.TranslationsLayer">
+ permission="zope.Public">
<browser:page
name="+rosetta-status-legend"
template="../templates/rosetta-status-legend.pt"/>
@@ -267,16 +236,14 @@
permission="zope.Public"
for="lp.translations.interfaces.productserieslanguage.IProductSeriesLanguage"
template="../templates/serieslanguage-index.pt"
- class="lp.translations.browser.serieslanguage.ProductSeriesLanguageView"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ class="lp.translations.browser.serieslanguage.ProductSeriesLanguageView"/>
<browser:navigation
module="lp.translations.browser.language"
classes="
LanguageSetNavigation"/>
<browser:defaultView
for="lp.services.worlddata.interfaces.language.ILanguage"
- name="+index"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ name="+index"/>
<browser:menus
module="lp.translations.browser.language"
classes="
@@ -292,20 +259,17 @@
class="lp.translations.browser.language.LanguageView"
permission="zope.Public"
template="../templates/language-index.pt"
- name="+index"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ name="+index"/>
<browser:page
for="lp.services.worlddata.interfaces.language.ILanguage"
class="lp.translations.browser.language.LanguageAdminView"
permission="launchpad.Admin"
template="../../app/templates/generic-edit.pt"
- name="+admin"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ name="+admin"/>
<browser:pages
for="lp.services.worlddata.interfaces.language.ILanguage"
class="lp.translations.browser.language.LanguageView"
- permission="zope.Public"
- layer="lp.translations.publisher.TranslationsLayer">
+ permission="zope.Public">
<browser:page
name="+portlet-details"
template="../templates/language-portlet-details.pt"/>
@@ -315,8 +279,7 @@
</browser:pages>
<browser:defaultView
for="lp.services.worlddata.interfaces.language.ILanguageSet"
- name="+index"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ name="+index"/>
<browser:url
for="lp.services.worlddata.interfaces.language.ILanguageSet"
path_expression="string:+languages"
@@ -327,15 +290,13 @@
class="lp.translations.browser.language.LanguageSetView"
permission="zope.Public"
template="../templates/languageset-index.pt"
- name="+index"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ name="+index"/>
<browser:page
for="lp.services.worlddata.interfaces.language.ILanguageSet"
class="lp.translations.browser.language.LanguageAddView"
permission="launchpad.Admin"
template="../../app/templates/generic-edit.pt"
- name="+add"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ name="+add"/>
<browser:navigation
module="lp.translations.browser.potemplate"
classes="
@@ -344,20 +305,17 @@
POTemplateSetNavigation"/>
<browser:defaultView
for="lp.translations.interfaces.potemplate.IPOTemplate"
- name="+index"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ name="+index"/>
<browser:page
name="+preferred-chart"
for="lp.translations.interfaces.potemplate.IPOTemplate"
class="lp.translations.browser.potemplate.POTemplateViewPreferred"
permission="zope.Public"
- template="../templates/potemplate-chart.pt"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ template="../templates/potemplate-chart.pt"/>
<browser:pages
for="lp.translations.interfaces.potemplate.IPOTemplate"
class="lp.translations.browser.potemplate.POTemplateView"
- permission="zope.Public"
- layer="lp.translations.publisher.TranslationsLayer">
+ permission="zope.Public">
<browser:page
name="+index"
template="../templates/potemplate-index.pt"/>
@@ -379,29 +337,25 @@
for="lp.translations.interfaces.potemplate.IPOTemplate"
permission="launchpad.TranslationsAdmin"
template="../templates/potemplate-upload.pt"
- class="lp.translations.browser.potemplate.POTemplateUploadView"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ class="lp.translations.browser.potemplate.POTemplateUploadView"/>
<browser:page
name="+edit"
for="lp.translations.interfaces.potemplate.IPOTemplate"
class="lp.translations.browser.potemplate.POTemplateEditView"
permission="launchpad.TranslationsAdmin"
- template="../../app/templates/generic-edit.pt"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ template="../../app/templates/generic-edit.pt"/>
<browser:page
name="+admin"
for="lp.translations.interfaces.potemplate.IPOTemplate"
class="lp.translations.browser.potemplate.POTemplateAdminView"
permission="launchpad.Admin"
- template="../../app/templates/generic-edit.pt"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ template="../../app/templates/generic-edit.pt"/>
<browser:page
name="+export"
for="lp.translations.interfaces.potemplate.IPOTemplate"
permission="launchpad.AnyPerson"
template="../templates/potemplate-export.pt"
- class="lp.translations.browser.potemplate.POTemplateExportView"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ class="lp.translations.browser.potemplate.POTemplateExportView"/>
<browser:menus
module="lp.translations.browser.potemplate"
classes="
@@ -415,15 +369,13 @@
urldata="lp.translations.browser.potemplate.POTemplateURL"/>
<browser:defaultView
for="lp.translations.interfaces.potemplate.IPOTemplateSubset"
- name="+index"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ name="+index"/>
<browser:page
name="+index"
for="lp.translations.interfaces.potemplate.IPOTemplateSubset"
permission="zope.Public"
class="lp.translations.browser.potemplate.POTemplateSubsetView"
- attribute="__call__"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ attribute="__call__"/>
<browser:navigation
module="lp.translations.browser.translationgroup"
classes="
@@ -431,8 +383,7 @@
TranslationGroupSetNavigation"/>
<browser:defaultView
for="lp.translations.interfaces.translationgroup.ITranslationGroup"
- name="+index"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ name="+index"/>
<browser:url
for="lp.translations.interfaces.translationgroup.ITranslationGroup"
path_expression="name"
@@ -441,8 +392,7 @@
<browser:pages
for="lp.translations.interfaces.translationgroup.ITranslationGroup"
class="lp.translations.browser.translationgroup.TranslationGroupView"
- permission="zope.Public"
- layer="lp.translations.publisher.TranslationsLayer">
+ permission="zope.Public">
<browser:page
template="../templates/translationgroup-index.pt"
name="+index"/>
@@ -458,28 +408,24 @@
for="lp.translations.interfaces.translationgroup.ITranslationGroup"
permission="launchpad.Edit"
class="lp.translations.browser.translationgroup.TranslationGroupEditView"
- template="../../app/templates/generic-edit.pt"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ template="../../app/templates/generic-edit.pt"/>
<browser:page
name="+appoint"
for="lp.translations.interfaces.translationgroup.ITranslationGroup"
permission="launchpad.Edit"
class="lp.translations.browser.translationgroup.TranslationGroupAddTranslatorView"
- template="../../app/templates/generic-edit.pt"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ template="../../app/templates/generic-edit.pt"/>
<browser:page
name="+reassign"
for="lp.translations.interfaces.translationgroup.ITranslationGroup"
permission="launchpad.Edit"
class="lp.translations.browser.translationgroup.TranslationGroupReassignmentView"
- template="../templates/translationgroup-reassignment.pt"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ template="../templates/translationgroup-reassignment.pt"/>
<browser:page
for="lp.translations.interfaces.translationgroup.ITranslationGroup"
permission="launchpad.Edit"
name="+object-reassignment"
- template="../../app/templates/object-reassignment.pt"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ template="../../app/templates/object-reassignment.pt"/>
<browser:url
for="lp.translations.interfaces.translationgroup.ITranslationGroupSet"
path_expression="string:+groups"
@@ -487,22 +433,19 @@
rootsite="translations" />
<browser:defaultView
for="lp.translations.interfaces.translationgroup.ITranslationGroupSet"
- name="+index"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ name="+index"/>
<browser:page
name="+new"
for="lp.translations.interfaces.translationgroup.ITranslationGroupSet"
class="lp.translations.browser.translationgroup.TranslationGroupAddView"
permission="launchpad.Admin"
- template="../../app/templates/generic-edit.pt"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ template="../../app/templates/generic-edit.pt"/>
<browser:page
for="lp.translations.interfaces.translationgroup.ITranslationGroupSet"
class="lp.translations.browser.translationgroup.TranslationGroupSetView"
permission="zope.Public"
template="../templates/translationgroups-index.pt"
- name="+index"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ name="+index"/>
<browser:url
for="lp.translations.interfaces.translationmessage.ITranslationMessage"
path_expression="string:${sequence}"
@@ -515,32 +458,23 @@
CurrentTranslationMessageAppMenus"/>
<browser:defaultView
for="lp.translations.interfaces.translationmessage.ITranslationMessage"
- name="+index"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ name="+index"/>
<browser:page
for="lp.translations.interfaces.translationmessage.ITranslationMessage"
class="lp.translations.browser.translationmessage.CurrentTranslationMessageIndexView"
permission="zope.Public"
- name="+index"
- layer="lp.translations.publisher.TranslationsLayer"/>
- <browser:page
- name="+translate"
- for="lp.translations.interfaces.translationmessage.ITranslationMessage"
- class="lp.translations.browser.translations.TranslateRedirectView"
- permission="zope.Public"/>
+ name="+index"/>
<browser:page
name="+translate"
for="lp.translations.interfaces.translationmessage.ITranslationMessage"
permission="zope.Public"
template="../templates/translationmessage-translate.pt"
- class="lp.translations.browser.translationmessage.CurrentTranslationMessagePageView"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ class="lp.translations.browser.translationmessage.CurrentTranslationMessagePageView"/>
<browser:page
name="+display"
for="lp.translations.interfaces.translationmessage.ITranslationMessageSuggestions"
permission="launchpad.AnyPerson"
- template="../templates/translationmessage-suggestions.pt"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ template="../templates/translationmessage-suggestions.pt"/>
<!-- SourcePackage translation pages -->
@@ -557,22 +491,15 @@
name="+imports"
class="lp.translations.browser.hastranslationimports.HasTranslationImportsView"
permission="zope.Public"
- template="../templates/hastranslationimports-index.pt"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ template="../templates/hastranslationimports-index.pt"/>
<browser:page
for="lp.registry.interfaces.sourcepackage.ISourcePackage"
name="+export"
- layer="lp.translations.publisher.TranslationsLayer"
permission="launchpad.ExpensiveRequest"
template="../templates/translations-export.pt"
class="
lp.translations.browser.sourcepackage.SourcePackageTranslationsExportView"/>
<browser:page
- name="+translations"
- for="lp.registry.interfaces.sourcepackage.ISourcePackage"
- class="lp.translations.browser.translations.TranslationsRedirectView"
- permission="zope.Public"/>
- <browser:page
name="+translate"
for="lp.registry.interfaces.sourcepackage.ISourcePackage"
class="lp.translations.browser.translations.TranslationsRedirectView"
@@ -582,13 +509,11 @@
name="+sharing-details"
class="lp.translations.browser.sourcepackage.SourcePackageTranslationSharingDetailsView"
permission="zope.Public"
- template="../templates/sourcepackage-sharing-details.pt"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ template="../templates/sourcepackage-sharing-details.pt"/>
<browser:pages
for="lp.registry.interfaces.sourcepackage.ISourcePackage"
permission="zope.Public"
- class="lp.translations.browser.sourcepackage.SourcePackageTranslationsView"
- layer="lp.translations.publisher.TranslationsLayer">
+ class="lp.translations.browser.sourcepackage.SourcePackageTranslationsView">
<browser:page
name="+potlist"
template="../templates/object-pots.pt"/>
@@ -606,16 +531,10 @@
<browser:menus
classes="ProductSeriesTranslationsMenu"
module="lp.translations.browser.productseries"/>
- <browser:page
- name="+translations"
- for="lp.registry.interfaces.productseries.IProductSeries"
- class="lp.translations.browser.translations.TranslationsRedirectView"
- permission="zope.Public"/>
<browser:pages
for="lp.registry.interfaces.productseries.IProductSeries"
class="lp.translations.browser.productseries.ProductSeriesView"
- permission="zope.Public"
- layer="lp.translations.publisher.TranslationsLayer" >
+ permission="zope.Public">
<browser:page
name="+translations"
template="../templates/productseries-translations.pt"
@@ -637,8 +556,7 @@
<browser:pages
for="lp.registry.interfaces.productseries.IProductSeries"
class="lp.translations.browser.productseries.ProductSeriesUploadView"
- permission="launchpad.Edit"
- layer="lp.translations.publisher.TranslationsLayer">
+ permission="launchpad.Edit">
<browser:page
name="+translations-upload"
template="../templates/productseries-translations-upload.pt"/>
@@ -648,39 +566,33 @@
name="+imports"
class="lp.translations.browser.hastranslationimports.HasTranslationImportsView"
permission="zope.Public"
- template="../templates/hastranslationimports-index.pt"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ template="../templates/hastranslationimports-index.pt"/>
<browser:page
for="lp.registry.interfaces.productseries.IProductSeries"
name="+translations-settings"
class="lp.translations.browser.productseries.ProductSeriesTranslationsSettingsView"
permission="launchpad.Edit"
- template="../templates/productseries-translations-settings.pt"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ template="../templates/productseries-translations-settings.pt"/>
<browser:page
for="lp.registry.interfaces.productseries.IProductSeries"
name="+templates"
class="lp.translations.browser.productseries.ProductSeriesTemplatesView"
permission="zope.Public"
- template="../templates/object-templates.pt"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ template="../templates/object-templates.pt"/>
<browser:page
for="lp.registry.interfaces.productseries.IProductSeries"
name="+request-bzr-import"
class="lp.translations.browser.productseries.ProductSeriesTranslationsBzrImportView"
permission="launchpad.Edit"
- template="../templates/productseries-translations-bzr-import.pt"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ template="../templates/productseries-translations-bzr-import.pt"/>
<browser:page
name="+export"
- layer="lp.translations.publisher.TranslationsLayer"
for="lp.registry.interfaces.productseries.IProductSeries"
permission="launchpad.AnyPerson"
template="../templates/translations-export.pt"
class="lp.translations.browser.productseries.ProductSeriesTranslationsExportView"/>
<browser:page
name="+link-translations-branch"
- layer="lp.translations.publisher.TranslationsLayer"
for="lp.registry.interfaces.productseries.IProductSeries"
permission="launchpad.Edit"
template="../../app/templates/generic-edit.pt"
@@ -697,32 +609,24 @@
classes="
PersonTranslationsMenu"/>
<browser:page
- name="+translations"
- for="lp.registry.interfaces.person.IPerson"
- class="lp.translations.browser.translations.TranslationsRedirectView"
- permission="zope.Public"/>
- <browser:page
for="lp.registry.interfaces.person.IPerson"
name="+translations"
class="lp.translations.browser.person.PersonTranslationView"
permission="zope.Public"
- template="../templates/person-translations.pt"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ template="../templates/person-translations.pt"/>
<browser:page
for="lp.registry.interfaces.person.IPerson"
name="+licensing"
class="
lp.translations.browser.person.PersonTranslationRelicensingView"
permission="launchpad.Edit"
- template="../templates/person-translations-relicensing.pt"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ template="../templates/person-translations-relicensing.pt"/>
<browser:page
for="lp.registry.interfaces.person.IPerson"
name="+imports"
class="lp.translations.browser.hastranslationimports.HasTranslationImportsView"
permission="zope.Public"
- template="../templates/hastranslationimports-index.pt"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ template="../templates/hastranslationimports-index.pt"/>
<browser:page
for="lp.registry.interfaces.person.IPerson"
class="lp.translations.browser.person.PersonTranslationView"
@@ -734,15 +638,13 @@
name="+activity"
class="lp.translations.browser.person.TranslationActivityView"
permission="zope.Public"
- template="../templates/person-translation-activity.pt"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ template="../templates/person-translation-activity.pt"/>
<browser:page
for="lp.registry.interfaces.person.IPerson"
name="+translations-to-review"
class="lp.translations.browser.person.PersonTranslationReviewView"
permission="zope.Public"
- template="../templates/person-translations-to-review.pt"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ template="../templates/person-translations-to-review.pt"/>
<!-- Product views -->
@@ -756,17 +658,11 @@
ProductTranslationsMenu"
module="lp.translations.browser.product"/>
<browser:page
- name="+translations"
- for="lp.registry.interfaces.product.IProduct"
- class="lp.translations.browser.translations.TranslationsRedirectView"
- permission="zope.Public"/>
- <browser:page
for="lp.registry.interfaces.product.IProduct"
name="+imports"
class="lp.translations.browser.hastranslationimports.HasTranslationImportsView"
permission="zope.Public"
- template="../templates/hastranslationimports-index.pt"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ template="../templates/hastranslationimports-index.pt"/>
<browser:page
name="+configure-translations"
for="lp.registry.interfaces.product.IProduct"
@@ -776,8 +672,7 @@
<browser:pages
for="lp.registry.interfaces.product.IProduct"
permission="zope.Public"
- class="lp.translations.browser.product.ProductView"
- layer="lp.translations.publisher.TranslationsLayer">
+ class="lp.translations.browser.product.ProductView">
<browser:page
name="+translations"
template="../templates/product-translations.pt"/>
@@ -809,24 +704,17 @@
ProjectTranslationsMenu"
module="lp.translations.browser.project"/>
<browser:page
- name="+translations"
- for="lp.registry.interfaces.projectgroup.IProjectGroup"
- class="lp.translations.browser.translations.TranslationsRedirectView"
- permission="zope.Public"/>
- <browser:page
for="lp.registry.interfaces.projectgroup.IProjectGroup"
permission="zope.Public"
name="+translations"
class="lp.translations.browser.project.ProjectView"
- template="../templates/project-translations.pt"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ template="../templates/project-translations.pt"/>
<browser:page
name="+settings"
for="lp.registry.interfaces.projectgroup.IProjectGroup"
class="lp.translations.browser.project.ProjectSettingsView"
permission="launchpad.TranslationsAdmin"
- template="../templates/configure-translations.pt"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ template="../templates/configure-translations.pt"/>
<!-- Distribution -->
@@ -839,63 +727,50 @@
DistributionTranslationsMenu"
module="lp.translations.browser.distribution"/>
<browser:page
- name="+translations"
- for="lp.registry.interfaces.distribution.IDistribution"
- class="lp.translations.browser.translations.TranslationsRedirectView"
- permission="zope.Public"/>
- <browser:page
for="lp.registry.interfaces.distribution.IDistribution"
class="lp.translations.browser.distribution.DistributionView"
permission="zope.Public"
name="+translations"
- template="../templates/distribution-translations.pt"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ template="../templates/distribution-translations.pt"/>
<browser:page
name="+configure-translations"
for="lp.registry.interfaces.distribution.IDistribution"
class="lp.translations.browser.distribution.DistributionSettingsView"
permission="launchpad.TranslationsAdmin"
- template="../templates/configure-translations.pt"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ template="../templates/configure-translations.pt"/>
<browser:page
for="lp.registry.interfaces.distribution.IDistribution"
name="+imports"
class="lp.translations.browser.hastranslationimports.HasTranslationImportsView"
permission="zope.Public"
- template="../templates/hastranslationimports-index.pt"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ template="../templates/hastranslationimports-index.pt"/>
<browser:page
for="lp.registry.interfaces.distribution.IDistribution"
name="+select-language-pack-admin"
class="lp.translations.browser.distribution.DistributionLanguagePackAdminView"
permission="launchpad.TranslationsAdmin"
- template="../../app/templates/generic-edit.pt"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ template="../../app/templates/generic-edit.pt"/>
<!-- Language pack admin portlet -->
<browser:page
name="+language-pack-admin-info"
for="lp.registry.interfaces.distribution.IDistribution"
permission="launchpad.View"
- template="../templates/distribution-language-pack-admin-info.pt"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ template="../templates/distribution-language-pack-admin-info.pt"/>
<browser:page
name="+portlet-not-using-launchpad"
for="lp.registry.interfaces.distribution.IDistribution"
permission="zope.Public"
- template="../templates/translations-portlet-not-using-launchpad.pt"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ template="../templates/translations-portlet-not-using-launchpad.pt"/>
<browser:page
name="+portlet-not-using-launchpad-extra"
for="lp.registry.interfaces.distribution.IDistribution"
permission="zope.Public"
- template="../templates/translations-portlet-not-using-launchpad-extra.pt"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ template="../templates/translations-portlet-not-using-launchpad-extra.pt"/>
<browser:page
name="+portlet-configuration"
for="lp.registry.interfaces.distribution.IDistribution"
permission="zope.Public"
- template="../templates/translations-portlet-configuration.pt"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ template="../templates/translations-portlet-configuration.pt"/>
<!-- DistroSeries -->
<browser:defaultView
@@ -907,16 +782,10 @@
DistroSeriesTranslationsMenu"
module="lp.translations.browser.distroseries"/>
- <browser:page
- name="+translations"
- for="lp.registry.interfaces.distroseries.IDistroSeries"
- class="lp.translations.browser.translations.TranslationsRedirectView"
- permission="zope.Public"/>
<browser:pages
for="lp.registry.interfaces.distroseries.IDistroSeries"
class="lp.translations.browser.distroseries.DistroSeriesView"
- permission="zope.Public"
- layer="lp.translations.publisher.TranslationsLayer">
+ permission="zope.Public">
<browser:page
name="+translations"
template="../templates/distroseries-translations.pt"/>
@@ -937,7 +806,6 @@
for="lp.registry.interfaces.distroseries.IDistroSeries"
class="lp.translations.browser.distroseries.DistroSeriesTemplatesView"
permission="zope.Public"
- layer="lp.translations.publisher.TranslationsLayer"
name="+templates"
template="../templates/object-templates.pt" />
<browser:page
@@ -952,13 +820,11 @@
name="+imports"
class="lp.translations.browser.hastranslationimports.HasTranslationImportsView"
permission="zope.Public"
- template="../templates/hastranslationimports-index.pt"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ template="../templates/hastranslationimports-index.pt"/>
<browser:page
for="lp.registry.interfaces.distroseries.IDistroSeries"
class="lp.translations.browser.distroseries.DistroSeriesLanguagePackView"
permission="zope.Public"
- layer="lp.translations.publisher.TranslationsLayer"
name="+language-packs"
template="../templates/distroseries-language-packs.pt"/>
@@ -967,8 +833,7 @@
<browser:defaultView
for="lp.translations.interfaces.customlanguagecode.ICustomLanguageCode"
- name="+index"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ name="+index"/>
<browser:url
for="lp.translations.interfaces.customlanguagecode.ICustomLanguageCode"
path_expression="string:+customcode/${language_code}"
@@ -979,30 +844,26 @@
for="lp.translations.interfaces.customlanguagecode.ICustomLanguageCode"
permission="zope.Public"
class="lp.translations.browser.customlanguagecode.CustomLanguageCodeView"
- template="../templates/customlanguagecode-index.pt"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ template="../templates/customlanguagecode-index.pt"/>
<browser:page
name="+remove"
for="lp.translations.interfaces.customlanguagecode.ICustomLanguageCode"
permission="launchpad.TranslationsAdmin"
class="lp.translations.browser.customlanguagecode.CustomLanguageCodeRemoveView"
- template="../templates/customlanguagecode-remove.pt"
- layer="lp.translations.publisher.TranslationsLayer"/>
+ template="../templates/customlanguagecode-remove.pt"/>
<!-- IHasCustomLanguageCodes -->
<browser:page
name="+custom-language-codes"
for="lp.translations.interfaces.customlanguagecode.IHasCustomLanguageCodes"
- layer="lp.translations.publisher.TranslationsLayer"
class="lp.translations.browser.customlanguagecode.CustomLanguageCodesIndexView"
template="../templates/customlanguagecodes-index.pt"
permission="zope.Public"/>
<browser:page
name="+add-custom-language-code"
for="lp.translations.interfaces.customlanguagecode.IHasCustomLanguageCodes"
- layer="lp.translations.publisher.TranslationsLayer"
class="lp.translations.browser.customlanguagecode.CustomLanguageCodeAddView"
template="../templates/customlanguagecode-add.pt"
permission="launchpad.TranslationsAdmin"/>
=== modified file 'lib/lp/translations/browser/translations.py'
--- lib/lp/translations/browser/translations.py 2011-07-01 11:27:27 +0000
+++ lib/lp/translations/browser/translations.py 2011-11-28 04:33:24 +0000
@@ -7,7 +7,6 @@
'RosettaApplicationView',
'RosettaStatsView',
'RosettaApplicationNavigation',
- 'TranslateRedirectView',
'TranslationsLanguageBreadcrumb',
'TranslationsMixin',
'TranslationsRedirectView',
@@ -172,13 +171,6 @@
]), status=301)
-class TranslateRedirectView(PageRedirectView):
- """Redirects to translations site for +translate page."""
-
- def __init__(self, context, request):
- PageRedirectView.__init__(self, context, request, '+translate')
-
-
class TranslationsRedirectView(PageRedirectView):
"""Redirects to translations site for +translations page."""
Follow ups
