Launchpad itself

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

  1. bug-597809
  2. Merge into devel
Proposed by Brad Crittenden
Status: Merged
Approved by: Brad Crittenden
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) Approve
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.
Revision history for this message
Leonard Richardson (leonardr) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/lp/registry/browser/person.py'
--- lib/lp/registry/browser/person.py 2010-06-18 15:06:32 +0000
+++ lib/lp/registry/browser/person.py 2010-06-29 13:08:29 +0000
@@ -3049,14 +3049,6 @@
3049 else:3049 else:
3050 return getUtility(ILaunchpadCelebrities).english.englishname3050 return getUtility(ILaunchpadCelebrities).english.englishname
30513051
3052 @property
3053 def public_private_css(self):
3054 """The CSS classes that represent the public or private state."""
3055 if self.context.private:
3056 return 'aside private'
3057 else:
3058 return 'aside public'
3059
3060 @cachedproperty3052 @cachedproperty
3061 def should_show_ppa_section(self):3053 def should_show_ppa_section(self):
3062 """Return True if "Personal package archives" is to be shown.3054 """Return True if "Personal package archives" is to be shown.
30633055
=== modified file 'lib/lp/registry/templates/team-index.pt'
--- lib/lp/registry/templates/team-index.pt 2010-02-04 19:51:17 +0000
+++ lib/lp/registry/templates/team-index.pt 2010-06-29 13:08:29 +0000
@@ -25,7 +25,7 @@
25<div metal:fill-slot="side"25<div metal:fill-slot="side"
26 tal:define="overview_menu context/menu:overview">26 tal:define="overview_menu context/menu:overview">
2727
28 <div id="privacy" class="portlet private"28 <div id="privacy"
29 tal:attributes="class view/visibility_portlet_class">29 tal:attributes="class view/visibility_portlet_class">
30 <span tal:content="view/visibility_info">Private team</span>30 <span tal:content="view/visibility_info">Private team</span>
31 </div>31 </div>
@@ -42,12 +42,6 @@
42<div metal:fill-slot="main"42<div metal:fill-slot="main"
43 tal:define="overview_menu context/menu:overview">43 tal:define="overview_menu context/menu:overview">
4444
45 <div tal:attributes="class view/public_private_css">
46 <tal:comment condition="nothing">
47 Display striped image.
48 </tal:comment>
49 </div>
50
51 <div45 <div
52 class="description"46 class="description"
53 tal:condition="context/homepage_content"47 tal:condition="context/homepage_content"