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: 19c27aadfc3607953f5a4a8b6dad34f494f0d95e
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: 74 lines (+12/-8)
3 files modified
lib/canonical/launchpad/icing/css/typography.scss (+4/-0)
lib/lp/registry/browser/person.py (+6/-2)
lib/lp/registry/templates/person-editircnicknames.pt (+2/-6)
Reviewer Review Type Date Requested Status
Simone Pelosi Approve
Review via email: mp+458629@code.launchpad.net

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

Description of the change

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

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 c6717f7..201cf7c 100644
3--- a/lib/canonical/launchpad/icing/css/typography.scss
4+++ b/lib/canonical/launchpad/icing/css/typography.scss
5@@ -41,6 +41,10 @@ h1, h2, h3, h4, h5, h6 {
6
7 .yui-u {
8 padding-bottom: 1em;
9+
10+ & dl {
11+ margin-bottom: 1em;
12+ }
13 }
14
15 p {
16diff --git a/lib/lp/registry/browser/person.py b/lib/lp/registry/browser/person.py
17index 6dab8c8..a741540 100644
18--- a/lib/lp/registry/browser/person.py
19+++ b/lib/lp/registry/browser/person.py
20@@ -877,13 +877,13 @@ class PersonOverviewMenu(
21 def editircnicknames(self):
22 target = "+editircnicknames"
23 text = "Update IRC nicknames"
24- return Link(target, text, icon="edit")
25+ return Link(target, text, icon="edit", summary=text)
26
27 @enabled_with_permission("launchpad.Edit")
28 def editjabberids(self):
29 target = "+editjabberids"
30 text = "Update Jabber IDs"
31- return Link(target, text, icon="edit")
32+ return Link(target, text, icon="edit", summary=text)
33
34 @enabled_with_permission("launchpad.Edit")
35 def editlocation(self):
36@@ -2368,6 +2368,10 @@ class PersonEditIRCNicknamesView(LaunchpadFormView):
37 def cancel_url(self):
38 return canonical_url(self.context)
39
40+ @property
41+ def next_url(self):
42+ return canonical_url(self.context)
43+
44 @action(_("Save Changes"), name="save")
45 def save(self, action, data):
46 """Process the IRC nicknames form."""
47diff --git a/lib/lp/registry/templates/person-editircnicknames.pt b/lib/lp/registry/templates/person-editircnicknames.pt
48index ec64be1..bc034fe 100644
49--- a/lib/lp/registry/templates/person-editircnicknames.pt
50+++ b/lib/lp/registry/templates/person-editircnicknames.pt
51@@ -46,21 +46,17 @@
52 </label>
53 </td>
54 </tr>
55-
56 </div>
57
58 <tr>
59- <td><label>Network:</label></td>
60- <td><label>Nickname:</label></td>
61- </tr>
62-
63- <tr>
64 <td>
65 <input name="newnetwork" type="text"
66+ placeholder="Enter new network"
67 tal:attributes="value view/newnetwork|nothing" />
68 </td>
69 <td>
70 <input name="newnick" type="text"
71+ placeholder="Enter new nickname"
72 tal:attributes="value view/newnick|nothing" />
73 </td>
74 </tr>

Subscribers

People subscribed via source and target branches

to status/vote changes: