launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #05690
[Merge] lp:~wgrant/launchpad/facet-everything into lp:launchpad
William Grant has proposed merging lp:~wgrant/launchpad/facet-everything into lp:launchpad.
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~wgrant/launchpad/facet-everything/+merge/83506
This branch deletes a few hundred lines of ZCML facet specifications. It was all left in a pretty terrible state after the apocalypse.
<facet> directives don't make sense at all in model ZCML, so they're all gone. In browser ZCML, I've lifted most of the browser:page facet arguments up into ~1 <facet> directive per file.
--
https://code.launchpad.net/~wgrant/launchpad/facet-everything/+merge/83506
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~wgrant/launchpad/facet-everything into lp:launchpad.
=== modified file 'lib/lp/blueprints/browser/configure.zcml'
--- lib/lp/blueprints/browser/configure.zcml 2011-09-29 06:11:35 +0000
+++ lib/lp/blueprints/browser/configure.zcml 2011-11-27 08:32:25 +0000
@@ -242,9 +242,6 @@
class="lp.blueprints.browser.specificationbranch.SpecificationBranchStatusView"
permission="launchpad.AnyPerson"
template="../templates/specificationbranch-status.pt"/>
- </facet>
- <facet
- facet="specifications">
<browser:menus
module="lp.blueprints.browser.specification"
classes="
@@ -497,14 +494,6 @@
for="lp.blueprints.interfaces.specification.ISpecificationSet"
permission="zope.Public">
- <!-- browser:page
-
-
- name="+portlet-details"
-
-
- template="../templates/specifications-portlet-details.pt" / -->
-
<browser:page
name="+portlet-latestcompleted"
template="../templates/specifications-portlet-latestcompleted.pt"/>
@@ -530,9 +519,6 @@
permission="launchpad.AnyPerson"
template="../../app/templates/generic-edit.pt"
class="lp.blueprints.browser.specification.NewSpecificationFromRootView"/>
- </facet>
- <facet
- facet="specifications">
<browser:pages
for="lp.blueprints.interfaces.specificationtarget.ISpecificationGoal"
class="lp.blueprints.browser.specificationtarget.HasSpecificationsView"
@@ -543,13 +529,9 @@
<browser:page
for="lp.blueprints.interfaces.specificationtarget.ISpecificationGoal"
name="+setgoals"
- facet="specifications"
class="lp.blueprints.browser.specificationgoal.GoalDecideView"
permission="launchpad.Driver"
template="../templates/specificationgoal-setgoals.pt"/>
- </facet>
- <facet
- facet="specifications">
<browser:pages
for="lp.blueprints.interfaces.specificationtarget.IHasSpecifications"
permission="zope.Public">
@@ -585,13 +567,11 @@
for="lp.blueprints.interfaces.specificationtarget.ISpecificationTarget"
class="lp.blueprints.browser.specificationtarget.RegisterABlueprintButtonView"
permission="zope.Public"/>
- </facet>
<browser:page
name="+addspec"
for="lp.registry.interfaces.distribution.IDistribution"
class="lp.blueprints.browser.specification.NewSpecificationFromDistributionView"
- facet="specifications"
permission="launchpad.AnyPerson"
template="../../app/templates/generic-edit.pt"/>
@@ -603,14 +583,12 @@
name="+addspec"
for="lp.registry.interfaces.distroseries.IDistroSeries"
class="lp.blueprints.browser.specification.NewSpecificationFromDistroSeriesView"
- facet="specifications"
permission="launchpad.AnyPerson"
template="../../app/templates/generic-edit.pt"/>
<browser:pages
for="lp.registry.interfaces.projectgroup.IProjectGroup"
class="lp.blueprints.browser.specificationtarget.HasSpecificationsView"
- facet="specifications"
permission="zope.Public">
<browser:page
name="+specs"/>
@@ -622,7 +600,6 @@
name="+assignments"
for="lp.registry.interfaces.projectgroup.IProjectGroup"
class="lp.blueprints.browser.specificationtarget.SpecificationAssignmentsView"
- facet="specifications"
permission="zope.Public"
template="../templates/specificationtarget-assignments.pt"/>
@@ -630,7 +607,6 @@
name="+addspec"
for="lp.registry.interfaces.projectgroup.IProjectGroup"
class="lp.blueprints.browser.specification.NewSpecificationFromProjectView"
- facet="specifications"
permission="launchpad.AnyPerson"
template="../../app/templates/generic-edit.pt"/>
@@ -638,7 +614,6 @@
name="+addspec"
for="lp.registry.interfaces.product.IProduct"
class="lp.blueprints.browser.specification.NewSpecificationFromProductView"
- facet="specifications"
permission="launchpad.AnyPerson"
template="../../app/templates/generic-edit.pt"/>
@@ -646,9 +621,9 @@
name="+addspec"
for="lp.registry.interfaces.productseries.IProductSeries"
class="lp.blueprints.browser.specification.NewSpecificationFromProductSeriesView"
- facet="specifications"
permission="launchpad.AnyPerson"
template="../../app/templates/generic-edit.pt"/>
+ </facet>
<adapter
factory="lp.blueprints.browser.specification.starter_xhtml_representation"
=== modified file 'lib/lp/bugs/browser/configure.zcml'
--- lib/lp/bugs/browser/configure.zcml 2011-10-31 08:09:56 +0000
+++ lib/lp/bugs/browser/configure.zcml 2011-11-27 08:32:25 +0000
@@ -86,27 +86,23 @@
name="+filebug"
for="lp.bugs.interfaces.bugtarget.IBugTarget"
class="lp.bugs.browser.bugtarget.FileBugGuidedView"
- facet="bugs"
permission="launchpad.AnyPerson"/>
<browser:page
name="+filebug-show-similar"
for="lp.bugs.interfaces.bugtarget.IBugTarget"
class="lp.bugs.browser.bugtarget.FilebugShowSimilarBugsView"
template="../templates/bugtarget-filebug-show-similar.pt"
- facet="bugs"
permission="launchpad.AnyPerson"/>
<browser:page
name="+filebug-advanced"
for="lp.bugs.interfaces.bugtarget.IBugTarget"
class="lp.bugs.browser.bugtarget.FileBugAdvancedView"
- facet="bugs"
permission="launchpad.AnyPerson"/>
<browser:page
name="+filebug-inline-form"
for="lp.bugs.interfaces.bugtarget.IBugTarget"
class="lp.bugs.browser.bugtarget.FilebugShowSimilarBugsView"
template="../templates/bugtarget-filebug-inline-form.pt"
- facet="bugs"
permission="launchpad.AnyPerson"/>
<browser:page
for="lp.bugs.interfaces.bugtarget.IHasBugs"
@@ -118,24 +114,20 @@
name="+manage-official-tags"
for="lp.bugs.interfaces.bugtarget.IOfficialBugTagTargetRestricted"
class="lp.bugs.browser.bugtarget.OfficialBugTagsManageView"
- facet="bugs"
permission="launchpad.BugSupervisor"
template="../templates/official-bug-target-manage-tags.pt"/>
<browser:page
name="+patches"
for="lp.bugs.interfaces.bugtarget.IHasBugs"
class="lp.bugs.browser.bugtarget.BugsPatchesView"
- facet="bugs"
permission="zope.Public"
template="../templates/bugtarget-patches.pt"/>
<browser:page
name="+patches"
for="lp.registry.interfaces.person.IPerson"
class="lp.bugs.browser.bugtarget.BugsPatchesView"
- facet="bugs"
permission="zope.Public"
template="../templates/bugtarget-patches.pt"/>
- </facet>
<browser:page
name="+bugtarget-macros-search"
for="*"
@@ -159,8 +151,6 @@
permission="zope.Public"
name="unlinkbugs_template"
template="../templates/buglinktarget-unlinkbugs.pt"/>
- <facet
- facet="bugs">
<browser:page
for="*"
name="bugcomment-macros"
@@ -199,7 +189,6 @@
template="../templates/bugcomment-box.pt"
class="lp.bugs.browser.bugcomment.BugCommentBoxExpandedReplyView"
permission="launchpad.View"/>
- </facet>
<adapter
factory="lp.bugs.browser.bugcomment.BugCommentXHTMLRepresentation"
name="lazr.restful.EntryResource"
@@ -237,14 +226,12 @@
<browser:page
for="lp.bugs.interfaces.malone.IMaloneApplication"
class="lp.bugs.browser.bug.MaloneView"
- facet="bugs"
permission="zope.Public"
name="+index"
template="../templates/malone-index.pt"/>
<browser:page
for="lp.bugs.interfaces.malone.IMaloneApplication"
class="lp.bugs.browser.bug.MaloneView"
- facet="bugs"
permission="zope.Public"
name="+portlet-stats"
template="../templates/malone-portlet-stats.pt"/>
@@ -256,7 +243,6 @@
class="lp.bugs.browser.bugtask.BugsBugTaskSearchListingView"
permission="zope.Public"
name="+bugs"
- facet="bugs"
template="../templates/buglisting-embedded-advanced-search.pt"/>
<browser:page
for="lp.bugs.interfaces.structuralsubscription.IStructuralSubscriptionTarget"
@@ -284,56 +270,48 @@
<browser:page
name="+bugs"
for="lp.registry.interfaces.person.IPerson"
- facet="bugs"
class="lp.registry.browser.person.PersonRelatedBugTaskSearchListingView"
permission="zope.Public"
template="../templates/buglisting-embedded-advanced-search.pt"/>
<browser:page
name="+affectingbugs"
for="lp.registry.interfaces.person.IPerson"
- facet="bugs"
class="lp.registry.browser.person.PersonAffectingBugTaskSearchListingView"
permission="zope.Public"
template="../templates/buglisting-embedded-advanced-search.pt"/>
<browser:page
name="+assignedbugs"
for="lp.registry.interfaces.person.IPerson"
- facet="bugs"
class="lp.registry.browser.person.PersonAssignedBugTaskSearchListingView"
permission="zope.Public"
template="../templates/buglisting-embedded-advanced-search.pt"/>
<browser:page
name="+commentedbugs"
for="lp.registry.interfaces.person.IPerson"
- facet="bugs"
class="lp.registry.browser.person.PersonCommentedBugTaskSearchListingView"
permission="zope.Public"
template="../templates/buglisting-embedded-advanced-search.pt"/>
<browser:page
name="+packagebugs-search"
for="lp.registry.interfaces.person.IPerson"
- facet="bugs"
class="lp.registry.browser.person.BugSubscriberPackageBugsSearchListingView"
permission="zope.Public"
template="../templates/person-packagebugs-search.pt"/>
<browser:page
name="+packagebugs"
for="lp.registry.interfaces.person.IPerson"
- facet="bugs"
class="lp.registry.browser.person.BugSubscriberPackageBugsSearchListingView"
permission="zope.Public"
template="../templates/person-packagebugs-overview.pt"/>
<browser:page
name="+reportedbugs"
for="lp.registry.interfaces.person.IPerson"
- facet="bugs"
class="lp.registry.browser.person.PersonReportedBugTaskSearchListingView"
permission="zope.Public"
template="../templates/buglisting-embedded-advanced-search.pt"/>
<browser:page
name="+subscribedbugs"
for="lp.registry.interfaces.person.IPerson"
- facet="bugs"
class="lp.registry.browser.person.PersonSubscribedBugTaskSearchListingView"
permission="zope.Public"
template="../templates/buglisting-embedded-advanced-search.pt"/>
@@ -342,47 +320,40 @@
class="lp.bugs.browser.cvereport.CVEReportView"
permission="zope.Public"
name="+cve"
- facet="bugs"
template="../templates/product-cvereport.pt"/>
<browser:page
for="lp.registry.interfaces.distribution.IDistribution"
name="+upstreamreport"
class="lp.bugs.browser.distribution_upstream_bug_report.DistributionUpstreamBugReport"
permission="zope.Public"
- facet="bugs"
template="../templates/distribution-upstream-bug-report.pt"/>
<browser:page
for="lp.registry.interfaces.distribution.IDistribution"
name="+bugs-index"
class="lp.bugs.browser.bugtarget.BugTargetBugsView"
permission="zope.Public"
- facet="bugs"
template="../templates/bugtarget-bugs.pt"/>
<browser:page
for="lp.registry.interfaces.distribution.IDistribution"
class="lp.bugs.browser.cvereport.CVEReportView"
permission="zope.Public"
name="+cve"
- facet="bugs"
template="../templates/distribution-cvereport.pt"/>
<browser:page
for="lp.registry.interfaces.distroseries.IDistroSeries"
class="lp.bugs.browser.cvereport.CVEReportView"
permission="zope.Public"
name="+cve"
- facet="bugs"
template="../templates/distroseries-cvereport.pt"/>
<browser:page
for="lp.registry.interfaces.distroseries.IDistroSeries"
class="lp.bugs.browser.bugtarget.BugTargetBugListingView"
- facet="bugs"
permission="zope.Public"
name="+portlet-bugtasklist-seriesbugs"
template="../templates/bugtask-portlet-seriesbugs.pt"/>
<browser:page
for="lp.registry.interfaces.distroseries.IDistroSeries"
class="lp.bugs.browser.bugtarget.BugTargetBugListingView"
- facet="bugs"
permission="zope.Public"
name="+portlet-bugtasklist-milestonebugs"
template="../templates/bugtask-portlet-milestonebugs.pt"/>
@@ -391,20 +362,17 @@
name="+nominations"
class="lp.bugs.browser.bugtask.BugNominationsView"
permission="zope.Public"
- facet="bugs"
template="../templates/series-bug-nominations.pt"/>
<browser:page
for="lp.registry.interfaces.distroseries.IDistroSeries"
name="+bugs-index"
class="lp.bugs.browser.bugtarget.BugTargetBugsView"
permission="zope.Public"
- facet="bugs"
template="../templates/bugtarget-bugs.pt"/>
<browser:page
name="+securitycontact"
for="lp.bugs.interfaces.securitycontact.IHasSecurityContact"
class="lp.bugs.browser.securitycontact.SecurityContactEditView"
- facet="bugs"
permission="launchpad.Edit"
template="../templates/securitycontact-edit.pt"/>
<adapter
@@ -413,7 +381,6 @@
factory=".bugtarget.product_to_productbugconfiguration" />
<browser:page
for="lp.registry.interfaces.product.IProduct"
- facet="bugs"
permission="launchpad.BugSupervisor"
name="+configure-bugtracker"
template="../../app/templates/generic-edit.pt"
@@ -423,33 +390,28 @@
name="+bugs-index"
class="lp.bugs.browser.bugtarget.BugTargetBugsView"
permission="zope.Public"
- facet="bugs"
template="../templates/bugtarget-bugs.pt"/>
<browser:page
for="lp.registry.interfaces.product.IProduct"
class="lp.bugs.browser.bugtarget.BugTargetBugListingView"
- facet="bugs"
permission="zope.Public"
name="+portlet-bugtasklist-seriesbugs"
template="../templates/bugtask-portlet-seriesbugs.pt"/>
<browser:page
for="lp.registry.interfaces.product.IProduct"
class="lp.bugs.browser.bugtarget.BugTargetBugListingView"
- facet="bugs"
permission="zope.Public"
name="+portlet-bugtasklist-milestonebugs"
template="../templates/bugtask-portlet-milestonebugs.pt"/>
<browser:page
for="lp.registry.interfaces.distribution.IDistribution"
class="lp.bugs.browser.bugtarget.BugTargetBugListingView"
- facet="bugs"
permission="zope.Public"
name="+portlet-bugtasklist-seriesbugs"
template="../templates/bugtask-portlet-seriesbugs.pt"/>
<browser:page
for="lp.registry.interfaces.distribution.IDistribution"
class="lp.bugs.browser.bugtarget.BugTargetBugListingView"
- facet="bugs"
permission="zope.Public"
name="+portlet-bugtasklist-milestonebugs"
template="../templates/bugtask-portlet-milestonebugs.pt"/>
@@ -457,13 +419,11 @@
name="+filebug"
for="lp.registry.interfaces.projectgroup.IProjectGroup"
class="lp.bugs.browser.bugtarget.ProjectFileBugGuidedView"
- facet="bugs"
permission="launchpad.AnyPerson"/>
<browser:page
name="+filebug-advanced"
for="lp.registry.interfaces.projectgroup.IProjectGroup"
class="lp.bugs.browser.bugtarget.FileBugAdvancedView"
- facet="bugs"
permission="launchpad.AnyPerson"/>
<browser:page
for="lp.registry.interfaces.productseries.IProductSeries"
@@ -475,19 +435,16 @@
name="+bugs-index"
class="lp.bugs.browser.bugtarget.BugTargetBugsView"
permission="zope.Public"
- facet="bugs"
template="../templates/bugtarget-bugs.pt"/>
<browser:page
for="lp.registry.interfaces.productseries.IProductSeries"
class="lp.bugs.browser.bugtarget.BugTargetBugListingView"
- facet="bugs"
permission="zope.Public"
name="+portlet-bugtasklist-seriesbugs"
template="../templates/bugtask-portlet-seriesbugs.pt"/>
<browser:page
for="lp.registry.interfaces.productseries.IProductSeries"
class="lp.bugs.browser.bugtarget.BugTargetBugListingView"
- facet="bugs"
permission="zope.Public"
name="+portlet-bugtasklist-milestonebugs"
template="../templates/bugtask-portlet-milestonebugs.pt"/>
@@ -496,10 +453,7 @@
name="+nominations"
class="lp.bugs.browser.bugtask.BugNominationsView"
permission="zope.Public"
- facet="bugs"
template="../templates/series-bug-nominations.pt"/>
- <facet
- facet="bugs">
<browser:menus
module="lp.bugs.browser.bugtask"
classes="
@@ -748,7 +702,6 @@
class="lp.bugs.browser.bugsubscription.BugSubscriptionAddView"
permission="launchpad.AnyPerson"
template="../templates/bug-addsubscriber.pt"/>
- </facet>
<browser:url
for="lp.bugs.interfaces.bugattachment.IBugAttachment"
urldata="lp.bugs.browser.bugattachment.BugAttachmentURL"/>
@@ -758,14 +711,12 @@
<browser:page
for="lp.bugs.interfaces.bugattachment.IBugAttachment"
class="lp.bugs.browser.bugattachment.BugAttachmentEditView"
- facet="bugs"
name="+edit"
permission="launchpad.AnyPerson"
template="../templates/bug-attachment-edit.pt"/>
<browser:page
for="lp.bugs.interfaces.bugattachment.IBugAttachment"
class="lp.bugs.browser.bugattachment.BugAttachmentPatchConfirmationView"
- facet="bugs"
name="+confirm-is-patch"
permission="launchpad.AnyPerson"
template="../templates/bug-attachment-confirm-is-patch.pt"/>
@@ -776,12 +727,9 @@
<browser:page
name="+bugsupervisor"
for="lp.bugs.interfaces.bugsupervisor.IHasBugSupervisor"
- facet="bugs"
class="lp.bugs.browser.bugsupervisor.BugSupervisorEditView"
permission="launchpad.Edit"
template="../templates/edit-bug-supervisor.pt"/>
- <facet
- facet="bugs">
<browser:menus
module="lp.bugs.browser.bugtracker"
classes="
@@ -881,7 +829,6 @@
name="+index"
template="../templates/remotebug-index.pt"/>
</browser:pages>
- </facet>
<browser:page
for="lp.bugs.interfaces.bugbranch.IBugBranch"
name="+hierarchy"
@@ -899,7 +846,6 @@
name="+delete"
for="lp.bugs.interfaces.bugbranch.IBugBranch"
class="lp.bugs.browser.bugbranch.BugBranchDeleteView"
- facet="branches"
permission="launchpad.Edit"
template="../templates/bugbranch-delete.pt"/>
<browser:page
@@ -912,8 +858,6 @@
factory="lp.bugs.browser.bugbranch.BugBranchXHTMLRepresentation"
name="lazr.restful.EntryResource"
/>
- <facet
- facet="bugs">
<browser:menus
module="lp.bugs.browser.cve"
classes="
@@ -993,14 +937,11 @@
class="lp.bugs.browser.buglinktarget.BugLinksListingView"
permission="zope.Public"
template="../templates/cve-portlet-bugs2.pt"/>
- </facet>
<browser:url
for="lp.bugs.interfaces.bugsubscription.IBugSubscription"
path_expression="string:+subscription/${person/name}"
attribute_to_parent="bug"
rootsite="bugs"/>
- <facet
- facet="bugs">
<browser:menus
module="lp.bugs.browser.bug"
classes="
@@ -1102,9 +1043,6 @@
for="lp.bugs.interfaces.bug.IBugSet"
path_expression="string:bugs"
parent_utility="lp.bugs.interfaces.malone.IMaloneApplication"/>
- </facet>
- <facet
- facet="bugs">
<browser:menus
module="lp.bugs.browser.bugnomination"
classes="
@@ -1132,9 +1070,6 @@
path_expression="string:nominations/${id}"
attribute_to_parent="bug"
rootsite="bugs" />
- </facet>
- <facet
- facet="bugs">
<browser:url
for="lp.bugs.interfaces.bugwatch.IBugWatch"
path_expression="string:+watch/${id}"
@@ -1185,11 +1120,8 @@
module="lp.bugs.browser.bugwatch"
classes="
BugWatchSetNavigation"/>
- </facet>
<!-- Structural subscriptions -->
- <facet
- facet="bugs">
<browser:page
for="lp.bugs.interfaces.structuralsubscription.IStructuralSubscriptionTarget"
name="+subscribe"
@@ -1208,7 +1140,6 @@
class="lp.bugs.browser.bugtarget.TargetSubscriptionView"
permission="launchpad.AnyPerson"
template="../templates/bugtarget-subscription-list.pt"/>
- </facet>
<browser:url
for="lp.bugs.interfaces.structuralsubscription.IStructuralSubscription"
@@ -1219,7 +1150,6 @@
classes="StructuralSubscriptionNavigation"/>
<!-- Bug Subscription Filters -->
- <facet facet="bugs">
<browser:url
for="lp.bugs.interfaces.bugsubscriptionfilter.IBugSubscriptionFilter"
path_expression="string:+filter/${id}"
@@ -1243,7 +1173,6 @@
template="../../app/templates/generic-edit.pt"
permission="launchpad.View"
name="+new-filter" />
- </facet>
<!-- Widgets -->
<include package=".widgets"/>
@@ -1268,4 +1197,5 @@
template="../templates/bugs-listing-nominations-table-without-navlinks.pt"
permission="zope.Public" />
+ </facet>
</configure>
=== modified file 'lib/lp/bugs/configure.zcml'
--- lib/lp/bugs/configure.zcml 2011-11-18 04:49:42 +0000
+++ lib/lp/bugs/configure.zcml 2011-11-27 08:32:25 +0000
@@ -37,19 +37,14 @@
<allow
interface="lp.bugs.interfaces.bugactivity.IBugActivitySet"/>
</securedutility>
- <facet
- facet="bugs"/>
<!-- Macros -->
- <facet
- facet="bugs">
<class
class="lp.bugs.browser.bugcomment.BugComment">
<allow
interface="lp.bugs.interfaces.bugmessage.IBugComment"/>
</class>
- </facet>
<subscriber
for="lp.bugs.interfaces.cve.ICve zope.lifecycleevent.interfaces.IObjectModifiedEvent"
handler="lp.bugs.subscribers.cve.cve_modified"/>
@@ -156,8 +151,6 @@
permission="launchpad.AnyPerson"
set_schema="lp.bugs.interfaces.cvereference.ICveReference"/>
</class>
- <facet
- facet="bugs">
<class class="lp.bugs.interfaces.bugtaskfilter.OrderedBugTask">
<allow attributes="rank id task"/>
@@ -339,7 +332,6 @@
<allow
interface="lp.bugs.interfaces.bugtask.IBugTaskDelta"/>
</class>
- </facet>
<class
class="lp.bugs.model.bugattachment.BugAttachment">
<require
@@ -363,8 +355,6 @@
<allow
interface="lp.bugs.interfaces.bugattachment.IBugAttachmentSet"/>
</securedutility>
- <facet
- facet="bugs">
<!-- BugTracker -->
@@ -528,7 +518,6 @@
<allow
interface="lp.bugs.interfaces.bugtracker.IRemoteBug"/>
</class>
- </facet>
<!-- IBugBranch -->
@@ -573,8 +562,6 @@
<allow
interface="lp.bugs.interfaces.bugcve.IBugCve"/>
</class>
- <facet
- facet="bugs">
<!-- CVE -->
@@ -611,7 +598,6 @@
<allow
interface="lp.bugs.interfaces.cve.ICveSet"/>
</securedutility>
- </facet>
<!-- BugSubscription -->
@@ -712,9 +698,6 @@
lp.bugs.interfaces.personsubscriptioninfo.IPersonSubscriptions"/>
</class>
- <facet
- facet="bugs">
-
<!-- Bug -->
<class
@@ -912,7 +895,6 @@
<allow
interface="lp.bugs.interfaces.bug.IBugDelta"/>
</class>
- </facet>
<!-- BugMessage -->
@@ -942,8 +924,6 @@
for="lp.bugs.interfaces.bugnomination.IBugNomination"
provides="canonical.launchpad.webapp.interfaces.IPrimaryContext"
factory="lp.bugs.browser.bugnomination.BugNominationPrimaryContext"/>
- <facet
- facet="bugs">
<class
class="lp.bugs.model.bugnomination.BugNomination">
<require
@@ -976,7 +956,6 @@
<allow
interface="lp.bugs.interfaces.bugnomination.IBugNominationSet"/>
</securedutility>
- </facet>
<subscriber
for="lp.bugs.interfaces.bug.IBug zope.lifecycleevent.interfaces.IObjectCreatedEvent"
handler="lp.bugs.subscribers.bugactivity.record_bug_added"/>
@@ -992,8 +971,6 @@
<subscriber
for="lp.bugs.interfaces.bugsubscription.IBugSubscription lazr.lifecycle.interfaces.IObjectModifiedEvent"
handler="lp.bugs.subscribers.bugactivity.record_bugsubscription_edited"/>
- <facet
- facet="bugs">
<!-- BugWatch -->
@@ -1077,7 +1054,6 @@
<allow
interface="lp.bugs.interfaces.bugwatch.IBugWatchActivity"/>
</class>
- </facet>
<subscriber
for="lp.bugs.interfaces.bugtask.IBugTask lazr.lifecycle.interfaces.IObjectCreatedEvent"
handler="lp.bugs.subscribers.bugactivity.notify_bugtask_added"/>
=== modified file 'lib/lp/code/browser/configure.zcml'
--- lib/lp/code/browser/configure.zcml 2011-08-16 14:21:39 +0000
+++ lib/lp/code/browser/configure.zcml 2011-11-27 08:32:25 +0000
@@ -66,8 +66,6 @@
permission="zope.Public"
/>
-</facet>
-
<browser:url
for="lp.code.interfaces.codereviewvote.ICodeReviewVoteReference"
path_expression="string:+review/${id}"
@@ -78,11 +76,8 @@
layer="lp.code.publisher.CodeLayer"
name="+reassign"
class="lp.code.browser.codereviewvote.CodeReviewVoteReassign"
- facet="branches"
permission="launchpad.AnyPerson"
template="../../app/templates/generic-edit.pt"/>
- <facet
- facet="branches">
<browser:url
for="lp.code.interfaces.codeimportmachine.ICodeImportMachine"
path_expression="string:${hostname}"
@@ -99,9 +94,6 @@
name="+index"
template="../templates/codeimport-machine-index.pt"
permission="zope.Public"/>
- </facet>
- <facet
- facet="branches">
<browser:navigation
module="lp.code.browser.codeimportmachine"
classes="CodeImportMachineSetNavigation"/>
@@ -121,7 +113,6 @@
name="+index"
template="../templates/codeimport-machines.pt"
permission="zope.Public"/>
- </facet>
<browser:url
for="lp.code.interfaces.branchref.IBranchRef"
path_expression="string:.bzr"
@@ -143,7 +134,6 @@
layer="lp.code.publisher.CodeLayer"
permission="zope.Public"
class="lp.code.browser.bazaar.BazaarApplicationView"
- facet="branches"
name="+index"
template="../templates/bazaar-index.pt" />
<browser:page
@@ -151,7 +141,6 @@
layer="lp.code.publisher.CodeLayer"
permission="zope.Public"
class="lp.code.browser.recipebuildslisting.CompletedDailyBuildsView"
- facet="branches"
name="+daily-builds"
template="../templates/daily-builds-listing.pt" />
@@ -173,7 +162,6 @@
<!-- No view needed -->
<browser:pages
for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
- facet="branches"
permission="launchpad.View">
<browser:page
name="+heading"
@@ -187,7 +175,6 @@
for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchmergeproposal.BranchMergeProposalView"
- facet="branches"
permission="launchpad.View">
<browser:page
name="+index"
@@ -202,7 +189,6 @@
<browser:pages
for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
class="lp.code.browser.branchmergeproposal.BranchMergeProposalVoteView"
- facet="branches"
permission="launchpad.View">
<browser:page
name="+votes"
@@ -215,7 +201,6 @@
for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchmergeproposal.BranchMergeProposalEditView"
- facet="branches"
permission="launchpad.Edit">
<browser:page
name="+edit"
@@ -226,7 +211,6 @@
for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchmergeproposal.BranchMergeProposalCommitMessageEditView"
- facet="branches"
permission="launchpad.Edit"
template="../../app/templates/generic-edit.pt"/>
<browser:page
@@ -234,7 +218,6 @@
for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchmergeproposal.BranchMergeProposalDescriptionEditView"
- facet="branches"
permission="launchpad.Edit"
template="../../app/templates/generic-edit.pt"/>
<browser:page
@@ -242,7 +225,6 @@
for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchmergeproposal.BranchMergeProposalDeleteView"
- facet="branches"
permission="launchpad.Edit"
template="../templates/branchmergeproposal-delete.pt"/>
<browser:page
@@ -250,7 +232,6 @@
for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchmergeproposal.BranchMergeProposalChangeStatusView"
- facet="branches"
permission="launchpad.Edit"
template="../templates/branchmergeproposal-editstatus.pt"/>
<browser:page
@@ -258,7 +239,6 @@
for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchmergeproposal.BranchMergeProposalRequestReviewView"
- facet="branches"
permission="launchpad.Edit"
template="../../app/templates/generic-edit.pt"/>
<browser:page
@@ -266,7 +246,6 @@
for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchmergeproposal.BranchMergeProposalResubmitView"
- facet="branches"
permission="launchpad.Edit"
template="../templates/branchmergeproposal-resubmit.pt"/>
<browser:page
@@ -274,7 +253,6 @@
for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchmergeproposal.BranchMergeProposalEnqueueView"
- facet="branches"
permission="launchpad.Edit"
template="../templates/branchmergeproposal-enqueue.pt"/>
<browser:page
@@ -282,7 +260,6 @@
for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchmergeproposal.BranchMergeProposalDequeueView"
- facet="branches"
permission="launchpad.Edit"
template="../../app/templates/generic-edit.pt"/>
<browser:page
@@ -290,7 +267,6 @@
for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchmergeproposal.BranchMergeProposalInlineDequeueView"
- facet="branches"
permission="launchpad.Edit"
template="../templates/inline-form-only-buttons.pt"/>
<browser:page
@@ -298,7 +274,6 @@
for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchmergeproposal.BranchMergeProposalJumpQueueView"
- facet="branches"
permission="launchpad.Edit"
template="../templates/inline-form-only-buttons.pt"/>
<browser:page
@@ -306,14 +281,12 @@
for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchmergeproposal.BranchMergeProposalMergedView"
- facet="branches"
permission="launchpad.Edit"
template="../../app/templates/generic-edit.pt"/>
<browser:page
name="+link-summary"
for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
class="lp.code.browser.branchmergeproposal.BranchMergeCandidateView"
- facet="branches"
permission="zope.Public"
template="../templates/branchmergeproposal-link-summary.pt"/>
<browser:page
@@ -321,7 +294,6 @@
for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchmergeproposal.BranchMergeProposalSubscribersView"
- facet="branches"
permission="launchpad.View"
template="../templates/branchmergeproposal-pagelet-subscribers.pt"/>
<browser:page
@@ -329,7 +301,6 @@
for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.codereviewcomment.CodeReviewCommentAddView"
- facet="branches"
permission="launchpad.AnyPerson"
template="../templates/codereviewcomment-reply.pt"/>
<browser:page
@@ -337,7 +308,6 @@
for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchmergeproposal.BranchMergeProposalAddVoteView"
- facet="branches"
permission="launchpad.AnyPerson"
template="../templates/branchmergeproposal-vote.pt"/>
<browser:url
@@ -380,7 +350,6 @@
for="lp.code.interfaces.branchsubscription.IBranchSubscription"
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchsubscription.BranchSubscriptionEditView"
- facet="branches"
permission="launchpad.Edit"
template="../templates/branchsubscription-edit.pt"/>
<browser:url
@@ -408,7 +377,6 @@
<browser:pages
for="lp.code.interfaces.branch.IBranch"
layer="lp.code.publisher.CodeLayer"
- facet="branches"
permission="zope.Public"
class="lp.code.browser.branch.BranchView">
<browser:page
@@ -460,7 +428,6 @@
for="lp.code.interfaces.branch.IBranch"
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branch.BranchSubscriptionsView"
- facet="branches"
permission="zope.Public"
template="../templates/branch-portlet-subscribers.pt"/>
<browser:page
@@ -498,7 +465,6 @@
for="lp.code.interfaces.branch.IBranch"
class="lp.code.browser.branch.BranchEditWhiteboardView"
layer="lp.code.publisher.CodeLayer"
- facet="branches"
permission="launchpad.AnyPerson"
template="../../app/templates/generic-edit.pt"/>
<browser:page
@@ -506,7 +472,6 @@
for="lp.code.interfaces.branch.IBranch"
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branch.BranchEditStatusView"
- facet="branches"
permission="launchpad.Edit"
template="../../app/templates/generic-edit.pt"/>
<browser:page
@@ -514,7 +479,6 @@
for="lp.code.interfaces.branch.IBranch"
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branch.BranchEditView"
- facet="branches"
permission="launchpad.Edit"
template="../../app/templates/generic-edit.pt"/>
<browser:page
@@ -522,7 +486,6 @@
for="lp.code.interfaces.branch.IBranch"
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branch.BranchUpgradeView"
- facet="branches"
permission="launchpad.Edit"
template="../../app/templates/generic-edit.pt"/>
<browser:page
@@ -530,7 +493,6 @@
for="lp.code.interfaces.branch.IBranch"
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branch.BranchReviewerEditView"
- facet="branches"
permission="launchpad.Edit"
template="../../app/templates/generic-edit.pt"/>
<browser:page
@@ -538,7 +500,6 @@
for="lp.code.interfaces.branch.IBranch"
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.codeimport.CodeImportEditView"
- facet="branches"
permission="launchpad.Edit"
template="../../app/templates/generic-edit.pt"/>
<browser:page
@@ -546,14 +507,12 @@
for="lp.code.interfaces.branch.IBranch"
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branch.BranchDeletionView"
- facet="branches"
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"
- facet="branches"
permission="launchpad.View">
<browser:page
name="+mirror-status"
@@ -567,7 +526,6 @@
for="lp.code.interfaces.branch.IBranch"
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchsubscription.BranchSubscriptionAddView"
- facet="branches"
permission="launchpad.AnyPerson"
template="../../app/templates/generic-edit.pt"/>
<browser:page
@@ -575,7 +533,6 @@
for="lp.code.interfaces.branch.IBranch"
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branch.RegisterBranchMergeProposalView"
- facet="branches"
permission="launchpad.AnyPerson"
template="../templates/branch-register-merge.pt"/>
<browser:page
@@ -583,7 +540,6 @@
for="lp.code.interfaces.branch.IBranch"
layer="lp.code.publisher.CodeLayer"
class="lp.bugs.browser.bugbranch.BranchLinkToBugView"
- facet="branches"
permission="launchpad.AnyPerson"
template="../../app/templates/generic-edit.pt"/>
<browser:page
@@ -591,7 +547,6 @@
for="lp.code.interfaces.branch.IBranch"
layer="lp.code.publisher.CodeLayer"
class="lp.blueprints.browser.specificationbranch.BranchLinkToSpecificationView"
- facet="branches"
permission="launchpad.AnyPerson"
template="../../app/templates/generic-edit.pt"/>
<browser:page
@@ -599,7 +554,6 @@
for="lp.code.interfaces.branch.IBranch"
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchsubscription.BranchSubscriptionAddOtherView"
- facet="branches"
permission="launchpad.AnyPerson"
template="../../app/templates/generic-edit.pt"/>
<browser:page
@@ -607,7 +561,6 @@
for="lp.code.interfaces.branch.IBranch"
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchsubscription.BranchSubscriptionEditOwnView"
- facet="branches"
permission="launchpad.AnyPerson"
template="../templates/branch-edit-subscription.pt"/>
<browser:page
@@ -630,7 +583,6 @@
class="lp.code.browser.branchmergeproposallisting.BranchActiveReviewsView"
permission="zope.Public"
name="+activereviews"
- facet="branches"
template="../templates/active-reviews.pt"/>
<browser:page
for="lp.code.interfaces.branch.IBranchBatchNavigator"
@@ -681,7 +633,6 @@
layer="lp.code.publisher.CodeLayer"
name="+index"/>
<browser:pages
- facet="branches"
for="lp.code.interfaces.codereviewcomment.ICodeReviewComment"
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.codereviewcomment.CodeReviewCommentView"
@@ -694,7 +645,6 @@
template="../templates/codereviewcomment-fragment.pt"/>
</browser:pages>
<browser:pages
- facet="branches"
for="lp.code.browser.codereviewcomment.ICodeReviewDisplayComment"
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.codereviewcomment.CodeReviewCommentView"
@@ -710,7 +660,6 @@
template="../templates/codereviewcomment-footer.pt"/>
</browser:pages>
<browser:pages
- facet="branches"
for="lp.code.browser.branchmergeproposal.ICodeReviewNewRevisions"
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchmergeproposal.CodeReviewNewRevisionsView"
@@ -724,7 +673,6 @@
</browser:pages>
<browser:page
name="+reply"
- facet="branches"
for="lp.code.interfaces.codereviewcomment.ICodeReviewComment"
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.codereviewcomment.CodeReviewCommentAddView"
@@ -733,17 +681,12 @@
<browser:menus
classes="CodeReviewCommentContextMenu"
module="lp.code.browser.codereviewcomment"/>
- <facet
- facet="branches">
<browser:page
for="lp.code.interfaces.codeimport.ICodeImport"
layer="lp.code.publisher.CodeLayer"
name="+macros"
permission="zope.Public"
template="../templates/codeimport-macros.pt"/>
- </facet>
- <facet
- facet="branches">
<browser:url
for="lp.code.interfaces.codeimport.ICodeImportSet"
path_expression="string:+code-imports"
@@ -774,7 +717,6 @@
name="+new-import"
template="../templates/codeimport-new.pt"
permission="launchpad.AnyPerson"/>
- </facet>
<browser:url
for="lp.code.interfaces.codeimport.ICodeImport"
attribute_to_parent="branch"
@@ -792,14 +734,12 @@
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchlisting.SourcePackageBranchesView"
permission="zope.Public"
- facet="branches"
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"
- facet="branches"
permission="zope.Public"
name="+count-summary"
template="../templates/branch-count-summary.pt"/>
@@ -808,14 +748,12 @@
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchlisting.DistributionBranchListingView"
permission="zope.Public"
- facet="branches"
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"
- facet="branches"
permission="zope.Public"
name="+count-summary"
template="../templates/branch-count-summary.pt"/>
@@ -824,14 +762,12 @@
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchlisting.DistroSeriesBranchListingView"
permission="zope.Public"
- facet="branches"
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"
- facet="branches"
permission="zope.Public"
name="+count-summary"
template="../templates/branch-count-summary.pt"/>
@@ -840,7 +776,6 @@
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchlisting.DistributionSourcePackageBranchesView"
permission="zope.Public"
- facet="branches"
name="+branches"
template="../templates/generic-branch-listing.pt"/>
<browser:page
@@ -848,14 +783,12 @@
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchlisting.GroupedDistributionSourcePackageBranchesView"
permission="zope.Public"
- facet="branches"
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"
- facet="branches"
permission="zope.Public"
name="+count-summary"
template="../templates/branch-count-summary.pt"/>
@@ -863,7 +796,6 @@
for="lp.registry.interfaces.projectgroup.IProjectGroup"
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchlisting.ProjectBranchesView"
- facet="branches"
permission="zope.Public"
name="+branches"
template="../templates/project-branches.pt"/>
@@ -871,13 +803,10 @@
for="lp.registry.interfaces.projectgroup.IProjectGroup"
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.summary.BranchCountSummaryView"
- facet="branches"
permission="zope.Public"
name="+count-summary"
template="../templates/branch-count-summary.pt"/>
- <facet
- facet="overview">
<browser:menus
module="lp.code.browser.branchlisting"
classes="
@@ -891,7 +820,6 @@
class="lp.code.browser.branchlisting.PersonOwnedBranchesView"
layer="lp.code.publisher.CodeLayer"
permission="zope.Public"
- facet="branches"
name="+branches"
template="../templates/person-branches.pt"/>
<browser:page
@@ -899,7 +827,6 @@
class="lp.code.browser.branchlisting.PersonOwnedBranchesView"
layer="lp.code.publisher.CodeLayer"
permission="zope.Public"
- facet="branches"
name="+ownedbranches"
template="../templates/person-branches.pt"/>
<browser:page
@@ -907,7 +834,6 @@
class="lp.code.browser.branchlisting.PersonSubscribedBranchesView"
layer="lp.code.publisher.CodeLayer"
permission="zope.Public"
- facet="branches"
name="+subscribedbranches"
template="../templates/person-branches.pt"/>
<browser:page
@@ -915,7 +841,6 @@
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchlisting.PersonRegisteredBranchesView"
permission="zope.Public"
- facet="branches"
name="+registeredbranches"
template="../templates/person-branches.pt"/>
<browser:page
@@ -923,7 +848,6 @@
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchlisting.PersonCodeSummaryView"
permission="zope.Public"
- facet="branches"
name="+codesummary"
template="../templates/person-codesummary.pt"/>
<browser:page
@@ -931,7 +855,6 @@
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchmergeproposallisting.PersonActiveReviewsView"
permission="zope.Public"
- facet="branches"
name="+activereviews"
template="../templates/active-reviews.pt"/>
<browser:page
@@ -939,7 +862,6 @@
for="lp.registry.interfaces.person.IPerson"
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branch.BranchAddView"
- facet="branches"
permission="launchpad.AnyPerson"
template="../templates/branch-add.pt"/>
<browser:page
@@ -949,13 +871,11 @@
name="+portlet-teambranches"
template="../templates/person-portlet-teambranches.pt"
permission="zope.Public"/>
- </facet>
<browser:page
for="lp.registry.interfaces.product.IProduct"
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchlisting.ProductBranchesView"
- facet="branches"
permission="zope.Public"
name="+branches"
template="../templates/product-branches.pt"/>
@@ -963,7 +883,6 @@
for="lp.registry.interfaces.product.IProduct"
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchlisting.ProductCodeIndexView"
- facet="branches"
permission="zope.Public"
name="+code-index"
template="../templates/product-branches.pt"/>
@@ -977,7 +896,6 @@
for="lp.registry.interfaces.product.IProduct"
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchlisting.ProductCodeIndexView"
- facet="branches"
permission="zope.Public"
name="+branch-summary"
template="../templates/product-branch-summary.pt"/>
@@ -985,7 +903,6 @@
for="lp.registry.interfaces.product.IProduct"
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.summary.BranchCountSummaryView"
- facet="branches"
permission="zope.Public"
name="+count-summary"
template="../templates/branch-count-summary.pt"/>
@@ -995,7 +912,6 @@
for="lp.registry.interfaces.product.IProduct"
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branch.BranchAddView"
- facet="branches"
permission="launchpad.AnyPerson"
template="../templates/branch-add.pt"/>
@@ -1004,7 +920,6 @@
for="lp.registry.interfaces.productseries.IProductSeries"
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branch.BranchAddView"
- facet="branches"
permission="launchpad.AnyPerson"
template="../templates/branch-add.pt"/>
@@ -1063,7 +978,6 @@
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchlisting.PersonProductOwnedBranchesView"
permission="zope.Public"
- facet="branches"
name="+branches"
template="../templates/person-branches.pt"
/>
@@ -1072,7 +986,6 @@
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchlisting.PersonProductSubscribedBranchesView"
permission="zope.Public"
- facet="branches"
name="+subscribedbranches"
template="../templates/person-branches.pt"
/>
@@ -1081,7 +994,6 @@
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchlisting.PersonProductRegisteredBranchesView"
permission="zope.Public"
- facet="branches"
name="+registeredbranches"
template="../templates/person-branches.pt"
/>
@@ -1090,7 +1002,6 @@
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchmergeproposallisting.PersonProductActiveReviewsView"
permission="zope.Public"
- facet="branches"
name="+activereviews"
template="../templates/active-reviews.pt"/>
@@ -1098,7 +1009,6 @@
for="lp.registry.interfaces.personproduct.IPersonProduct"
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchlisting.PersonProductTeamBranchesView"
- facet="branches"
name="+portlet-teambranches"
template="../templates/person-portlet-teambranches.pt"
permission="zope.Public"
@@ -1108,7 +1018,6 @@
for="lp.registry.interfaces.personproduct.IPersonProduct"
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchlisting.PersonProductCodeSummaryView"
- facet="branches"
name="+codesummary"
template="../templates/person-codesummary.pt"
permission="zope.Public"
@@ -1118,7 +1027,6 @@
for="lp.code.interfaces.hasbranches.IHasMergeProposals"
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchmergeproposallisting.BranchMergeProposalListingView"
- facet="branches"
permission="zope.Public"
name="+merges"
template="../templates/branchmergeproposal-generic-listing.pt"/>
@@ -1128,7 +1036,6 @@
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchmergeproposallisting.ActiveReviewsView"
permission="zope.Public"
- facet="branches"
name="+activereviews"
template="../templates/active-reviews.pt"/>
@@ -1204,8 +1111,6 @@
module="lp.code.browser.sourcepackagerecipebuild"
classes="SourcePackageRecipeBuildNavigation" />
- <facet facet="branches">
-
<browser:defaultView
for="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"
name="+index"
@@ -1237,8 +1142,6 @@
class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeRequestDailyBuildView"
name="+request-daily-build"
permission="launchpad.Edit"/>
- </facet>
- <facet facet="branches">
<browser:defaultView
for="lp.code.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuild"
name="+index"
@@ -1272,7 +1175,6 @@
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeAddView"
permission="launchpad.AnyPerson"
- facet="branches"
name="+new-recipe"
template="../templates/sourcepackagerecipe-new.pt"/>
<browser:page
@@ -1280,7 +1182,6 @@
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeEditView"
permission="launchpad.Edit"
- facet="branches"
name="+edit"
template="../../app/templates/generic-edit.pt"/>
<browser:page
@@ -1288,7 +1189,6 @@
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeDeleteView"
permission="launchpad.Edit"
- facet="branches"
name="+delete"
template="../../app/templates/generic-edit.pt"/>
@@ -1297,7 +1197,6 @@
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.sourcepackagerecipelisting.BranchRecipeListingView"
permission="zope.Public"
- facet="branches"
name="+recipes"
template="../templates/sourcepackagerecipe-listing.pt"/>
<browser:page
@@ -1305,7 +1204,6 @@
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.sourcepackagerecipelisting.ProductRecipeListingView"
permission="zope.Public"
- facet="branches"
name="+recipes"
template="../templates/sourcepackagerecipe-listing.pt"/>
<browser:page
@@ -1313,7 +1211,6 @@
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.sourcepackagerecipelisting.PersonRecipeListingView"
permission="zope.Public"
- facet="branches"
name="+recipes"
template="../templates/sourcepackagerecipe-listing.pt"/>
@@ -1336,7 +1233,6 @@
layer="lp.code.publisher.CodeLayer"
class="lp.code.browser.branchmergequeuelisting.PersonMergeQueueListingView"
permission="zope.Public"
- facet="branches"
name="+merge-queues"
template="../templates/branchmergequeue-listing.pt"/>
@@ -1349,8 +1245,6 @@
class="lp.app.browser.launchpad.Macro"/>
- </facet>
-
<browser:url
for="lp.code.interfaces.branchmergequeue.IBranchMergeQueue"
attribute_to_parent="owner"
@@ -1361,7 +1255,6 @@
classes="BranchMergeQueueContextMenu"
module="lp.code.browser.branchmergequeue"/>
- <facet facet="branches">
<browser:defaultView
for="lp.code.interfaces.branchmergequeue.IBranchMergeQueue"
name="+index"
=== modified file 'lib/lp/code/configure.zcml'
--- lib/lp/code/configure.zcml 2011-09-12 07:29:31 +0000
+++ lib/lp/code/configure.zcml 2011-11-27 08:32:25 +0000
@@ -739,8 +739,6 @@
for="lp.code.interfaces.codeimport.ICodeImport
lazr.lifecycle.interfaces.IObjectCreatedEvent"
handler="lp.code.mail.codeimport.new_import"/>
- <facet
- facet="branches"/>
<!-- CodeImportSet -->
=== modified file 'lib/lp/registry/browser/configure.zcml'
--- lib/lp/registry/browser/configure.zcml 2011-10-12 00:21:07 +0000
+++ lib/lp/registry/browser/configure.zcml 2011-11-27 08:32:25 +0000
@@ -9,6 +9,7 @@
xmlns:xmlrpc="http://namespaces.zope.org/xmlrpc";
i18n_domain="launchpad">
<!-- RDF downloadable documents -->
+<facet facet="overview">
<browser:page
for="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
class="lp.registry.browser.RDFIndexView"
@@ -51,14 +52,12 @@
<browser:page
name="+index"
for="lp.registry.interfaces.teammembership.ITeamMembership"
- facet="overview"
permission="launchpad.Edit"
class="lp.registry.browser.teammembership.TeamMembershipEditView"
template="../templates/teammembership-index.pt"/>
<browser:page
name="+listing-simple"
for="lp.registry.interfaces.teammembership.ITeamMembership"
- facet="overview"
permission="zope.Public"
template="../templates/teammembership-listing-simple.pt"/>
<browser:navigation
@@ -85,7 +84,6 @@
for="lp.registry.interfaces.distroseries.IDistroSeries"
permission="zope.Public"
name="+search"
- facet="overview"
class="lp.registry.browser.distroseries.DistroSeriesPackageSearchView"
template="../templates/distroseries-search.pt"/>
<browser:pages
@@ -94,7 +92,6 @@
permission="zope.Public">
<browser:page
name="+table-milestones"
- facet="overview"
template="../templates/productseries-table-releases.pt"/>
<browser:page
name="+filebug"
@@ -102,19 +99,15 @@
attribute="redirectToDistroFileBug"/>
<browser:page
name="+index"
- facet="overview"
template="../templates/distroseries-index.pt"/>
<browser:page
name="+portlet-details"
- facet="overview"
template="../templates/distroseries-details.pt"/>
<browser:page
name="+portlet-package-summary"
- facet="overview"
template="../templates/distroseries-portlet-packaging.pt"/>
<browser:page
name="+portlet-derivation"
- facet="overview"
template="../templates/distroseries-portlet-derivation.pt"/>
</browser:pages>
<browser:page
@@ -122,34 +115,29 @@
class="lp.registry.browser.distroseries.DistroSeriesPackagesView"
permission="zope.Public"
name="+packaging"
- facet="overview"
template="../templates/distroseries-packaging.pt"/>
<browser:page
for="lp.registry.interfaces.distroseries.IDistroSeries"
class="lp.registry.browser.distroseries.DistroSeriesNeedsPackagesView"
permission="zope.Public"
name="+needs-packaging"
- facet="overview"
template="../templates/distroseries-needs-packaging.pt"/>
<browser:page
for="lp.registry.interfaces.distroseries.IDistroSeries"
permission="launchpad.Edit"
name="+edit"
class="lp.registry.browser.distroseries.DistroSeriesEditView"
- facet="overview"
template="../../app/templates/generic-edit.pt"/>
<browser:page
for="lp.registry.interfaces.distroseries.IDistroSeries"
permission="launchpad.Moderate"
name="+admin"
class="lp.registry.browser.distroseries.DistroSeriesAdminView"
- facet="overview"
template="../../app/templates/generic-edit.pt"/>
<browser:page
name="+addmilestone"
for="lp.registry.interfaces.distroseries.IDistroSeries"
class="lp.registry.browser.milestone.MilestoneAddView"
- facet="overview"
permission="launchpad.Edit"
template="../templates/milestone-add.pt"/>
<browser:page
@@ -213,8 +201,6 @@
DistroSeriesBugsMenu
DistroSeriesSpecificationsMenu"
module="lp.registry.browser.distroseries"/>
- <facet
- facet="overview">
<browser:menus
module="lp.registry.browser.codeofconduct"
classes="
@@ -311,7 +297,6 @@
class="lp.registry.browser.codeofconduct.SignedCodeOfConductAckView"
permission="launchpad.Admin"
template="../../app/templates/generic-edit.pt" />
- </facet>
<browser:url
for="lp.registry.interfaces.irc.IIrcID"
path_expression="string:+ircnick/${id}"
@@ -360,7 +345,6 @@
permission="zope.Public">
<browser:page
name="+index"
- facet="overview"
template="../templates/project-index.pt"/>
<browser:page
name="+listing-detailed"
@@ -370,20 +354,17 @@
<browser:page
name="+details"
- facet="overview"
template="../templates/project-details.pt"/>
</browser:pages>
<browser:page
for="lp.registry.interfaces.projectgroup.IProjectGroup"
class="lp.registry.browser.project.ProjectRdfView"
- facet="overview"
permission="zope.Public"
name="+rdf"
attribute="__call__"/>
<browser:pages
for="lp.registry.interfaces.projectgroup.IProjectGroup"
permission="launchpad.Edit"
- facet="overview"
class="lp.registry.browser.project.ProjectMaintainerReassignmentView">
<browser:page
name="+reassign"
@@ -398,27 +379,23 @@
name="+edit"
for="lp.registry.interfaces.projectgroup.IProjectGroup"
class="lp.registry.browser.project.ProjectEditView"
- facet="overview"
permission="launchpad.Edit"
template="../templates/project-edit.pt"/>
<browser:page
name="+branding"
for="lp.registry.interfaces.projectgroup.IProjectGroup"
class="lp.registry.browser.project.ProjectBrandingView"
- facet="overview"
permission="launchpad.Edit"
template="../templates/object-branding.pt"/>
<browser:page
name="+review"
for="lp.registry.interfaces.projectgroup.IProjectGroup"
class="lp.registry.browser.project.ProjectReviewView"
- facet="overview"
permission="launchpad.Moderate"
template="../templates/project-edit.pt"/>
<browser:page
name="+newproduct"
for="lp.registry.interfaces.projectgroup.IProjectGroup"
- facet="overview"
class="lp.registry.browser.project.ProjectAddProductView"
permission="launchpad.AnyPerson"
template="../templates/product-new.pt"/>
@@ -435,7 +412,6 @@
parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"/>
<browser:pages
for="lp.registry.interfaces.projectgroup.IProjectGroupSet"
- facet="overview"
permission="zope.Public"
class="lp.registry.browser.project.ProjectSetView">
<browser:page
@@ -449,7 +425,6 @@
name="+new"
for="lp.registry.interfaces.projectgroup.IProjectGroupSet"
class="lp.registry.browser.project.ProjectAddView"
- facet="overview"
permission="launchpad.Moderate"
template="../../app/templates/generic-edit.pt"/>
<browser:url
@@ -496,14 +471,12 @@
<browser:page
for="lp.registry.interfaces.distributionsourcepackage.IDistributionSourcePackage"
class="lp.registry.browser.distributionsourcepackage.DistributionSourcePackageView"
- facet="overview"
permission="zope.Public"
name="+index"
template="../templates/distributionsourcepackage-index.pt" />
<browser:page
for="lp.registry.interfaces.distributionsourcepackage.IDistributionSourcePackage"
class="lp.registry.browser.distributionsourcepackage.DistributionSourcePackageChangelogView"
- facet="overview"
permission="zope.Public"
name="+changelog"
template="../templates/distributionsourcepackage-changelog.pt"/>
@@ -512,7 +485,6 @@
permission="launchpad.BugSupervisor"
class="lp.registry.browser.distributionsourcepackage.DistributionSourcePackageEditView"
name="+edit"
- facet="overview"
template="../../app/templates/generic-edit.pt"/>
<browser:page
for="lp.registry.interfaces.distributionsourcepackage.IDistributionSourcePackage"
@@ -569,11 +541,8 @@
name="+get-involved"
for="*"
class="lp.registry.browser.pillar.PillarView"
- facet="overview"
permission="zope.Public"
template="../templates/pillar-involvement-portlet.pt"/>
- <facet
- facet="overview">
<browser:url
for="lp.registry.interfaces.karma.IKarmaAction"
path_expression="name"
@@ -607,7 +576,6 @@
<browser:pages
for="lp.registry.interfaces.karma.IKarmaContext"
class="lp.registry.browser.karma.KarmaContextTopContributorsView"
- facet="overview"
permission="zope.Public">
<browser:page
name="+topcontributors"
@@ -618,13 +586,9 @@
</browser:pages>
<browser:page
for="lp.registry.interfaces.karma.IKarmaContext"
- facet="overview"
permission="zope.Public"
name="karmacontext-macros"
template="../templates/karmacontext-macros.pt"/>
- </facet>
- <facet
- facet="overview">
<browser:menus
module="lp.registry.browser.poll"
classes="
@@ -691,7 +655,6 @@
class="lp.registry.browser.poll.PollOptionEditView"
permission="launchpad.Edit"
template="../templates/polloption-edit.pt"/>
- </facet>
<browser:url
for="lp.registry.interfaces.announcement.IAnnouncement"
path_expression="string:+announcement/${id}"
@@ -702,49 +665,42 @@
<browser:page
for="lp.registry.interfaces.announcement.IAnnouncement"
class="lp.registry.browser.announcement.AnnouncementView"
- facet="overview"
permission="launchpad.View"
template="../templates/announcement-index.pt"
name="+index"/>
<browser:page
for="lp.registry.interfaces.announcement.IAnnouncement"
class="lp.registry.browser.announcement.AnnouncementEditView"
- facet="overview"
permission="launchpad.Edit"
name="+edit"
template="../templates/announcement-edit.pt"/>
<browser:page
for="lp.registry.interfaces.announcement.IAnnouncement"
class="lp.registry.browser.announcement.AnnouncementRetargetView"
- facet="overview"
permission="launchpad.Edit"
name="+retarget"
template="../templates/announcement-retarget.pt"/>
<browser:page
for="lp.registry.interfaces.announcement.IAnnouncement"
class="lp.registry.browser.announcement.AnnouncementPublishView"
- facet="overview"
permission="launchpad.Edit"
name="+publish"
template="../templates/announcement-publish.pt"/>
<browser:page
for="lp.registry.interfaces.announcement.IAnnouncement"
class="lp.registry.browser.announcement.AnnouncementRetractView"
- facet="overview"
permission="launchpad.Edit"
name="+retract"
template="../templates/announcement-retract.pt"/>
<browser:page
for="lp.registry.interfaces.announcement.IAnnouncement"
class="lp.registry.browser.announcement.AnnouncementDeleteView"
- facet="overview"
permission="launchpad.Edit"
name="+delete"
template="../templates/announcement-delete.pt"/>
<browser:pages
for="lp.registry.interfaces.announcement.IHasAnnouncements"
class="lp.registry.browser.announcement.HasAnnouncementsView"
- facet="overview"
permission="zope.Public">
<browser:page
name="+announcements"
@@ -756,7 +712,6 @@
<browser:page
for="lp.registry.interfaces.announcement.IMakesAnnouncements"
class="lp.registry.browser.announcement.AnnouncementAddView"
- facet="overview"
permission="launchpad.Edit"
name="+announce"
template="../templates/announcement-add.pt"/>
@@ -770,7 +725,6 @@
<browser:page
for="lp.registry.interfaces.announcement.IAnnouncementSet"
name="+announcements"
- facet="overview"
class="lp.registry.browser.announcement.AnnouncementSetView"
permission="zope.Public"
template="../templates/announcements-all.pt"/>
@@ -790,8 +744,6 @@
classes="
AnnouncementCreateNavigationMenu
AnnouncementEditNavigationMenu"/>
- <facet
- facet="overview">
<browser:navigation
module="lp.registry.browser.person"
classes="PersonNavigation"/>
@@ -1318,7 +1270,6 @@
name="+mergerequest-sent"
template="../templates/people-mergerequest-sent.pt"/>
</browser:pages>
- </facet>
<browser:navigation
module="lp.registry.browser.milestone"
classes="
@@ -1346,7 +1297,6 @@
<browser:pages
for="lp.registry.interfaces.milestone.IMilestone"
class="lp.registry.browser.milestone.MilestoneView"
- facet="overview"
permission="zope.Public">
<browser:page
name="+index"
@@ -1362,42 +1312,36 @@
name="+pillar-table-row"
for="lp.registry.interfaces.milestone.IMilestone"
class="lp.registry.browser.milestone.MilestoneWithoutCountsView"
- facet="overview"
permission="zope.Public"
template="../templates/productseries-milestone-table-row.pt"/>
<browser:page
name="+pillar-table-row"
for="lp.registry.interfaces.milestone.IProjectGroupMilestone"
class="lp.registry.browser.milestone.MilestoneWithoutCountsView"
- facet="overview"
permission="zope.Public"
template="../templates/productseries-milestone-table-row.pt"/>
<browser:page
name="+edit"
for="lp.registry.interfaces.milestone.IMilestone"
class="lp.registry.browser.milestone.MilestoneEditView"
- facet="overview"
permission="launchpad.Edit"
template="../templates/milestone-edit.pt"/>
<browser:page
name="+delete"
for="lp.registry.interfaces.milestone.IMilestone"
class="lp.registry.browser.milestone.MilestoneDeleteView"
- facet="overview"
permission="launchpad.Edit"
template="../templates/milestone-delete.pt"/>
<browser:page
name="+addrelease"
for="lp.registry.interfaces.milestone.IMilestone"
class="lp.registry.browser.productrelease.ProductReleaseAddView"
- facet="overview"
permission="launchpad.Edit"
template="../templates/productrelease-add.pt"/>
<browser:page
for="lp.registry.interfaces.milestone.IHasMilestones"
class="lp.registry.browser.milestone.ObjectMilestonesView"
name="+milestones"
- facet="overview"
permission="zope.Public"
template="../templates/object-milestones.pt"/>
<browser:menus
@@ -1449,7 +1393,6 @@
name="+get-involved"
for="lp.registry.interfaces.product.IProduct"
class="lp.registry.browser.product.ProductInvolvementView"
- facet="overview"
permission="zope.Public"
template="../templates/pillar-involvement-portlet.pt"/>
<browser:page
@@ -1457,7 +1400,6 @@
name="+download"
class="lp.registry.browser.product.ProductDownloadFilesView"
permission="zope.Public"
- facet="overview"
template="../templates/product-files.pt"/>
<browser:pages
for="lp.registry.interfaces.product.IProduct"
@@ -1465,11 +1407,9 @@
class="lp.registry.browser.product.ProductView">
<browser:page
name="+index"
- facet="overview"
template="../templates/product-index.pt"/>
<browser:page
name="+timeline-graph"
- facet="overview"
template="../templates/object-timeline-graph.pt"/>
<browser:page
name="+listing-for-review"
@@ -1479,32 +1419,27 @@
<browser:page
name="+portlet-requires-subscription"
- facet="overview"
template="../templates/product-portlet-requires-subscription.pt"/>
<browser:page
name="+portlet-license-missing"
- facet="overview"
template="../templates/product-portlet-license-missing.pt"/>
</browser:pages>
<browser:page
for="lp.registry.interfaces.product.IProduct"
permission="zope.Public"
name="+purchase-subscription"
- facet="overview"
class="lp.registry.browser.product.ProductPurchaseSubscriptionView"
template="../templates/product-purchase-subscription.pt"/>
<browser:page
for="lp.registry.interfaces.product.IProduct"
permission="zope.Public"
name="+portlet-packages"
- facet="overview"
class="lp.registry.browser.product.ProductPackagesPortletView"
template="../templates/product-portlet-packages.pt"/>
<browser:page
for="lp.registry.interfaces.product.IProduct"
class="lp.registry.browser.product.ProductSeriesSetView"
name="+series"
- facet="overview"
permission="zope.Public"
template="../templates/product-series.pt"/>
<browser:page
@@ -1512,7 +1447,6 @@
permission="zope.Public"
class="lp.registry.browser.product.ProductPackagesView"
name="+packages"
- facet="overview"
template="../templates/product-packages.pt"/>
<browser:page
for="lp.registry.interfaces.product.IProduct"
@@ -1534,7 +1468,6 @@
<browser:pages
for="lp.registry.interfaces.product.IProduct"
permission="launchpad.Edit"
- facet="overview"
class="lp.registry.browser.product.ProductEditPeopleView">
<browser:page
name="+edit-people"
@@ -1543,20 +1476,17 @@
<browser:page
name="+edit"
for="lp.registry.interfaces.product.IProduct"
- facet="overview"
class="lp.registry.browser.product.ProductEditView"
permission="launchpad.Edit"
template="../../app/templates/generic-edit.pt"/>
<browser:page
for="lp.registry.interfaces.product.IProduct"
- facet="overview"
permission="launchpad.Edit"
name="+configure-answers"
template="../../app/templates/generic-edit.pt"
class="lp.registry.browser.product.ProductConfigureAnswersView"/>
<browser:page
for="lp.registry.interfaces.product.IProduct"
- facet="overview"
permission="launchpad.Edit"
name="+configure-blueprints"
template="../../app/templates/generic-edit.pt"
@@ -1564,21 +1494,18 @@
<browser:page
name="+branding"
for="lp.registry.interfaces.product.IProduct"
- facet="overview"
class="lp.registry.browser.product.ProductBrandingView"
permission="launchpad.Edit"
template="../templates/object-branding.pt"/>
<browser:page
name="+admin"
for="lp.registry.interfaces.product.IProduct"
- facet="overview"
class="lp.registry.browser.product.ProductAdminView"
permission="launchpad.Moderate"
template="../../app/templates/generic-edit.pt"/>
<browser:page
name="+review-license"
for="lp.registry.interfaces.product.IProduct"
- facet="overview"
class="lp.registry.browser.product.ProductReviewLicenseView"
permission="launchpad.Moderate"
template="../templates/product-review-license.pt"/>
@@ -1586,7 +1513,6 @@
<browser:page
for="lp.registry.interfaces.nameblacklist.INameBlacklist"
permission="launchpad.Edit"
- facet="overview"
class="lp.registry.browser.nameblacklist.NameBlacklistEditView"
name="+edit"
template="../../app/templates/generic-edit.pt"/>
@@ -1606,14 +1532,12 @@
<browser:page
for="lp.registry.interfaces.nameblacklist.INameBlacklistSet"
permission="launchpad.View"
- facet="overview"
class="lp.registry.browser.nameblacklist.NameBlacklistSetView"
name="+index"
template="../templates/nameblacklists-index.pt"/>
<browser:page
for="lp.registry.interfaces.nameblacklist.INameBlacklistSet"
permission="launchpad.Edit"
- facet="overview"
class="lp.registry.browser.nameblacklist.NameBlacklistAddView"
name="+add"
template="../../app/templates/generic-edit.pt"/>
@@ -1633,7 +1557,6 @@
name="+addseries"
for="lp.registry.interfaces.product.IProduct"
class="lp.registry.browser.product.ProductAddSeriesView"
- facet="overview"
permission="launchpad.Driver"
template="../templates/productseries-new.pt"/>
<browser:defaultView
@@ -1651,7 +1574,6 @@
<browser:pages
for="lp.registry.interfaces.product.IProductSet"
permission="zope.Public"
- facet="overview"
class="lp.registry.browser.product.ProductSetView">
<browser:page
name="+index"
@@ -1663,7 +1585,6 @@
<browser:pages
for="lp.registry.interfaces.product.IProductSet"
class="lp.registry.browser.product.ProductSetReviewLicensesView"
- facet="overview"
permission="launchpad.Moderate">
<browser:page
name="+review-licenses"
@@ -1672,7 +1593,6 @@
<browser:page
name="+new"
for="lp.registry.interfaces.product.IProductSet"
- facet="overview"
class="lp.registry.browser.product.ProductAddView"
permission="launchpad.AnyPerson"
template="../templates/product-new.pt"/>
@@ -1734,13 +1654,11 @@
name="+get-involved"
for="lp.registry.interfaces.productseries.IProductSeries"
class="lp.registry.browser.productseries.ProductSeriesInvolvementView"
- facet="overview"
permission="zope.Public"
template="../templates/pillar-involvement-portlet.pt"/>
<browser:pages
for="lp.registry.interfaces.productseries.IProductSeries"
class="canonical.launchpad.webapp.LaunchpadView"
- facet="overview"
permission="zope.Public">
<browser:page
name="+timeline-graph"
@@ -1755,7 +1673,6 @@
<browser:pages
for="lp.registry.interfaces.productseries.IProductSeries"
class="lp.registry.browser.productseries.ProductSeriesView"
- facet="overview"
permission="zope.Public">
<browser:page
name="+index"
@@ -1766,7 +1683,6 @@
</browser:pages>
<browser:page
name="+ubuntupkg"
- facet="overview"
template="../templates/productseries-ubuntupkg.pt"
for="lp.registry.interfaces.productseries.IProductSeries"
class="lp.registry.browser.productseries.ProductSeriesUbuntuPackagingView"
@@ -1777,7 +1693,6 @@
permission="zope.Public">
<browser:page
name="+status"
- facet="overview"
template="../templates/productseries-status.pt"/>
<browser:page
name="+code-summary"
@@ -1787,13 +1702,11 @@
for="lp.registry.interfaces.productseries.IProductSeries"
class="lp.registry.browser.productseries.ProductSeriesDetailedDisplayView"
template="../templates/productseries-detailed-display.pt"
- facet="overview"
permission="zope.Public"
name="+detailed-display"/>
<browser:page
for="lp.registry.interfaces.productseries.IProductSeries"
class="lp.registry.browser.productseries.ProductSeriesRdfView"
- facet="overview"
permission="zope.Public"
name="+rdf"
attribute="__call__"/>
@@ -1801,26 +1714,22 @@
name="+edit"
for="lp.registry.interfaces.productseries.IProductSeries"
class="lp.registry.browser.productseries.ProductSeriesEditView"
- facet="overview"
permission="launchpad.Edit"
template="../templates/productseries-edit.pt"/>
<browser:page
name="+delete"
for="lp.registry.interfaces.productseries.IProductSeries"
class="lp.registry.browser.productseries.ProductSeriesDeleteView"
- facet="overview"
permission="launchpad.Edit"
template="../templates/productseries-delete.pt"/>
<browser:page
name="+addrelease"
for="lp.registry.interfaces.productseries.IProductSeries"
class="lp.registry.browser.productrelease.ProductReleaseFromSeriesAddView"
- facet="overview"
permission="launchpad.Edit"
template="../templates/productrelease-add-from-series.pt"/>
<browser:page
name="+addmilestone"
- facet="overview"
for="lp.registry.interfaces.productseries.IProductSeries"
class="lp.registry.browser.milestone.MilestoneAddView"
permission="launchpad.Edit"
@@ -1830,27 +1739,23 @@
name="+linkbranch"
class="lp.registry.browser.productseries.ProductSeriesLinkBranchView"
template="../templates/productseries-linkbranch.pt"
- facet="overview"
permission="launchpad.Edit"/>
<browser:page
for="lp.registry.interfaces.productseries.IProductSeries"
name="+linkbranchtoseries"
class="lp.registry.browser.productseries.ProductSeriesLinkBranchFromCodeView"
template="../templates/productseries-linkbranch.pt"
- facet="overview"
permission="launchpad.Edit"/>
<browser:page
for="lp.registry.interfaces.productseries.IProductSeries"
name="+setbranch"
class="lp.registry.browser.productseries.ProductSeriesSetBranchView"
template="../templates/productseries-setbranch.pt"
- facet="overview"
permission="launchpad.Edit"/>
<browser:page
name="+review"
for="lp.registry.interfaces.productseries.IProductSeries"
class="lp.registry.browser.productseries.ProductSeriesReviewView"
- facet="overview"
permission="launchpad.Admin"
template="../templates/productseries-review.pt"/>
<browser:page
@@ -1891,7 +1796,6 @@
DistributionNavigation"/>
<browser:page
for="lp.registry.interfaces.distribution.IDistribution"
- facet="overview"
class="lp.registry.browser.distribution.DistributionArchiveMirrorsView"
permission="zope.Public"
name="+archivemirrors"
@@ -1909,7 +1813,6 @@
template="../templates/distribution-mirrors-rss.pt"/>
<browser:page
for="lp.registry.interfaces.distribution.IDistribution"
- facet="overview"
class="lp.registry.browser.distribution.DistributionSeriesMirrorsView"
permission="zope.Public"
name="+cdmirrors"
@@ -1922,28 +1825,24 @@
template="../templates/distribution-mirrors-rss.pt"/>
<browser:page
for="lp.registry.interfaces.distribution.IDistribution"
- facet="overview"
class="lp.registry.browser.distribution.DistributionDisabledMirrorsView"
permission="zope.Public"
name="+disabledmirrors"
template="../templates/distribution-mirrors.pt"/>
<browser:page
for="lp.registry.interfaces.distribution.IDistribution"
- facet="overview"
class="lp.registry.browser.distribution.DistributionUnofficialMirrorsView"
permission="zope.Public"
name="+unofficialmirrors"
template="../templates/distribution-mirrors.pt"/>
<browser:page
for="lp.registry.interfaces.distribution.IDistribution"
- facet="overview"
class="lp.registry.browser.distribution.DistributionPendingReviewMirrorsView"
permission="zope.Public"
name="+pendingreviewmirrors"
template="../templates/distribution-mirrors.pt"/>
<browser:page
name="+newmirror"
- facet="overview"
for="lp.registry.interfaces.distribution.IDistribution"
class="lp.registry.browser.distributionmirror.DistributionMirrorAddView"
permission="launchpad.AnyPerson"
@@ -1953,7 +1852,6 @@
for="lp.registry.interfaces.distribution.IDistribution"
permission="zope.Public"
name="+search"
- facet="overview"
class="lp.registry.browser.distribution.DistributionPackageSearchView"
template="../templates/distribution-search.pt"/>
<browser:page
@@ -1961,35 +1859,30 @@
class="lp.registry.browser.distribution.DistributionView"
permission="zope.Public"
name="+index"
- facet="overview"
template="../templates/distribution-index.pt"/>
<browser:page
for="lp.registry.interfaces.distribution.IDistribution"
class="lp.registry.browser.distribution.DistributionSeriesView"
permission="zope.Public"
name="+series"
- facet="overview"
template="../templates/distribution-series.pt"/>
<browser:page
for="lp.registry.interfaces.distribution.IDistribution"
class="lp.registry.browser.distribution.DistributionView"
permission="zope.Public"
name="+series-and-milestones"
- facet="overview"
template="../templates/distribution-series-and-milestones.pt"/>
<browser:page
for="lp.registry.interfaces.distribution.IDistribution"
class="lp.registry.browser.distribution.DistributionDerivativesView"
permission="zope.Public"
name="+derivatives"
- facet="overview"
template="../templates/distribution-series.pt"/>
<browser:page
for="lp.registry.interfaces.distribution.IDistribution"
class="lp.registry.browser.distribution.DistributionView"
permission="zope.Public"
name="+derivatives-slot"
- facet="overview"
template="../templates/distribution-derivatives.pt"/>
<browser:page
for="lp.registry.interfaces.distribution.IDistribution"
@@ -2000,7 +1893,6 @@
<browser:pages
for="lp.registry.interfaces.distribution.IDistribution"
permission="launchpad.Edit"
- facet="overview"
class="lp.registry.browser.distribution.DistributionReassignmentView">
<browser:page
name="+reassign"
@@ -2012,7 +1904,6 @@
name="+addseries"
for="lp.registry.interfaces.distribution.IDistribution"
class="lp.registry.browser.distroseries.DistroSeriesAddView"
- facet="overview"
permission="launchpad.Admin"
template="../templates/distroseries-add.pt">
</browser:page>
@@ -2020,7 +1911,6 @@
name="+addseries"
for="lp.registry.interfaces.distribution.IDerivativeDistribution"
class="lp.registry.browser.distroseries.DistroSeriesAddView"
- facet="overview"
permission="launchpad.Moderate"
template="../templates/distroseries-add.pt">
</browser:page>
@@ -2028,7 +1918,6 @@
name="+initseries"
for="lp.registry.interfaces.distroseries.IDistroSeries"
class="lp.registry.browser.distroseries.DistroSeriesInitializeView"
- facet="overview"
permission="launchpad.Edit"
template="../templates/distroseries-initialize.pt">
</browser:page>
@@ -2038,20 +1927,17 @@
permission="launchpad.Edit"
class="lp.registry.browser.distribution.DistributionEditView"
name="+edit"
- facet="overview"
template="../../app/templates/generic-edit.pt"/>
<browser:page
name="+selectmemberteam"
for="lp.registry.interfaces.distribution.IDistribution"
class="lp.registry.browser.distribution.DistributionChangeMembersView"
- facet="overview"
permission="launchpad.Edit"
template="../../app/templates/generic-edit.pt"/>
<browser:page
name="+selectmirroradmins"
for="lp.registry.interfaces.distribution.IDistribution"
class="lp.registry.browser.distribution.DistributionChangeMirrorAdminView"
- facet="overview"
permission="launchpad.Edit"
template="../../app/templates/generic-edit.pt"/>
<browser:page
@@ -2059,7 +1945,6 @@
for="lp.registry.interfaces.distribution.IDistribution"
class="lp.registry.browser.distribution.DistributionPublisherConfigView"
template="../../app/templates/generic-edit.pt"
- facet="overview"
permission="launchpad.Admin"/>
<browser:defaultView
for="lp.registry.interfaces.distribution.IDistributionSet"
@@ -2075,7 +1960,6 @@
<browser:pages
for="lp.registry.interfaces.distribution.IDistributionSet"
permission="zope.Public"
- facet="overview"
class="lp.registry.browser.distribution.DistributionSetView">
<browser:page
name="+index"
@@ -2084,14 +1968,12 @@
<browser:pages
for="lp.registry.interfaces.distribution.IDistributionSet"
permission="zope.Public"
- facet="overview"
class="lp.registry.browser.distribution.DistributionSetView">
</browser:pages>
<browser:page
name="+add"
for="lp.registry.interfaces.distribution.IDistributionSet"
class="lp.registry.browser.distribution.DistributionAddView"
- facet="overview"
permission="launchpad.Admin"
template="../../app/templates/generic-edit.pt"/>
<browser:menus
@@ -2125,7 +2007,6 @@
attribute_to_parent="distroseries"/>
<browser:pages
for="lp.registry.interfaces.sourcepackage.ISourcePackage"
- facet="overview"
permission="zope.Public">
<browser:page
name="+portlet-releases"
@@ -2137,19 +2018,16 @@
class="lp.registry.browser.sourcepackage.SourcePackageView">
<browser:page
name="+index"
- facet="overview"
template="../templates/sourcepackage-index.pt"/>
<!-- SourcePackage Portlets -->
<browser:page
name="+portlet-details"
- facet="overview"
template="../templates/sourcepackage-portlet-details.pt"/>
</browser:pages>
<browser:page
for="lp.registry.interfaces.sourcepackage.ISourcePackage"
permission="zope.Public"
name="+portlet-associations"
- facet="overview"
class="lp.registry.browser.sourcepackage.SourcePackageAssociationPortletView"
template="../templates/sourcepackage-portlet-associations.pt"/>
@@ -2157,7 +2035,6 @@
for="lp.registry.interfaces.sourcepackage.ISourcePackage"
permission="zope.Public"
name="+upstream-connections"
- facet="overview"
class="lp.registry.browser.sourcepackage.SourcePackageUpstreamConnectionsView"
template="../templates/sourcepackage-upstream-connections.pt"/>
<browser:menus
@@ -2188,7 +2065,6 @@
name="+index"/>
<browser:pages
for="lp.registry.interfaces.productrelease.IProductRelease"
- facet="overview"
permission="zope.Public">
<browser:page
name="+portlet-downloads"
@@ -2196,7 +2072,6 @@
</browser:pages>
<browser:page
for="lp.registry.interfaces.productrelease.IProductRelease"
- facet="overview"
permission="zope.Public"
name="+index"
class="lp.registry.browser.milestone.MilestoneView"
@@ -2204,7 +2079,6 @@
<browser:page
for="lp.registry.interfaces.productrelease.IProductRelease"
class="lp.registry.browser.productrelease.ProductReleaseRdfView"
- facet="overview"
permission="zope.Public"
name="+rdf"
attribute="__call__"/>
@@ -2213,20 +2087,17 @@
name="+adddownloadfile"
class="lp.registry.browser.productrelease.ProductReleaseAddDownloadFileView"
permission="launchpad.Edit"
- facet="overview"
template="../templates/productrelease-file-add.pt"/>
<browser:page
for="lp.registry.interfaces.productrelease.IProductRelease"
name="+delete"
class="lp.registry.browser.productrelease.ProductReleaseDeleteView"
permission="launchpad.Edit"
- facet="overview"
template="../templates/productrelease-delete.pt"/>
<browser:page
name="+edit"
for="lp.registry.interfaces.productrelease.IProductRelease"
class="lp.registry.browser.productrelease.ProductReleaseEditView"
- facet="overview"
permission="launchpad.Edit"
template="../templates/productrelease-edit.pt"/>
<browser:menus
@@ -2237,7 +2108,6 @@
name="+driver"
for="lp.registry.interfaces.role.IHasAppointedDriver"
class="lp.registry.browser.driver.AppointDriverView"
- facet="overview"
permission="launchpad.Edit"
template="../../app/templates/generic-edit.pt"/>
<browser:defaultView
@@ -2263,7 +2133,6 @@
name="+index"
for="lp.registry.interfaces.distributionmirror.IDistributionMirror"
class="lp.registry.browser.distributionmirror.DistributionMirrorView"
- facet="overview"
permission="zope.Public"
template="../templates/distributionmirror-index.pt">
</browser:page>
@@ -2272,7 +2141,6 @@
for="lp.registry.interfaces.distributionmirror.IDistributionMirror"
permission="launchpad.Edit"
class="lp.registry.browser.distributionmirror.DistributionMirrorEditView"
- facet="overview"
template="../templates/distributionmirror-edit.pt">
</browser:page>
<browser:page
@@ -2280,7 +2148,6 @@
for="lp.registry.interfaces.distributionmirror.IDistributionMirror"
permission="launchpad.Admin"
class="lp.registry.browser.distributionmirror.DistributionMirrorReviewView"
- facet="overview"
template="../templates/distributionmirror-review.pt">
</browser:page>
<browser:page
@@ -2288,14 +2155,12 @@
for="lp.registry.interfaces.distributionmirror.IDistributionMirror"
permission="launchpad.Admin"
class="lp.registry.browser.distributionmirror.DistributionMirrorDeleteView"
- facet="overview"
template="../templates/distributionmirror-delete.pt">
</browser:page>
<browser:page
for="lp.registry.interfaces.distributionmirror.IDistributionMirror"
permission="launchpad.Edit"
class="lp.registry.browser.distributionmirror.DistributionMirrorReassignmentView"
- facet="overview"
name="+reassign"
template="../../app/templates/object-reassignment.pt">
</browser:page>
@@ -2303,7 +2168,6 @@
name="+prober-logs"
for="lp.registry.interfaces.distributionmirror.IDistributionMirror"
class="lp.registry.browser.distributionmirror.DistributionMirrorProberLogView"
- facet="overview"
permission="launchpad.Edit"
template="../templates/distributionmirror-prober-logs.pt">
</browser:page>
@@ -2327,7 +2191,6 @@
permission="launchpad.AnyPerson"
class="lp.registry.browser.sourcepackage.SourcePackageChangeUpstreamView"
name="+edit-packaging"
- facet="overview"
template="../templates/sourcepackage-edit-packaging.pt"
/>
<browser:page
@@ -2335,7 +2198,6 @@
permission="launchpad.AnyPerson"
class="lp.registry.browser.sourcepackage.SourcePackageRemoveUpstreamView"
name="+remove-packaging"
- facet="overview"
template="../templates/sourcepackage-remove-packaging.pt"
/>
@@ -2364,4 +2226,5 @@
rootsite="api"
attribute_to_parent="owner" />
+</facet>
</configure>
=== modified file 'lib/lp/registry/configure.zcml'
--- lib/lp/registry/configure.zcml 2011-11-24 06:08:40 +0000
+++ lib/lp/registry/configure.zcml 2011-11-27 08:32:25 +0000
@@ -275,9 +275,6 @@
factory="lp.registry.browser.distroseries.DistroSeriesBreadcrumb"
permission="zope.Public"/>
- <facet
- facet="overview">
-
<!-- CodeofConduct -->
<class
@@ -334,7 +331,6 @@
<!-- string:${id} because id is an int -->
- </facet>
<class
class="lp.registry.model.person.IrcID">
<allow
@@ -429,9 +425,6 @@
factory="lp.registry.browser.project.ProjectSetBreadcrumb"
permission="zope.Public"/>
- <facet
- facet="answers"/>
-
<!-- ProjectGroupSet-->
<class
@@ -631,8 +624,6 @@
<allow
interface="lp.registry.interfaces.sourcepackagename.ISourcePackageNameSet"/>
</class>
- <facet
- facet="overview">
<!-- Karma -->
@@ -707,9 +698,6 @@
<allow
interface="lp.registry.interfaces.karma.IKarmaActionSet"/>
</securedutility>
- </facet>
- <facet
- facet="overview">
<!-- Poll -->
@@ -810,7 +798,6 @@
<allow
interface="lp.registry.interfaces.poll.IVoteCastSet"/>
</securedutility>
- </facet>
<!-- Announcement -->
@@ -849,8 +836,6 @@
<allow
interface="lp.registry.interfaces.announcement.IAnnouncementSet"/>
</securedutility>
- <facet
- facet="overview">
<!-- Person -->
@@ -993,7 +978,6 @@
<allow
interface="canonical.launchpad.webapp.interfaces.ICanonicalUrlData"/>
</securedutility>
- </facet>
<adapter
for="canonical.launchpad.webapp.interfaces.ILaunchpadPrincipal"
provides="lp.registry.interfaces.person.IPerson"
=== modified file 'lib/lp/soyuz/browser/configure.zcml'
--- lib/lp/soyuz/browser/configure.zcml 2011-11-01 16:15:16 +0000
+++ lib/lp/soyuz/browser/configure.zcml 2011-11-27 08:32:25 +0000
@@ -46,7 +46,6 @@
for="lp.soyuz.interfaces.processor.IProcessor"
path_expression="string:${name}"
parent_utility="lp.soyuz.interfaces.processor.IProcessorSet" />
- </facet>
<browser:navigation
module="lp.soyuz.browser.binarypackagerelease"
classes="
@@ -54,7 +53,6 @@
<browser:pages
for="lp.soyuz.model.binarypackagerelease.BinaryPackageRelease"
class="lp.soyuz.browser.binarypackagerelease.BinaryPackageView"
- facet="overview"
permission="zope.Public">
<browser:page
name="+portlet-details"
@@ -127,11 +125,8 @@
template="../templates/sourcepackagerelease-copyright.pt"/>
<browser:page
name="+files"
- facet="overview"
template="../templates/sourcepackagerelease-files.pt"/>
</browser:pages>
- <facet
- facet="overview">
<browser:pages
for="lp.soyuz.interfaces.publishing.ISourcePackagePublishingHistory"
permission="zope.Public"
@@ -174,7 +169,6 @@
<browser:navigation
module="lp.soyuz.browser.publishing"
classes="SourcePackagePublishingHistoryNavigation" />
- </facet>
<browser:defaultView
for="lp.soyuz.interfaces.distroseriessourcepackagerelease.IDistroSeriesSourcePackageRelease"
name="+index"/>
@@ -192,14 +186,12 @@
permission="zope.Public">
<browser:page
name="+index"
- facet="overview"
template="../templates/distroseriessourcepackagerelease-index.pt"/>
<!-- DistroSeriesSourcePackageRelease Portlets -->
<browser:page
name="+portlet-details"
- facet="overview"
template="../templates/distroseriessourcepackagerelease-portlet-details.pt"/>
</browser:pages>
<browser:defaultView
@@ -219,14 +211,12 @@
permission="zope.Public">
<browser:page
name="+index"
- facet="overview"
template="../templates/distroarchseriesbinarypackagerelease-index.pt"/>
<!-- DistroArchSeriesBinaryPackageRelease Portlets -->
<browser:page
name="+portlet-details"
- facet="overview"
template="../templates/distroarchseriesbinarypackagerelease-portlet-details.pt"/>
</browser:pages>
<browser:defaultView
@@ -259,21 +249,18 @@
permission="launchpad.View"
name="+index"
template="../templates/archive-index.pt"
- facet="overview"
class="lp.soyuz.browser.archive.ArchiveView"/>
<browser:page
for="lp.soyuz.interfaces.archive.IArchive"
permission="launchpad.View"
name="+packages"
template="../templates/archive-packages.pt"
- facet="overview"
class="lp.soyuz.browser.archive.ArchivePackagesView"/>
<browser:pages
for="lp.soyuz.interfaces.archive.IArchive"
permission="launchpad.View">
<browser:page
template="../templates/archive-ppa-row.pt"
- facet="overview"
name="+ppa-row"/>
<browser:page
template="../templates/archive-repository-size.pt"
@@ -285,7 +272,6 @@
class="lp.soyuz.browser.archive.ArchiveBuildsView">
<browser:page
name="+builds"
- facet="overview"
template="../templates/builds.pt"/>
<browser:page
name="+builds-list"
@@ -293,21 +279,18 @@
</browser:pages>
<browser:page
name="+edit"
- facet="overview"
for="lp.soyuz.interfaces.archive.IArchive"
class="lp.soyuz.browser.archive.ArchiveEditView"
permission="launchpad.Edit"
template="../../app/templates/generic-edit.pt"/>
<browser:page
name="+delete"
- facet="overview"
for="lp.soyuz.interfaces.archive.IArchive"
class="lp.soyuz.browser.archive.ArchiveDeleteView"
permission="launchpad.Edit"
template="../templates/archive-delete.pt"/>
<browser:page
name="+admin"
- facet="overview"
for="lp.soyuz.interfaces.archive.IArchive"
class="lp.soyuz.browser.archive.ArchiveAdminView"
permission="launchpad.Commercial"
@@ -318,7 +301,6 @@
class="lp.soyuz.browser.archive.ArchivePackageDeletionView">
<browser:page
template="../templates/archive-delete-packages.pt"
- facet="overview"
name="+delete-packages"/>
</browser:pages>
<browser:pages
@@ -327,7 +309,6 @@
class="lp.soyuz.browser.archive.ArchivePackageCopyingView">
<browser:page
template="../templates/archive-copy-packages.pt"
- facet="overview"
name="+copy-packages"/>
</browser:pages>
<browser:pages
@@ -336,7 +317,6 @@
class="lp.soyuz.browser.archive.ArchiveEditDependenciesView">
<browser:page
template="../templates/archive-edit-dependencies.pt"
- facet="overview"
name="+edit-dependencies"/>
</browser:pages>
<browser:pages
@@ -345,7 +325,6 @@
class="lp.soyuz.browser.archivesubscription.ArchiveSubscribersView">
<browser:page
name="+subscriptions"
- facet="overview"
template="../templates/archive-subscribers.pt"/>
</browser:pages>
<browser:menus
@@ -380,7 +359,6 @@
permission="launchpad.View">
<browser:page
name="+index"
- facet="overview"
template="../templates/build-index.pt"/>
</browser:pages>
<browser:pages
@@ -389,7 +367,6 @@
permission="launchpad.Edit">
<browser:page
name="+retry"
- facet="overview"
template="../templates/build-retry.pt"/>
</browser:pages>
<browser:pages
@@ -398,7 +375,6 @@
permission="launchpad.Admin">
<browser:page
name="+rescore"
- facet="overview"
template="../templates/build-rescore.pt"/>
</browser:pages>
<browser:pages
@@ -407,7 +383,6 @@
permission="launchpad.Edit">
<browser:page
name="+cancel"
- facet="overview"
template="../../app/templates/generic-edit.pt"/>
</browser:pages>
<browser:menus
@@ -431,16 +406,14 @@
class="lp.soyuz.browser.builder.BuilderSetView">
<browser:page
template="../templates/builders-index.pt"
- name="+index"
- facet="overview"/>
+ name="+index"/>
</browser:pages>
<browser:page
name="+new"
for="lp.buildmaster.interfaces.builder.IBuilderSet"
class="lp.soyuz.browser.builder.BuilderSetAddView"
permission="launchpad.Admin"
- template="../templates/builder-new.pt"
- facet="overview"/>
+ template="../templates/builder-new.pt"/>
<browser:defaultView
for="lp.buildmaster.interfaces.builder.IBuilder"
name="+index"/>
@@ -458,12 +431,10 @@
class="lp.soyuz.browser.builder.BuilderView">
<browser:page
template="../templates/builder-index.pt"
- facet="overview"
name="+index"/>
<browser:page
template="../templates/builder-portlet-details.pt"
- name="+portlet-details"
- facet="overview"/>
+ name="+portlet-details"/>
</browser:pages>
<browser:pages
for="lp.buildmaster.interfaces.builder.IBuilder"
@@ -471,20 +442,17 @@
class="lp.soyuz.browser.builder.BuilderHistoryView">
<browser:page
name="+history"
- template="../templates/builds.pt"
- facet="overview" />
+ template="../templates/builds.pt"/>
<browser:page
template="../templates/builds-list.pt"
- name="+builds-list"
- facet="overview"/>
+ name="+builds-list"/>
</browser:pages>
<browser:page
name="+edit"
for="lp.buildmaster.interfaces.builder.IBuilder"
class="lp.soyuz.browser.builder.BuilderEditView"
permission="launchpad.Edit"
- template="../templates/builder-edit.pt"
- facet="overview"/>
+ template="../templates/builder-edit.pt"/>
<browser:menus
classes="
BuilderSetFacets
@@ -512,7 +480,6 @@
permission="zope.Public">
<browser:page
name="+index"
- facet="overview"
template="../templates/distroarchseriesbinarypackage-index.pt"/>
<!-- DistroArchSeriesBinaryPackage Portlets -->
@@ -534,21 +501,18 @@
attribute_to_parent="subscriber"/>
<browser:page
name="+index"
- facet="overview"
for="lp.soyuz.interfaces.archivesubscriber.IArchiveSubscriber"
class="lp.soyuz.browser.archivesubscription.ArchiveSubscriptionEditView"
permission="launchpad.Edit"
template="../templates/archive-subscriber-edit.pt" />
<browser:page
name="+edit"
- facet="overview"
for="lp.soyuz.interfaces.archivesubscriber.IArchiveSubscriber"
class="lp.soyuz.browser.archivesubscription.ArchiveSubscriptionEditView"
permission="launchpad.Edit"
template="../templates/archive-subscriber-edit.pt"/>
<browser:page
name="+index"
- facet="overview"
for="lp.soyuz.interfaces.archivesubscriber.IPersonalArchiveSubscription"
class="lp.soyuz.browser.archivesubscription.PersonArchiveSubscriptionView"
permission="launchpad.View"
@@ -573,11 +537,9 @@
permission="zope.Public">
<browser:page
name="+index"
- facet="overview"
template="../templates/distributionsourcepackagerelease-index.pt"/>
<browser:page
name="+changes"
- facet="overview"
template="../templates/distributionsourcepackagerelease-changes.pt"/>
</browser:pages>
<browser:page
@@ -585,7 +547,6 @@
class="lp.soyuz.browser.distributionsourcepackagerelease.DistributionSourcePackageReleasePublishingHistoryView"
permission="zope.Public"
name="+publishinghistory"
- facet="overview"
template="../templates/distributionsourcepackage-publishinghistory.pt" />
<browser:defaultView
for="lp.soyuz.interfaces.distroseriesbinarypackage.IDistroSeriesBinaryPackage"
@@ -604,7 +565,6 @@
permission="zope.Public">
<browser:page
name="+index"
- facet="overview"
template="../templates/distroseriesbinarypackage-index.pt"/>
<!-- DistroSeriesBinaryPackage Portlets -->
@@ -621,8 +581,6 @@
DistroSeriesBinaryPackageFacets"
module="lp.soyuz.browser.distroseriesbinarypackage"/>
- <facet
- facet="overview">
<browser:defaultView
for="lp.soyuz.interfaces.distroarchseries.IDistroArchSeries"
name="+index"/>
@@ -655,7 +613,6 @@
class="lp.soyuz.browser.build.BuildRecordsView">
<browser:page
name="+builds"
- facet="overview"
template="../templates/builds.pt"/>
<browser:page
name="+builds-list"
@@ -676,7 +633,6 @@
name="+addport"
for="lp.registry.interfaces.distroseries.IDistroSeries"
class="lp.soyuz.browser.distroarchseries.DistroArchSeriesAddView"
- facet="overview"
permission="launchpad.Admin"
template="../templates/distroseries-addport.pt"/>
<browser:page
@@ -718,7 +674,6 @@
<browser:page
name="+activate-ppa"
for="lp.registry.interfaces.person.IPerson"
- facet="overview"
class="lp.soyuz.browser.archive.ArchiveActivateView"
permission="launchpad.Edit"
template="../templates/archive-activate.pt"/>
@@ -727,28 +682,24 @@
class="lp.registry.browser.distribution.DistributionPPASearchView"
name="+ppas"
permission="zope.Public"
- facet="overview"
template="../templates/distribution-ppa-list.pt"/>
<browser:page
for="lp.registry.interfaces.distribution.IDistribution"
class="lp.registry.browser.distribution.DistributionArchivesView"
name="+archives"
permission="launchpad.View"
- facet="overview"
template="../templates/distribution-archive-list.pt"/>
<browser:page
for="lp.registry.interfaces.distributionsourcepackage.IDistributionSourcePackage"
class="lp.registry.browser.distributionsourcepackage.DistributionSourcePackageView"
permission="zope.Public"
name="+portlet-publishing-details"
- facet="overview"
template="../templates/distributionsourcepackage-portlet-pub-details.pt"/>
<browser:page
for="lp.registry.interfaces.distributionsourcepackage.IDistributionSourcePackage"
class="lp.registry.browser.distributionsourcepackage.DistributionSourcePackagePublishingHistoryView"
permission="zope.Public"
name="+publishinghistory"
- facet="overview"
template="../templates/distributionsourcepackage-publishinghistory.pt"/>
<browser:page
for="lp.registry.interfaces.distribution.IDistribution"
@@ -767,7 +718,6 @@
"lp.soyuz.browser.sourcepackage.SourcePackageChangelogView"
permission="zope.Public"
name="+changelog"
- facet="overview"
template="../templates/sourcepackage-changelog.pt"/>
<browser:page
for="lp.registry.interfaces.sourcepackage.ISourcePackage"
@@ -775,7 +725,6 @@
"lp.soyuz.browser.sourcepackage.SourcePackageCopyrightView"
permission="zope.Public"
name="+copyright"
- facet="overview"
template="../templates/sourcepackage-copyright.pt"/>
<browser:pages
for="lp.registry.interfaces.sourcepackage.ISourcePackage"
@@ -787,7 +736,6 @@
template="../templates/builds-list.pt"/>
<browser:page
name="+builds"
- facet="overview"
template="../templates/builds.pt"/>
</browser:pages>
<browser:pages
@@ -807,7 +755,6 @@
permission="zope.Public">
<browser:page
name="+builds"
- facet="overview"
template="../templates/builds.pt"/>
<browser:page
name="+builds-list"
@@ -819,7 +766,6 @@
permission="zope.Public">
<browser:page
name="+builds"
- facet="overview"
template="../templates/builds.pt"/>
<browser:page
name="+builds-list"
@@ -831,7 +777,6 @@
name="+portlet-latestuploads"
template="../templates/distroseries-portlet-latestuploads.pt"/>
</browser:pages>
- </facet>
<browser:url
for="lp.soyuz.interfaces.packageset.IPackagesetSet"
@@ -868,21 +813,18 @@
for="lp.buildmaster.interfaces.buildqueue.IBuildQueue"
name="+current"
class="canonical.launchpad.webapp.publisher.LaunchpadView"
- facet="overview"
permission="launchpad.View"
template="../templates/buildqueue-current.pt"/>
<browser:page
for="lp.buildmaster.interfaces.buildfarmbranchjob.IBuildFarmBranchJob"
name="+current"
class="canonical.launchpad.webapp.publisher.LaunchpadView"
- facet="overview"
permission="launchpad.View"
template="../templates/buildfarmbranchjob-current.pt"/>
<browser:page
for="lp.soyuz.interfaces.buildfarmbuildjob.IBuildFarmBuildJob"
name="+current"
class="canonical.launchpad.webapp.publisher.LaunchpadView"
- facet="overview"
permission="launchpad.View"
template="../templates/buildfarmbuildjob-current.pt"/>
<browser:pages
@@ -893,4 +835,5 @@
template="../templates/packagerelationship-list.pt"
/>
</browser:pages>
+ </facet>
</configure>
=== modified file 'lib/lp/soyuz/configure.zcml'
--- lib/lp/soyuz/configure.zcml 2011-08-24 10:13:50 +0000
+++ lib/lp/soyuz/configure.zcml 2011-11-27 08:32:25 +0000
@@ -21,8 +21,6 @@
<allow
interface="lp.soyuz.interfaces.packagecloner.IPackageCloner"/>
</securedutility>
- <facet
- facet="overview">
<!-- BinaryPackagePublishingHistory -->
@@ -52,8 +50,6 @@
</class>
- </facet>
-
<!-- ArchiveArch -->
<class
class="lp.soyuz.model.archivearch.ArchiveArch">
@@ -95,8 +91,6 @@
permission="launchpad.Edit"
set_attributes="changelog"/>
</class>
- <facet
- facet="overview">
<!-- SourcePackagePublishingHistory -->
@@ -139,7 +133,6 @@
<allow
interface="lp.soyuz.interfaces.publishing.IPublishingSet"/>
</securedutility>
- </facet>
<class
class="lp.soyuz.model.queue.PackageUploadQueue">
<implements
@@ -234,8 +227,6 @@
<allow
interface="lp.soyuz.interfaces.queue.IPackageUploadSet"/>
</securedutility>
- <facet
- facet="overview">
<!-- BinaryPackagename -->
@@ -276,7 +267,6 @@
<allow
interface="lp.soyuz.interfaces.binarypackagename.IBinaryPackageNameSet"/>
</class>
- </facet>
<!-- ArchiveDependency -->
@@ -613,9 +603,6 @@
factory="lp.soyuz.browser.distroseriesbinarypackage.DistroSeriesBinaryPackageBreadcrumb"
permission="zope.Public"/>
- <facet
- facet="overview">
-
<!-- DistroArchSeries -->
<class
@@ -635,7 +622,6 @@
provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"
factory="lp.soyuz.browser.distroarchseries.DistroArchSeriesBreadcrumb"
permission="zope.Public" />
- </facet>
<!-- DistroArchSeriesSet -->
=== modified file 'lib/lp/translations/browser/configure.zcml'
--- lib/lp/translations/browser/configure.zcml 2011-10-05 11:12:21 +0000
+++ lib/lp/translations/browser/configure.zcml 2011-11-27 08:32:25 +0000
@@ -8,6 +8,7 @@
xmlns:i18n="http://namespaces.zope.org/i18n";
xmlns:xmlrpc="http://namespaces.zope.org/xmlrpc";
i18n_domain="launchpad">
+<facet facet="translations">
<browser:url
for="canonical.launchpad.interfaces.launchpad.IRosettaApplication"
path_expression="string:translations"
@@ -22,7 +23,6 @@
RosettaApplicationNavigation"/>
<browser:pages
for="canonical.launchpad.interfaces.launchpad.IRosettaApplication"
- facet="translations"
permission="zope.Public"
class="lp.translations.browser.translations.RosettaApplicationView"
layer="lp.translations.publisher.TranslationsLayer">
@@ -41,7 +41,6 @@
</browser:pages>
<browser:page
for="canonical.launchpad.interfaces.launchpad.IRosettaApplication"
- facet="translations"
permission="zope.Public"
class="lp.translations.browser.translations.TranslatableProductsView"
layer="lp.translations.publisher.TranslationsLayer"
@@ -51,12 +50,10 @@
for="*"
name="+rosetta-status-legend"
template="../templates/rosetta-status-legend.pt"
- facet="translations"
permission="zope.Public"/>
<browser:page
for="lp.translations.interfaces.rosettastats.IRosettaStats"
class="lp.translations.browser.translations.RosettaStatsView"
- facet="translations"
permission="zope.Public"
name="+barchart"
template="../templates/rosettastats-barchart.pt"
@@ -64,20 +61,16 @@
<browser:page
for="*"
name="+translations-macros"
- facet="translations"
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"
- facet="translations"
permission="zope.Public"
name="+portlet-translation-groups-and-permission"
template="../templates/hastranslationgroup-portlet-translation-groups-and-permission.pt"
layer="lp.translations.publisher.TranslationsLayer"/>
- <facet
- facet="translations">
<browser:defaultView
for="lp.translations.interfaces.translator.ITranslator"
name="+admin"
@@ -103,9 +96,6 @@
class="lp.translations.browser.translator.TranslatorRemoveView"
template="../../app/templates/generic-edit.pt"
layer="lp.translations.publisher.TranslationsLayer"/>
- </facet>
- <facet
- facet="translations">
<browser:navigation
module="lp.translations.browser.translationimportqueue"
classes="
@@ -128,7 +118,6 @@
layer="lp.translations.publisher.TranslationsLayer"/>
<browser:page
for="lp.translations.interfaces.translationimportqueue.ITranslationImportQueueEntry"
- facet="translations"
permission="zope.Public"
layer="lp.translations.publisher.TranslationsLayer"
name="+portlet-details"
@@ -146,11 +135,9 @@
for="lp.translations.interfaces.translationimportqueue.ITranslationImportQueue"
name="+index"
class="lp.translations.browser.translationimportqueue.TranslationImportQueueView"
- facet="translations"
permission="zope.Public"
template="../templates/translationimportqueue-index.pt"
layer="lp.translations.publisher.TranslationsLayer"/>
- </facet>
<browser:url
for="lp.translations.interfaces.distroserieslanguage.IDistroSeriesLanguage"
path_expression="string:+lang/${language/code}"
@@ -166,7 +153,6 @@
<browser:pages
for="lp.translations.interfaces.distroserieslanguage.IDistroSeriesLanguage"
permission="zope.Public"
- facet="translations"
layer="lp.translations.publisher.TranslationsLayer">
<browser:page
name="+rosetta-status-legend"
@@ -178,10 +164,7 @@
for="lp.translations.interfaces.distroserieslanguage.IDistroSeriesLanguage"
template="../templates/serieslanguage-index.pt"
class="lp.translations.browser.serieslanguage.DistroSeriesLanguageView"
- facet="translations"
layer="lp.translations.publisher.TranslationsLayer"/>
- <facet
- facet="translations">
<browser:navigation
module="lp.translations.browser.pofile"
classes="
@@ -236,7 +219,6 @@
<browser:page
name="+translate"
for="lp.translations.interfaces.pofile.IPOFile"
- facet="overview"
class="lp.translations.browser.translations.TranslateRedirectView"
permission="zope.Public"/>
<browser:page
@@ -260,7 +242,6 @@
template="../templates/pofile-filter.pt"
class="lp.translations.browser.pofile.POFileFilteredView"
layer="lp.translations.publisher.TranslationsLayer"/>
- </facet>
<browser:url
for="lp.translations.interfaces.productserieslanguage.IProductSeriesLanguage"
path_expression="string:+lang/${language/code}"
@@ -276,7 +257,6 @@
<browser:pages
for="lp.translations.interfaces.productserieslanguage.IProductSeriesLanguage"
permission="zope.Public"
- facet="translations"
layer="lp.translations.publisher.TranslationsLayer">
<browser:page
name="+rosetta-status-legend"
@@ -288,10 +268,7 @@
for="lp.translations.interfaces.productserieslanguage.IProductSeriesLanguage"
template="../templates/serieslanguage-index.pt"
class="lp.translations.browser.serieslanguage.ProductSeriesLanguageView"
- facet="translations"
layer="lp.translations.publisher.TranslationsLayer"/>
- <facet
- facet="translations">
<browser:navigation
module="lp.translations.browser.language"
classes="
@@ -727,7 +704,6 @@
<browser:page
for="lp.registry.interfaces.person.IPerson"
name="+translations"
- facet="translations"
class="lp.translations.browser.person.PersonTranslationView"
permission="zope.Public"
template="../templates/person-translations.pt"
@@ -1030,8 +1006,7 @@
class="lp.translations.browser.customlanguagecode.CustomLanguageCodeAddView"
template="../templates/customlanguagecode-add.pt"
permission="launchpad.TranslationsAdmin"/>
-
- </facet>
+</facet>
<!-- TranslationTemplateBuild -->
<browser:defaultView
=== modified file 'lib/lp/translations/configure.zcml'
--- lib/lp/translations/configure.zcml 2011-10-27 20:21:57 +0000
+++ lib/lp/translations/configure.zcml 2011-11-27 08:32:25 +0000
@@ -158,8 +158,6 @@
for="lp.translations.interfaces.potemplate.IPOTemplate
lazr.lifecycle.interfaces.IObjectModifiedEvent"
handler=".model.translationsharingjob.schedule_potemplate_job" />
- <facet
- facet="translations">
<!-- TranslatorSet -->
@@ -183,9 +181,6 @@
permission="launchpad.Edit"
set_schema="lp.translations.interfaces.translator.IEditTranslator"/>
</class>
- </facet>
- <facet
- facet="translations">
<!-- TranslationImportQueue -->
@@ -206,7 +201,6 @@
<allow
interface="lp.translations.interfaces.translationimportqueue.ITranslationImportQueue"/>
</securedutility>
- </facet>
<class
class="lp.translations.model.pofiletranslator.POFileTranslator">
<allow
@@ -349,8 +343,6 @@
for="lp.translations.interfaces.pofile.IPOFile"
factory="lp.translations.browser.translations.TranslationsLanguageBreadcrumb"
permission="zope.Public"/>
- <facet
- facet="translations">
<class
class="lp.translations.model.pofile.POFile">
<allow
@@ -386,7 +378,6 @@
<allow
interface="lp.translations.interfaces.pofile.IPOFileSet"/>
</securedutility>
- </facet>
<class
class="lp.translations.model.translationtemplateitem.TranslationTemplateItem">
<allow
@@ -418,18 +409,13 @@
</securedutility>
<!-- TranslatedLanguage -->
- <facet
- facet="translations">
<class
class="lp.translations.model.translatedlanguage.POFilesByPOTemplates">
<allow
interface="lp.translations.interfaces.translatedlanguage.IPOFilesByPOTemplates"/>
</class>
- </facet>
<!-- POTemplate -->
- <facet
- facet="translations">
<class
class="lp.translations.model.potemplate.POTemplate">
<allow
@@ -486,9 +472,6 @@
permission="zope.Public"
interface="lp.translations.interfaces.potemplate.IPOTemplateSharingSubset"/>
</class>
- </facet>
- <facet
- facet="translations">
<!-- TranslationGroup -->
@@ -519,7 +502,6 @@
for="lp.translations.interfaces.translationgroup.ITranslationGroupSet"
factory="lp.translations.browser.translationgroup.TranslationGroupSetBreadcrumb"
permission="zope.Public"/>
- </facet>
<class
class="lp.translations.model.potmsgset.POTMsgSet">
<allow
@@ -537,8 +519,6 @@
<allow
interface="lp.translations.interfaces.translatablemessage.ITranslatableMessage"/>
</class>
- <facet
- facet="translations">
<!-- LanguagePack -->
@@ -559,9 +539,6 @@
<allow
interface="lp.translations.interfaces.languagepack.ILanguagePackSet"/>
</securedutility>
- </facet>
- <facet
- facet="translations">
<class
class="lp.translations.model.translationmessage.TranslationMessage">
<allow
@@ -601,7 +578,6 @@
<allow
interface="lp.translations.interfaces.side.ITranslationSideTraitsSet"/>
</securedutility>
- </facet>
<adapter
provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"
for="lp.translations.interfaces.customlanguagecode.ICustomLanguageCode"
Follow ups
