Merge lp:~sinzui/launchpad/something-and-nothing into lp:launchpad

[Curtis Hovey]

[Curtis Hovey (sinzui)]

This is my branch to fix some trivial issues in pages.

    lp:~sinzui/launchpad/something-and-nothing
    Diff size: 145
    Launchpad bug: https://bugs.launchpad.net/bugs/518217
                   https://bugs.launchpad.net/bugs/525566
                   https://bugs.launchpad.net/bugs/429216
    Test command: ./bin/test -vv \
        -t site-search
        -t stories/mailinglists/subscriptions
        -t xx-team-home
    Pre-implementation: no-one
    Target release: 10.02

Fix some trivial issues
------------------------

Bug #518217 [search navigation has two blue bars]
    Recent changes to CSS or markup has created an extra blue bar above the
    BatchNavigation on https://edge.launchpad.net/+search

Bug #525566 ["Subscribe to mailing list" link shown when I am not a member]
    Like the title says. The problem was caused by the use of an ambiguous
    method.

Bug #429216 ["You are not a member of this team. You are an indirect member
of this team" is confusing]
    When you're an indirect member of a team, it tells you that you're not a
    member, but you are. The template is missing "tal:" in front of the
    condition, so the non-member rule is always shown even though the template
    does not intend to show it.

Rules
-----

Bug #518217 [search navigation has two blue bars]
    The extra blue bars are created by redundant markup. The markup was moved
    to @@+navigation-links-upper and @@+navigation-links-lower, so the markup
    in the template can be deleted.

Bug #525566 ["Subscribe to mailing list" link shown when I am not a member]
    The template assumes the user is a member for the subscribe/unsubscribe
    actions. Wrap the two actions in a guard to ensure the user is a member.
    Update the the doc for user_can_subscribe_to_list() to make it clear
    that is is for joining a team.

Bug #429216 ["You are not a member of this team. You are an indirect member
of this team" is confusing]
    Add "tal:" in front of the condition in the template.

QA
--

Bug #518217 [search navigation has two blue bars]
    Search for 'gedit' in launchpad, verify that the batch navigation is
    not preceed by an extra blue bar.

Bug #525566 ["Subscribe to mailing list" link shown when I am not a member]
    * Visit https://edge.launchpad.net/~drizzle-discuss
    * Verify you are not shown (+) Subscribe to mailing list

Bug #429216 ["You are not a member of this team. You are an indirect member
of this team" is confusing]
    * Visit https://edge.launchpad.net/~launchpad-bugs
    * Verify you do not see "You are not a member of this team."

Lint
----

Linting changed files:
  lib/lp/app/templates/launchpad-search.pt
  lib/lp/registry/browser/person.py
  lib/lp/registry/stories/mailinglists/subscriptions.txt
  lib/lp/registry/stories/team/xx-team-home.txt
  lib/lp/registry/templates/team-portlet-mailinglist.pt
  lib/lp/registry/templates/team-portlet-membership.pt

Test
----

    * lib/lp/registry/stories/mailinglists/subscriptions.txt
      * Clarified what a member sees on the team page.
      * Added a test to verify what a non-member sees.
    * lib/lp/registry/stories/team/xx-team-home.txt
      * Corrected the test to not look f...

[Paul Hummer (rockstar)]

This looks good.

review: Approve (code)

=== modified file 'lib/lp/app/templates/launchpad-search.pt'
--- lib/lp/app/templates/launchpad-search.pt	2010-01-08 21:23:15 +0000
+++ lib/lp/app/templates/launchpad-search.pt	2010-02-26 00:10:33 +0000
@@ -152,10 +152,8 @@
             condition="view/pages"
             define="batch view/pages/currentBatch|nothing">
 
-            <div class="upper-batch-nav search-batch">
-              <tal:navigation
-                 replace="structure view/pages/@@+navigation-links-upper"/>
-            </div>
+            <tal:navigation
+               replace="structure view/pages/@@+navigation-links-upper"/>
 
             <ul class="site-matches" tal:condition="batch">
               <li class="pagematch" tal:repeat="page batch">
@@ -172,10 +170,8 @@
               </li>
             </ul>
 
-            <div class="lower-batch-nav search-batch">
-              <tal:navigation
-                 replace="structure view/pages/@@+navigation-links-lower" />
-            </div>
+            <tal:navigation
+               replace="structure view/pages/@@+navigation-links-lower" />
 
             <form tal:replace="structure view/@@+search-form" />
           </tal:batch>

=== modified file 'lib/lp/registry/browser/person.py'
--- lib/lp/registry/browser/person.py	2010-02-16 20:36:48 +0000
+++ lib/lp/registry/browser/person.py	2010-02-26 00:10:33 +0000
@@ -2581,7 +2581,7 @@
 
     @property
     def user_can_subscribe_to_list(self):
-        """Can the user subscribe to this team's mailing list?
+        """Can the prospective member subscribe to this team's mailing list?
 
         A user can subscribe to the list if the team has an active
         mailing list, and if they do not already have a subscription.

=== modified file 'lib/lp/registry/stories/mailinglists/subscriptions.txt'
--- lib/lp/registry/stories/mailinglists/subscriptions.txt	2009-12-24 01:41:54 +0000
+++ lib/lp/registry/stories/mailinglists/subscriptions.txt	2010-02-26 00:10:33 +0000
@@ -396,10 +396,24 @@
     >>> browser.open('http://launchpad.dev/~rosetta-admins')
     >>> print extract_text(
     ...     find_portlet(browser.contents, 'Mailing list'))
-    Mailing list...
+    Mailing list
+    [e-mail]
+    Policy: You must be a team member to subscribe to the team mailing list.
+    Subscribe to mailing list
     View archive
     View subscribers...
 
+Non-members are not shown links to subscribe or unsubscribe.
+
+    >>> user_browser.open('http://launchpad.dev/~rosetta-admins')
+    >>> print extract_text(
+    ...     find_portlet(user_browser.contents, 'Mailing list'))
+    Mailing list
+    [e-mail]
+    Policy: You must be a team member to subscribe to the team mailing list.
+    View archive
+    View subscribers
+
 The mailing list for Rosetta Admins has no subscribers.
 (Jeff Waugh has asked to subscribe but he's not considered a subscriber
 because his membership on Rosetta Admins hasn't been approved)

=== modified file 'lib/lp/registry/stories/team/xx-team-home.txt'
--- lib/lp/registry/stories/team/xx-team-home.txt	2009-12-22 04:28:58 +0000
+++ lib/lp/registry/stories/team/xx-team-home.txt	2010-02-26 00:10:33 +0000
@@ -173,7 +173,6 @@
     >>> sample_browser.open('http://launchpad.dev/~name18')
     >>> print extract_text(
     ...     find_tag_by_id(sample_browser.contents, 'your-involvement'))
-    Join...
     You are an indirect member of this team:
     Sample Person &rarr; Warty Security Team &rarr; Ubuntu Gnome Team...
 

=== modified file 'lib/lp/registry/templates/team-portlet-mailinglist.pt'
--- lib/lp/registry/templates/team-portlet-mailinglist.pt	2009-08-28 00:57:32 +0000
+++ lib/lp/registry/templates/team-portlet-mailinglist.pt	2010-02-26 00:10:33 +0000
@@ -19,19 +19,21 @@
       <strong>Policy:</strong>
       You must be a team member to subscribe to the team mailing list.
       <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>
+      <tal:member condition="view/user_is_active_member">
+        <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>
+      </tal:member>
       <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"

=== modified file 'lib/lp/registry/templates/team-portlet-membership.pt'
--- lib/lp/registry/templates/team-portlet-membership.pt	2010-02-04 19:51:17 +0000
+++ lib/lp/registry/templates/team-portlet-membership.pt	2010-02-26 00:10:33 +0000
@@ -66,7 +66,7 @@
           </tal:can-leave>
         </tal:active-member>
         <tal:not-active-member tal:condition="not: view/user_is_active_member">
-          <div condition="not: view/userIsParticipant"
+          <div tal:condition="not: view/userIsParticipant"
                style="margin-top: 1.5em">
             <a tal:define="link context/menu:overview/join"
                tal:condition="link/enabled"