1
=== modified file 'lib/lp/registry/browser/tests/pillar-views.txt'
2
--- lib/lp/registry/browser/tests/pillar-views.txt	2010-08-02 20:26:40 +0000
3
+++ lib/lp/registry/browser/tests/pillar-views.txt	2010-08-04 12:49:10 +0000
4
@@ -127,9 +127,62 @@
5
127
    {'done': 25,
127
    {'done': 25,
6
128
     'undone': 75}
128
     'undone': 75}
7
129
129
11
130
130
The progress bar is shown as a green bar.
12
131
Project groups are supported too, but they only display the applications used by
131
13
132
their products.
132
    >>> from canonical.launchpad.testing.pages import find_tag_by_id
14
133
    >>> rendered = view.render()
15
134
    >>> print find_tag_by_id(rendered, 'progressbar')
16
135
    <div ... id="progressbar">
17
136
    ...
18
137
    <img src="/@@/green-bar" ... width="25".../>
19
138
    ...
20
139
21
140
Each application is displayed (except for blueprints) with an
22
141
indicator showing whether it has been configured or not.
23
142
24
143
    >>> print find_tag_by_id(rendered, 'configuration_links')
25
144
    <table...
26
145
    <a href="http://launchpad.dev/bread/+configure-bugtracker"...
27
146
    <span class="sprite yes">...
28
147
    <a href="http://launchpad.dev/bread/+configure-answers"...
29
148
    <span class="sprite no">...
30
149
    <a href="http://launchpad.dev/bread/+configure-translations"...
31
150
    <span class="sprite no">...
32
151
    <a href="http://launchpad.dev/bread/trunk/+setbranch"...
33
152
    <span class="sprite no">...
34
153
    </table>
35
154
36
155
Until other supporting code lands, the progress bar is not going to be
37
156
shown on lpnet.
38
157
39
158
    >>> # Pretend that we're on launchpad.net:
40
159
    >>> from canonical.config import config
41
160
    >>> from textwrap import dedent
42
161
    >>> test_data = dedent("""
43
162
    ...     [launchpad]
44
163
    ...     is_lpnet: True
45
164
    ...     """)
46
165
    >>> config.push('test_data', test_data)
47
166
48
167
The progress bar is not shown on lpnet.
49
168
50
169
    >>> view = create_view(product, '+get-involved')
51
170
    >>> rendered = view.render()
52
171
    >>> print find_tag_by_id(rendered, 'progressbar')
53
172
    None
54
173
55
174
Neither are the indicator sprites.
56
175
57
176
    >>> 'sprite' in find_tag_by_id(rendered, 'configuration_links')
58
177
    False
59
178
60
179
    >>> # Restore the previous config:
61
180
    >>> config_data = config.pop('test_data')
62
181
    >>> print config.launchpad.is_lpnet
63
182
    False
64
183
65
184
Project groups are supported too, but they only display the
66
185
applications used by their products.
67
133
186
68
134
    >>> project_group = factory.makeProject(name='box', owner=product.owner)
187
    >>> project_group = factory.makeProject(name='box', owner=product.owner)
69
135
    >>> product.project = project_group
188
    >>> product.project = project_group
70
136
189
71
=== modified file 'lib/lp/registry/templates/pillar-involvement-portlet.pt'
72
--- lib/lp/registry/templates/pillar-involvement-portlet.pt	2010-08-02 22:03:33 +0000
73
+++ lib/lp/registry/templates/pillar-involvement-portlet.pt	2010-08-04 12:49:10 +0000
74
@@ -3,6 +3,7 @@
75
3
  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
3
  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
76
4
  id="involvement" class="portlet"
4
  id="involvement" class="portlet"
77
5
  tal:condition="view/has_involvement"
5
  tal:condition="view/has_involvement"
78
6
  tal:define="is_lpnet modules/canonical.config/config/launchpad/is_lpnet;"
79
6
  >
7
  >
80
7
  <h2>Get Involved</h2>
8
  <h2>Get Involved</h2>
81
8
9
82
@@ -33,9 +34,11 @@
83
33
34
84
34
  <tal:editor condition="context/required:launchpad.Edit"
35
  <tal:editor condition="context/required:launchpad.Edit"
85
35
              define="registration view/registration_completeness">
36
              define="registration view/registration_completeness">
86
37
87
38
    <tal:not_lpnet condition="not:is_lpnet">
88
36
    <tal:show_configuration condition="registration">
39
    <tal:show_configuration condition="registration">
89
37
      <h2>Configuration Progress</h2>
40
      <h2>Configuration Progress</h2>
91
38
      <div class="centered">
41
      <div class="centered" id="progressbar">
92
39
          <table width="80%" border="1">
42
          <table width="80%" border="1">
93
40
            <tr>
43
            <tr>
94
41
              <td>
44
              <td>
95
@@ -51,17 +54,23 @@
96
51
          </table>
54
          </table>
97
52
      </div>
55
      </div>
98
53
    </tal:show_configuration>
56
    </tal:show_configuration>
99
57
    </tal:not_lpnet>
100
54
58
101
55
    <table style="width: 100%; padding-top: 1em"
59
    <table style="width: 100%; padding-top: 1em"
103
56
           tal:condition="view/configuration_links">
60
           tal:condition="view/configuration_links"
104
61
           id="configuration_links">
105
57
      <tal:item repeat="link_status view/configuration_links">
62
      <tal:item repeat="link_status view/configuration_links">
106
58
        <tr>
63
        <tr>
107
59
          <td>
64
          <td>
108
60
            <a tal:replace="structure link_status/link/fmt:link" />
65
            <a tal:replace="structure link_status/link/fmt:link" />
109
61
          </td>
66
          </td>
110
67
111
68
          <tal:not_lpnet condition="not:is_lpnet">
112
62
          <td style="text-align: right;" tal:condition="registration">
69
          <td style="text-align: right;" tal:condition="registration">
113
63
            <tal:yes-no replace="structure link_status/configured/image:boolean" />
70
            <tal:yes-no replace="structure link_status/configured/image:boolean" />
114
64
          </td>
71
          </td>
115
72
          </tal:not_lpnet>
116
73
117
65
        </tr>
74
        </tr>
118
66
      </tal:item>
75
      </tal:item>
119
67
    </table>
76
    </table>
Reviewer	Review Type	Date Requested	Status
Edwin Grubbs (community)	code	2010-08-04	Approve on 2010-08-04
Review via email: mp+31749@code.launchpad.net