Launchpad itself

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

  1. bug-595907
  2. Merge into devel
Proposed by Brad Crittenden
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merged at revision: 11062
Proposed branch: lp:~bac/launchpad/bug-595907
Merge into: lp:launchpad
Diff against target: 113 lines (+17/-11)
7 files modified
buildout-templates/bin/retest.in (+1/-1)
lib/canonical/launchpad/icing/style-3-0.css.in (+4/-0)
lib/lp/bugs/help/tag-help.html (+2/-2)
lib/lp/bugs/templates/bugtask-index.pt (+4/-2)
lib/lp/registry/stories/person/xx-person-home.txt (+2/-2)
lib/lp/registry/templates/person-portlet-contact-details.pt (+2/-2)
lib/lp/registry/templates/product-index.pt (+2/-2)
To merge this branch: bzr merge lp:~bac/launchpad/bug-595907
Reviewer Review Type Date Requested Status
Jelmer Vernooij (community) code Approve
Review via email: mp+28423@code.launchpad.net

Commit message

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

Description of the change

= 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

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
34${python-relative-path-setup}34${python-relative-path-setup}
3535
36# The test script for this branch.36# The test script for this branch.
37TEST = ${buildout:directory/bin/test|path-repr}37TEST = ${buildout:directory/bin/test}
3838
39# Regular expression to match numbered stories.39# Regular expression to match numbered stories.
40STORY_RE = re.compile("(.*)/\d{2}-.*")40STORY_RE = re.compile("(.*)/\d{2}-.*")
4141
=== 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 @@
1989 background-image: url(/@@/maybe.png); /* sprite-ref: icon-sprites */1989 background-image: url(/@@/maybe.png); /* sprite-ref: icon-sprites */
1990 background-repeat: no-repeat;1990 background-repeat: no-repeat;
1991 }1991 }
1992.maybe {
1993 background-image: url(/@@/maybe.png); /* sprite-ref: icon-sprites */
1994 background-repeat: no-repeat;
1995 }
1992.error-icon {1996.error-icon {
1993 background-image: url(/@@/error.png); /* sprite-ref: icon-sprites */1997 background-image: url(/@@/error.png); /* sprite-ref: icon-sprites */
1994 background-repeat: no-repeat;1998 background-repeat: no-repeat;
19951999
=== 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 @@
17 </p>17 </p>
1818
19 <p>19 <p>
20 For example, if it's a user interface bug you might tag it with '<code>20 For example, if it's a user interface bug you might tag it with
21 ui</code>'.21 '<code>ui</code>'.
22 </p>22 </p>
2323
24 <p>24 <p>
2525
=== 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 @@
160 id="edit-tags-cancel" style="display: none"160 id="edit-tags-cancel" style="display: none"
161 type="button">Cancel</button>161 type="button">Cancel</button>
162 </form>162 </form>
163 <a href="/+help/tag-help.html" target="help" class="icon"><img src="/@@/maybe" alt="help" /></a>163 <a href="/+help/tag-help.html" target="help" class="sprite maybe">&nbsp;
164 <span class="invisible-link">Tag help</span></a>
164 </div>165 </div>
165 <div id="add-bug-tags"166 <div id="add-bug-tags"
166 tal:attributes="class python: ('tags-container ' +167 tal:attributes="class python: ('tags-container ' +
@@ -169,7 +170,8 @@
169 <a href="+edit" title="Add tags" id="add-tags-trigger" class="sprite add">170 <a href="+edit" title="Add tags" id="add-tags-trigger" class="sprite add">
170 Add tags171 Add tags
171 </a>172 </a>
172 <a href="/+help/tag-help.html" target="help" class="icon"><img src="/@@/maybe" alt="help" /></a>173 <a href="/+help/tag-help.html" target="help" class="sprite maybe">&nbsp;
174 <span class="invisible-link">Tag help</span></a>
173 </div>175 </div>
174176
175 <div class="clearfix"></div>177 <div class="clearfix"></div>
176178
=== 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 @@
59 >>> print extract_text(59 >>> print extract_text(
60 ... find_tag_by_id(user_browser.contents, 'openid-info'))60 ... find_tag_by_id(user_browser.contents, 'openid-info'))
61 OpenID login:61 OpenID login:
62 http://launchpad.dev/~no-priv62 http://launchpad.dev/~no-priv...
6363
64The URL is followed by a helpful link.64The URL is followed by a helpful link.
6565
66 >>> print user_browser.getLink('openid help').url66 >>> print user_browser.getLink('OpenID help').url
67 http://launchpad.dev/+help/openid.html67 http://launchpad.dev/+help/openid.html
6868
69However, when the user visits someone else's page, they see no such URL.69However, when the user visits someone else's page, they see no such URL.
7070
=== 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 @@
67 <dd>67 <dd>
68 <img src="/@@/private" alt="" />68 <img src="/@@/private" alt="" />
69 <tal:openid-login content="view/openid_identity_url" />69 <tal:openid-login content="view/openid_identity_url" />
70 <a target="help" href="/+help/openid.html" class="icon">70 <a target="help" href="/+help/openid.html" class="sprite maybe">&nbsp;
71 <img src="/@@/maybe" alt="openid help" /></a>71 <span class="invisible-link">OpenID help</span></a>
72 </dd>72 </dd>
73 </dl>73 </dl>
7474
7575
=== 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 @@
91 <a tal:replace="structure overview_menu/reassign/fmt:icon" />91 <a tal:replace="structure overview_menu/reassign/fmt:icon" />
92 </tal:driver_unset>92 </tal:driver_unset>
9393
94 <a target="help" href="/+help/driver.html" class="icon">94 <a target="help" href="/+help/driver.html"
95 <img src="/@@/maybe" alt="help" /></a>95 class="sprite maybe">&nbsp;<span class="invisible-link">Driver help</span></a>
96 </dd>96 </dd>
97 </dl>97 </dl>
9898