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

[Brad Crittenden]

Use the 'maybe' sprite for pop-up help rather than referencing the img directly.

= Summary =

Recently I added pop-up help and copied existing template code to make
it work. Sadly the code I copied was not using the available sprite but
referencing the img directly.

== Proposed fix ==

Fix the new code and the old to use "sprite maybe". Add "maybe" to the
sprite CSS.

As a drive-by fix I've corrected the path generated for bin/retest to
make it work again.

== Pre-implementation notes ==

Chat with Curtis.

== Implementation details ==

As above.

== Tests ==

Run the registy and bugs tests to ensure nothing broke.

== Demo and Q/A ==

Look at https://launchpad.dev/firefox, https://launchpad.dev/~mark, and
https://launchpad.dev/bugs/15 to ensure the pop-up icons are displayed

= 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/product-index.pt
  lib/lp/bugs/help/tag-help.html
  lib/lp/registry/stories/person/xx-person-home.txt
  lib/lp/registry/templates/person-portlet-contact-details.pt
  lib/canonical/launchpad/icing/style-3-0.css.in
  buildout-templates/bin/retest.in
  lib/lp/bugs/templates/bugtask-index.pt

[Jelmer Vernooij (jelmer)]

review: Approve (code)

=== modified file 'buildout-templates/bin/retest.in'
--- buildout-templates/bin/retest.in	2010-04-20 19:10:35 +0000
+++ buildout-templates/bin/retest.in	2010-06-24 20:27:26 +0000
@@ -34,7 +34,7 @@
 ${python-relative-path-setup}
 
 # The test script for this branch.
-TEST = ${buildout:directory/bin/test|path-repr}
+TEST = ${buildout:directory/bin/test}
 
 # Regular expression to match numbered stories.
 STORY_RE = re.compile("(.*)/\d{2}-.*")

=== modified file 'lib/canonical/launchpad/icing/style-3-0.css.in'
--- lib/canonical/launchpad/icing/style-3-0.css.in	2010-06-21 04:08:54 +0000
+++ lib/canonical/launchpad/icing/style-3-0.css.in	2010-06-24 20:27:26 +0000
@@ -1989,6 +1989,10 @@
     background-image: url(/@@/maybe.png); /* sprite-ref: icon-sprites */
     background-repeat: no-repeat;
     }
+.maybe {
+    background-image: url(/@@/maybe.png); /* sprite-ref: icon-sprites */
+    background-repeat: no-repeat;
+    }
 .error-icon {
     background-image: url(/@@/error.png); /* sprite-ref: icon-sprites */
     background-repeat: no-repeat;

=== modified file 'lib/lp/bugs/help/tag-help.html'
--- lib/lp/bugs/help/tag-help.html	2010-04-28 13:00:59 +0000
+++ lib/lp/bugs/help/tag-help.html	2010-06-24 20:27:26 +0000
@@ -17,8 +17,8 @@
     </p>
 
     <p>
-      For example, if it's a user interface bug you might tag it with '<code>
-      ui</code>'.
+      For example, if it's a user interface bug you might tag it with
+      '<code>ui</code>'.
     </p>
 
     <p>

=== modified file 'lib/lp/bugs/templates/bugtask-index.pt'
--- lib/lp/bugs/templates/bugtask-index.pt	2010-06-15 15:52:12 +0000
+++ lib/lp/bugs/templates/bugtask-index.pt	2010-06-24 20:27:26 +0000
@@ -160,7 +160,8 @@
                       id="edit-tags-cancel" style="display: none"
                       type="button">Cancel</button>
            </form>
-           <a href="/+help/tag-help.html" target="help" class="icon"><img src="/@@/maybe" alt="help" /></a>
+           <a href="/+help/tag-help.html" target="help" class="sprite maybe">&nbsp;
+             <span class="invisible-link">Tag help</span></a>
           </div>
           <div id="add-bug-tags"
                tal:attributes="class python: ('tags-container ' +
@@ -169,7 +170,8 @@
             <a href="+edit" title="Add tags" id="add-tags-trigger" class="sprite add">
               Add tags
             </a>
-            <a href="/+help/tag-help.html" target="help" class="icon"><img src="/@@/maybe" alt="help" /></a>
+            <a href="/+help/tag-help.html" target="help" class="sprite maybe">&nbsp;
+             <span class="invisible-link">Tag help</span></a>
           </div>
 
         <div class="clearfix"></div>

=== modified file 'lib/lp/registry/stories/person/xx-person-home.txt'
--- lib/lp/registry/stories/person/xx-person-home.txt	2010-06-18 18:23:18 +0000
+++ lib/lp/registry/stories/person/xx-person-home.txt	2010-06-24 20:27:26 +0000
@@ -59,11 +59,11 @@
     >>> print extract_text(
     ...     find_tag_by_id(user_browser.contents, 'openid-info'))
     OpenID login:
-    http://launchpad.dev/~no-priv
+    http://launchpad.dev/~no-priv...
 
 The URL is followed by a helpful link.
 
-    >>> print user_browser.getLink('openid help').url
+    >>> print user_browser.getLink('OpenID help').url
     http://launchpad.dev/+help/openid.html
 
 However, when the user visits someone else's page, they see no such URL.

=== modified file 'lib/lp/registry/templates/person-portlet-contact-details.pt'
--- lib/lp/registry/templates/person-portlet-contact-details.pt	2010-06-11 21:54:08 +0000
+++ lib/lp/registry/templates/person-portlet-contact-details.pt	2010-06-24 20:27:26 +0000
@@ -67,8 +67,8 @@
       <dd>
         <img src="/@@/private" alt="" />
         <tal:openid-login content="view/openid_identity_url" />
-        <a target="help" href="/+help/openid.html" class="icon">
-          <img src="/@@/maybe" alt="openid help" /></a>
+        <a target="help" href="/+help/openid.html" class="sprite maybe">&nbsp;
+          <span class="invisible-link">OpenID help</span></a>
       </dd>
     </dl>
 

=== modified file 'lib/lp/registry/templates/product-index.pt'
--- lib/lp/registry/templates/product-index.pt	2010-06-11 21:53:32 +0000
+++ lib/lp/registry/templates/product-index.pt	2010-06-24 20:27:26 +0000
@@ -91,8 +91,8 @@
                   <a tal:replace="structure overview_menu/reassign/fmt:icon" />
                   </tal:driver_unset>
 
-                  <a target="help" href="/+help/driver.html" class="icon">
-                    <img src="/@@/maybe" alt="help" /></a>
+                  <a target="help" href="/+help/driver.html"
+                     class="sprite maybe">&nbsp;<span class="invisible-link">Driver help</span></a>
                 </dd>
               </dl>