Launchpad itself

Merge ~lgp171188/launchpad:fix-social-accounts-class-to-not-trigger-adblocker into launchpad:master

  1. Git
  2. lp:~lgp171188/launchpad
  3. fix-social-accounts-class-to-not-trigger-adblocker
  4. Merge into master
Proposed by Guruprasad
Status: Merged
Approved by: Ines Almeida
Approved revision: 1d2507cf677ddb257e81b6c2eb07f9a5b0957479
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~lgp171188/launchpad:fix-social-accounts-class-to-not-trigger-adblocker
Merge into: launchpad:master
Diff against target: 104 lines (+18/-17)
4 files modified
lib/canonical/launchpad/icing/css/components/social_accounts.scss (+1/-1)
lib/lp/app/browser/tales.py (+1/-1)
lib/lp/app/tests/test_tales.py (+4/-3)
lib/lp/registry/templates/person-portlet-contact-details.pt (+12/-12)
Reviewer Review Type Date Requested Status
Ines Almeida Approve
Review via email: mp+459250@code.launchpad.net

Commit message

Update social accounts' elements' class names

The previous 'social_accounts*' class names were getting blocked by the
ad blockers.

To post a comment you must log in.
Revision history for this message
Ines Almeida (ines-almeida) wrote :

LGTM.
We can change the _ to - as discussed in another MP

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/canonical/launchpad/icing/css/components/social_accounts.scss b/lib/canonical/launchpad/icing/css/components/social_accounts.scss
2index 8284e29..1524995 100644
3--- a/lib/canonical/launchpad/icing/css/components/social_accounts.scss
4+++ b/lib/canonical/launchpad/icing/css/components/social_accounts.scss
5@@ -1,4 +1,4 @@
6-.social_accounts {
7+.user_social_accounts {
8 &__icon {
9 margin-right: 0.5em;
10 height: 1.4em;
11diff --git a/lib/lp/app/browser/tales.py b/lib/lp/app/browser/tales.py
12index 6c962ea..e2cf36c 100644
13--- a/lib/lp/app/browser/tales.py
14+++ b/lib/lp/app/browser/tales.py
15@@ -3065,7 +3065,7 @@ class SocialAccountFormatterAPI(ObjectFormatterAPI):
16
17 def icon(self, platform):
18 return (
19- f'<img class="social_accounts__icon" alt="{platform.title}" '
20+ f'<img class="user_social_accounts__icon" alt="{platform.title}" '
21 f'title="{platform.title}" src="/@@/{platform.icon}" />'
22 )
23
24diff --git a/lib/lp/app/tests/test_tales.py b/lib/lp/app/tests/test_tales.py
25index bbfb36b..1376d95 100644
26--- a/lib/lp/app/tests/test_tales.py
27+++ b/lib/lp/app/tests/test_tales.py
28@@ -406,9 +406,10 @@ class TestSocialAccountFormatterAPI(TestCaseWithFactory):
29 person, SocialPlatformType.MATRIX, identity
30 )
31 expected_html = (
32- '<img class="social_accounts__icon" alt="Matrix" title="Matrix" '
33- 'src="/@@/social-matrix" /> <a href=https://matrix.to//#/@fred'
34- ':ubuntu.com target="_blank"><strong>@fred:ubuntu.com</strong></a>'
35+ '<img class="user_social_accounts__icon" alt="Matrix" '
36+ 'title="Matrix" src="/@@/social-matrix" /> '
37+ "<a href=https://matrix.to//#/@fred:ubuntu.com "
38+ 'target="_blank"><strong>@fred:ubuntu.com</strong></a>'
39 )
40
41 self.assertEqual(
42diff --git a/lib/lp/registry/templates/person-portlet-contact-details.pt b/lib/lp/registry/templates/person-portlet-contact-details.pt
43index 66d5c65..0354913 100644
44--- a/lib/lp/registry/templates/person-portlet-contact-details.pt
45+++ b/lib/lp/registry/templates/person-portlet-contact-details.pt
46@@ -172,46 +172,46 @@
47 </dl>
48 </div>
49
50- <div class="yui-u social_accounts" tal:condition="view/should_show_socialaccounts_section">
51+ <div class="yui-u user_social_accounts" tal:condition="view/should_show_socialaccounts_section">
52 <dl id="social-accounts">
53 <dt>Social accounts:</dt>
54
55- <dd class="social_accounts__item irc_account" tal:repeat="ircnick context/ircnicknames">
56- <img class="social_accounts__icon" alt="IRC" title="IRC" src="/@@/social-irc"/>
57+ <dd class="user_social_accounts__item irc_account" tal:repeat="ircnick context/ircnicknames">
58+ <img class="user_social_accounts__icon" alt="IRC" title="IRC" src="/@@/social-irc"/>
59 <span><span tal:replace="structure ircnick/fmt:formatted_displayname" /></span>
60 <a tal:replace="structure overview_menu/editircnicknames/fmt:icon"/>
61 </dd>
62
63- <dd class="social_accounts__item jabber_account" tal:repeat="jabberid context/jabberids">
64- <img class="social_accounts__icon" alt="Jabber" title="Jabber" src="/@@/social-jabber" />
65+ <dd class="user_social_accounts__item jabber_account" tal:repeat="jabberid context/jabberids">
66+ <img class="user_social_accounts__icon" alt="Jabber" title="Jabber" src="/@@/social-jabber" />
67 <span><span tal:replace="jabberid/jabberid/fmt:obfuscate-email" /></span>
68 <a tal:replace="structure overview_menu/editjabberids/fmt:icon"/>
69 </dd>
70
71- <dd class="social_accounts__item matrix_account" tal:repeat="social_account view/matrix_accounts">
72+ <dd class="user_social_accounts__item matrix_account" tal:repeat="social_account view/matrix_accounts">
73 <span><span tal:replace="structure social_account/fmt:formatted_display" /></span>
74 <a tal:replace="structure overview_menu/editmatrixaccounts/fmt:icon" />
75 </dd>
76
77 <tal:irc condition="view/should_show_ircnicknames_section">
78- <dd class="social_accounts__item" tal:condition="not: context/ircnicknames" id="empty-irc">
79- <img class="social_accounts__icon" alt="IRC" title="IRC" src="/@@/social-irc"/>
80+ <dd class="user_social_accounts__item" tal:condition="not: context/ircnicknames" id="empty-irc">
81+ <img class="user_social_accounts__icon" alt="IRC" title="IRC" src="/@@/social-irc"/>
82 <span>No IRC nicknames registered.</span>
83 <a tal:replace="structure overview_menu/editircnicknames/fmt:icon"/>
84 </dd>
85 </tal:irc>
86
87 <tal:jabber condition="view/should_show_jabberids_section">
88- <dd class="social_accounts__item" tal:condition="context/jabberids/is_empty" id="empty-jabber">
89- <img class="social_accounts__icon" alt="Jabber" title="Jabber" src="/@@/social-jabber" />
90+ <dd class="user_social_accounts__item" tal:condition="context/jabberids/is_empty" id="empty-jabber">
91+ <img class="user_social_accounts__icon" alt="Jabber" title="Jabber" src="/@@/social-jabber" />
92 <span>No Jabber IDs registered.</span>
93 <a tal:replace="structure overview_menu/editjabberids/fmt:icon" />
94 </dd>
95 </tal:jabber>
96
97 <tal:matrix condition="view/should_show_matrix_accounts_section">
98- <dd class="social_accounts__item" tal:condition="not: view/matrix_accounts" id="empty-matrix">
99- <img class="social_accounts__icon" alt="Matrix" title="Matrix" src="/@@/social-matrix" />
100+ <dd class="user_social_accounts__item" tal:condition="not: view/matrix_accounts" id="empty-matrix">
101+ <img class="user_social_accounts__icon" alt="Matrix" title="Matrix" src="/@@/social-matrix" />
102 <span>No matrix accounts registered.</span>
103 <a tal:replace="structure overview_menu/editmatrixaccounts/fmt:icon" />
104 </dd>

Subscribers

People subscribed via source and target branches

to status/vote changes: