Merge lp:~adeuring/launchpad/bug-201015-bug-branch-search into lp:launchpad/db-devel

[Abel Deuring]

[Abel Deuring (adeuring)]

This branch is a fix of bug 201015: "Cannot search for bugs with Bazaar branches"

implementation details:

- added an enumeration BugBranchSearch to lp.bugs.interfaces.bugtask
- added a new constructor parameter and a new property "linked_branches" to class BugTaskSearchParams
- code in BugTaskSet.search() to generate an SQL clause for the new search option.
- added a Choice field with BugBranchSearch as a vocabulary to the interface class for the data of the "advanced bug search" form
- told the browser class for the "advanced bug search" to use a radio button widget for the new input filed "search for bugs having [no] linked branches"
- tests of BugTaskSet.search() (via IProduct.searchTasks()) for the new search option
- a short story test for the "presentation" of the new search option

UI note: I wanted to place the new radio buttons close to the existing input field "Show only bugs with patches available", since the new option has a similar purpose. This makes the right column of the table "other options" much longer that the left column, which is aesthetically not very appealing. I considered to move the options "Show only bugs associated with a CVE" and "Show only bugs affecting me" into the left column, but did not do this, because myself would be a bit confused by the changed layout, i.e., I would need a few extra seconds to find the options in their slightly changed location, when doing a bug search...

./bin/test -t bugtask-search.txt
./bin/test -t xx-filter-by-linked-branches.txt

no lint

[Curtis Hovey (sinzui)]

Hi Abel.

I am sorry you had to touch this page and that I am the reviewer; this
page has irked me for a long time because it does not look consistent
with the rest of Launchpad. Instead of asking you to fix this page, I
will propose code and text fixes that I think are easy to make.

There are some general problems that are never being addresses when
we update this page. I really want to take the time to fix the general
problem with this branch, and you get to close some extra bugs too:

    * Hard to scan. There is not enough white-space in the layout and
      all the text is the same weight and size. Information is lost
      like a tree in a forest.
    * Labels/legends do not match their field content.
    * We have added to this page without ever asking if we need
      to rearrange to the order of the sections to match what users
      want to use.

Your screenshot illustrated these three problems. Notice that the
Tags any/all radio buttons look like there are subordinate to
Show only bugs affecting me. I also question why some checkbox text are
bold and others are normal.

What follows is my analysis and proposed fix: you can see a see a picture
and patch at:
    http://people.canonical.com/~curtis/bug-search.png
    http://people.canonical.com/~curtis/bug-search.patch

My assumption was that the primary problem with this form is that
it is crafted rather than generated. After investigating how I could
make this better, I know understand this issue is really one of
markup+css neglect. All pages that use <legend> in a collapsible field
except this one. They are used to add an expansible section to a form.
This page is intended to be long with all sections visible. We do not
have css rules for this page!

    * In style.css, replace
        legend {font-weight: bold;}

      with
        .long td {
            padding-right: 1em;
            }
        .long fieldset {
            margin-top: 1em;
            }
        .long legend {
            color: #666;
            font-weight: bold;
            font-size: 123.1%;
            }

     * In bugtask-macros-tableview.pt, update the form class in
       <metal:advanced_search_form define-macro="advanced_search_form"> from
          <form class="lesser" name="search" method="get" action="">

       to
          <form class="long" name="search" method="get" action="">

We do not want to use the .lesser class because this page is not showing
a long listing, and it is forcing all the text to be the same small font.
We are replacing the css rules for this page with rules that create space
between the sections and make each section distinct.

As for the legend text and sections:

    * Series-specific => Milestones, components, and tags
      * Remove the width="40%" rules from the <td> and the remove the
        empty <td>.
      * Move tags below milestones and components
      * Use <td span="2"> so that the layout can fit the space:
        Move the help to the right of the input,
        Move the radio button below the field that controls them.

    * Other => Bug relationships
      * Move the "Show ..." group of option to the first column,
        and make your addition to the bottom
 ...

review: Needs Fixing (ui)

[Abel Deuring (adeuring)]

Hi Curtis,

thanks for the improvements of the search page!

On 19.02.2010 19:06, Curtis Hovey wrote:
> Review: Needs Fixing ui
> Hi Abel.
>
> I am sorry you had to touch this page and that I am the reviewer; this
> page has irked me for a long time because it does not look consistent
> with the rest of Launchpad. Instead of asking you to fix this page, I
> will propose code and text fixes that I think are easy to make.
>
> There are some general problems that are never being addresses when
> we update this page. I really want to take the time to fix the general
> problem with this branch, and you get to close some extra bugs too:
>
> * Hard to scan. There is not enough white-space in the layout and
> all the text is the same weight and size. Information is lost
> like a tree in a forest.
> * Labels/legends do not match their field content.
> * We have added to this page without ever asking if we need
> to rearrange to the order of the sections to match what users
> want to use.
>
> Your screenshot illustrated these three problems. Notice that the
> Tags any/all radio buttons look like there are subordinate to
> Show only bugs affecting me. I also question why some checkbox text are
> bold and others are normal.
>
> What follows is my analysis and proposed fix: you can see a see a picture
> and patch at:
> http://people.canonical.com/~curtis/bug-search.png
> http://people.canonical.com/~curtis/bug-search.patch

I applied your patch.

>
> My assumption was that the primary problem with this form is that
> it is crafted rather than generated. After investigating how I could
> make this better, I know understand this issue is really one of
> markup+css neglect. All pages that use <legend> in a collapsible field
> except this one. They are used to add an expansible section to a form.
> This page is intended to be long with all sections visible. We do not
> have css rules for this page!
>
> * In style.css, replace
> legend {font-weight: bold;}
>
> with
> .long td {
> padding-right: 1em;
> }
> .long fieldset {
> margin-top: 1em;
> }
> .long legend {
> color: #666;
> font-weight: bold;
> font-size: 123.1%;
> }
>
> * In bugtask-macros-tableview.pt, update the form class in
> <metal:advanced_search_form define-macro="advanced_search_form"> from
> <form class="lesser" name="search" method="get" action="">
>
> to
> <form class="long" name="search" method="get" action="">
>
> We do not want to use the .lesser class because this page is not showing
> a long listing, and it is forcing all the text to be the same small font.
> We are replacing the css rules for this page with rules that create space
> between the sections and make each section distinct.
>
> As for the legend text and sections:
>
> * Series-specific => Milestones, components, and tags
> * Remove the width="40%" rules from the <td> and the remove the
> empty <td>.
> * Move tags below milestones and components
> * Use <td span="2"> so...

[Abel Deuring (adeuring)]

A screenshot of the the searhc page: http://people.canonical.com/~adeuring/branchsearch.png

[Curtis Hovey (sinzui)]

Hi Abel

  review: approve

On Tue, 2010-02-23 at 09:54 +0000, Abel Deuring wrote:
> Hi Curtis,
...
> I added two checkboxes "Show bugs with[out] branches" below "Show only
> bugs with patches available".
>
> We had on Friday a short discussion on IRC if searching for bugs without
> branches is important enough. I think it is: We want to improve the
> relations with upstream project, and people working on upstream projects
> can find the most autoritative answer to what code is used in Ubuntu in
> Bazaar branches. On the other hand, a link between a branch and bug must
> be manually created by an Ubuntu developer, and this is quite easy to
> forget (I am a good example that this can happen quite often ;) So,
> being able to get a list of bugs in the states "fix commited" and "fix
> released" but having no linked branches allows Ubuntu developers to add
> possibly missing links betwwen branches and bugs, thus making live
> easier for upstream.
>
> Also, we discussed if radio button should be used to select the options
> "search for bugs with/without branches/search all bugs". Deryck proposed
> to use checkboxes instead, and while I would prefer radio buttons,
> because they describe more precisely the three possible options,
> checkboxes are of course more consistent with the other interfaces
> elements of the page.

Yes, a radio button is correct in this case. Your screenshot of two
mutually exclusive checkboxes selected shows we are encouraging users to
ask the impossible. I think the layout was the underlying reason to
change the control. This layout is much nicer and the position of the
two radio buttons will make the intent clear.

--
__Curtis C. Hovey_________
http://launchpad.net/

review: Approve

=== modified file 'lib/canonical/launchpad/icing/style.css'
--- lib/canonical/launchpad/icing/style.css	2010-02-21 20:46:26 +0000
+++ lib/canonical/launchpad/icing/style.css	2010-02-25 08:53:48 +0000
@@ -84,7 +84,17 @@
   outline: 1px #666;
 }
 label {white-space: nowrap;}
-legend {font-weight: bold;}
+.long td {
+    padding-right: 1em;
+    }
+.long fieldset {
+    margin-top: 1em;
+    }
+.long legend {
+    color: #666;
+    font-weight: bold;
+    font-size: 123.1%;
+    }
 .listbox { /* a scrolling list of checkboxes or radio buttons */
   border: 1px solid #8cacbb;
   display: inline-block;

=== modified file 'lib/lp/bugs/browser/bugtask.py'
--- lib/lp/bugs/browser/bugtask.py	2010-02-20 13:16:38 +0000
+++ lib/lp/bugs/browser/bugtask.py	2010-02-25 08:53:48 +0000
@@ -103,8 +103,9 @@
     BugNominationStatus, IBugNominationSet)
 from lp.bugs.interfaces.bug import IBug, IBugSet
 from lp.bugs.interfaces.bugtask import (
-    BugTagsSearchCombinator, BugTaskImportance, BugTaskSearchParams,
-    BugTaskStatus, BugTaskStatusSearchDisplay, IBugTask, IBugTaskSearch,
+    BugBranchSearch, BugTagsSearchCombinator, BugTaskImportance,
+    BugTaskSearchParams, BugTaskStatus, BugTaskStatusSearchDisplay,
+    DEFAULT_SEARCH_BUGTASK_STATUSES_FOR_DISPLAY, IBugTask, IBugTaskSearch,
     IBugTaskSet, ICreateQuestionFromBugTaskForm, IDistroBugTask,
     IDistroSeriesBugTask, IFrontPageBugTaskSearch,
     INominationsReviewTableBatchNavigator, INullBugTask, IPersonBugTaskSearch,
@@ -2324,6 +2325,16 @@
             if has_patch:
                 data["attachmenttype"] = BugAttachmentType.PATCH
 
+            has_branches = data.get('has_branches', True)
+            has_no_branches = data.get('has_no_branches', True)
+            if has_branches and not has_no_branches:
+                data['linked_branches'] = BugBranchSearch.BUGS_WITH_BRANCHES
+            elif not has_branches and has_no_branches:
+                data['linked_branches'] = (
+                    BugBranchSearch.BUGS_WITHOUT_BRANCHES)
+            else:
+                data['linked_branches'] = BugBranchSearch.ALL
+
             # Filter appropriately if the user wants to restrict the
             # search to only bugs with no package information.
             has_no_package = data.pop("has_no_package", False)
@@ -2501,14 +2512,13 @@
                 dict(
                     value=term.token, title=term.title or term.token,
                     checked=term.value in default_values))
-
         return helpers.shortlist(widget_values, longest_expected=10)
 
     def getStatusWidgetValues(self):
         """Return data used to render the status checkboxes."""
         return self.getWidgetValues(
             vocabulary=BugTaskStatusSearchDisplay,
-            default_values=UNRESOLVED_BUGTASK_STATUSES)
+            default_values=DEFAULT_SEARCH_BUGTASK_STATUSES_FOR_DISPLAY)
 
     def getImportanceWidgetValues(self):
         """Return data used to render the Importance checkboxes."""

=== modified file 'lib/lp/bugs/doc/bugtask-search.txt'
--- lib/lp/bugs/doc/bugtask-search.txt	2010-02-11 05:08:47 +0000
+++ lib/lp/bugs/doc/bugtask-search.txt	2010-02-25 08:53:48 +0000
@@ -962,10 +962,36 @@
     >>> print reduce(
     ...     lambda x, y: x and y,
     ...     [task.bug.isUserAffected(foo_bar)
-    ...      for task in firefox.searchTasks(search_params)]) 
+    ...      for task in firefox.searchTasks(search_params)])
     True
 
 
+== Searching for bugs linked to branches ==
+
+We can search for bugs having branches linked to them.
+
+    >>> from lp.bugs.interfaces.bugtask import BugBranchSearch
+    >>> search_params = BugTaskSearchParams(
+    ...     user=None, linked_branches=BugBranchSearch.BUGS_WITH_BRANCHES)
+    >>> for task in firefox.searchTasks(search_params):
+    ...     print task.bug.id, task.bug.linked_branches.count()
+    4 2
+    5 1
+
+Similary, we can search for bugs that do not have any linked branches.
+
+    >>> from lp.bugs.interfaces.bugtask import BugBranchSearch
+    >>> search_params = BugTaskSearchParams(
+    ...     user=None, linked_branches=BugBranchSearch.BUGS_WITHOUT_BRANCHES)
+    >>> for task in firefox.searchTasks(search_params):
+    ...     print task.bug.id, task.bug.linked_branches.count()
+    1 0
+    6 0
+    18 0
+    20 0
+    21 0
+
+
 == Ordering search results ==
 
 The result returned by bugtask searches can come sorted by a specified order

=== modified file 'lib/lp/bugs/interfaces/bugtarget.py'
--- lib/lp/bugs/interfaces/bugtarget.py	2010-01-21 22:43:19 +0000
+++ lib/lp/bugs/interfaces/bugtarget.py	2010-02-25 08:53:48 +0000
@@ -179,7 +179,7 @@
                     hardware_owner_is_bug_reporter=None,
                     hardware_owner_is_affected_by_bug=False,
                     hardware_owner_is_subscribed_to_bug=False,
-                    hardware_is_linked_to_bug=False):
+                    hardware_is_linked_to_bug=False, linked_branches=None):
         """Search the IBugTasks reported on this entity.
 
         :search_params: a BugTaskSearchParams object

=== modified file 'lib/lp/bugs/interfaces/bugtask.py'
--- lib/lp/bugs/interfaces/bugtask.py	2010-02-08 17:00:55 +0000
+++ lib/lp/bugs/interfaces/bugtask.py	2010-02-25 08:53:48 +0000
@@ -9,6 +9,7 @@
 
 __all__ = [
     'BUG_SUPERVISOR_BUGTASK_STATUSES',
+    'BugBranchSearch',
     'BugTagsSearchCombinator',
     'BugTaskImportance',
     'BugTaskSearchParams',
@@ -16,6 +17,7 @@
     'BugTaskStatusSearch',
     'BugTaskStatusSearchDisplay',
     'ConjoinedBugTaskEditError',
+    'DEFAULT_SEARCH_BUGTASK_STATUSES_FOR_DISPLAY',
     'IAddBugTaskForm',
     'IAddBugTaskWithProductCreationForm',
     'IBugTask',
@@ -273,6 +275,20 @@
     use_template(BugTaskStatusSearch, exclude=('INCOMPLETE'))
 
 
+class BugBranchSearch(EnumeratedType):
+    """Bug branch search option.
+
+    The possible values to search for bugs having branches attached
+    or not having branches attched.
+    """
+
+    ALL = Item("Show all bugs")
+
+    BUGS_WITH_BRANCHES = Item("Show only Bugs with linked Branches")
+
+    BUGS_WITHOUT_BRANCHES = Item("Show only Bugs without linked Branches")
+
+
 # XXX: Brad Bollenbach 2005-12-02 bugs=5320:
 # In theory, INCOMPLETE belongs in UNRESOLVED_BUGTASK_STATUSES, but the
 # semantics of our current reports would break if it were added to the
@@ -309,6 +325,11 @@
     BugTaskStatusSearch.INPROGRESS,
     BugTaskStatusSearch.FIXCOMMITTED)
 
+DEFAULT_SEARCH_BUGTASK_STATUSES_FOR_DISPLAY = [
+    BugTaskStatusSearchDisplay.items.mapping[item.value]
+    for item in DEFAULT_SEARCH_BUGTASK_STATUSES
+    ]
+
 class ConjoinedBugTaskEditError(Exception):
     """An error raised when trying to modify a conjoined bugtask."""
 
@@ -799,6 +820,12 @@
         required=False)
     affects_me = Bool(
         title=_('Show only bugs affecting me'), required=False)
+    has_branches = Bool(
+        title=_('Show only bugs with linked branches'), required=False,
+        default=True)
+    has_no_branches = Bool(
+        title=_('Show only bugs without linked branches'), required=False,
+        default=True)
 
 
 class IBugTaskSearch(IBugTaskSearchBase):
@@ -989,7 +1016,8 @@
                  hardware_owner_is_bug_reporter=None,
                  hardware_owner_is_affected_by_bug=False,
                  hardware_owner_is_subscribed_to_bug=False,
-                 hardware_is_linked_to_bug=False
+                 hardware_is_linked_to_bug=False,
+                 linked_branches=None
                  ):
 
         self.bug = bug
@@ -1033,6 +1061,7 @@
         self.hardware_owner_is_subscribed_to_bug = (
             hardware_owner_is_subscribed_to_bug)
         self.hardware_is_linked_to_bug = hardware_is_linked_to_bug
+        self.linked_branches = linked_branches
 
     def setProduct(self, product):
         """Set the upstream context on which to filter the search."""
@@ -1105,7 +1134,7 @@
                        hardware_owner_is_bug_reporter=None,
                        hardware_owner_is_affected_by_bug=False,
                        hardware_owner_is_subscribed_to_bug=False,
-                       hardware_is_linked_to_bug=False):
+                       hardware_is_linked_to_bug=False, linked_branches=None):
         """Create and return a new instance using the parameter list."""
         search_params = cls(user=user, orderby=order_by)
 
@@ -1172,6 +1201,7 @@
             hardware_owner_is_subscribed_to_bug)
         search_params.hardware_is_linked_to_bug = (
             hardware_is_linked_to_bug)
+        search_params.linked_branches=linked_branches
 
         return search_params
 

=== modified file 'lib/lp/bugs/model/bugtarget.py'
--- lib/lp/bugs/model/bugtarget.py	2010-01-25 20:04:20 +0000
+++ lib/lp/bugs/model/bugtarget.py	2010-02-25 08:53:48 +0000
@@ -57,7 +57,7 @@
                     hardware_owner_is_bug_reporter=None,
                     hardware_owner_is_affected_by_bug=False,
                     hardware_owner_is_subscribed_to_bug=False,
-                    hardware_is_linked_to_bug=False):
+                    hardware_is_linked_to_bug=False, linked_branches=None):
         """See `IHasBugs`."""
         if status is None:
             # If no statuses are supplied, default to the

=== modified file 'lib/lp/bugs/model/bugtask.py'
--- lib/lp/bugs/model/bugtask.py	2010-02-20 13:16:38 +0000
+++ lib/lp/bugs/model/bugtask.py	2010-02-25 08:53:48 +0000
@@ -55,13 +55,13 @@
 from lp.bugs.interfaces.bugattachment import BugAttachmentType
 from lp.bugs.interfaces.bugnomination import BugNominationStatus
 from lp.bugs.interfaces.bugtask import (
-    BUG_SUPERVISOR_BUGTASK_STATUSES, BugTaskImportance, BugTaskSearchParams,
-    BugTaskStatus, BugTaskStatusSearch, ConjoinedBugTaskEditError, IBugTask,
-    IBugTaskDelta, IBugTaskSet, IDistroBugTask, IDistroSeriesBugTask,
-    INullBugTask, IProductSeriesBugTask, IUpstreamBugTask, IllegalTarget,
-    RESOLVED_BUGTASK_STATUSES, UNRESOLVED_BUGTASK_STATUSES,
-    UserCannotEditBugTaskImportance, UserCannotEditBugTaskMilestone,
-    UserCannotEditBugTaskStatus)
+    BUG_SUPERVISOR_BUGTASK_STATUSES, BugBranchSearch, BugTaskImportance,
+    BugTaskSearchParams, BugTaskStatus, BugTaskStatusSearch,
+    ConjoinedBugTaskEditError, IBugTask, IBugTaskDelta, IBugTaskSet,
+    IDistroBugTask, IDistroSeriesBugTask, INullBugTask, IProductSeriesBugTask,
+    IUpstreamBugTask, IllegalTarget, RESOLVED_BUGTASK_STATUSES,
+    UNRESOLVED_BUGTASK_STATUSES, UserCannotEditBugTaskImportance,
+    UserCannotEditBugTaskMilestone, UserCannotEditBugTaskStatus)
 from lp.bugs.model.bugsubscription import BugSubscription
 from lp.registry.interfaces.distribution import (
     IDistribution, IDistributionSet)
@@ -1671,6 +1671,21 @@
         if hw_clause is not None:
             extra_clauses.append(hw_clause)
 
+        if params.linked_branches == BugBranchSearch.BUGS_WITH_BRANCHES:
+            extra_clauses.append(
+                """EXISTS (
+                    SELECT id FROM BugBranch WHERE BugBranch.bug=Bug.id)
+                """)
+        elif params.linked_branches == BugBranchSearch.BUGS_WITHOUT_BRANCHES:
+            extra_clauses.append(
+                """NOT EXISTS (
+                    SELECT id FROM BugBranch WHERE BugBranch.bug=Bug.id)
+                """)
+        else:
+            # If no branch specific search restriction is specified,
+            # we don't need to add any clause.
+            pass
+
         orderby_arg = self._processOrderBy(params)
 
         query = " AND ".join(extra_clauses)

=== added file 'lib/lp/bugs/stories/bugtask-searches/xx-filter-by-linked-branches.txt'
--- lib/lp/bugs/stories/bugtask-searches/xx-filter-by-linked-branches.txt	1970-01-01 00:00:00 +0000
+++ lib/lp/bugs/stories/bugtask-searches/xx-filter-by-linked-branches.txt	2010-02-25 08:53:48 +0000
@@ -0,0 +1,64 @@
+= Searching for bugs with linked branches =
+
+Using the "advanced search" form, we can limit a bug task search
+to bugs that are linked to branches or to bugs that are not linked
+to any branches. Normally, both options are turned on.
+
+    >>> anon_browser.open(
+    ...     'http://bugs.launchpad.dev/firefox/+bugs?advanced=1')
+    >>> anon_browser.getControl(
+    ...     'Show only bugs with linked branches').selected
+    True
+    >>> anon_browser.getControl(
+    ...     'Show only bugs without linked branches').selected
+    True
+
+In this case all bugs are returned.
+
+    >>> from lp.bugs.tests.bug import print_bugtasks
+    >>> anon_browser.getControl('Search', index=1).click()
+    >>> print_bugtasks(anon_browser.contents)
+    5 Firefox install instructions should be complete    Critical New
+    4 Reflow problems with complex page layouts          Medium   New
+    1 Firefox does not support SVG                       Low      New
+
+When we uncheck 'Show only bugs without linked branches', only bugs with
+linkes branches are returned.
+
+    >>> anon_browser.open(
+    ...     'http://bugs.launchpad.dev/firefox/+bugs?advanced=1')
+    >>> without_branches = anon_browser.getControl(
+    ...     'Show only bugs without linked branches')
+    >>> without_branches.selected = False
+    >>> anon_browser.getControl('Search', index=1).click()
+    >>> print_bugtasks(anon_browser.contents)
+    5 Firefox install instructions should be complete    Critical New
+    4 Reflow problems with complex page layouts          Medium   New
+
+Similary, we can search for branches that don't have linked branches, if
+we uncheck 'Show only bugs with linked branches'.
+
+    >>> anon_browser.open(
+    ...     'http://bugs.launchpad.dev/firefox/+bugs?advanced=1')
+    >>> with_branches = anon_browser.getControl(
+    ...     'Show only bugs with linked branches')
+    >>> with_branches.selected = False
+    >>> anon_browser.getControl('Search', index=1).click()
+    >>> print_bugtasks(anon_browser.contents)
+    1 Firefox does not support SVG                       Low      New
+
+If we uncheck both fields, all bugs are returned.
+
+    >>> anon_browser.open(
+    ...     'http://bugs.launchpad.dev/firefox/+bugs?advanced=1')
+    >>> with_branches = anon_browser.getControl(
+    ...     'Show only bugs with linked branches')
+    >>> with_branches.selected = False
+    >>> without_branches = anon_browser.getControl(
+    ...     'Show only bugs without linked branches')
+    >>> without_branches.selected = False
+    >>> anon_browser.getControl('Search', index=1).click()
+    >>> print_bugtasks(anon_browser.contents)
+    5 Firefox install instructions should be complete    Critical New
+    4 Reflow problems with complex page layouts          Medium   New
+    1 Firefox does not support SVG                       Low      New

=== modified file 'lib/lp/bugs/templates/bugtask-macros-tableview.pt'
--- lib/lp/bugs/templates/bugtask-macros-tableview.pt	2010-01-21 16:47:24 +0000
+++ lib/lp/bugs/templates/bugtask-macros-tableview.pt	2010-02-25 08:53:48 +0000
@@ -236,7 +236,7 @@
 
 <metal:advanced_search_form define-macro="advanced_search_form">
 
-  <form class="lesser" name="search" method="get" action="">
+  <form class="long" name="search" method="get" action="">
     <span tal:condition="view/current_package|nothing">
       <input type="hidden" name="field.distribution"
              tal:attributes="value view/current_package/distribution/name" />
@@ -260,13 +260,13 @@
               <div tal:repeat="widget_value view/getStatusWidgetValues">
                 <tal:checkbox
                     define="widget_id string:status.${widget_value/title}">
-
                             <input name="field.status:list"
                                    type="checkbox"
                                    tal:attributes="value widget_value/value;
                                                    checked widget_value/checked;
                                                    id widget_id"/>
-                            <label tal:content="widget_value/title"
+                            <label style="font-weight: normal"
+                                   tal:content="widget_value/title"
                                    tal:attributes="for widget_id">
                               Unconfirmed
                             </label>
@@ -285,7 +285,8 @@
                                 tal:attributes="value widget_value/value;
                                                 checked widget_value/checked;
                                                 id widget_id"/>
-                            <label tal:content="widget_value/title"
+                            <label style="font-weight: normal"
+                                tal:content="widget_value/title"
                                 tal:attributes="for widget_id">Critical</label>
 
               </tal:checkbox>
@@ -315,14 +316,16 @@
                         value="any"
                         id="any"
                         checked="checked" />
-                      <label for="any">Doesn&#8217;t matter</label><br />
+                      <label style="font-weight: normal"
+                        for="any">Doesn&#8217;t matter</label><br />
 
                       <input
                           type="radio"
                           name="assignee_option"
                           value="none"
                           id="none" />
-                        <label for="none"> Nobody</label><br />
+                        <label style="font-weight: normal"
+                          for="none"> Nobody</label><br />
                         <div class="field"
                           tal:define="error
                           python:view.getFieldError('assignee')">
@@ -463,10 +466,10 @@
 
     </fieldset>
     <fieldset tal:define="show_component_widget view/shouldShowComponentWidget">
-      <legend>Series-specific</legend>
+      <legend>Milestones, components, and tags</legend>
       <table>
         <tr>
-          <td width="40%">
+          <td>
             <table tal:define="widget_values view/getMilestoneWidgetValues">
               <tr>
                 <td><label for="field.milestone">Target milestone:</label></td>
@@ -481,7 +484,8 @@
                              tal:attributes="value widget_value/value;
                                              checked widget_value/checked;
                                              id widget_id" />
-                      <label tal:content="widget_value/title"
+                      <label style="font-weight: normal"
+                             tal:content="widget_value/title"
                              tal:attributes="for widget_id">
                         dapper
                       </label>
@@ -493,7 +497,7 @@
               </tr>
             </table>
           </td>
-          <td tal:condition="show_component_widget" width="40%">
+          <td tal:condition="show_component_widget">
             <table>
               <tr>
                 <td><label for="field.component">Component:</label></td>
@@ -505,57 +509,6 @@
               </tr>
             </table>
           </td>
-          <td>&nbsp;</td>
-        </tr>
-      </table>
-    </fieldset>
-
-    <fieldset tal:condition="view/shouldShowUpstreamStatusBox">
-      <legend>Upstream status</legend>
-
-          <table>
-            <tr>
-              <td style="white-space: nowrap"
-                  tal:content="structure view/widgets/status_upstream" />
-            </tr>
-          </table>
-
-    </fieldset>
-
-    <fieldset>
-      <legend>Other</legend>
-          <table>
-            <tr>
-              <td style="white-space: nowrap">
-                  <span tal:content="structure view/widgets/omit_dupes" />
-                  <label for="field.omit_dupes">Hide duplicate bugs</label>
-              </td>
-              <td style="white-space: nowrap">
-                  <span tal:content="structure view/widgets/has_patch" />
-                  <label for="field.has_patch">
-                    Show only bugs with patches available
-                  </label>
-              </td>
-            </tr>
-            <tr>
-	      <td>
-	      </td>
-              <td style="white-space: nowrap">
-                  <input tal:replace="structure view/widgets/has_cve" />
-                  <label tal:attributes="for view/widgets/has_cve/name">
-                     Show only bugs associated with a CVE
-                  </label>
-              </td>
-            </tr>
-            <tr>
-	      <td>
-	      </td>
-          <td style="white-space: nowrap">
-            <input tal:replace="structure view/widgets/affects_me" />
-            <label tal:attributes="for view/widgets/affects_me/name">
-                Show only bugs affecting me
-            </label>
-          </td>
         </tr>
 	    <tr>
               <tal:XXX condition="nothing">
@@ -567,55 +520,124 @@
                 # FormLayout lands we should be able to use the
                 # standard macro instead.
               </tal:XXX>
-              <td tal:define="error view/widgets/tag/error">
+              <td span="2"
+                tal:define="error view/widgets/tag/error">
                 <div tal:attributes="class python:error and 'error' or ''">
                   <label tal:attributes="for view/widgets/tag/name"
                          tal:content="structure view/widgets/tag/label">
                     Tag
                   </label>: <input tal:replace="structure view/widgets/tag" />
+                  <a href="/+help/tag-search.html"
+                      target="help">Tag search help</a>
                   <div
                     tal:condition="error"
                     class="message"
                     tal:content="structure error"
                     >An error message.</div>
                 </div>
-                <p><a href="/+help/tag-search.html"
-                      target="help">Tag search help</a></p>
-              </td>
-	      <td>
+
                 <div condition="view/shouldShowTagsCombinatorWidget"
                      class="value">
-                  <label>
+                  <label style="font-weight: normal">
                     <input id="field.tags_combinator.0"
                            name="field.tags_combinator"
                            value="ANY" checked="checked"
                            class="radioType" type="radio" />&nbsp;Any
                   </label>
                   <br />
-                  <label>
+                  <label style="font-weight: normal">
                     <input id="field.tags_combinator.1"
                            name="field.tags_combinator"
                            value="ALL"
                            class="radioType" type="radio" />&nbsp;All
                   </label>
                 </div>
-	      </td>
+              </td>
 	    </tr>
+      </table>
+    </fieldset>
+
+    <fieldset tal:condition="view/shouldShowUpstreamStatusBox">
+      <legend>Upstream status</legend>
+
+          <table>
             <tr>
-              <td tal:condition="view/shouldShowNoPackageWidget">
-                  <span tal:content="structure view/widgets/has_no_package" />
-                  <label for="field.has_no_package">
-                    Hide bugs with packages specified
-                  </label>
-              </td>
-              <td style="white-space: nowrap">
-              </td>
+              <td style="white-space: nowrap"
+                  tal:content="structure view/widgets/status_upstream" />
             </tr>
-
           </table>
 
     </fieldset>
-    <div><input type="submit" name="search" value="Search" /></div>
+
+    <fieldset>
+      <legend>Bug relationships</legend>
+      <table>
+        <tr>
+          <td style="white-space: nowrap">
+              <input tal:replace="structure view/widgets/has_cve" />
+              <label style="font-weight: normal"
+                tal:attributes="for view/widgets/has_cve/name">
+                 Show only bugs associated with a CVE
+              </label>
+          </td>
+          <td style="white-space: nowrap">
+              <span tal:content="structure view/widgets/omit_dupes" />
+              <label style="font-weight: normal"
+                for="field.omit_dupes">Hide duplicate bugs</label>
+          </td>
+        </tr>
+
+        <tr>
+          <td style="white-space: nowrap">
+            <input tal:replace="structure view/widgets/affects_me" />
+            <label style="font-weight: normal"
+              tal:attributes="for view/widgets/affects_me/name">
+                Show only bugs affecting me
+            </label>
+          </td>
+          <td style="white-space: nowrap"
+            tal:condition="view/shouldShowNoPackageWidget">
+              <span tal:content="structure view/widgets/has_no_package" />
+              <label style="font-weight: normal" for="field.has_no_package">
+                Hide bugs with packages specified
+              </label>
+          </td>
+        </tr>
+
+        <tr>
+          <td style="white-space: nowrap">
+            <span tal:content="structure view/widgets/has_patch" />
+            <label style="font-weight: normal" for="field.has_patch">
+              Show only bugs with patches available
+            </label>
+          </td>
+          <td>
+          </td>
+        </tr>
+        <tr>
+          <td style="white-space: nowrap">
+            <span tal:content="structure view/widgets/has_branches" />
+            <label style="font-weight: normal" for="field.has_branches">
+              Show only bugs with linked branches
+            </label>
+          </td>
+          <td>
+          </td>
+        </tr>
+        <tr>
+          <td style="white-space: nowrap">
+            <span tal:content="structure view/widgets/has_no_branches" />
+            <label style="font-weight: normal" for="field.has_no_branches">
+              Show only bugs without linked branches
+            </label>
+          </td>
+          <td>
+          </td>
+        </tr>
+      </table>
+
+    </fieldset>
+    <div style="margin-top: 1em;"><input type="submit" name="search" value="Search" /></div>
   </form>
 </metal:advanced_search_form>
 </tal:root>