Launchpad itself

Merge ~ines-almeida/launchpad:social-accounts-create-social-accounts-section into launchpad:master

  1. Git
  2. lp:~ines-almeida/launchpad
  3. social-accounts-create-social-accounts-section
  4. Merge into master
Proposed by Ines Almeida
Status: Merged
Approved by: Ines Almeida
Approved revision: 240461d38b0f7e9727fd789b6d0603c49f0624e8
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~ines-almeida/launchpad:social-accounts-create-social-accounts-section
Merge into: launchpad:master
Diff against target: 120 lines (+41/-35)
2 files modified
lib/canonical/launchpad/icing/css/typography.scss (+4/-0)
lib/lp/registry/templates/person-portlet-contact-details.pt (+37/-35)
Reviewer Review Type Date Requested Status
Simone Pelosi Approve
Review via email: mp+458602@code.launchpad.net

Commit message

Move Jabber and IRC profile items into a 'Social Accounts' section

Description of the change

In this MP we are just moving around some profile items:
 - IRC and Jabber go to a separate 'Social Accounts' section
 - Languages item moves up to where the IRC item previously was to reduce the order of items in the page
 - Small CSS change to add a small margin to the end of large sections

Note that this is not adding any new social accounts.

To post a comment you must log in.
Revision history for this message
Simone Pelosi (pelpsi) wrote :

LGTM!

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/typography.scss b/lib/canonical/launchpad/icing/css/typography.scss
2index 4315b99..c6717f7 100644
3--- a/lib/canonical/launchpad/icing/css/typography.scss
4+++ b/lib/canonical/launchpad/icing/css/typography.scss
5@@ -39,6 +39,10 @@ h1, h2, h3, h4, h5, h6 {
6 margin-top: 0;
7 }
8
9+ .yui-u {
10+ padding-bottom: 1em;
11+ }
12+
13 p {
14 width: auto;
15 margin-bottom: $reduced-spacing;
16diff --git a/lib/lp/registry/templates/person-portlet-contact-details.pt b/lib/lp/registry/templates/person-portlet-contact-details.pt
17index 9a45fd4..e9b37b2 100644
18--- a/lib/lp/registry/templates/person-portlet-contact-details.pt
19+++ b/lib/lp/registry/templates/person-portlet-contact-details.pt
20@@ -59,22 +59,6 @@
21 </dd>
22 </dl>
23
24-
25- <dl tal:condition="view/should_show_jabberids_section" id="jabber-ids">
26- <dt>Jabber:
27- <a tal:replace="structure overview_menu/editjabberids/fmt:icon" />
28- </dt>
29- <dd>
30- <tal:block repeat="jabberid context/jabberids">
31- <span tal:replace="jabberid/jabberid/fmt:obfuscate-email"
32- /><span tal:condition="not: repeat/jabberid/end">,</span>
33- </tal:block>
34- <div tal:condition="context/jabberids/is_empty">
35- No Jabber IDs registered.
36- </div>
37- </dd>
38- </dl>
39-
40 <dl tal:condition="view/viewing_own_page" id="openid-info">
41 <dt>OpenID login:</dt>
42 <dd>
43@@ -122,15 +106,14 @@
44 </div>
45
46 <div class="yui-u two-column-list">
47- <dl tal:condition="view/should_show_ircnicknames_section">
48- <dt>IRC:
49- <a tal:replace="structure overview_menu/editircnicknames/fmt:icon" />
50+ <dl id="languages">
51+ <dt>Languages:
52+ <a tal:replace="structure overview_menu/editlanguages/fmt:icon" />
53 </dt>
54- <dd tal:repeat="ircnick context/ircnicknames">
55- <span tal:replace="structure ircnick/fmt:formatted_displayname"/>
56- </dd>
57- <dd tal:condition="not: context/ircnicknames">
58- No IRC nicknames registered.
59+ <dd>
60+ <tal:languages content="view/languages">
61+ English
62+ </tal:languages>
63 </dd>
64 </dl>
65
66@@ -169,17 +152,6 @@
67 </dd>
68 </dl>
69
70- <dl id="languages">
71- <dt>Languages:
72- <a tal:replace="structure overview_menu/editlanguages/fmt:icon" />
73- </dt>
74- <dd>
75- <tal:languages content="view/languages">
76- English
77- </tal:languages>
78- </dd>
79- </dl>
80-
81 <dl id="timezone">
82 <dt>Time zone:
83 <a tal:replace="structure overview_menu/editlocation/fmt:icon" />
84@@ -200,6 +172,36 @@
85 </dl>
86 </div>
87
88+ <div class="yui-u two-column-list">
89+ <dt>Social Accounts:</dt>
90+ <dl tal:condition="view/should_show_ircnicknames_section">
91+ <dt>IRC:
92+ <a tal:replace="structure overview_menu/editircnicknames/fmt:icon" />
93+ </dt>
94+ <dd tal:repeat="ircnick context/ircnicknames">
95+ <span tal:replace="structure ircnick/fmt:formatted_displayname"/>
96+ </dd>
97+ <dd tal:condition="not: context/ircnicknames">
98+ No IRC nicknames registered.
99+ </dd>
100+ </dl>
101+
102+ <dl tal:condition="view/should_show_jabberids_section" id="jabber-ids">
103+ <dt>Jabber:
104+ <a tal:replace="structure overview_menu/editjabberids/fmt:icon" />
105+ </dt>
106+ <dd>
107+ <tal:block repeat="jabberid context/jabberids">
108+ <span tal:replace="jabberid/jabberid/fmt:obfuscate-email"
109+ /><span tal:condition="not: repeat/jabberid/end">,</span>
110+ </tal:block>
111+ <div tal:condition="context/jabberids/is_empty">
112+ No Jabber IDs registered.
113+ </div>
114+ </dd>
115+ </dl>
116+ </div>
117+
118 </div>
119
120 </tal:root>

Subscribers

People subscribed via source and target branches

to status/vote changes: