Launchpad itself

Merge lp:~bac/launchpad/bug-597809 into lp:launchpad

  1. bug-597809
  2. Merge into devel
Proposed by Brad Crittenden on 2010-06-28
Status: Merged
Approved by: Brad Crittenden on 2010-06-29
Approved revision: no longer in the source branch.
Merged at revision: 11075
Proposed branch: lp:~bac/launchpad/bug-597809
Merge into: lp:launchpad
Diff against target: 44 lines (+1/-15)
2 files modified
lib/lp/registry/browser/person.py (+0/-8)
lib/lp/registry/templates/team-index.pt (+1/-7)
To merge this branch: bzr merge lp:~bac/launchpad/bug-597809
Reviewer Review Type Date Requested Status
Leonard Richardson (community) 2010-06-28 Approve on 2010-06-29
Review via email: mp+28690@code.launchpad.net

Commit Message

Remove the extraneous and ill-placed padlock icon for private teams that is leftover from a previous page design.

Description of the Change

= Summary =

A left-over element was causing a privacy sprite (padlock) to appear on
private team pages.

== Proposed fix ==

Remove the unneeded, offending <div>

== Pre-implementation notes ==

Mumbled with Curtis

== Implementation details ==

As above.

== Tests ==

None.

== Demo and Q/A ==

Look at a private team and ensure the lock icon is not presented.

= Launchpad lint =

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

Linting changed files:
  lib/lp/registry/templates/team-index.pt
  lib/lp/registry/browser/person.py

To post a comment you must log in.
Leonard Richardson (leonardr) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/registry/browser/person.py'
2--- lib/lp/registry/browser/person.py 2010-06-18 15:06:32 +0000
3+++ lib/lp/registry/browser/person.py 2010-06-29 13:08:29 +0000
4@@ -3049,14 +3049,6 @@
5 else:
6 return getUtility(ILaunchpadCelebrities).english.englishname
7
8- @property
9- def public_private_css(self):
10- """The CSS classes that represent the public or private state."""
11- if self.context.private:
12- return 'aside private'
13- else:
14- return 'aside public'
15-
16 @cachedproperty
17 def should_show_ppa_section(self):
18 """Return True if "Personal package archives" is to be shown.
19
20=== modified file 'lib/lp/registry/templates/team-index.pt'
21--- lib/lp/registry/templates/team-index.pt 2010-02-04 19:51:17 +0000
22+++ lib/lp/registry/templates/team-index.pt 2010-06-29 13:08:29 +0000
23@@ -25,7 +25,7 @@
24 <div metal:fill-slot="side"
25 tal:define="overview_menu context/menu:overview">
26
27- <div id="privacy" class="portlet private"
28+ <div id="privacy"
29 tal:attributes="class view/visibility_portlet_class">
30 <span tal:content="view/visibility_info">Private team</span>
31 </div>
32@@ -42,12 +42,6 @@
33 <div metal:fill-slot="main"
34 tal:define="overview_menu context/menu:overview">
35
36- <div tal:attributes="class view/public_private_css">
37- <tal:comment condition="nothing">
38- Display striped image.
39- </tal:comment>
40- </div>
41-
42 <div
43 class="description"
44 tal:condition="context/homepage_content"