← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~benji/launchpad/bug-771239 into lp:launchpad

 

Benji York has proposed merging lp:~benji/launchpad/bug-771239 into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #771239 in Launchpad itself: ""Select all" and "Select none" are too close together in the "Importances" and "Statuses" sections of the edit subscription accordion"
  https://bugs.launchpad.net/launchpad/+bug/771239

For more details, see:
https://code.launchpad.net/~benji/launchpad/bug-771239/+merge/60113

In bug 771239 Huw points out that the "Select all"/"Select none" links
on the add/edit subscription form are too close together and could use a
separator (like "or").  This branch fixes that.

A screen shot demonstrating the change is at http://i.imgur.com/6DI0t.png.

The branch is free of lint.

To run the associated tests load
lib/lp/registry/javascript/tests/test_structural_subscription.html in a
browser.

-- 
https://code.launchpad.net/~benji/launchpad/bug-771239/+merge/60113
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~benji/launchpad/bug-771239 into lp:launchpad.
=== modified file 'lib/lp/registry/javascript/structural-subscription.js'
--- lib/lp/registry/javascript/structural-subscription.js	2011-05-04 05:02:39 +0000
+++ lib/lp/registry/javascript/structural-subscription.js	2011-05-05 20:13:34 +0000
@@ -454,15 +454,24 @@
 function make_selector_controls(parent) {
     var selectors_id = parent + '-selectors';
     var rv = {};
-    rv.all_link = Y.Node.create(
-        '<a href="#" class="select-all">Select all</a>');
-    rv.none_link = Y.Node.create(
-        '<a href="#" class="select-none">Select none</a>');
-    rv.node = Y.Node.create(
-            '<div style="margin-left: 10px;margin-bottom: 10px"></div>')
+    rv.all_link = Y.Node.create('<a/>')
+        .set('href', '#')
+        .set('text', 'Select all')
+        .addClass('select-all');
+    rv.none_link = Y.Node.create('<a/>')
+        .set('href', '#')
+        .set('text', 'Select none')
+        .addClass('select-none');
+    rv.node = Y.Node.create('<div/>')
         .set('id', selectors_id)
+        .setStyle('marginBottom', '1ex')
+        .setStyle('marginLeft', '1ex')
         .append(rv.all_link)
-        .append(' &nbsp; ')
+        .append(Y.Node.create('<span/>')
+            .set('text', 'or')
+            // Why different margins?  Manual kerning.
+            .setStyle('marginLeft', '0.9ex')
+            .setStyle('marginRight', '0.7ex'))
         .append(rv.none_link);
 
     return rv;