Merge lp:~benji/launchpad/bug-771269 into lp:launchpad

[Benji York]

[r=gmb][bug=771260,771269] make a few small UI improvements

This branch fixes bug 771260 ("In the 'bugs must match this filter' accordion we should state that tags are space separated, without having to click a help pop-up") and bug 771269 ("Structural subscription description is hard to read") as well as making proper labels for the all/any tags radio buttons so the click targets aren't so painfully small.

The branch is lint-free.

[Graham Binns (gmb)]

review: Approve (code)

=== modified file 'lib/lp/registry/javascript/structural-subscription.js'
--- lib/lp/registry/javascript/structural-subscription.js	2011-04-21 21:13:49 +0000
+++ lib/lp/registry/javascript/structural-subscription.js	2011-04-26 15:41:47 +0000
@@ -506,21 +506,35 @@
     } );
     tags_container = tags_ai;
     tags_ai.set("bodyContent", Y.Node.create('<div><div></div></div>')
-        .append(Y.Node.create('<input type="radio" name="tag_match" checked>')
-            .set('value', MATCH_ALL))
-        .append('Match all tags')
-        .append(Y.Node.create('<input type="radio" name="tag_match" checked>')
-            .set('value', MATCH_ANY))
-        .append('Match any tags')
-        .append(
-        '<div style="padding-bottom:10px;">' +
-        '    <input type="text" name="tags" size="50"/>' +
-        '    <a target="help"'+
-        '        href="/+help/structural-subscription-tags.html" ' +
-        '        class="sprite maybe">&nbsp;'+
-               '<span class="invisible-link">Structural subscription tags '+
-        '       help</span></a> ' +
-        '</div>'));
+        .append(Y.Node.create('<label/>')
+            .append(Y.Node.create('<input/>')
+                .set('type', 'radio')
+                .set('name', 'tag_match')
+                .set('checked', 'checked')
+                .set('value', MATCH_ALL))
+            .append('Match all tags'))
+        .append(Y.Node.create('<label/>')
+            .append(Y.Node.create('<input/>')
+                .set('type', 'radio')
+                .set('name', 'tag_match')
+                .set('value', MATCH_ANY))
+            .append('Match any tags'))
+        .append(Y.Node.create('<div/>')
+            .append(Y.Node.create('<input/>')
+                .set('type', 'text')
+                .set('name', 'tags')
+                .set('size', '50'))
+            .append(Y.Node.create('<a/>')
+                .set('target', 'help')
+                .set('href', '/+help/structural-subscription-tags.html')
+                .addClass('sprite')
+                .addClass('maybe')
+                .append(Y.Node.create('<span/>')
+                    .addClass('invisible-link')
+                    .set('text', 'Structural subscription tags help')))
+        .append(Y.Node.create('<div/>')
+            .setStyle('paddingBottom', '10px')
+            .set('text', 'Separate tags with a space'))));
     accordion.addItem(tags_ai);
 
     // Build importances pane.
@@ -1325,13 +1339,14 @@
     // Format status conditions.
     if (filter.statuses.length !== 0) {
         filter_items.push(Y.Node.create('<li></li>')
-            .set('text', 'have status '+filter.statuses.join(', ')));
+            .set('text', 'have the status(es): '+filter.statuses.join(', ')));
     }
 
     // Format importance conditions.
     if (filter.importances.length !== 0) {
         filter_items.push(Y.Node.create('<li></li>')
-            .set('text', 'are of importance '+filter.importances.join(', ')));
+            .set('text',
+                'are of importance: '+filter.importances.join(', ')));
     }
 
     // Format tag conditions.