Launchpad itself

Merge lp:~deryck/launchpad/remove-bugs-templates-in-lp-431916 into lp:launchpad

  1. remove-bugs-templates-in-lp-431916
  2. Merge into devel
Proposed by Deryck Hodge
Status: Merged
Merged at revision: not available
Proposed branch: lp:~deryck/launchpad/remove-bugs-templates-in-lp-431916
Merge into: lp:launchpad
Diff against target: None lines
To merge this branch: bzr merge lp:~deryck/launchpad/remove-bugs-templates-in-lp-431916
Reviewer Review Type Date Requested Status
Celso Providelo (community) code Approve
Review via email: mp+11992@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Deryck Hodge (deryck) wrote :

= Summary =

This branch removes unused template bugbranch-delete.pt and updates
structural-subscriptions-manage.pt. These templates belong to the bugs
app but lived in lib/canonical/launchpad/templates.

See bug 431916.

No tests seem affected by the mechanical changes, but I'll run it
through it ec2test before submitting.

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/canonical/launchpad/pagetitles.py
  lib/canonical/launchpad/browser/structuralsubscription.py
  lib/canonical/launchpad/templates/structural-subscriptions-manage.pt

Revision history for this message
Celso Providelo (cprov) wrote :

Deryck,

The branch looks good, thanks for working on it.

We briefly discussed the current deficiencies on the default title using the reversed-nav-path and why we will be forced to override it almost every time. You pointed that this issue will be sorted after 3.0.

Other than that everything is great, r=me, thanks.

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/canonical/launchpad/browser/structuralsubscription.py'
--- lib/canonical/launchpad/browser/structuralsubscription.py 2009-08-25 11:21:05 +0000
+++ lib/canonical/launchpad/browser/structuralsubscription.py 2009-09-17 17:12:58 +0000
@@ -34,6 +34,16 @@
34 custom_widget('subscriptions_team', LabeledMultiCheckBoxWidget)34 custom_widget('subscriptions_team', LabeledMultiCheckBoxWidget)
35 custom_widget('remove_other_subscriptions', LabeledMultiCheckBoxWidget)35 custom_widget('remove_other_subscriptions', LabeledMultiCheckBoxWidget)
3636
37 override_title_breadcrumbs = True
38
39 @property
40 def page_title(self):
41 return 'Subscribe to Bugs in %s' % self.context.title
42
43 @property
44 def label(self):
45 return self.page_title
46
37 def setUpFields(self):47 def setUpFields(self):
38 """See LaunchpadFormView."""48 """See LaunchpadFormView."""
39 LaunchpadFormView.setUpFields(self)49 LaunchpadFormView.setUpFields(self)
4050
=== modified file 'lib/canonical/launchpad/pagetitles.py'
--- lib/canonical/launchpad/pagetitles.py 2009-09-17 12:31:13 +0000
+++ lib/canonical/launchpad/pagetitles.py 2009-09-17 17:12:58 +0000
@@ -363,9 +363,6 @@
363distributionsourcepackage_publishinghistory = ContextTitle(363distributionsourcepackage_publishinghistory = ContextTitle(
364 'Publishing history of %s')364 'Publishing history of %s')
365365
366structural_subscriptions_manage = ContextTitle(
367 'Bug subscriptions for %s')
368
369distroarchseries_index = ContextTitle('%s in Launchpad')366distroarchseries_index = ContextTitle('%s in Launchpad')
370367
371distroarchseries_builds = ContextTitle('%s builds')368distroarchseries_builds = ContextTitle('%s builds')
372369
=== removed file 'lib/canonical/launchpad/templates/bugbranch-delete.pt'
--- lib/canonical/launchpad/templates/bugbranch-delete.pt 2009-07-17 17:59:07 +0000
+++ lib/canonical/launchpad/templates/bugbranch-delete.pt 1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
1<html
2 xmlns="http://www.w3.org/1999/xhtml"
3 xml:lang="en"
4 lang="en"
5 metal:use-macro="context/@@main_template/master"
6 i18n:domain="launchpad">
7
8<body>
9
10<metal:leftportlets fill-slot="portlets">
11 <div tal:replace="structure context/branch/@@+portlet-details" />
12</metal:leftportlets>
13
14<div metal:fill-slot="main">
15
16 <h1>Delete bug branch link</h1>
17
18 <div class="documentDescription">
19 Are you sure you want to remove the link between...
20 </div>
21
22 <div metal:use-macro="context/@@launchpad_form/form">
23 </div>
24
25</div>
26
27</body>
28</html>
290
=== modified file 'lib/canonical/launchpad/templates/structural-subscriptions-manage.pt'
--- lib/canonical/launchpad/templates/structural-subscriptions-manage.pt 2009-07-17 17:59:07 +0000
+++ lib/canonical/launchpad/templates/structural-subscriptions-manage.pt 2009-09-17 17:12:58 +0000
@@ -3,41 +3,28 @@
3 xmlns:tal="http://xml.zope.org/namespaces/tal"3 xmlns:tal="http://xml.zope.org/namespaces/tal"
4 xmlns:metal="http://xml.zope.org/namespaces/metal"4 xmlns:metal="http://xml.zope.org/namespaces/metal"
5 xmlns:i18n="http://xml.zope.org/namespaces/i18n"5 xmlns:i18n="http://xml.zope.org/namespaces/i18n"
6 xml:lang="en"6 metal:use-macro="view/macro:page/main_side"
7 lang="en"
8 dir="ltr"
9 metal:use-macro="context/@@main_template/master"
10 i18n:domain="launchpad"7 i18n:domain="launchpad"
11>8>
12<body>9<body>
1310 <div metal:fill-slot="main">
14<metal:leftportlets fill-slot="portlets_one">11 <p>
15 <div tal:replace="structure context/@@+portlet-malone-bugmail-filtering-faq"/>12 You can choose to receive an e-mail every time someone reports or
16</metal:leftportlets>13 changes a public bug associated with
1714 <span tal:replace="context/title">this item</span>.
18<metal:rightportlets fill-slot="portlets_two">15 </p>
19 <div tal:condition="view/show_details_portlet"16 <p>
20 tal:replace="structure context/@@+portlet-details" />17 <strong>Important:</strong> subscribing here may mean you receive a
21 <div tal:replace="structure context/@@+portlet-structural-subscribers" />18 great deal of e-mail. You can return here to unsubscribe at any
22</metal:rightportlets>19 time.
2320 </p>
24<metal:heading fill-slot="pageheading">21 <div metal:use-macro="context/@@launchpad_form/form" />
25 <h1>Change bug subscriptions</h1>22 </div>
26</metal:heading>23 <div metal:fill-slot="side">
2724 <div tal:replace="structure context/@@+portlet-malone-bugmail-filtering-faq"/>
28<div metal:fill-slot="main">25 <div tal:condition="view/show_details_portlet"
29 26 tal:replace="structure context/@@+portlet-details" />
30 <p>27 <div tal:replace="structure context/@@+portlet-structural-subscribers" />
31 You can choose to receive an e-mail every time someone reports or28 </div>
32 changes a public bug associated with
33 <span tal:replace="context/title">this item</span>.
34 </p>
35 <p>
36 <strong>Important:</strong> subscribing here may mean you receive a
37 great deal of e-mail. You can return here to unsubscribe at any
38 time.
39 </p>
40 <div metal:use-macro="context/@@launchpad_form/form" />
41</div>
42</body>29</body>
43</html>30</html>