launchpad-reviewers team mailing list archive

[Ines Almeida <mp+458602@xxxxxxxxxxxxxxxxxx>]

Ines Almeida has proposed merging ~ines-almeida/launchpad:social-accounts-create-social-accounts-section into launchpad:master.

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

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~ines-almeida/launchpad/+git/launchpad/+merge/458602

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.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~ines-almeida/launchpad:social-accounts-create-social-accounts-section into launchpad:master.

diff --git a/lib/canonical/launchpad/icing/css/typography.scss b/lib/canonical/launchpad/icing/css/typography.scss
index 4315b99..c6717f7 100644
--- a/lib/canonical/launchpad/icing/css/typography.scss
+++ b/lib/canonical/launchpad/icing/css/typography.scss
@@ -39,6 +39,10 @@ h1, h2, h3, h4, h5, h6 {
     margin-top: 0;
   }
 
+  .yui-u {
+    padding-bottom: 1em;
+  }
+
   p {
     width: auto;
     margin-bottom: $reduced-spacing;
diff --git a/lib/lp/registry/templates/person-portlet-contact-details.pt b/lib/lp/registry/templates/person-portlet-contact-details.pt
index 9a45fd4..e9b37b2 100644
--- a/lib/lp/registry/templates/person-portlet-contact-details.pt
+++ b/lib/lp/registry/templates/person-portlet-contact-details.pt
@@ -59,22 +59,6 @@
       </dd>
     </dl>
 
-
-    <dl tal:condition="view/should_show_jabberids_section" id="jabber-ids">
-      <dt>Jabber:
-        <a tal:replace="structure overview_menu/editjabberids/fmt:icon" />
-      </dt>
-      <dd>
-        <tal:block repeat="jabberid context/jabberids">
-          <span tal:replace="jabberid/jabberid/fmt:obfuscate-email"
-            /><span tal:condition="not: repeat/jabberid/end">,</span>
-        </tal:block>
-        <div tal:condition="context/jabberids/is_empty">
-          No Jabber IDs registered.
-        </div>
-      </dd>
-    </dl>
-
     <dl tal:condition="view/viewing_own_page" id="openid-info">
       <dt>OpenID login:</dt>
       <dd>
@@ -122,15 +106,14 @@
   </div>
 
   <div class="yui-u two-column-list">
-    <dl tal:condition="view/should_show_ircnicknames_section">
-      <dt>IRC:
-        <a tal:replace="structure overview_menu/editircnicknames/fmt:icon" />
+    <dl id="languages">
+      <dt>Languages:
+        <a tal:replace="structure overview_menu/editlanguages/fmt:icon" />
       </dt>
-      <dd tal:repeat="ircnick context/ircnicknames">
-        <span tal:replace="structure ircnick/fmt:formatted_displayname"/>
-      </dd>
-      <dd tal:condition="not: context/ircnicknames">
-        No IRC nicknames registered.
+      <dd>
+        <tal:languages content="view/languages">
+          English
+        </tal:languages>
       </dd>
     </dl>
 
@@ -169,17 +152,6 @@
       </dd>
     </dl>
 
-    <dl id="languages">
-      <dt>Languages:
-        <a tal:replace="structure overview_menu/editlanguages/fmt:icon" />
-      </dt>
-      <dd>
-        <tal:languages content="view/languages">
-          English
-        </tal:languages>
-      </dd>
-    </dl>
-
     <dl id="timezone">
       <dt>Time zone:
         <a tal:replace="structure overview_menu/editlocation/fmt:icon" />
@@ -200,6 +172,36 @@
     </dl>
   </div>
 
+  <div class="yui-u two-column-list">
+    <dt>Social Accounts:</dt>
+    <dl tal:condition="view/should_show_ircnicknames_section">
+      <dt>IRC:
+        <a tal:replace="structure overview_menu/editircnicknames/fmt:icon" />
+      </dt>
+      <dd tal:repeat="ircnick context/ircnicknames">
+        <span tal:replace="structure ircnick/fmt:formatted_displayname"/>
+      </dd>
+      <dd tal:condition="not: context/ircnicknames">
+        No IRC nicknames registered.
+      </dd>
+    </dl>
+
+    <dl tal:condition="view/should_show_jabberids_section" id="jabber-ids">
+      <dt>Jabber:
+        <a tal:replace="structure overview_menu/editjabberids/fmt:icon" />
+      </dt>
+      <dd>
+        <tal:block repeat="jabberid context/jabberids">
+          <span tal:replace="jabberid/jabberid/fmt:obfuscate-email"
+            /><span tal:condition="not: repeat/jabberid/end">,</span>
+        </tal:block>
+        <div tal:condition="context/jabberids/is_empty">
+          No Jabber IDs registered.
+        </div>
+      </dd>
+    </dl>
+  </div>
+
 </div>
 
 </tal:root>