← Back to team overview

launchpad-reviewers team mailing list archive

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

 

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

Commit message:
Improve social accounts existing views

 - Add 'title' attribute to social accounts edit buttons
 - Add small margin-bottom to '.yui-u dl' elements
 - Return user to profile after IRC form save
 - Add placeholder text to IRC form inputs


Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

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

Before and after adding the small margin-bottom to `.yui-u dl` elements:
 - Before: https://pasteboard.co/0whPg1yID33C.png
 - After: https://pasteboard.co/DrZk2bW4DrbY.png

Before and after of the placholder text in the IRC forms:
 - Before: https://pasteboard.co/oOGYHgs3WEYL.png
 - After: https://pasteboard.co/waWJHoYwHZxP.png
-- 
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 c6717f7..201cf7c 100644
--- a/lib/canonical/launchpad/icing/css/typography.scss
+++ b/lib/canonical/launchpad/icing/css/typography.scss
@@ -41,6 +41,10 @@ h1, h2, h3, h4, h5, h6 {
 
   .yui-u {
     padding-bottom: 1em;
+
+    & dl {
+      margin-bottom: 1em;
+    }
   }
 
   p {
diff --git a/lib/lp/registry/browser/person.py b/lib/lp/registry/browser/person.py
index 6dab8c8..a741540 100644
--- a/lib/lp/registry/browser/person.py
+++ b/lib/lp/registry/browser/person.py
@@ -877,13 +877,13 @@ class PersonOverviewMenu(
     def editircnicknames(self):
         target = "+editircnicknames"
         text = "Update IRC nicknames"
-        return Link(target, text, icon="edit")
+        return Link(target, text, icon="edit", summary=text)
 
     @enabled_with_permission("launchpad.Edit")
     def editjabberids(self):
         target = "+editjabberids"
         text = "Update Jabber IDs"
-        return Link(target, text, icon="edit")
+        return Link(target, text, icon="edit", summary=text)
 
     @enabled_with_permission("launchpad.Edit")
     def editlocation(self):
@@ -2368,6 +2368,10 @@ class PersonEditIRCNicknamesView(LaunchpadFormView):
     def cancel_url(self):
         return canonical_url(self.context)
 
+    @property
+    def next_url(self):
+        return canonical_url(self.context)
+
     @action(_("Save Changes"), name="save")
     def save(self, action, data):
         """Process the IRC nicknames form."""
diff --git a/lib/lp/registry/templates/person-editircnicknames.pt b/lib/lp/registry/templates/person-editircnicknames.pt
index ec64be1..bc034fe 100644
--- a/lib/lp/registry/templates/person-editircnicknames.pt
+++ b/lib/lp/registry/templates/person-editircnicknames.pt
@@ -46,21 +46,17 @@
             </label>
           </td>
         </tr>
-
       </div>
 
     <tr>
-      <td><label>Network:</label></td>
-      <td><label>Nickname:</label></td>
-    </tr>
-
-    <tr>
       <td>
         <input name="newnetwork" type="text"
+               placeholder="Enter new network"
                tal:attributes="value view/newnetwork|nothing" />
       </td>
       <td>
         <input name="newnick" type="text"
+               placeholder="Enter new nickname"
                tal:attributes="value view/newnick|nothing" />
       </td>
     </tr>