Launchpad itself

Merge lp:~rockstar/launchpad/sourcelist-template into lp:launchpad

  1. sourcelist-template
  2. Merge into devel
Proposed by Paul Hummer
Status: Merged
Approved by: Brad Crittenden
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~rockstar/launchpad/sourcelist-template
Merge into: lp:launchpad
Diff against target: None lines
To merge this branch: bzr merge lp:~rockstar/launchpad/sourcelist-template
Reviewer Review Type Date Requested Status
Brad Crittenden (community) release-critical Approve
Aaron Bentley (community) code Approve
Review via email: mp+12195@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Paul Hummer (rockstar) wrote :

Hi Aaron-

  This branch ports two (quite unrelated) templates to 3.0. The first is the
sources-list.pt template. It was missed by the Code team the first pass since
it was still living in canonical/launchpad/templates - My first order of
business was to re-locate it, and then I switched it to use the 3.0 template.
You can see this template at https://code.launchpad.dev/+code-import-list

  The second template is the template found at https://answers.launchpad.net
and was just as straightforward as the previous template.

  There is some lint, but it's unrelated to these changes, and since this
branch is going to be an RC, I thought I'd leave it for now.

 reviewer abentley code
 reviewer bac release-critical

Cheers,
Paul

Revision history for this message
Aaron Bentley (abentley) :
review: Approve (code)
Revision history for this message
Brad Crittenden (bac) wrote :

Niiice.

review: Approve (release-critical)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/lp/answers/browser/question.py'
--- lib/lp/answers/browser/question.py 2009-09-10 20:49:25 +0000
+++ lib/lp/answers/browser/question.py 2009-09-21 20:29:08 +0000
@@ -197,6 +197,9 @@
197 schema = IAnswersFrontPageSearchForm197 schema = IAnswersFrontPageSearchForm
198 custom_widget('scope', ProjectScopeWidget)198 custom_widget('scope', ProjectScopeWidget)
199199
200 page_title = 'Questions and Answers'
201 label = page_title
202
200 @property203 @property
201 def scope_css_class(self):204 def scope_css_class(self):
202 """The CSS class for used in the scope widget."""205 """The CSS class for used in the scope widget."""
203206
=== modified file 'lib/lp/answers/templates/questions-index.pt'
--- lib/lp/answers/templates/questions-index.pt 2009-08-13 21:32:59 +0000
+++ lib/lp/answers/templates/questions-index.pt 2009-09-21 20:42:18 +0000
@@ -2,76 +2,66 @@
2 xmlns="http://www.w3.org/1999/xhtml"2 xmlns="http://www.w3.org/1999/xhtml"
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 xml:lang="en"5 metal:use-macro="view/macro:page/main_only">
6 lang="en"
7 dir="ltr"
8 metal:use-macro="view/macro:page/applicationhome">
9 <body>6 <body>
10 <h1 metal:fill-slot="heading">Questions and answers</h1>
11 <div metal:fill-slot="main">7 <div metal:fill-slot="main">
128
13 <ul class="rollover buttons">9 <div class="yui-g">
14 <li>10 <p id="application-summary">
15 <a href="/+tour/community-support"11 Launchpad Answers helps you build a
16 tal:attributes="href string:${rooturl}+tour/community-support">12 community support network and knowledge base for
17 <img13 your project. Encourage new users to ask questions
18 alt="Take a tour"14 rather than file bugs! (<a href="https://help.launchpad.net/Answers">Read our guide</a>)
19 src="/+icing/but-lrg-takeatour.gif"15 </p>
20 />16 </div>
21 </a>17
22 </li>18 <div class="yui-g">
23 </ul>19 <form class="central" action="" method="get"
24 <form class="central" action="" method="get"20 tal:attributes="action request/URL">
25 tal:attributes="action request/URL">21 <table>
26 <table>22 <tbody>
27 <tbody>23 <tr>
28 <tr>24 <td style="text-align: right;">
29 <td style="text-align: right;">25 <input
30 <input26 id="text"
31 id="text"27 type="text"
32 type="text"28 name="field.search_text"
33 name="field.search_text"29 size="50"
34 size="50"30 />
35 />31 </td>
36 </td>32 <td>
37 <td>33 <input
38 <input34 tal:replace="structure view/search_action/render"
39 tal:replace="structure view/search_action/render"35 type="submit"
40 type="submit"36 value="Find Answers"
41 value="Find Answers"37 />
42 />38 </td>
43 </td>39 </tr>
44 </tr>40 <tr tal:define="target_widget nocall:view/widgets/scope/target_widget">
45 <tr tal:define="target_widget nocall:view/widgets/scope/target_widget">41 <td tal:attributes="class view/scope_css_class"
46 <td tal:attributes="class view/scope_css_class"42 style="text-align: right;">
47 style="text-align: right;">43
4844 <tal:scope
49 <tal:scope45 replace="structure view/widgets/scope/renderScopeOptions" />
50 replace="structure view/widgets/scope/renderScopeOptions" />46
5147 <tal:input replace="structure target_widget/inputField" />
52 <tal:input replace="structure target_widget/inputField" />48
5349 <tal:sort
54 <tal:sort50 replace="structure view/widgets/sort/hidden" />
55 replace="structure view/widgets/sort/hidden" />51 <tal:status
56 <tal:status52 replace="structure view/widgets/status/hidden" />
57 replace="structure view/widgets/status/hidden" />53 <div class="message"
58 <div class="message"54 tal:condition="view/scope_error"
59 tal:condition="view/scope_error"55 tal:content="structure view/scope_error">
60 tal:content="structure view/scope_error">56 Error message
61 Error message57 </div>
62 </div>58 </td>
63 </td>59 <td tal:content="structure target_widget/chooseLink" />
64 <td tal:content="structure target_widget/chooseLink" />60 </tr>
65 </tr>61 </tbody>
66 </tbody>62 </table>
67 </table>63 </form>
68 </form>64 </div>
69 <p id="application-summary">
70 Launchpad Answers helps you build a
71 community support network and knowledge base for
72 your project. Encourage new users to ask questions
73 rather than file bugs! (<a href="https://help.launchpad.net/Answers">Read our guide</a>)
74 </p>
7565
76 <div class="columns">66 <div class="columns">
77 <div id="most-active-projects" class="three column left">67 <div id="most-active-projects" class="three column left">
@@ -95,7 +85,7 @@
95 />85 />
96 </table>86 </table>
97 </div>87 </div>
98 88
99 <div id="latest-questions-solved" class="three column right">89 <div id="latest-questions-solved" class="three column right">
100 <h2>Latest questions solved</h2>90 <h2>Latest questions solved</h2>
101 <table>91 <table>
@@ -132,22 +122,5 @@
132122
133 </div><!--main-->123 </div><!--main-->
134124
135 <metal:help fill-slot="help">
136 <p>This page gives you a quick overview of the recent
137 activity in the Launchpad Answer Tracker.
138 </p>
139 <p>To post a new question, navigate to the project
140 you are having a problem with and use the <emph>Ask a Question</emph>
141 button.
142 </p>
143 <p>You can enter a question id in the search text field to quickly
144 navigate to the question.
145 </p>
146 <p><a href="https://help.launchpad.net/AnswerTrackerDocumentation">Extensive
147 documention</a> for the Answer Tracker application is available in the
148 Help wiki.</p>
149 </metal:help>
150
151 </body>125 </body>
152</html>126</html>
153<!-- 1-0 inprogress needs search of all answers -->
154127
=== modified file 'lib/lp/code/browser/configure.zcml'
--- lib/lp/code/browser/configure.zcml 2009-09-19 05:01:40 +0000
+++ lib/lp/code/browser/configure.zcml 2009-09-21 20:04:09 +0000
@@ -60,7 +60,7 @@
60 for="canonical.launchpad.webapp.interfaces.ILaunchpadApplication"60 for="canonical.launchpad.webapp.interfaces.ILaunchpadApplication"
61 name="+code-import-list"61 name="+code-import-list"
62 class="lp.registry.browser.productseries.ProductSeriesSourceListView"62 class="lp.registry.browser.productseries.ProductSeriesSourceListView"
63 template="../../../canonical/launchpad/templates/sources-list.pt"63 template="../templates/sources-list.pt"
64 permission="zope.Public"64 permission="zope.Public"
65 />65 />
66 <browser:page66 <browser:page
6767
=== renamed file 'lib/canonical/launchpad/templates/sources-list.pt' => 'lib/lp/code/templates/sources-list.pt'
--- lib/canonical/launchpad/templates/sources-list.pt 2009-07-17 17:59:07 +0000
+++ lib/lp/code/templates/sources-list.pt 2009-09-21 20:18:02 +0000
@@ -3,16 +3,11 @@
3 xmlns:tal="http://xml.zope.org/namespaces/tal"3 xmlns:tal="http://xml.zope.org/namespaces/tal"
4 xmlns:metal="http://xml.zope.org/namespaces/metal"4 xmlns:metal="http://xml.zope.org/namespaces/metal"
5 xmlns:i18n="http://xml.zope.org/namespaces/i18n"5 xmlns:i18n="http://xml.zope.org/namespaces/i18n"
6 xml:lang="en"6 metal:use-macro="view/macro:page/main_only"
7 lang="en"
8 dir="ltr"
9 metal:use-macro="view/macro:page/applicationhome"
10 i18n:domain="bazaar">7 i18n:domain="bazaar">
118
12<body>9<body>
1310
14 <h1 metal:fill-slot="heading">Available code imports</h1>
15
16<div metal:fill-slot="main" class="visualPadding"11<div metal:fill-slot="main" class="visualPadding"
17 tal:define="batch view/batchnav/currentBatch">12 tal:define="batch view/batchnav/currentBatch">
1813
1914
=== modified file 'lib/lp/registry/browser/productseries.py'
--- lib/lp/registry/browser/productseries.py 2009-09-15 02:16:19 +0000
+++ lib/lp/registry/browser/productseries.py 2009-09-21 20:18:02 +0000
@@ -710,6 +710,9 @@
710 See `ICodeImportSet.getActiveImports` for our definition of running.710 See `ICodeImportSet.getActiveImports` for our definition of running.
711 """711 """
712712
713 page_title = 'Available code imports'
714 label = page_title
715
713 def initialize(self):716 def initialize(self):
714 """See `LaunchpadFormView`."""717 """See `LaunchpadFormView`."""
715 self.text = self.request.get('text')718 self.text = self.request.get('text')