launchpad-reviewers team mailing list archive

[Colin Watson <mp+439513@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:fix-openpgp-keys-style-logged-out into launchpad:master.

Commit message:
Fix OpenPGP key rendering when logged out, better

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #1996775 in Launchpad itself: "OpenPGP keys field may overlap next field in a user profile"
  https://bugs.launchpad.net/launchpad/+bug/1996775

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/439513

I mistyped `content=...` instead of `tal:content=...` in commit 1ff2add6307cb41f919f7c83a5d0bafc07518dc7, and there was a doctest to update as well.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:fix-openpgp-keys-style-logged-out into launchpad:master.

diff --git a/lib/lp/registry/stories/person/xx-person-home.rst b/lib/lp/registry/stories/person/xx-person-home.rst
index 003386e..2778686 100644
--- a/lib/lp/registry/stories/person/xx-person-home.rst
+++ b/lib/lp/registry/stories/person/xx-person-home.rst
@@ -129,9 +129,11 @@ authenticated users can see the key fingerprint with a link to the keyserver.
     <a href="https://keyserver...
 
     >>> anon_browser.open("http://launchpad.test/~name16";)
-    >>> print(find_tag_by_id(anon_browser.contents, "pgp-keys"))
+    >>> print(find_tag_by_id(anon_browser.contents, "pgp-keys"))  # noqa
     <dl...
-    <dd> ABCDEF0123456789ABCDDCBA0000111112345678...
+    <dd>
+    <span style="word-wrap: anywhere">ABCDEF0123456789ABCDDCBA0000111112345678</span>
+    ...
 
 
 Languages
diff --git a/lib/lp/registry/templates/person-portlet-contact-details.pt b/lib/lp/registry/templates/person-portlet-contact-details.pt
index 02b55a7..eebd9fb 100644
--- a/lib/lp/registry/templates/person-portlet-contact-details.pt
+++ b/lib/lp/registry/templates/person-portlet-contact-details.pt
@@ -142,7 +142,7 @@
         <tal:keys repeat="key view/gpg_keys">
           <a tal:attributes="href key/keyserverURL"
              tal:omit-tag="not: request/lp:person">
-            <span style="word-wrap: anywhere" content="key/fingerprint"
+            <span style="word-wrap: anywhere" tal:content="key/fingerprint"
               /></a><span tal:condition="not: repeat/key/end">,</span>
         </tal:keys>
         <div tal:condition="not: view/gpg_keys">