Hi Salgado,

Can you do a followup review on the changes I made for Martin? BTW, it is understood that the changes to the see-all css also affect the project page and any other portlets.

-Edwin

{{{
=== modified file 'lib/canonical/launchpad/icing/style-3-0.css'
--- lib/canonical/launchpad/icing/style-3-0.css	2009-08-23 01:55:48 +0000
+++ lib/canonical/launchpad/icing/style-3-0.css	2009-08-28 02:04:01 +0000
@@ -369,9 +369,8 @@
     }
 .see-all a {
     padding-left: 8px;
-    background: url(/@@/link-grey-arrow.png) left center no-repeat;
+    background: inherit;
     font-size: 72%;
-    color: #484848;
     text-decoration: underline;
     }
 .rss-right {
@@ -576,6 +575,30 @@
     text-align: right;
     }
 
+ul.super-add-action {
+    margin: 0 auto 1em;
+}
+
+ul.super-add-action li {
+    padding: 0;
+}
+
+ul.super-add-action li a {
+    display: block;
+    border: 1px solid black;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    -khtml-border-radius: 3px;
+    background: #4f843c url(/@@/bg-action-add) center left no-repeat;
+    border-radius: 3px;
+    padding: 6%;
+    padding-left: 45px;
+    color: #fff;
+    font-size: 108%;
+    font-weight: bold;
+    text-decoration: underline;
+    }
+
 .involvement ul {
     border-top: 1px solid #d0d0d0;
     }

=== added file 'lib/canonical/launchpad/images/bg-action-add.png'
Binary files lib/canonical/launchpad/images/bg-action-add.png	1970-01-01 00:00:00 +0000 and lib/canonical/launchpad/images/bg-action-add.png	2009-08-26 19:07:10 +0000 differ
=== modified file 'lib/lp/registry/browser/person.py'
--- lib/lp/registry/browser/person.py	2009-08-24 19:14:38 +0000
+++ lib/lp/registry/browser/person.py	2009-08-27 22:12:31 +0000
@@ -877,7 +877,8 @@
     def maintained(self):
         target = '+maintained-packages'
         text = 'Maintained Packages'
-        return Link(target, text, icon='info')
+        enabled = bool(self.team.getLatestMaintainedPackages())
+        return Link(target, text, enabled=enabled, icon='info')
 
     def uploaded(self):
         target = '+uploaded-packages'
@@ -1078,7 +1079,7 @@
         return Link(target, text)
 
 
-class PersonRelatedSoftwareNavigationMenu(NavigationMenu):
+class PersonRelatedSoftwareNavigationMenu(NavigationMenu, CommonMenuLinks):
 
     usedfor = IPersonRelatedSoftwareMenu
     facet = 'overview'
@@ -1226,7 +1227,7 @@
     @enabled_with_permission('launchpad.Edit')
     def editemail(self):
         target = '+contactaddress'
-        text = 'Change contact address'
+        text = 'Set contact address'
         summary = (
             'The address Launchpad uses to contact %s' %
             self.team.displayname)
@@ -1235,10 +1236,16 @@
     @enabled_with_permission('launchpad.MailingListManager')
     def configure_mailing_list(self):
         target = '+mailinglist'
-        text = 'Configure mailing list'
+        mailing_list = self.team.mailing_list
+        if mailing_list is not None and mailing_list.is_usable:
+            text = 'Configure mailing list'
+            icon = 'edit'
+        else:
+            text = 'Create a mailing list'
+            icon = 'add'
         summary = (
             'The mailing list associated with %s' % self.context.displayname)
-        return Link(target, text, summary, icon='edit')
+        return Link(target, text, summary, icon=icon)
 
     @enabled_with_active_mailing_list
     @enabled_with_permission('launchpad.Edit')
@@ -1255,23 +1262,28 @@
         text = 'Set preferred languages'
         return Link(target, text, icon='edit')
 
-    def joinleave(self):
+    def leave(self):
+        enabled = True
+        if not userIsActiveTeamMember(self.team):
+            enabled = False
+        if self.team.teamowner == self.user:
+            # The owner cannot leave his team.
+            enabled = False
+        target = '+leave'
+        text = 'Leave the Team'
+        icon = 'remove'
+        return Link(target, text, icon=icon, enabled=enabled)
+
+    def join(self):
         enabled = True
         if userIsActiveTeamMember(self.team):
-            if self.team.teamowner == self.user:
-                # The owner cannot leave his team
-                enabled = False
-            target = '+leave'
-            text = 'Leave the Team' # …
-            icon = 'remove'
-        else:
-            if (self.team.subscriptionpolicy
-                == TeamSubscriptionPolicy.RESTRICTED):
-                # This is a restricted team; users can't join.
-                enabled = False
-            target = '+join'
-            text = 'Join the team' # …
-            icon = 'add'
+            enabled = False
+        if self.team.subscriptionpolicy == TeamSubscriptionPolicy.RESTRICTED:
+            # This is a restricted team; users can't join.
+            enabled = False
+        target = '+join'
+        text = 'Join the team'
+        icon = 'add'
         return Link(target, text, icon=icon, enabled=enabled)
 
 
@@ -1284,7 +1296,7 @@
              'memberships', 'received_invitations',
              'editemail', 'configure_mailing_list', 'moderate_mailing_list',
              'editlanguages', 'map', 'polls',
-             'add_poll', 'joinleave', 'add_my_teams', 'mentorships',
+             'add_poll', 'join', 'leave', 'add_my_teams', 'mentorships',
              'reassign', 'related_projects',
              'activate_ppa', 'maintained']
 
@@ -5530,7 +5542,7 @@
     usedfor = ITeamIndexMenu
     facet = 'overview'
     title = 'Change team'
-    links = ('edit', 'joinleave', 'add_member', 'add_my_teams')
+    links = ('edit', 'add_member', 'add_my_teams', 'leave')
 
 
 class TeamEditMenu(TeamNavigationMenuBase):

=== modified file 'lib/lp/registry/templates/person-macros.pt'
--- lib/lp/registry/templates/person-macros.pt	2009-08-22 16:51:26 +0000
+++ lib/lp/registry/templates/person-macros.pt	2009-08-27 21:43:57 +0000
@@ -35,9 +35,12 @@
           <div style="white-space: nowrap">
             <img src="/@@/mail" alt="mail" />
             <tal:email replace="email"><email address hidden></tal:email>
+            <a class="sprite edit"
+               tal:attributes="href overview_menu/editemail/fmt:url"></a>
           </div>
         </tal:emails>
-        <a tal:replace="structure overview_menu/editemail/fmt:link" />
+        <a tal:condition="not: view/visible_email_addresses"
+           tal:replace="structure overview_menu/editemail/fmt:link"></a>
       </dd>
     </dl>
 
@@ -75,7 +78,9 @@
 <!-- subteam-of macro. -->
 <metal:macro define-macro="subteam-of">
   <div class="portlet"
-       id="subteam-of">
+       id="subteam-of"
+       tal:condition="
+          python: context.super_teams or context.open_membership_invitations">
     <h2>Subteam of</h2>
 
     <p tal:condition="not: context/super_teams">
@@ -95,13 +100,14 @@
       </ul>
     </tal:is-a-subteam>
 
-    <p>
-      <tal:memberships
-        replace="structure overview_menu/memberships/fmt:link" />
-      &nbsp;
-      <tal:received_invitations
-        replace="structure overview_menu/received_invitations/fmt:link" />
-    </p>
+    <ul class="horizontal">
+      <li
+        tal:condition="context/super_teams"
+        tal:replace="structure overview_menu/memberships/fmt:link" />
+      <li
+        tal:condition="context/open_membership_invitations"
+        tal:replace="structure overview_menu/received_invitations/fmt:link" />
+    </ul>
   </div>
 </metal:macro>
 

=== modified file 'lib/lp/registry/templates/person-portlet-related-projects.pt'
--- lib/lp/registry/templates/person-portlet-related-projects.pt	2009-08-21 14:51:31 +0000
+++ lib/lp/registry/templates/person-portlet-related-projects.pt	2009-08-24 22:34:22 +0000
@@ -8,7 +8,19 @@
      tal:define="overview_menu context/menu:overview"
      tal:condition="view/first_five_related_projects">
 
-  <h2>Related projects</h2>
+  <h2>
+    <span class="see-all">
+      <a href="+projects" tal:condition="view/has_more_related_projects">
+        Show all
+        <tal:count content="view/related_projects_count">8</tal:count>
+        related projects</a>
+      <a href="+projects" tal:condition="not: view/has_more_related_projects">
+        Show related projects</a>
+    </span>
+    Related projects
+  </h2>
+
+
   <table tal:define="pillarnames view/first_five_related_projects">
     <tbody>
       <tr tal:repeat="pillarname pillarnames">
@@ -19,20 +31,6 @@
         </td>
       </tr>
     </tbody>
-    <tfoot>
-      <tr>
-        <td style="padding-top: .5em;">
-          <a class="sprite info" href="+projects"
-             tal:condition="view/has_more_related_projects">
-            Show all
-            <tal:count content="view/related_projects_count">8</tal:count>
-            related projects</a>
-          <a class="sprite info" href="+projects"
-             tal:condition="not: view/has_more_related_projects">
-            Show related projects</a>
-        </td>
-      </tr>
-    </tfoot>
   </table>
 </div>
 </tal:root>

=== modified file 'lib/lp/registry/templates/team-index.pt'
--- lib/lp/registry/templates/team-index.pt	2009-08-22 16:51:26 +0000
+++ lib/lp/registry/templates/team-index.pt	2009-08-27 22:24:39 +0000
@@ -31,15 +31,23 @@
     <span tal:content="view/visibility_info">Viewable by team members.</span>
   </div>
 
+  <ul id="join-team"
+      class="super-add-action"
+      tal:define="link context/menu:overview/join"
+      tal:condition="link/enabled"
+      >
+    <li>
+      <a tal:attributes="href link/fmt:url"
+         tal:content="link/text" />
+    </li>
+  </ul>
+
   <tal:menu replace="structure view/@@+global-actions" />
 
   <div id="polls" class="portlet">
-    <h2>Current polls for
-      &#8220;<span tal:replace="context/displayname" />&#8221;
-    </h2>
-
+    <h2>Polls</h2>
     <p tal:condition="not: view/hasCurrentPolls">
-      This team has no open polls nor polls that are not yet opened.
+      No polls created.
     </p>
 
     <ul tal:condition="view/hasCurrentPolls">
@@ -78,7 +86,8 @@
       </li>
     </ul>
 
-    <a tal:replace="structure overview_menu/polls/fmt:link" />
+    <a tal:condition="view/hasCurrentPolls"
+       tal:replace="structure overview_menu/polls/fmt:link" />
     <a tal:replace="structure overview_menu/add_poll/fmt:link" />
 
   </div>
@@ -92,9 +101,6 @@
       </tal:comment>
     </div>
 
-    <h1 style="margin: 0"
-        tal:content="context/displayname"/>
-
     <div
       class="description"
       tal:condition="context/homepage_content"
@@ -121,8 +127,8 @@
 
     <!-- Second portlet column. -->
     <div class="yui-u">
+      <metal:details use-macro="context/@@+person-macros/team-details" />
       <div tal:content="structure context/@@+portlet-related-projects" />
-      <metal:details use-macro="context/@@+person-macros/team-details" />
       <div tal:content="structure context/@@+portlet-mailinglist" />
     </div>
   </div>

=== modified file 'lib/lp/registry/templates/team-portlet-mailinglist.pt'
--- lib/lp/registry/templates/team-portlet-mailinglist.pt	2009-08-21 13:48:43 +0000
+++ lib/lp/registry/templates/team-portlet-mailinglist.pt	2009-08-28 00:53:35 +0000
@@ -18,11 +18,25 @@
       <br />
       <strong>Policy:</strong>
       You must be a team member to subscribe to the team mailing list.
-      <br /><img src="/@@/mail" alt="email" /> <a id="mailing-list-archive"
-              tal:attributes="href archive_url">Mailing list archive</a>
+      <br/>
+      <tal:can-subscribe-to-list
+          condition="view/user_can_subscribe_to_list">
+        <a class="sprite add"
+            href="/people/+me/+editemails">Subscribe to mailing list</a>
+        <br />
+      </tal:can-subscribe-to-list>
+      <tal:subscribed-to-list
+          condition="view/user_is_subscribed_to_list">
+        <form id="form.list.unsubscribe" name="unsubscribe"
+          action="" method="post">
+          <input type="submit" name="unsubscribe" value="Unsubscribe" />
+        </form>
+      </tal:subscribed-to-list>
+      <img src="/@@/mail" alt="email" /> <a id="mailing-list-archive"
+              tal:attributes="href archive_url">View archive</a>
       <br /><img src="/@@/team" alt="team" /> <a id="mailing-list-subscribers"
               tal:attributes="href context/fmt:url/+mailing-list-subscribers"
-              >Mailing list subscribers</a>
+              >View subscribers</a>
     </div>
     <div tal:condition="not: view/archive_url">
       This team does not have a mailing list.
@@ -34,24 +48,6 @@
       <tal:moderate_mailing_list
         replace="structure context/menu:overview/moderate_mailing_list/fmt:link-icon" />
     </div>
-    <tal:block condition="view/userIsParticipant">
-      <div id="mailing-list-involvement"
-        tal:condition="view/team_has_mailing_list">
-        <tal:subscribed-to-list
-            condition="view/user_is_subscribed_to_list">
-          <form class="actions" id="form.list.unsubscribe" name="unsubscribe"
-            action="" method="post">
-            You are subscribed to the team mailing list.
-            <input type="submit" name="unsubscribe" value="Unsubscribe" />
-          </form>
-        </tal:subscribed-to-list>
-        <tal:can-subscribe-to-list
-            condition="view/user_can_subscribe_to_list">
-          You are not subscribed to the team mailing list.
-          (<a href="/people/+me/+editemails">Subscribe</a>)
-        </tal:can-subscribe-to-list>
-      </div>
-    </tal:block>
   </div>
 </div>
 </tal:root>

=== modified file 'lib/lp/registry/templates/team-portlet-map.pt'
--- lib/lp/registry/templates/team-portlet-map.pt	2009-08-21 13:48:43 +0000
+++ lib/lp/registry/templates/team-portlet-map.pt	2009-08-24 23:08:54 +0000
@@ -4,11 +4,18 @@
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
   omit-tag="">
 
-<div class="portlet" id="portlet-map" style="margin-bottom: 0px;">
-  <h2>Location</h2>
+<div class="portlet" id="portlet-map" style="margin-bottom: 0px;"
+     tal:define="link context/menu:overview/map">
+<table>
+<tr><td>
+  <h2>
+    <span class="see-all">
+      <a tal:attributes="href link/fmt:url">View map and time zones</a>
+    </span>
+    Location
+  </h2>
 
-  <tal:can_view condition="context/required:launchpad.View"
-                define="link context/menu:overview/map">
+  <tal:can_view condition="context/required:launchpad.View">
     <div style="width: 400px;" tal:condition="view/has_mapped_participants">
       <div id="team_map_actions"
         style="position:relative; z-index: 9999;
@@ -17,20 +24,14 @@
       <div id="team_map_div" class="small-map"
         style="height: 200px; border: 1px; margin-top: 4px;"></div>
       <tal:mapscript replace="structure view/map_portlet_html" />
-      <div style="margin-top: 0px;">
-        <a tal:replace="structure link/render">View map and time zones</a>
-      </div>
     </div>
 
     <tal:no-map tal:condition="not: view/has_mapped_participants">
       <a tal:attributes="href link/target"
         ><img src="/+icing/portlet-map-unknown.png" /></a>
-
-      <div tal:condition="link/enabled">
-        <a tal:replace="structure link/render">Show map and time zones</a>
-      </div>
     </tal:no-map>
   </tal:can_view>
-
+</td></tr>
+</table>
 </div>
 </tal:root>

=== modified file 'lib/lp/registry/templates/team-portlet-membership.pt'
--- lib/lp/registry/templates/team-portlet-membership.pt	2009-08-21 13:48:43 +0000
+++ lib/lp/registry/templates/team-portlet-membership.pt	2009-08-27 22:32:38 +0000
@@ -5,7 +5,14 @@
   omit-tag="">
 
 <div id="membership" class="portlet">
-  <h2>Members</h2>
+  <h2>
+    <span class="see-all">
+      <a tal:attributes="href context/menu:overview/members/fmt:url">
+        Show all members
+      </a>
+    </span>
+    Members
+  </h2>
 
   <div id="membership-summary" class="portletBody portletContent"
     style="margin-bottom: 1.5em;">
@@ -38,10 +45,6 @@
             >proposed members</a>
         </tal:proposed>
       </div>
-      <tal:members
-        replace="structure context/menu:overview/members/fmt:link" />
-      &nbsp;
-      <tal:mugshots replace="structure context/menu:overview/mugshots/fmt:link" />
     </div>
 
     <p id="your-involvement" tal:condition="not: request/lp:person">
@@ -69,9 +72,14 @@
           </tal:can-leave>
         </tal:active-member>
         <tal:not-active-member tal:condition="not: view/userIsActiveMember">
-          <tal:not-member condition="not: view/userIsParticipant">
+          <div condition="not: view/userIsParticipant"
+               style="margin-top: 1.5em">
+            <a tal:define="link context/menu:overview/join"
+               tal:condition="link/enabled"
+               tal:replace="structure link/fmt:link"></a>
+            <br/>
             You are not a member of this team.
-          </tal:not-member>
+          </div>
           <tal:participant condition="view/userIsParticipant">
             You are an indirect member of this team:
             <br />
@@ -102,15 +110,11 @@
           <li tal:repeat="person view/recently_approved_members"
               tal:content="structure person/fmt:link" />
         </ul>
-        <div style="margin-top: 3px;">
-          <tal:mentorships
-            replace="structure overview_menu/mentorships/fmt:link" />
-        </div>
       </td>
       <td style="padding: 0px;" id="recently-applied"
         tal:condition="view/recently_proposed_members">
         <h3 style="color:black; font-weight:bold; margin: 0px">
-          Recently applied
+          Pending approval
         </h3>
         <ul>
           <li tal:repeat="person view/recently_proposed_members"


}}}