launchpad-reviewers team mailing list archive

[Brad Crittenden <bac@xxxxxxxxxxxxx>]

Brad Crittenden has proposed merging lp:~bac/launchpad/bug-777789 into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #777789 in Launchpad itself: ""Other subscriptions" description of direct team subscription makes no sense"
  https://bugs.launchpad.net/launchpad/+bug/777789

For more details, see:
https://code.launchpad.net/~bac/launchpad/bug-777789/+merge/61638

= Summary =

Two elements, one with float:right, were bumping into each other.

== Proposed fix ==

Put the rightmost element in a <div> and add some left padding to
maintain separation.  Note it still gets a little wonky if the text is
super long and a very narrow browser window is used.

== Pre-implementation notes ==

In-flight chats with Gary and Benji.

== Implementation details ==

As above.

== Tests ==

None

== Demo and Q/A ==

Create a structural subscription for a team to a project and then look
at a bug for that project.  Click on 'Edit bug mail' and expand 'Other
subscriptions'.  Play with browser width and see that it behaves acceptably.

= Launchpad lint =

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/lp/bugs/javascript/subscription.js
-- 
https://code.launchpad.net/~bac/launchpad/bug-777789/+merge/61638
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~bac/launchpad/bug-777789 into lp:launchpad.

=== modified file 'lib/lp/bugs/javascript/subscription.js'
--- lib/lp/bugs/javascript/subscription.js	2011-04-25 13:33:31 +0000
+++ lib/lp/bugs/javascript/subscription.js	2011-05-19 19:05:57 +0000
@@ -34,7 +34,7 @@
 namespace._reasons = reasons;
 
 /* These are components for team participation. */
-var _OF_TEAM = 'of the team {team}. That team is ';
+var _OF_TEAM = 'of the team {team}, which is ';
 var _OF_TEAMS = 'of the teams {teams}.  Those teams are ';
 var _BECAUSE_TEAM_IS = _BECAUSE_YOU_ARE + 'a member ' + _OF_TEAM;
 var _ADMIN_BECAUSE_TEAM_IS = (
@@ -293,7 +293,7 @@
             'innerHTML',
             safely_render_description(
                 {reason: 'Contact {teams} to request the administrators '+
-                          'make a change',
+                          'make a change.',
                  vars: {
                     teams: add_url_element_to_links(
                         args.teams, '/+contactuser')}}));
@@ -1212,10 +1212,14 @@
         .addClass('subscription-description');
     var action_node = subscription.action(subscription.args);
     if (Y.Lang.isValue(action_node)) {
-        node.appendChild(action_node.setStyle('float', 'right'));
+        var div = Y.Node.create('<div />');
+        div.appendChild(action_node);
+        div.setStyle('float', 'right')
+            .setStyle('paddingLeft', '3em');
+        node.appendChild(div);
     }
     node.appendChild(
-        Y.Node.create('<div></div>')
+        Y.Node.create('<div />')
             .addClass('description-text')
             .set('innerHTML',
                  safely_render_description(subscription, extra_data)));