Merge ~cjwatson/launchpad:fix-openpgp-keys-style-logged-out into launchpad:master

Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: 36ded415a2902c6bdf03c7b8e39b8216637a026d
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:fix-openpgp-keys-style-logged-out
Merge into: launchpad:master
Diff against target: 31 lines (+5/-3)
2 files modified
lib/lp/registry/stories/person/xx-person-home.rst (+4/-2)
lib/lp/registry/templates/person-portlet-contact-details.pt (+1/-1)
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+439513@code.launchpad.net

Commit message

Fix OpenPGP key rendering when logged out, better

Description of the change

I mistyped `content=...` instead of `tal:content=...` in commit 1ff2add6307cb41f919f7c83a5d0bafc07518dc7, and there was a doctest to update as well.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) wrote :

Simple test fix.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/lp/registry/stories/person/xx-person-home.rst b/lib/lp/registry/stories/person/xx-person-home.rst
2index 003386e..2778686 100644
3--- a/lib/lp/registry/stories/person/xx-person-home.rst
4+++ b/lib/lp/registry/stories/person/xx-person-home.rst
5@@ -129,9 +129,11 @@ authenticated users can see the key fingerprint with a link to the keyserver.
6 <a href="https://keyserver...
7
8 >>> anon_browser.open("http://launchpad.test/~name16")
9- >>> print(find_tag_by_id(anon_browser.contents, "pgp-keys"))
10+ >>> print(find_tag_by_id(anon_browser.contents, "pgp-keys")) # noqa
11 <dl...
12- <dd> ABCDEF0123456789ABCDDCBA0000111112345678...
13+ <dd>
14+ <span style="word-wrap: anywhere">ABCDEF0123456789ABCDDCBA0000111112345678</span>
15+ ...
16
17
18 Languages
19diff --git a/lib/lp/registry/templates/person-portlet-contact-details.pt b/lib/lp/registry/templates/person-portlet-contact-details.pt
20index 02b55a7..eebd9fb 100644
21--- a/lib/lp/registry/templates/person-portlet-contact-details.pt
22+++ b/lib/lp/registry/templates/person-portlet-contact-details.pt
23@@ -142,7 +142,7 @@
24 <tal:keys repeat="key view/gpg_keys">
25 <a tal:attributes="href key/keyserverURL"
26 tal:omit-tag="not: request/lp:person">
27- <span style="word-wrap: anywhere" content="key/fingerprint"
28+ <span style="word-wrap: anywhere" tal:content="key/fingerprint"
29 /></a><span tal:condition="not: repeat/key/end">,</span>
30 </tal:keys>
31 <div tal:condition="not: view/gpg_keys">

Subscribers

People subscribed via source and target branches

to status/vote changes: