Launchpad itself

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

  1. bug-771269
  2. Merge into devel
Proposed by Benji York
Status: Merged
Approved by: Benji York
Approved revision: no longer in the source branch.
Merged at revision: 12944
Proposed branch: lp:~benji/launchpad/bug-771269
Merge into: lp:launchpad
Diff against target: 71 lines (+32/-17)
1 file modified
lib/lp/registry/javascript/structural-subscription.js (+32/-17)
To merge this branch: bzr merge lp:~benji/launchpad/bug-771269
Reviewer Review Type Date Requested Status
Graham Binns (community) code Approve
Review via email: mp+59090@code.launchpad.net

Commit message

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

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Graham Binns (gmb) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
506 } );506 } );
507 tags_container = tags_ai;507 tags_container = tags_ai;
508 tags_ai.set("bodyContent", Y.Node.create('<div><div></div></div>')508 tags_ai.set("bodyContent", Y.Node.create('<div><div></div></div>')
509 .append(Y.Node.create('<input type="radio" name="tag_match" checked>')509 .append(Y.Node.create('<label/>')
510 .set('value', MATCH_ALL))510 .append(Y.Node.create('<input/>')
511 .append('Match all tags')511 .set('type', 'radio')
512 .append(Y.Node.create('<input type="radio" name="tag_match" checked>')512 .set('name', 'tag_match')
513 .set('value', MATCH_ANY))513 .set('checked', 'checked')
514 .append('Match any tags')514 .set('value', MATCH_ALL))
515 .append(515 .append('Match all tags'))
516 '<div style="padding-bottom:10px;">' +516 .append(Y.Node.create('<label/>')
517 ' <input type="text" name="tags" size="50"/>' +517 .append(Y.Node.create('<input/>')
518 ' <a target="help"'+518 .set('type', 'radio')
519 ' href="/+help/structural-subscription-tags.html" ' +519 .set('name', 'tag_match')
520 ' class="sprite maybe">&nbsp;'+520 .set('value', MATCH_ANY))
521 '<span class="invisible-link">Structural subscription tags '+521 .append('Match any tags'))
522 ' help</span></a> ' +522 .append(Y.Node.create('<div/>')
523 '</div>'));523 .append(Y.Node.create('<input/>')
524 .set('type', 'text')
525 .set('name', 'tags')
526 .set('size', '50'))
527 .append(Y.Node.create('<a/>')
528 .set('target', 'help')
529 .set('href', '/+help/structural-subscription-tags.html')
530 .addClass('sprite')
531 .addClass('maybe')
532 .append(Y.Node.create('<span/>')
533 .addClass('invisible-link')
534 .set('text', 'Structural subscription tags help')))
535 .append(Y.Node.create('<div/>')
536 .setStyle('paddingBottom', '10px')
537 .set('text', 'Separate tags with a space'))));
524 accordion.addItem(tags_ai);538 accordion.addItem(tags_ai);
525539
526 // Build importances pane.540 // Build importances pane.
@@ -1325,13 +1339,14 @@
1325 // Format status conditions.1339 // Format status conditions.
1326 if (filter.statuses.length !== 0) {1340 if (filter.statuses.length !== 0) {
1327 filter_items.push(Y.Node.create('<li></li>')1341 filter_items.push(Y.Node.create('<li></li>')
1328 .set('text', 'have status '+filter.statuses.join(', ')));1342 .set('text', 'have the status(es): '+filter.statuses.join(', ')));
1329 }1343 }
13301344
1331 // Format importance conditions.1345 // Format importance conditions.
1332 if (filter.importances.length !== 0) {1346 if (filter.importances.length !== 0) {
1333 filter_items.push(Y.Node.create('<li></li>')1347 filter_items.push(Y.Node.create('<li></li>')
1334 .set('text', 'are of importance '+filter.importances.join(', ')));1348 .set('text',
1349 'are of importance: '+filter.importances.join(', ')));
1335 }1350 }
13361351
1337 // Format tag conditions.1352 // Format tag conditions.